Merge branch 'master' into for-next

1168 files changed, 48874 insertions, 11421 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index dd0a5b5e9bf3..9bfb71ff3a6a 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -26,6 +26,8 @@ source "drivers/ata/Kconfig"
 
 source "drivers/md/Kconfig"
 
+source "drivers/target/Kconfig"
+
 source "drivers/message/fusion/Kconfig"
 
 source "drivers/firewire/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index ef5132469f58..b423bb16c3a8 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_XEN)		+= xen/
 # regulators early, since some subsystems rely on them to initialize
 obj-$(CONFIG_REGULATOR)         += regulator/
 
-# char/ comes before serial/ etc so that the VT console is the boot-time
+# tty/ comes before char/ so that the VT console is the boot-time
 # default.
 obj-y                           += tty/
 obj-y                           += char/
@@ -38,7 +38,6 @@ obj-$(CONFIG_CONNECTOR)		+= connector/
 obj-$(CONFIG_FB_I810)           += video/i810/
 obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
-obj-y                           += serial/
 obj-$(CONFIG_PARPORT)           += parport/
 obj-y                           += base/ block/ misc/ mfd/ nfc/
 obj-$(CONFIG_NUBUS)             += nubus/
@@ -46,6 +45,7 @@ obj-y				+= macintosh/
 obj-$(CONFIG_IDE)               += ide/
 obj-$(CONFIG_SCSI)              += scsi/
 obj-$(CONFIG_ATA)               += ata/
+obj-$(CONFIG_TARGET_CORE)       += target/
 obj-$(CONFIG_MTD)               += mtd/
 obj-$(CONFIG_SPI)               += spi/
 obj-y                           += net/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 3f3489c5ca8c..2aa042a5da6d 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -51,12 +51,7 @@ config ACPI_PROCFS
           For backwards compatibility, this option allows
           deprecated /proc/acpi/ files to exist, even when
           they have been replaced by functions in /sys.
-          The deprecated files (and their replacements) include:
 
-          /proc/acpi/processor/*/throttling (/sys/class/thermal/
-                cooling_device*/*)
-          /proc/acpi/video/*/brightness (/sys/class/backlight/)
-          /proc/acpi/thermal_zone/*/* (/sys/class/thermal/)
           This option has no effect on /proc/acpi/ files
           and functions which do not yet exist in /sys.
 
@@ -74,6 +69,8 @@ config ACPI_PROCFS_POWER
           /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
           This option has no effect on /proc/acpi/ directories
           and functions, which do not yet exist in /sys
+          This option, together with the proc directories, will be
+          deleted in 2.6.39.
 
           Say N to delete power /proc/acpi/ directories that have moved to /sys/
 
@@ -209,6 +206,17 @@ config ACPI_PROCESSOR
 
           To compile this driver as a module, choose M here:
           the module will be called processor.
+config ACPI_IPMI
+        tristate "IPMI"
+        depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
+        default n
+        help
+          This driver enables the ACPI to access the BMC controller. And it
+          uses the IPMI request/response message to communicate with BMC
+          controller, which can be found on on the server.
+
+          To compile this driver as a module, choose M here:
+          the module will be called as acpi_ipmi.
 
 config ACPI_HOTPLUG_CPU
         bool
@@ -310,7 +318,7 @@ config ACPI_PCI_SLOT
           the module will be called pci_slot.
 
 config X86_PM_TIMER
-        bool "Power Management Timer Support" if EMBEDDED
+        bool "Power Management Timer Support" if EXPERT
         depends on X86
         default y
         help
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3d031d02e54b..d113fa5100b2 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -24,7 +24,7 @@ acpi-y				+= atomicio.o
 # sleep related files
 acpi-y                          += wakeup.o
 acpi-y                          += sleep.o
-acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
+acpi-$(CONFIG_ACPI_SLEEP)       += proc.o nvs.o
 
 
 #
@@ -69,5 +69,6 @@ processor-y			+= processor_idle.o processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)    += processor_perflib.o
 
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
+obj-$(CONFIG_ACPI_IPMI)         += acpi_ipmi.o
 
 obj-$(CONFIG_ACPI_APEI)         += apei/
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 25d3aaebc10d..58c3f74bd84c 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -197,7 +197,8 @@ static int acpi_ac_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
 
-
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_ac_dir);
diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c
new file mode 100644
index 000000000000..f40acef80269
--- /dev/null
+++ b/drivers/acpi/acpi_ipmi.c
@@ -0,0 +1,525 @@
+/*
+ *  acpi_ipmi.c - ACPI IPMI opregion
+ *
+ *  Copyright (C) 2010 Intel Corporation
+ *  Copyright (C) 2010 Zhao Yakui <yakui.zhao@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 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/types.h>
+#include <linux/delay.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+#include <linux/ipmi.h>
+#include <linux/device.h>
+#include <linux/pnp.h>
+
+MODULE_AUTHOR("Zhao Yakui");
+MODULE_DESCRIPTION("ACPI IPMI Opregion driver");
+MODULE_LICENSE("GPL");
+
+#define IPMI_FLAGS_HANDLER_INSTALL      0
+
+#define ACPI_IPMI_OK                    0
+#define ACPI_IPMI_TIMEOUT               0x10
+#define ACPI_IPMI_UNKNOWN               0x07
+/* the IPMI timeout is 5s */
+#define IPMI_TIMEOUT                    (5 * HZ)
+
+struct acpi_ipmi_device {
+        /* the device list attached to driver_data.ipmi_devices */
+        struct list_head head;
+        /* the IPMI request message list */
+        struct list_head tx_msg_list;
+        struct mutex    tx_msg_lock;
+        acpi_handle handle;
+        struct pnp_dev *pnp_dev;
+        ipmi_user_t     user_interface;
+        int ipmi_ifnum; /* IPMI interface number */
+        long curr_msgid;
+        unsigned long flags;
+        struct ipmi_smi_info smi_data;
+};
+
+struct ipmi_driver_data {
+        struct list_head        ipmi_devices;
+        struct ipmi_smi_watcher bmc_events;
+        struct ipmi_user_hndl   ipmi_hndlrs;
+        struct mutex            ipmi_lock;
+};
+
+struct acpi_ipmi_msg {
+        struct list_head head;
+        /*
+         * General speaking the addr type should be SI_ADDR_TYPE. And
+         * the addr channel should be BMC.
+         * In fact it can also be IPMB type. But we will have to
+         * parse it from the Netfn command buffer. It is so complex
+         * that it is skipped.
+         */
+        struct ipmi_addr addr;
+        long tx_msgid;
+        /* it is used to track whether the IPMI message is finished */
+        struct completion tx_complete;
+        struct kernel_ipmi_msg tx_message;
+        int     msg_done;
+        /* tx data . And copy it from ACPI object buffer */
+        u8      tx_data[64];
+        int     tx_len;
+        u8      rx_data[64];
+        int     rx_len;
+        struct acpi_ipmi_device *device;
+};
+
+/* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */
+struct acpi_ipmi_buffer {
+        u8 status;
+        u8 length;
+        u8 data[64];
+};
+
+static void ipmi_register_bmc(int iface, struct device *dev);
+static void ipmi_bmc_gone(int iface);
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
+static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device);
+static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device);
+
+static struct ipmi_driver_data driver_data = {
+        .ipmi_devices = LIST_HEAD_INIT(driver_data.ipmi_devices),
+        .bmc_events = {
+                .owner = THIS_MODULE,
+                .new_smi = ipmi_register_bmc,
+                .smi_gone = ipmi_bmc_gone,
+        },
+        .ipmi_hndlrs = {
+                .ipmi_recv_hndl = ipmi_msg_handler,
+        },
+};
+
+static struct acpi_ipmi_msg *acpi_alloc_ipmi_msg(struct acpi_ipmi_device *ipmi)
+{
+        struct acpi_ipmi_msg *ipmi_msg;
+        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+
+        ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL);
+        if (!ipmi_msg)  {
+                dev_warn(&pnp_dev->dev, "Can't allocate memory for ipmi_msg\n");
+                return NULL;
+        }
+        init_completion(&ipmi_msg->tx_complete);
+        INIT_LIST_HEAD(&ipmi_msg->head);
+        ipmi_msg->device = ipmi;
+        return ipmi_msg;
+}
+
+#define         IPMI_OP_RGN_NETFN(offset)       ((offset >> 8) & 0xff)
+#define         IPMI_OP_RGN_CMD(offset)         (offset & 0xff)
+static void acpi_format_ipmi_msg(struct acpi_ipmi_msg *tx_msg,
+                                acpi_physical_address address,
+                                acpi_integer *value)
+{
+        struct kernel_ipmi_msg *msg;
+        struct acpi_ipmi_buffer *buffer;
+        struct acpi_ipmi_device *device;
+
+        msg = &tx_msg->tx_message;
+        /*
+         * IPMI network function and command are encoded in the address
+         * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3.
+         */
+        msg->netfn = IPMI_OP_RGN_NETFN(address);
+        msg->cmd = IPMI_OP_RGN_CMD(address);
+        msg->data = tx_msg->tx_data;
+        /*
+         * value is the parameter passed by the IPMI opregion space handler.
+         * It points to the IPMI request message buffer
+         */
+        buffer = (struct acpi_ipmi_buffer *)value;
+        /* copy the tx message data */
+        msg->data_len = buffer->length;
+        memcpy(tx_msg->tx_data, buffer->data, msg->data_len);
+        /*
+         * now the default type is SYSTEM_INTERFACE and channel type is BMC.
+         * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE,
+         * the addr type should be changed to IPMB. Then we will have to parse
+         * the IPMI request message buffer to get the IPMB address.
+         * If so, please fix me.
+         */
+        tx_msg->addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+        tx_msg->addr.channel = IPMI_BMC_CHANNEL;
+        tx_msg->addr.data[0] = 0;
+
+        /* Get the msgid */
+        device = tx_msg->device;
+        mutex_lock(&device->tx_msg_lock);
+        device->curr_msgid++;
+        tx_msg->tx_msgid = device->curr_msgid;
+        mutex_unlock(&device->tx_msg_lock);
+}
+
+static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
+                acpi_integer *value, int rem_time)
+{
+        struct acpi_ipmi_buffer *buffer;
+
+        /*
+         * value is also used as output parameter. It represents the response
+         * IPMI message returned by IPMI command.
+         */
+        buffer = (struct acpi_ipmi_buffer *)value;
+        if (!rem_time && !msg->msg_done) {
+                buffer->status = ACPI_IPMI_TIMEOUT;
+                return;
+        }
+        /*
+         * If the flag of msg_done is not set or the recv length is zero, it
+         * means that the IPMI command is not executed correctly.
+         * The status code will be ACPI_IPMI_UNKNOWN.
+         */
+        if (!msg->msg_done || !msg->rx_len) {
+                buffer->status = ACPI_IPMI_UNKNOWN;
+                return;
+        }
+        /*
+         * If the IPMI response message is obtained correctly, the status code
+         * will be ACPI_IPMI_OK
+         */
+        buffer->status = ACPI_IPMI_OK;
+        buffer->length = msg->rx_len;
+        memcpy(buffer->data, msg->rx_data, msg->rx_len);
+}
+
+static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi)
+{
+        struct acpi_ipmi_msg *tx_msg, *temp;
+        int count = HZ / 10;
+        struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+
+        list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) {
+                /* wake up the sleep thread on the Tx msg */
+                complete(&tx_msg->tx_complete);
+        }
+
+        /* wait for about 100ms to flush the tx message list */
+        while (count--) {
+                if (list_empty(&ipmi->tx_msg_list))
+                        break;
+                schedule_timeout(1);
+        }
+        if (!list_empty(&ipmi->tx_msg_list))
+                dev_warn(&pnp_dev->dev, "tx msg list is not NULL\n");
+}
+
+static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
+{
+        struct acpi_ipmi_device *ipmi_device = user_msg_data;
+        int msg_found = 0;
+        struct acpi_ipmi_msg *tx_msg;
+        struct pnp_dev *pnp_dev = ipmi_device->pnp_dev;
+
+        if (msg->user != ipmi_device->user_interface) {
+                dev_warn(&pnp_dev->dev, "Unexpected response is returned. "
+                        "returned user %p, expected user %p\n",
+                        msg->user, ipmi_device->user_interface);
+                ipmi_free_recv_msg(msg);
+                return;
+        }
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_for_each_entry(tx_msg, &ipmi_device->tx_msg_list, head) {
+                if (msg->msgid == tx_msg->tx_msgid) {
+                        msg_found = 1;
+                        break;
+                }
+        }
+
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        if (!msg_found) {
+                dev_warn(&pnp_dev->dev, "Unexpected response (msg id %ld) is "
+                        "returned.\n", msg->msgid);
+                ipmi_free_recv_msg(msg);
+                return;
+        }
+
+        if (msg->msg.data_len) {
+                /* copy the response data to Rx_data buffer */
+                memcpy(tx_msg->rx_data, msg->msg_data, msg->msg.data_len);
+                tx_msg->rx_len = msg->msg.data_len;
+                tx_msg->msg_done = 1;
+        }
+        complete(&tx_msg->tx_complete);
+        ipmi_free_recv_msg(msg);
+};
+
+static void ipmi_register_bmc(int iface, struct device *dev)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+        struct pnp_dev *pnp_dev;
+        ipmi_user_t             user;
+        int err;
+        struct ipmi_smi_info smi_data;
+        acpi_handle handle;
+
+        err = ipmi_get_smi_info(iface, &smi_data);
+
+        if (err)
+                return;
+
+        if (smi_data.addr_src != SI_ACPI) {
+                put_device(smi_data.dev);
+                return;
+        }
+
+        handle = smi_data.addr_info.acpi_info.acpi_handle;
+
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry(temp, &driver_data.ipmi_devices, head) {
+                /*
+                 * if the corresponding ACPI handle is already added
+                 * to the device list, don't add it again.
+                 */
+                if (temp->handle == handle)
+                        goto out;
+        }
+
+        ipmi_device = kzalloc(sizeof(*ipmi_device), GFP_KERNEL);
+
+        if (!ipmi_device)
+                goto out;
+
+        pnp_dev = to_pnp_dev(smi_data.dev);
+        ipmi_device->handle = handle;
+        ipmi_device->pnp_dev = pnp_dev;
+
+        err = ipmi_create_user(iface, &driver_data.ipmi_hndlrs,
+                                        ipmi_device, &user);
+        if (err) {
+                dev_warn(&pnp_dev->dev, "Can't create IPMI user interface\n");
+                kfree(ipmi_device);
+                goto out;
+        }
+        acpi_add_ipmi_device(ipmi_device);
+        ipmi_device->user_interface = user;
+        ipmi_device->ipmi_ifnum = iface;
+        mutex_unlock(&driver_data.ipmi_lock);
+        memcpy(&ipmi_device->smi_data, &smi_data, sizeof(struct ipmi_smi_info));
+        return;
+
+out:
+        mutex_unlock(&driver_data.ipmi_lock);
+        put_device(smi_data.dev);
+        return;
+}
+
+static void ipmi_bmc_gone(int iface)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry_safe(ipmi_device, temp,
+                                &driver_data.ipmi_devices, head) {
+                if (ipmi_device->ipmi_ifnum != iface)
+                        continue;
+
+                acpi_remove_ipmi_device(ipmi_device);
+                put_device(ipmi_device->smi_data.dev);
+                kfree(ipmi_device);
+                break;
+        }
+        mutex_unlock(&driver_data.ipmi_lock);
+}
+/* --------------------------------------------------------------------------
+ *                      Address Space Management
+ * -------------------------------------------------------------------------- */
+/*
+ * This is the IPMI opregion space handler.
+ * @function: indicates the read/write. In fact as the IPMI message is driven
+ * by command, only write is meaningful.
+ * @address: This contains the netfn/command of IPMI request message.
+ * @bits   : not used.
+ * @value  : it is an in/out parameter. It points to the IPMI message buffer.
+ *           Before the IPMI message is sent, it represents the actual request
+ *           IPMI message. After the IPMI message is finished, it represents
+ *           the response IPMI message returned by IPMI command.
+ * @handler_context: IPMI device context.
+ */
+
+static acpi_status
+acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
+                      u32 bits, acpi_integer *value,
+                      void *handler_context, void *region_context)
+{
+        struct acpi_ipmi_msg *tx_msg;
+        struct acpi_ipmi_device *ipmi_device = handler_context;
+        int err, rem_time;
+        acpi_status status;
+        /*
+         * IPMI opregion message.
+         * IPMI message is firstly written to the BMC and system software
+         * can get the respsonse. So it is unmeaningful for the read access
+         * of IPMI opregion.
+         */
+        if ((function & ACPI_IO_MASK) == ACPI_READ)
+                return AE_TYPE;
+
+        if (!ipmi_device->user_interface)
+                return AE_NOT_EXIST;
+
+        tx_msg = acpi_alloc_ipmi_msg(ipmi_device);
+        if (!tx_msg)
+                return AE_NO_MEMORY;
+
+        acpi_format_ipmi_msg(tx_msg, address, value);
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list);
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        err = ipmi_request_settime(ipmi_device->user_interface,
+                                        &tx_msg->addr,
+                                        tx_msg->tx_msgid,
+                                        &tx_msg->tx_message,
+                                        NULL, 0, 0, 0);
+        if (err) {
+                status = AE_ERROR;
+                goto end_label;
+        }
+        rem_time = wait_for_completion_timeout(&tx_msg->tx_complete,
+                                        IPMI_TIMEOUT);
+        acpi_format_ipmi_response(tx_msg, value, rem_time);
+        status = AE_OK;
+
+end_label:
+        mutex_lock(&ipmi_device->tx_msg_lock);
+        list_del(&tx_msg->head);
+        mutex_unlock(&ipmi_device->tx_msg_lock);
+        kfree(tx_msg);
+        return status;
+}
+
+static void ipmi_remove_space_handler(struct acpi_ipmi_device *ipmi)
+{
+        if (!test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
+                return;
+
+        acpi_remove_address_space_handler(ipmi->handle,
+                                ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler);
+
+        clear_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
+}
+
+static int ipmi_install_space_handler(struct acpi_ipmi_device *ipmi)
+{
+        acpi_status status;
+
+        if (test_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags))
+                return 0;
+
+        status = acpi_install_address_space_handler(ipmi->handle,
+                                                    ACPI_ADR_SPACE_IPMI,
+                                                    &acpi_ipmi_space_handler,
+                                                    NULL, ipmi);
+        if (ACPI_FAILURE(status)) {
+                struct pnp_dev *pnp_dev = ipmi->pnp_dev;
+                dev_warn(&pnp_dev->dev, "Can't register IPMI opregion space "
+                        "handle\n");
+                return -EINVAL;
+        }
+        set_bit(IPMI_FLAGS_HANDLER_INSTALL, &ipmi->flags);
+        return 0;
+}
+
+static void acpi_add_ipmi_device(struct acpi_ipmi_device *ipmi_device)
+{
+
+        INIT_LIST_HEAD(&ipmi_device->head);
+
+        mutex_init(&ipmi_device->tx_msg_lock);
+        INIT_LIST_HEAD(&ipmi_device->tx_msg_list);
+        ipmi_install_space_handler(ipmi_device);
+
+        list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices);
+}
+
+static void acpi_remove_ipmi_device(struct acpi_ipmi_device *ipmi_device)
+{
+        /*
+         * If the IPMI user interface is created, it should be
+         * destroyed.
+         */
+        if (ipmi_device->user_interface) {
+                ipmi_destroy_user(ipmi_device->user_interface);
+                ipmi_device->user_interface = NULL;
+        }
+        /* flush the Tx_msg list */
+        if (!list_empty(&ipmi_device->tx_msg_list))
+                ipmi_flush_tx_msg(ipmi_device);
+
+        list_del(&ipmi_device->head);
+        ipmi_remove_space_handler(ipmi_device);
+}
+
+static int __init acpi_ipmi_init(void)
+{
+        int result = 0;
+
+        if (acpi_disabled)
+                return result;
+
+        mutex_init(&driver_data.ipmi_lock);
+
+        result = ipmi_smi_watcher_register(&driver_data.bmc_events);
+
+        return result;
+}
+
+static void __exit acpi_ipmi_exit(void)
+{
+        struct acpi_ipmi_device *ipmi_device, *temp;
+
+        if (acpi_disabled)
+                return;
+
+        ipmi_smi_watcher_unregister(&driver_data.bmc_events);
+
+        /*
+         * When one smi_watcher is unregistered, it is only deleted
+         * from the smi_watcher list. But the smi_gone callback function
+         * is not called. So explicitly uninstall the ACPI IPMI oregion
+         * handler and free it.
+         */
+        mutex_lock(&driver_data.ipmi_lock);
+        list_for_each_entry_safe(ipmi_device, temp,
+                                &driver_data.ipmi_devices, head) {
+                acpi_remove_ipmi_device(ipmi_device);
+                put_device(ipmi_device->smi_data.dev);
+                kfree(ipmi_device);
+        }
+        mutex_unlock(&driver_data.ipmi_lock);
+}
+
+module_init(acpi_ipmi_init);
+module_exit(acpi_ipmi_exit);
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index a7e1d1aa4107..eec2eadd2431 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -14,7 +14,7 @@ acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
 
 acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
          evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
-         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o
+         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o
 
 acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
          exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 3e50c74ed4a1..e0ba17f0a7c8 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acconfig.h b/drivers/acpi/acpica/acconfig.h
index b17d8de9f6ff..ab87396c2c07 100644
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 72e9d5eb083c..eb0b1f8dee6d 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 894a0ff2a946..666271b65418 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index a6f99cc37a19..41d247daf461 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,8 +51,6 @@ acpi_status acpi_ev_initialize_events(void);
 
 acpi_status acpi_ev_install_xrupt_handlers(void);
 
-acpi_status acpi_ev_install_fadt_gpes(void);
-
 u32 acpi_ev_fixed_event_detect(void);
 
 /*
@@ -82,9 +80,9 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info);
 
 acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status acpi_raw_disable_gpe(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
 struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                        u32 gpe_number);
@@ -93,6 +91,8 @@ struct acpi_gpe_event_info *acpi_ev_low_get_gpe_info(u32 gpe_number,
                                                      struct acpi_gpe_block_info
                                                      *gpe_block);
 
+acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info);
+
 /*
  * evgpeblk - Upper-level GPE block support
  */
@@ -107,12 +107,13 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 acpi_status
 acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                              struct acpi_gpe_block_info *gpe_block,
-                             void *ignored);
+                             void *context);
 
 acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);
 
 u32
-acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info,
+acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
+                     struct acpi_gpe_event_info *gpe_event_info,
                      u32 gpe_number);
 
 /*
@@ -126,10 +127,6 @@ acpi_status
 acpi_ev_match_gpe_method(acpi_handle obj_handle,
                          u32 level, void *context, void **return_value);
 
-acpi_status
-acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
-                          u32 level, void *context, void **return_value);
-
 /*
  * evgpeutil - GPE utilities
  */
@@ -138,6 +135,10 @@ acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback, void *context);
 
 u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info);
 
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context);
+
 struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);
 
 acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index ad88fcae4eb9..82a1bd283db8 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,6 +146,9 @@ u8 acpi_gbl_system_awake_and_running;
 
 extern u32 acpi_gbl_nesting_level;
 
+ACPI_EXTERN u32 acpi_gpe_count;
+ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
+
 /* Support for dynamic control method tracing mechanism */
 
 ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
@@ -225,8 +228,10 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_present;
  */
 ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock;      /* For GPE data structs and registers */
 ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
+ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */
 #define acpi_gbl_gpe_lock       &_acpi_gbl_gpe_lock
 #define acpi_gbl_hardware_lock  &_acpi_gbl_hardware_lock
+#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock
 
 /*****************************************************************************
  *
@@ -370,7 +375,9 @@ ACPI_EXTERN struct acpi_fixed_event_handler
 ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
 ACPI_EXTERN struct acpi_gpe_block_info
 *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
-ACPI_EXTERN u8 acpi_all_gpes_initialized;
+ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
+ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
+ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
 
 /*****************************************************************************
  *
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 167470ad2d21..e7213beaafc7 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,7 @@ u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
                              struct acpi_gpe_register_info *gpe_register_info);
 
 acpi_status
-acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action);
+acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action);
 
 acpi_status
 acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index 049e203bd621..3731e1c34b83 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 2ceb0c05b2d7..54784bb42cec 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,17 +408,18 @@ struct acpi_predefined_data {
 
 /* Dispatch info for each GPE -- either a method or handler, cannot be both */
 
-struct acpi_handler_info {
-        acpi_event_handler address;     /* Address of handler, if any */
+struct acpi_gpe_handler_info {
+        acpi_gpe_handler address;       /* Address of handler, if any */
         void *context;          /* Context to be passed to handler */
         struct acpi_namespace_node *method_node;        /* Method node for this GPE level (saved) */
-        u8 orig_flags;          /* Original misc info about this GPE */
-        u8 orig_enabled;        /* Set if the GPE was originally enabled */
+        u8 original_flags;      /* Original (pre-handler) GPE info */
+        u8 originally_enabled;  /* True if GPE was originally enabled */
 };
 
 union acpi_gpe_dispatch_info {
         struct acpi_namespace_node *method_node;        /* Method node for this GPE level */
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
+        struct acpi_namespace_node *device_node;        /* Parent _PRW device for implicit notify */
 };
 
 /*
@@ -458,7 +459,7 @@ struct acpi_gpe_block_info {
         u32 register_count;     /* Number of register pairs in block */
         u16 gpe_count;          /* Number of individual GPEs in block */
         u8 block_base_number;   /* Base GPE number for this block */
-        u8 initialized;         /* If set, the GPE block has been initialized */
+        u8 initialized;         /* TRUE if this block is initialized */
 };
 
 /* Information about GPE interrupt handlers, one per each interrupt level used for GPEs */
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index 8d5c9e0a495f..b7491ee1fba6 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index d44d3bc5b847..79a598c67fe3 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 962a3ccff6fd..1055769f2f01 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,8 +97,6 @@
 #define AOPOBJ_OBJECT_INITIALIZED   0x08        /* Region is initialized, _REG was run */
 #define AOPOBJ_SETUP_COMPLETE       0x10        /* Region setup is complete */
 #define AOPOBJ_INVALID              0x20        /* Host OS won't allow a Region address */
-#define AOPOBJ_MODULE_LEVEL         0x40        /* Method is actually module-level code */
-#define AOPOBJ_MODIFIED_NAMESPACE   0x80        /* Method modified the namespace */
 
 /******************************************************************************
  *
@@ -175,7 +173,7 @@ struct acpi_object_region {
 };
 
 struct acpi_object_method {
-        ACPI_OBJECT_COMMON_HEADER u8 method_flags;
+        ACPI_OBJECT_COMMON_HEADER u8 info_flags;
         u8 param_count;
         u8 sync_level;
         union acpi_operand_object *mutex;
@@ -183,13 +181,21 @@ struct acpi_object_method {
         union {
                 ACPI_INTERNAL_METHOD implementation;
                 union acpi_operand_object *handler;
-        } extra;
+        } dispatch;
 
         u32 aml_length;
         u8 thread_count;
         acpi_owner_id owner_id;
 };
 
+/* Flags for info_flags field above */
+
+#define ACPI_METHOD_MODULE_LEVEL        0x01    /* Method is actually module-level code */
+#define ACPI_METHOD_INTERNAL_ONLY       0x02    /* Method is implemented internally (_OSI) */
+#define ACPI_METHOD_SERIALIZED          0x04    /* Method is serialized */
+#define ACPI_METHOD_SERIALIZED_PENDING  0x08    /* Method is to be marked serialized */
+#define ACPI_METHOD_MODIFIED_NAMESPACE  0x10    /* Method modified the namespace */
+
 /******************************************************************************
  *
  * Objects that can be notified.  All share a common notify_info area.
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index 8c15ff43f42b..bb2ccfad7376 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index d0bb0fd3e57a..5ea1e06afa20 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 10998d369ad0..94e73c97cf85 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 528bcbaf4ce7..f08b55b7f3a0 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 6e5dd97949fe..1623b245dde2 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 62a576e34361..967f08124eba 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 72e4183c1937..99c140d8e348 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/amlcode.h b/drivers/acpi/acpica/amlcode.h
index 1f484ba228fc..f4f0998d3967 100644
--- a/drivers/acpi/acpica/amlcode.h
+++ b/drivers/acpi/acpica/amlcode.h
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -480,16 +480,10 @@ typedef enum {
         AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D
 } AML_ACCESS_ATTRIBUTE;
 
-/* Bit fields in method_flags byte */
+/* Bit fields in the AML method_flags byte */
 
 #define AML_METHOD_ARG_COUNT        0x07
 #define AML_METHOD_SERIALIZED       0x08
 #define AML_METHOD_SYNC_LEVEL       0xF0
 
-/* METHOD_FLAGS_ARG_COUNT is not used internally, define additional flags */
-
-#define AML_METHOD_INTERNAL_ONLY    0x01
-#define AML_METHOD_RESERVED1        0x02
-#define AML_METHOD_RESERVED2        0x04
-
 #endif                          /* __AMLCODE_H__ */
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index 0e5798fcbb19..59122cde247c 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 347bee1726f1..34be60c0e448 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index cc4a38c57558..a7718bf2b9a1 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index d94dd8974b55..5d797751e205 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,6 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "amlcode.h"
 #include "acdispat.h"
 #include "acinterp.h"
 #include "acnamesp.h"
@@ -201,7 +200,7 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
         /*
          * If this method is serialized, we need to acquire the method mutex.
          */
-        if (obj_desc->method.method_flags & AML_METHOD_SERIALIZED) {
+        if (obj_desc->method.info_flags & ACPI_METHOD_SERIALIZED) {
                 /*
                  * Create a mutex for the method if it is defined to be Serialized
                  * and a mutex has not already been created. We defer the mutex creation
@@ -413,8 +412,9 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
 
         /* Invoke an internal method if necessary */
 
-        if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
-                status = obj_desc->method.extra.implementation(next_walk_state);
+        if (obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
+                status =
+                    obj_desc->method.dispatch.implementation(next_walk_state);
                 if (status == AE_OK) {
                         status = AE_CTRL_TERMINATE;
                 }
@@ -579,11 +579,14 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                 /*
                  * Delete any namespace objects created anywhere within the
-                 * namespace by the execution of this method. Unless this method
-                 * is a module-level executable code method, in which case we
-                 * want make the objects permanent.
+                 * namespace by the execution of this method. Unless:
+                 * 1) This method is a module-level executable code method, in which
+                 *    case we want make the objects permanent.
+                 * 2) There are other threads executing the method, in which case we
+                 *    will wait until the last thread has completed.
                  */
-                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                if (!(method_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL)
+                    && (method_desc->method.thread_count == 1)) {
 
                         /* Delete any direct children of (created by) this method */
 
@@ -593,12 +596,17 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                         /*
                          * Delete any objects that were created by this method
                          * elsewhere in the namespace (if any were created).
+                         * Use of the ACPI_METHOD_MODIFIED_NAMESPACE optimizes the
+                         * deletion such that we don't have to perform an entire
+                         * namespace walk for every control method execution.
                          */
                         if (method_desc->method.
-                            flags & AOPOBJ_MODIFIED_NAMESPACE) {
+                            info_flags & ACPI_METHOD_MODIFIED_NAMESPACE) {
                                 acpi_ns_delete_namespace_by_owner(method_desc->
                                                                   method.
                                                                   owner_id);
+                                method_desc->method.info_flags &=
+                                    ~ACPI_METHOD_MODIFIED_NAMESPACE;
                         }
                 }
         }
@@ -629,19 +637,43 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
                  * Serialized if it appears that the method is incorrectly written and
                  * does not support multiple thread execution. The best example of this
                  * is if such a method creates namespace objects and blocks. A second
-                 * thread will fail with an AE_ALREADY_EXISTS exception
+                 * thread will fail with an AE_ALREADY_EXISTS exception.
                  *
                  * This code is here because we must wait until the last thread exits
-                 * before creating the synchronization semaphore.
+                 * before marking the method as serialized.
                  */
-                if ((method_desc->method.method_flags & AML_METHOD_SERIALIZED)
-                    && (!method_desc->method.mutex)) {
-                        (void)acpi_ds_create_method_mutex(method_desc);
+                if (method_desc->method.
+                    info_flags & ACPI_METHOD_SERIALIZED_PENDING) {
+                        if (walk_state) {
+                                ACPI_INFO((AE_INFO,
+                                           "Marking method %4.4s as Serialized because of AE_ALREADY_EXISTS error",
+                                           walk_state->method_node->name.
+                                           ascii));
+                        }
+
+                        /*
+                         * Method tried to create an object twice and was marked as
+                         * "pending serialized". The probable cause is that the method
+                         * cannot handle reentrancy.
+                         *
+                         * The method was created as not_serialized, but it tried to create
+                         * a named object and then blocked, causing the second thread
+                         * entrance to begin and then fail. Workaround this problem by
+                         * marking the method permanently as Serialized when the last
+                         * thread exits here.
+                         */
+                        method_desc->method.info_flags &=
+                            ~ACPI_METHOD_SERIALIZED_PENDING;
+                        method_desc->method.info_flags |=
+                            ACPI_METHOD_SERIALIZED;
+                        method_desc->method.sync_level = 0;
                 }
 
                 /* No more threads, we can free the owner_id */
 
-                if (!(method_desc->method.flags & AOPOBJ_MODULE_LEVEL)) {
+                if (!
+                    (method_desc->method.
+                     info_flags & ACPI_METHOD_MODULE_LEVEL)) {
                         acpi_ut_release_owner_id(&method_desc->method.owner_id);
                 }
         }
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 8095306fcd8c..905ce29a92e1 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 8e85f54a8e0e..f42e17e5c252 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index 7c0e74227171..bbecf293aeeb 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 15135c25aa9b..2c477ce172fa 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 6b0b5d08d97a..fe40e4c6554f 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 140a9d002959..52566ff5e903 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswscope.c b/drivers/acpi/acpica/dswscope.c
index d1e701709dac..76a661fc1e09 100644
--- a/drivers/acpi/acpica/dswscope.c
+++ b/drivers/acpi/acpica/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 83155dd8671e..a6c374ef9914 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index c61c3039c31a..d458b041e651 100644
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -217,9 +217,17 @@ u32 acpi_ev_fixed_event_detect(void)
                      status_bit_mask)
                     && (fixed_enable & acpi_gbl_fixed_event_info[i].
                         enable_bit_mask)) {
+                        /*
+                         * Found an active (signalled) event. Invoke global event
+                         * handler if present.
+                         */
+                        acpi_fixed_event_count[i]++;
+                        if (acpi_gbl_global_event_handler) {
+                                acpi_gbl_global_event_handler
+                                    (ACPI_EVENT_TYPE_FIXED, NULL, i,
+                                     acpi_gbl_global_event_handler_context);
+                        }
 
-                        /* Found an active (signalled) event */
-                        acpi_os_fixed_event_count(i);
                         int_status |= acpi_ev_fixed_event_dispatch(i);
                 }
         }
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index f226eac314db..14988a86066f 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,8 @@ ACPI_MODULE_NAME("evgpe")
 /* Local prototypes */
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
 
+static void ACPI_SYSTEM_XFACE acpi_ev_asynch_enable_gpe(void *context);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_update_gpe_enable_mask
@@ -102,7 +104,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Clear the given GPE from stale events and enable it.
+ * DESCRIPTION: Clear a GPE of stale events and enable it.
  *
  ******************************************************************************/
 acpi_status
@@ -113,12 +115,13 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
         ACPI_FUNCTION_TRACE(ev_enable_gpe);
 
         /*
-         * We will only allow a GPE to be enabled if it has either an
-         * associated method (_Lxx/_Exx) or a handler. Otherwise, the
-         * GPE will be immediately disabled by acpi_ev_gpe_dispatch the
-         * first time it fires.
+         * We will only allow a GPE to be enabled if it has either an associated
+         * method (_Lxx/_Exx) or a handler, or is using the implicit notify
+         * feature. Otherwise, the GPE will be immediately disabled by
+         * acpi_ev_gpe_dispatch the first time it fires.
          */
-        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)) {
+        if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+            ACPI_GPE_DISPATCH_NONE) {
                 return_ACPI_STATUS(AE_NO_HANDLER);
         }
 
@@ -137,9 +140,9 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_raw_enable_gpe
+ * FUNCTION:    acpi_ev_add_gpe_reference
  *
- * PARAMETERS:  gpe_event_info  - GPE to enable
+ * PARAMETERS:  gpe_event_info          - Add a reference to this GPE
  *
  * RETURN:      Status
  *
@@ -148,16 +151,21 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
+        ACPI_FUNCTION_TRACE(ev_add_gpe_reference);
+
         if (gpe_event_info->runtime_count == ACPI_UINT8_MAX) {
                 return_ACPI_STATUS(AE_LIMIT);
         }
 
         gpe_event_info->runtime_count++;
         if (gpe_event_info->runtime_count == 1) {
+
+                /* Enable on first reference */
+
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
                         status = acpi_ev_enable_gpe(gpe_event_info);
@@ -173,9 +181,9 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_raw_disable_gpe
+ * FUNCTION:    acpi_ev_remove_gpe_reference
  *
- * PARAMETERS:  gpe_event_info  - GPE to disable
+ * PARAMETERS:  gpe_event_info          - Remove a reference to this GPE
  *
  * RETURN:      Status
  *
@@ -184,16 +192,21 @@ acpi_status acpi_raw_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_raw_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
+        ACPI_FUNCTION_TRACE(ev_remove_gpe_reference);
+
         if (!gpe_event_info->runtime_count) {
                 return_ACPI_STATUS(AE_LIMIT);
         }
 
         gpe_event_info->runtime_count--;
         if (!gpe_event_info->runtime_count) {
+
+                /* Disable on last reference */
+
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
                         status = acpi_hw_low_set_gpe(gpe_event_info,
@@ -379,7 +392,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         }
 
                         ACPI_DEBUG_PRINT((ACPI_DB_INTERRUPTS,
-                                          "Read GPE Register at GPE%X: Status=%02X, Enable=%02X\n",
+                                          "Read GPE Register at GPE%02X: Status=%02X, Enable=%02X\n",
                                           gpe_register_info->base_gpe_number,
                                           status_reg, enable_reg));
 
@@ -405,7 +418,9 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                                          * or method.
                                          */
                                         int_status |=
-                                            acpi_ev_gpe_dispatch(&gpe_block->
+                                            acpi_ev_gpe_dispatch(gpe_block->
+                                                                 node,
+                                                                 &gpe_block->
                                                 event_info[((acpi_size) i * ACPI_GPE_REGISTER_WIDTH) + j], j + gpe_register_info->base_gpe_number);
                                 }
                         }
@@ -435,19 +450,28 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
  *              an interrupt handler.
  *
  ******************************************************************************/
-static void acpi_ev_asynch_enable_gpe(void *context);
 
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 {
-        struct acpi_gpe_event_info *gpe_event_info = (void *)context;
+        struct acpi_gpe_event_info *gpe_event_info = context;
         acpi_status status;
-        struct acpi_gpe_event_info local_gpe_event_info;
+        struct acpi_gpe_event_info *local_gpe_event_info;
         struct acpi_evaluate_info *info;
 
         ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
 
+        /* Allocate a local GPE block */
+
+        local_gpe_event_info =
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_event_info));
+        if (!local_gpe_event_info) {
+                ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, "while handling a GPE"));
+                return_VOID;
+        }
+
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
+                ACPI_FREE(local_gpe_event_info);
                 return_VOID;
         }
 
@@ -455,6 +479,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 
         if (!acpi_ev_valid_gpe_event(gpe_event_info)) {
                 status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+                ACPI_FREE(local_gpe_event_info);
                 return_VOID;
         }
 
@@ -462,7 +487,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
          * Take a snapshot of the GPE info for this level - we copy the info to
          * prevent a race condition with remove_handler/remove_block.
          */
-        ACPI_MEMCPY(&local_gpe_event_info, gpe_event_info,
+        ACPI_MEMCPY(local_gpe_event_info, gpe_event_info,
                     sizeof(struct acpi_gpe_event_info));
 
         status = acpi_ut_release_mutex(ACPI_MTX_EVENTS);
@@ -470,12 +495,26 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                 return_VOID;
         }
 
-        /*
-         * Must check for control method type dispatch one more time to avoid a
-         * race with ev_gpe_install_handler
-         */
-        if ((local_gpe_event_info.flags & ACPI_GPE_DISPATCH_MASK) ==
-            ACPI_GPE_DISPATCH_METHOD) {
+        /* Do the correct dispatch - normal method or implicit notify */
+
+        switch (local_gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
+        case ACPI_GPE_DISPATCH_NOTIFY:
+
+                /*
+                 * Implicit notify.
+                 * Dispatch a DEVICE_WAKE notify to the appropriate handler.
+                 * NOTE: the request is queued for execution after this method
+                 * completes. The notify handlers are NOT invoked synchronously
+                 * from this thread -- because handlers may in turn run other
+                 * control methods.
+                 */
+                status =
+                    acpi_ev_queue_notify_request(local_gpe_event_info->dispatch.
+                                                 device_node,
+                                                 ACPI_NOTIFY_DEVICE_WAKE);
+                break;
+
+        case ACPI_GPE_DISPATCH_METHOD:
 
                 /* Allocate the evaluation information block */
 
@@ -488,7 +527,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                          * control method that corresponds to this GPE
                          */
                         info->prefix_node =
-                            local_gpe_event_info.dispatch.method_node;
+                            local_gpe_event_info->dispatch.method_node;
                         info->flags = ACPI_IGNORE_RETURN_VALUE;
 
                         status = acpi_ns_evaluate(info);
@@ -499,46 +538,98 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "while evaluating GPE method [%4.4s]",
                                         acpi_ut_get_node_name
-                                        (local_gpe_event_info.dispatch.
+                                        (local_gpe_event_info->dispatch.
                                          method_node)));
                 }
+
+                break;
+
+        default:
+                return_VOID;    /* Should never happen */
         }
+
         /* Defer enabling of GPE until all notify handlers are done */
-        acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_asynch_enable_gpe,
-                                gpe_event_info);
+
+        status = acpi_os_execute(OSL_NOTIFY_HANDLER,
+                                 acpi_ev_asynch_enable_gpe,
+                                 local_gpe_event_info);
+        if (ACPI_FAILURE(status)) {
+                ACPI_FREE(local_gpe_event_info);
+        }
         return_VOID;
 }
 
-static void acpi_ev_asynch_enable_gpe(void *context)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_asynch_enable_gpe
+ *
+ * PARAMETERS:  Context (gpe_event_info) - Info for this GPE
+ *              Callback from acpi_os_execute
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Asynchronous clear/enable for GPE. This allows the GPE to
+ *              complete (i.e., finish execution of Notify)
+ *
+ ******************************************************************************/
+
+static void ACPI_SYSTEM_XFACE acpi_ev_asynch_enable_gpe(void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info = context;
+
+        (void)acpi_ev_finish_gpe(gpe_event_info);
+
+        ACPI_FREE(gpe_event_info);
+        return;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_finish_gpe
+ *
+ * PARAMETERS:  gpe_event_info      - Info for this GPE
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Clear/Enable a GPE. Common code that is used after execution
+ *              of a GPE method or a synchronous or asynchronous GPE handler.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ev_finish_gpe(struct acpi_gpe_event_info *gpe_event_info)
+{
         acpi_status status;
+
         if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
             ACPI_GPE_LEVEL_TRIGGERED) {
                 /*
-                 * GPE is level-triggered, we clear the GPE status bit after handling
-                 * the event.
+                 * GPE is level-triggered, we clear the GPE status bit after
+                 * handling the event.
                  */
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        return_VOID;
+                        return (status);
                 }
         }
 
         /*
-         * Enable this GPE, conditionally. This means that the GPE will only be
-         * physically enabled if the enable_for_run bit is set in the event_info
+         * Enable this GPE, conditionally. This means that the GPE will
+         * only be physically enabled if the enable_for_run bit is set
+         * in the event_info.
          */
-        (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_COND_ENABLE);
-
-        return_VOID;
+        (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_CONDITIONAL_ENABLE);
+        return (AE_OK);
 }
 
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_gpe_dispatch
  *
- * PARAMETERS:  gpe_event_info  - Info for this GPE
+ * PARAMETERS:  gpe_device      - Device node. NULL for GPE0/GPE1
+ *              gpe_event_info  - Info for this GPE
  *              gpe_number      - Number relative to the parent GPE block
  *
  * RETURN:      INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED
@@ -551,13 +642,22 @@ static void acpi_ev_asynch_enable_gpe(void *context)
  ******************************************************************************/
 
 u32
-acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
+acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
+                    struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 {
         acpi_status status;
+        u32 return_value;
 
         ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
 
-        acpi_os_gpe_count(gpe_number);
+        /* Invoke global event handler if present */
+
+        acpi_gpe_count++;
+        if (acpi_gbl_global_event_handler) {
+                acpi_gbl_global_event_handler(ACPI_EVENT_TYPE_GPE, gpe_device,
+                                              gpe_number,
+                                              acpi_gbl_global_event_handler_context);
+        }
 
         /*
          * If edge-triggered, clear the GPE status bit now. Note that
@@ -568,59 +668,55 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE[0x%2X]",
-                                        gpe_number));
+                                        "Unable to clear GPE%02X", gpe_number));
                         return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
 
         /*
-         * Dispatch the GPE to either an installed handler, or the control method
-         * associated with this GPE (_Lxx or _Exx). If a handler exists, we invoke
-         * it and do not attempt to run the method. If there is neither a handler
-         * nor a method, we disable this GPE to prevent further such pointless
-         * events from firing.
+         * Always disable the GPE so that it does not keep firing before
+         * any asynchronous activity completes (either from the execution
+         * of a GPE method or an asynchronous GPE handler.)
+         *
+         * If there is no handler or method to run, just disable the
+         * GPE and leave it disabled permanently to prevent further such
+         * pointless events from firing.
+         */
+        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to disable GPE%02X", gpe_number));
+                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
+        }
+
+        /*
+         * Dispatch the GPE to either an installed handler or the control
+         * method associated with this GPE (_Lxx or _Exx). If a handler
+         * exists, we invoke it and do not attempt to run the method.
+         * If there is neither a handler nor a method, leave the GPE
+         * disabled.
          */
         switch (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) {
         case ACPI_GPE_DISPATCH_HANDLER:
 
-                /*
-                 * Invoke the installed handler (at interrupt level)
-                 * Ignore return status for now.
-                 * TBD: leave GPE disabled on error?
-                 */
-                (void)gpe_event_info->dispatch.handler->address(gpe_event_info->
-                                                                dispatch.
-                                                                handler->
-                                                                context);
+                /* Invoke the installed handler (at interrupt level) */
 
-                /* It is now safe to clear level-triggered events. */
+                return_value =
+                    gpe_event_info->dispatch.handler->address(gpe_device,
+                                                              gpe_number,
+                                                              gpe_event_info->
+                                                              dispatch.handler->
+                                                              context);
 
-                if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
-                    ACPI_GPE_LEVEL_TRIGGERED) {
-                        status = acpi_hw_clear_gpe(gpe_event_info);
-                        if (ACPI_FAILURE(status)) {
-                                ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to clear GPE[0x%2X]",
-                                                gpe_number));
-                                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                        }
+                /* If requested, clear (if level-triggered) and reenable the GPE */
+
+                if (return_value & ACPI_REENABLE_GPE) {
+                        (void)acpi_ev_finish_gpe(gpe_event_info);
                 }
                 break;
 
         case ACPI_GPE_DISPATCH_METHOD:
-
-                /*
-                 * Disable the GPE, so it doesn't keep firing before the method has a
-                 * chance to run (it runs asynchronously with interrupts enabled).
-                 */
-                status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[0x%2X]",
-                                        gpe_number));
-                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                }
+        case ACPI_GPE_DISPATCH_NOTIFY:
 
                 /*
                  * Execute the method associated with the GPE
@@ -631,7 +727,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                          gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to queue handler for GPE[0x%2X] - event disabled",
+                                        "Unable to queue handler for GPE%2X - event disabled",
                                         gpe_number));
                 }
                 break;
@@ -644,20 +740,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  * a GPE to be enabled if it has no handler or method.
                  */
                 ACPI_ERROR((AE_INFO,
-                            "No handler or method for GPE[0x%2X], disabling event",
+                            "No handler or method for GPE%02X, disabling event",
                             gpe_number));
 
-                /*
-                 * Disable the GPE. The GPE will remain disabled a handler
-                 * is installed or ACPICA is restarted.
-                 */
-                status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE);
-                if (ACPI_FAILURE(status)) {
-                        ACPI_EXCEPTION((AE_INFO, status,
-                                        "Unable to disable GPE[0x%2X]",
-                                        gpe_number));
-                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
-                }
                 break;
         }
 
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 020add3eee1c..ca2c41a53311 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -361,9 +361,9 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 
         gpe_block->node = gpe_device;
         gpe_block->gpe_count = (u16)(register_count * ACPI_GPE_REGISTER_WIDTH);
+        gpe_block->initialized = FALSE;
         gpe_block->register_count = register_count;
         gpe_block->block_base_number = gpe_block_base_number;
-        gpe_block->initialized = FALSE;
 
         ACPI_MEMCPY(&gpe_block->block_address, gpe_block_address,
                     sizeof(struct acpi_generic_address));
@@ -386,7 +386,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                 return_ACPI_STATUS(status);
         }
 
-        acpi_all_gpes_initialized = FALSE;
+        acpi_gbl_all_gpes_initialized = FALSE;
 
         /* Find all GPE methods (_Lxx or_Exx) for this block */
 
@@ -423,14 +423,12 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
  *
  * FUNCTION:    acpi_ev_initialize_gpe_block
  *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE block
- *              gpe_block           - Gpe Block info
+ * PARAMETERS:  acpi_gpe_callback
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Initialize and enable a GPE block. First find and run any
- *              _PRT methods associated with the block, then enable the
- *              appropriate GPEs.
+ * DESCRIPTION: Initialize and enable a GPE block. Enable GPEs that have
+ *              associated methods.
  *              Note: Assumes namespace is locked.
  *
  ******************************************************************************/
@@ -450,8 +448,8 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
         ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);
 
         /*
-         * Ignore a null GPE block (e.g., if no GPE block 1 exists) and
-         * GPE blocks that have been initialized already.
+         * Ignore a null GPE block (e.g., if no GPE block 1 exists), and
+         * any GPE blocks that have been initialized already.
          */
         if (!gpe_block || gpe_block->initialized) {
                 return_ACPI_STATUS(AE_OK);
@@ -459,8 +457,8 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
         /*
          * Enable all GPEs that have a corresponding method and have the
-         * ACPI_GPE_CAN_WAKE flag unset.  Any other GPEs within this block must
-         * be enabled via the acpi_enable_gpe() interface.
+         * ACPI_GPE_CAN_WAKE flag unset. Any other GPEs within this block
+         * must be enabled via the acpi_enable_gpe() interface.
          */
         gpe_enabled_count = 0;
 
@@ -472,14 +470,19 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                         gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j;
                         gpe_event_info = &gpe_block->event_info[gpe_index];
 
-                        /* Ignore GPEs that have no corresponding _Lxx/_Exx method */
-
-                        if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD)
+                        /*
+                         * Ignore GPEs that have no corresponding _Lxx/_Exx method
+                         * and GPEs that are used to wake the system
+                         */
+                        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+                             ACPI_GPE_DISPATCH_NONE)
+                            || ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
+                                == ACPI_GPE_DISPATCH_HANDLER)
                             || (gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
                                 continue;
                         }
 
-                        status = acpi_raw_enable_gpe(gpe_event_info);
+                        status = acpi_ev_add_gpe_reference(gpe_event_info);
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not enable GPE 0x%02X",
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c
index 4c8dea513b66..ce9aa9f9a972 100644
--- a/drivers/acpi/acpica/evgpeinit.c
+++ b/drivers/acpi/acpica/evgpeinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,11 +45,27 @@
 #include "accommon.h"
 #include "acevents.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeinit")
 
+/*
+ * Note: History of _PRW support in ACPICA
+ *
+ * Originally (2000 - 2010), the GPE initialization code performed a walk of
+ * the entire namespace to execute the _PRW methods and detect all GPEs
+ * capable of waking the system.
+ *
+ * As of 10/2010, the _PRW method execution has been removed since it is
+ * actually unnecessary. The host OS must in fact execute all _PRW methods
+ * in order to identify the device/power-resource dependencies. We now put
+ * the onus on the host OS to identify the wake GPEs as part of this process
+ * and to inform ACPICA of these GPEs via the acpi_setup_gpe_for_wake interface. This
+ * not only reduces the complexity of the ACPICA initialization code, but in
+ * some cases (on systems with very large namespaces) it should reduce the
+ * kernel boot time as well.
+ */
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_gpe_initialize
@@ -222,7 +238,7 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
         acpi_status status = AE_OK;
 
         /*
-         * 2) Find any _Lxx/_Exx GPE methods that have just been loaded.
+         * Find any _Lxx/_Exx GPE methods that have just been loaded.
          *
          * Any GPEs that correspond to new _Lxx/_Exx methods are immediately
          * enabled.
@@ -235,9 +251,9 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
                 return;
         }
 
+        walk_info.count = 0;
         walk_info.owner_id = table_owner_id;
         walk_info.execute_by_owner_id = TRUE;
-        walk_info.count = 0;
 
         /* Walk the interrupt level descriptor list */
 
@@ -298,7 +314,7 @@ void acpi_ev_update_gpes(acpi_owner_id table_owner_id)
  *                  xx     - is the GPE number [in HEX]
  *
  * If walk_info->execute_by_owner_id is TRUE, we only execute examine GPE methods
- *    with that owner.
+ * with that owner.
  *
  ******************************************************************************/
 
@@ -415,6 +431,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
          * Add the GPE information from above to the gpe_event_info block for
          * use during dispatch of this GPE.
          */
+        gpe_event_info->flags &= ~(ACPI_GPE_DISPATCH_MASK);
         gpe_event_info->flags |= (u8)(type | ACPI_GPE_DISPATCH_METHOD);
         gpe_event_info->dispatch.method_node = method_node;
 
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index 19a0e513ea48..80a81d0c4a80 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -154,6 +154,45 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ev_get_gpe_device
+ *
+ * PARAMETERS:  GPE_WALK_CALLBACK
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Matches the input GPE index (0-current_gpe_count) with a GPE
+ *              block device. NULL if the GPE is one of the FADT-defined GPEs.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+                       struct acpi_gpe_block_info *gpe_block, void *context)
+{
+        struct acpi_gpe_device_info *info = context;
+
+        /* Increment Index by the number of GPEs in this block */
+
+        info->next_block_base_index += gpe_block->gpe_count;
+
+        if (info->index < info->next_block_base_index) {
+                /*
+                 * The GPE index is within this block, get the node. Leave the node
+                 * NULL for the FADT-defined GPEs
+                 */
+                if ((gpe_block->node)->type == ACPI_TYPE_DEVICE) {
+                        info->gpe_device = gpe_block->node;
+                }
+
+                info->status = AE_OK;
+                return (AE_CTRL_END);
+        }
+
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ev_get_gpe_xrupt_block
  *
  * PARAMETERS:  interrupt_number     - Interrupt for a GPE block
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index fcaed9fb44ff..7dc80946f7bd 100644
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -284,41 +284,39 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
  * RETURN:      ACPI_INTERRUPT_HANDLED
  *
  * DESCRIPTION: Invoked directly from the SCI handler when a global lock
- *              release interrupt occurs. Attempt to acquire the global lock,
- *              if successful, signal the thread waiting for the lock.
+ *              release interrupt occurs.  If there's a thread waiting for
+ *              the global lock, signal it.
  *
  * NOTE: Assumes that the semaphore can be signaled from interrupt level. If
  * this is not possible for some reason, a separate thread will have to be
  * scheduled to do this.
  *
  ******************************************************************************/
+static u8 acpi_ev_global_lock_pending;
 
 static u32 acpi_ev_global_lock_handler(void *context)
 {
-        u8 acquired = FALSE;
+        acpi_status status;
+        acpi_cpu_flags flags;
 
-        /*
-         * Attempt to get the lock.
-         *
-         * If we don't get it now, it will be marked pending and we will
-         * take another interrupt when it becomes free.
-         */
-        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
-        if (acquired) {
+        flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
 
-                /* Got the lock, now wake all threads waiting for it */
+        if (!acpi_ev_global_lock_pending) {
+                goto out;
+        }
 
-                acpi_gbl_global_lock_acquired = TRUE;
-                /* Send a unit to the semaphore */
+        /* Send a unit to the semaphore */
 
-                if (ACPI_FAILURE
-                    (acpi_os_signal_semaphore
-                     (acpi_gbl_global_lock_semaphore, 1))) {
-                        ACPI_ERROR((AE_INFO,
-                                    "Could not signal Global Lock semaphore"));
-                }
+        status = acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore, 1);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not signal Global Lock semaphore"));
         }
 
+        acpi_ev_global_lock_pending = FALSE;
+
+ out:
+        acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
+
         return (ACPI_INTERRUPT_HANDLED);
 }
 
@@ -415,6 +413,7 @@ static int acpi_ev_global_lock_acquired;
 
 acpi_status acpi_ev_acquire_global_lock(u16 timeout)
 {
+        acpi_cpu_flags flags;
         acpi_status status = AE_OK;
         u8 acquired = FALSE;
 
@@ -467,32 +466,47 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
                 return_ACPI_STATUS(AE_OK);
         }
 
-        /* Attempt to acquire the actual hardware lock */
+        flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
+
+        do {
+
+                /* Attempt to acquire the actual hardware lock */
+
+                ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
+                if (acquired) {
+                        acpi_gbl_global_lock_acquired = TRUE;
+
+                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                          "Acquired hardware Global Lock\n"));
+                        break;
+                }
 
-        ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_FACS, acquired);
-        if (acquired) {
+                acpi_ev_global_lock_pending = TRUE;
 
-                /* We got the lock */
+                acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
 
+                /*
+                 * Did not get the lock. The pending bit was set above, and we
+                 * must wait until we get the global lock released interrupt.
+                 */
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Acquired hardware Global Lock\n"));
+                                  "Waiting for hardware Global Lock\n"));
 
-                acpi_gbl_global_lock_acquired = TRUE;
-                return_ACPI_STATUS(AE_OK);
-        }
+                /*
+                 * Wait for handshake with the global lock interrupt handler.
+                 * This interface releases the interpreter if we must wait.
+                 */
+                status = acpi_ex_system_wait_semaphore(
+                                                acpi_gbl_global_lock_semaphore,
+                                                ACPI_WAIT_FOREVER);
 
-        /*
-         * Did not get the lock. The pending bit was set above, and we must now
-         * wait until we get the global lock released interrupt.
-         */
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Waiting for hardware Global Lock\n"));
+                flags = acpi_os_acquire_lock(acpi_ev_global_lock_pending_lock);
 
-        /*
-         * Wait for handshake with the global lock interrupt handler.
-         * This interface releases the interpreter if we must wait.
-         */
-        status = acpi_ex_system_wait_semaphore(acpi_gbl_global_lock_semaphore,
-                                               ACPI_WAIT_FOREVER);
+        } while (ACPI_SUCCESS(status));
+
+        acpi_ev_global_lock_pending = FALSE;
+
+        acpi_os_release_lock(acpi_ev_global_lock_pending_lock, flags);
 
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 98fd210e87b2..785a5ee64585 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 0b47a6dc9290..9659cee6093e 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -590,9 +590,9 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                                  * See acpi_ns_exec_module_code
                                  */
                                 if (obj_desc->method.
-                                    flags & AOPOBJ_MODULE_LEVEL) {
+                                    info_flags & ACPI_METHOD_MODULE_LEVEL) {
                                         handler_obj =
-                                            obj_desc->method.extra.handler;
+                                            obj_desc->method.dispatch.handler;
                                 }
                                 break;
 
diff --git a/drivers/acpi/acpica/evsci.c b/drivers/acpi/acpica/evsci.c
index 8dfbaa96e422..2ebd40e1a3ef 100644
--- a/drivers/acpi/acpica/evsci.c
+++ b/drivers/acpi/acpica/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 36af222cac65..e1141402dbed 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,6 +92,57 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                          /*  ACPI_FUTURE_USAGE  */
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_global_event_handler
+ *
+ * PARAMETERS:  Handler         - Pointer to the global event handler function
+ *              Context         - Value passed to the handler on each event
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Saves the pointer to the handler function. The global handler
+ *              is invoked upon each incoming GPE and Fixed Event. It is
+ *              invoked at interrupt level at the time of the event dispatch.
+ *              Can be used to update event counters, etc.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_install_global_event_handler);
+
+        /* Parameter validation */
+
+        if (!handler) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Don't allow two handlers. */
+
+        if (acpi_gbl_global_event_handler) {
+                status = AE_ALREADY_EXISTS;
+                goto cleanup;
+        }
+
+        acpi_gbl_global_event_handler = handler;
+        acpi_gbl_global_event_handler_context = context;
+
+      cleanup:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_global_event_handler)
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_fixed_event_handler
@@ -671,10 +722,10 @@ ACPI_EXPORT_SYMBOL(acpi_remove_notify_handler)
 acpi_status
 acpi_install_gpe_handler(acpi_handle gpe_device,
                          u32 gpe_number,
-                         u32 type, acpi_event_handler address, void *context)
+                         u32 type, acpi_gpe_handler address, void *context)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -693,7 +744,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         /* Allocate memory for the handler object */
 
-        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_handler_info));
+        handler = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_gpe_handler_info));
         if (!handler) {
                 status = AE_NO_MEMORY;
                 goto unlock_and_exit;
@@ -722,7 +773,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         handler->address = address;
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
-        handler->orig_flags = gpe_event_info->flags &
+        handler->original_flags = gpe_event_info->flags &
                         (ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
 
         /*
@@ -731,10 +782,10 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
          * disabled now to avoid spurious execution of the handler.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
             && gpe_event_info->runtime_count) {
-                handler->orig_enabled = 1;
-                (void)acpi_raw_disable_gpe(gpe_event_info);
+                handler->originally_enabled = 1;
+                (void)acpi_ev_remove_gpe_reference(gpe_event_info);
         }
 
         /* Install the handler */
@@ -777,10 +828,10 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_handler)
  ******************************************************************************/
 acpi_status
 acpi_remove_gpe_handler(acpi_handle gpe_device,
-                        u32 gpe_number, acpi_event_handler address)
+                        u32 gpe_number, acpi_gpe_handler address)
 {
         struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_handler_info *handler;
+        struct acpi_gpe_handler_info *handler;
         acpi_status status;
         acpi_cpu_flags flags;
 
@@ -835,7 +886,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
         gpe_event_info->dispatch.method_node = handler->method_node;
         gpe_event_info->flags &=
                 ~(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
-        gpe_event_info->flags |= handler->orig_flags;
+        gpe_event_info->flags |= handler->original_flags;
 
         /*
          * If the GPE was previously associated with a method and it was
@@ -843,9 +894,9 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
          * post-initialization configuration.
          */
 
-        if ((handler->orig_flags & ACPI_GPE_DISPATCH_METHOD)
-            && handler->orig_enabled)
-                (void)acpi_raw_enable_gpe(gpe_event_info);
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
+            && handler->originally_enabled)
+                (void)acpi_ev_add_gpe_reference(gpe_event_info);
 
         /* Now we can free the handler object */
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index a1dabe3fd8ae..c57b5c707a77 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,18 +43,11 @@
 
 #include <acpi/acpi.h>
 #include "accommon.h"
-#include "acevents.h"
-#include "acnamesp.h"
 #include "actables.h"
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evxfevnt")
 
-/* Local prototypes */
-static acpi_status
-acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                       struct acpi_gpe_block_info *gpe_block, void *context);
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable
@@ -213,185 +206,6 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_gpe_wakeup
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *              Action          - Enable or Disable
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Set or clear the GPE's wakeup enable mask bit.
- *
- ******************************************************************************/
-acpi_status acpi_gpe_wakeup(acpi_handle gpe_device, u32 gpe_number, u8 action)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        struct acpi_gpe_register_info *gpe_register_info;
-        acpi_cpu_flags flags;
-        u32 register_bit;
-
-        ACPI_FUNCTION_TRACE(acpi_gpe_wakeup);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (!gpe_event_info || !(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        gpe_register_info = gpe_event_info->register_info;
-        if (!gpe_register_info) {
-                status = AE_NOT_EXIST;
-                goto unlock_and_exit;
-        }
-
-        register_bit =
-            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
-
-        /* Perform the action */
-
-        switch (action) {
-        case ACPI_GPE_ENABLE:
-                ACPI_SET_BIT(gpe_register_info->enable_for_wake,
-                             (u8)register_bit);
-                break;
-
-        case ACPI_GPE_DISABLE:
-                ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
-                               (u8)register_bit);
-                break;
-
-        default:
-                ACPI_ERROR((AE_INFO, "%u, Invalid action", action));
-                status = AE_BAD_PARAMETER;
-                break;
-        }
-
-unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_gpe_wakeup)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_enable_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
- *              hardware-enabled.
- *
- ******************************************************************************/
-acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (gpe_event_info) {
-                status = acpi_raw_enable_gpe(gpe_event_info);
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_disable_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove a reference to a GPE. When the last reference is
- *              removed, only then is the GPE disabled (for runtime GPEs), or
- *              the GPE mask bit disabled (for wake GPEs)
- *
- ******************************************************************************/
-acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_BAD_PARAMETER;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (gpe_event_info) {
-                status = acpi_raw_disable_gpe(gpe_event_info) ;
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_gpe_can_wake
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Set the ACPI_GPE_CAN_WAKE flag for the given GPE.  If the GPE
- *              has a corresponding method and is currently enabled, disable it
- *              (GPEs with corresponding methods are enabled unconditionally
- *              during initialization, but GPEs that can wake up are expected
- *              to be initially disabled).
- *
- ******************************************************************************/
-acpi_status acpi_gpe_can_wake(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_gpe_can_wake);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (gpe_event_info) {
-                gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
-        } else {
-                status = AE_BAD_PARAMETER;
-        }
-
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-ACPI_EXPORT_SYMBOL(acpi_gpe_can_wake)
-
-/*******************************************************************************
- *
  * FUNCTION:    acpi_disable_event
  *
  * PARAMETERS:  Event           - The fixed eventto be enabled
@@ -483,44 +297,6 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_clear_gpe
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Clear an ACPI event (general purpose)
- *
- ******************************************************************************/
-acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (!gpe_event_info) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        status = acpi_hw_clear_gpe(gpe_event_info);
-
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-/*******************************************************************************
- *
  * FUNCTION:    acpi_get_event_status
  *
  * PARAMETERS:  Event           - The fixed event
@@ -575,379 +351,3 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_event_status)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_gpe_status
- *
- * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
- *              gpe_number      - GPE level within the GPE block
- *              event_status    - Where the current status of the event will
- *                                be returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Get status of an event (general purpose)
- *
- ******************************************************************************/
-acpi_status
-acpi_get_gpe_status(acpi_handle gpe_device,
-                    u32 gpe_number, acpi_event_status *event_status)
-{
-        acpi_status status = AE_OK;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_cpu_flags flags;
-
-        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
-
-        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
-
-        /* Ensure that we have a valid GPE number */
-
-        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
-        if (!gpe_event_info) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        /* Obtain status on the requested GPE number */
-
-        status = acpi_hw_get_gpe_status(gpe_event_info, event_status);
-
-        if (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
-                *event_status |= ACPI_EVENT_FLAG_HANDLE;
-
-      unlock_and_exit:
-        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
-/*******************************************************************************
- *
- * FUNCTION:    acpi_install_gpe_block
- *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *              gpe_block_address   - Address and space_iD
- *              register_count      - Number of GPE register pairs in the block
- *              interrupt_number    - H/W interrupt for the block
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Create and Install a block of GPE registers
- *
- ******************************************************************************/
-acpi_status
-acpi_install_gpe_block(acpi_handle gpe_device,
-                       struct acpi_generic_address *gpe_block_address,
-                       u32 register_count, u32 interrupt_number)
-{
-        acpi_status status = AE_OK;
-        union acpi_operand_object *obj_desc;
-        struct acpi_namespace_node *node;
-        struct acpi_gpe_block_info *gpe_block;
-
-        ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
-
-        if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        node = acpi_ns_validate_handle(gpe_device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        /*
-         * For user-installed GPE Block Devices, the gpe_block_base_number
-         * is always zero
-         */
-        status =
-            acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
-                                     interrupt_number, &gpe_block);
-        if (ACPI_FAILURE(status)) {
-                goto unlock_and_exit;
-        }
-
-        /* Install block in the device_object attached to the node */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc) {
-
-                /*
-                 * No object, create a new one (Device nodes do not always have
-                 * an attached object)
-                 */
-                obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
-                if (!obj_desc) {
-                        status = AE_NO_MEMORY;
-                        goto unlock_and_exit;
-                }
-
-                status =
-                    acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);
-
-                /* Remove local reference to the object */
-
-                acpi_ut_remove_reference(obj_desc);
-
-                if (ACPI_FAILURE(status)) {
-                        goto unlock_and_exit;
-                }
-        }
-
-        /* Now install the GPE block in the device_object */
-
-        obj_desc->device.gpe_block = gpe_block;
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_remove_gpe_block
- *
- * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Remove a previously installed block of GPE registers
- *
- ******************************************************************************/
-acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
-{
-        union acpi_operand_object *obj_desc;
-        acpi_status status;
-        struct acpi_namespace_node *node;
-
-        ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
-
-        if (!gpe_device) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        node = acpi_ns_validate_handle(gpe_device);
-        if (!node) {
-                status = AE_BAD_PARAMETER;
-                goto unlock_and_exit;
-        }
-
-        /* Get the device_object attached to the node */
-
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc || !obj_desc->device.gpe_block) {
-                return_ACPI_STATUS(AE_NULL_OBJECT);
-        }
-
-        /* Delete the GPE block (but not the device_object) */
-
-        status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block);
-        if (ACPI_SUCCESS(status)) {
-                obj_desc->device.gpe_block = NULL;
-        }
-
-      unlock_and_exit:
-        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
-        return_ACPI_STATUS(status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_get_gpe_device
- *
- * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
- *              gpe_device          - Where the parent GPE Device is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Obtain the GPE device associated with the input index. A NULL
- *              gpe device indicates that the gpe number is contained in one of
- *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
- *
- ******************************************************************************/
-acpi_status
-acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
-{
-        struct acpi_gpe_device_info info;
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_get_gpe_device);
-
-        if (!gpe_device) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
-        }
-
-        if (index >= acpi_current_gpe_count) {
-                return_ACPI_STATUS(AE_NOT_EXIST);
-        }
-
-        /* Setup and walk the GPE list */
-
-        info.index = index;
-        info.status = AE_NOT_EXIST;
-        info.gpe_device = NULL;
-        info.next_block_base_index = 0;
-
-        status = acpi_ev_walk_gpe_list(acpi_ev_get_gpe_device, &info);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        *gpe_device = info.gpe_device;
-        return_ACPI_STATUS(info.status);
-}
-
-ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_get_gpe_device
- *
- * PARAMETERS:  GPE_WALK_CALLBACK
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Matches the input GPE index (0-current_gpe_count) with a GPE
- *              block device. NULL if the GPE is one of the FADT-defined GPEs.
- *
- ******************************************************************************/
-static acpi_status
-acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                       struct acpi_gpe_block_info *gpe_block, void *context)
-{
-        struct acpi_gpe_device_info *info = context;
-
-        /* Increment Index by the number of GPEs in this block */
-
-        info->next_block_base_index += gpe_block->gpe_count;
-
-        if (info->index < info->next_block_base_index) {
-                /*
-                 * The GPE index is within this block, get the node. Leave the node
-                 * NULL for the FADT-defined GPEs
-                 */
-                if ((gpe_block->node)->type == ACPI_TYPE_DEVICE) {
-                        info->gpe_device = gpe_block->node;
-                }
-
-                info->status = AE_OK;
-                return (AE_CTRL_END);
-        }
-
-        return (AE_OK);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_disable_all_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Disable and clear all GPEs in all GPE blocks
- *
- ******************************************************************************/
-
-acpi_status acpi_disable_all_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_disable_all_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_hw_disable_all_gpes();
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_enable_all_runtime_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Enable all "runtime" GPEs, in all GPE blocks
- *
- ******************************************************************************/
-
-acpi_status acpi_enable_all_runtime_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_enable_all_runtime_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        }
-
-        status = acpi_hw_enable_all_runtime_gpes();
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_update_gpes
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Enable all GPEs that have associated _Lxx or _Exx methods and
- *              are not pointed to by any device _PRW methods indicating that
- *              these GPEs are generally intended for system or device wakeup
- *              (such GPEs have to be enabled directly when the devices whose
- *              _PRW methods point to them are set up for wakeup signaling).
- *
- ******************************************************************************/
-
-acpi_status acpi_update_gpes(void)
-{
-        acpi_status status;
-
-        ACPI_FUNCTION_TRACE(acpi_update_gpes);
-
-        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
-        if (ACPI_FAILURE(status)) {
-                return_ACPI_STATUS(status);
-        } else if (acpi_all_gpes_initialized) {
-                goto unlock;
-        }
-
-        status = acpi_ev_walk_gpe_list(acpi_ev_initialize_gpe_block, NULL);
-        if (ACPI_SUCCESS(status)) {
-                acpi_all_gpes_initialized = TRUE;
-        }
-
-unlock:
-        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-
-        return_ACPI_STATUS(status);
-}
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
new file mode 100644
index 000000000000..e9562a7cb2f9
--- /dev/null
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -0,0 +1,669 @@
+/******************************************************************************
+ *
+ * Module Name: evxfgpe - External Interfaces for General Purpose Events (GPEs)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "acevents.h"
+#include "acnamesp.h"
+
+#define _COMPONENT          ACPI_EVENTS
+ACPI_MODULE_NAME("evxfgpe")
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_update_all_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Complete GPE initialization and enable all GPEs that have
+ *              associated _Lxx or _Exx methods and are not pointed to by any
+ *              device _PRW methods (this indicates that these GPEs are
+ *              generally intended for system or device wakeup. Such GPEs
+ *              have to be enabled directly when the devices whose _PRW
+ *              methods point to them are set up for wakeup signaling.)
+ *
+ * NOTE: Should be called after any GPEs are added to the system. Primarily,
+ * after the system _PRW methods have been run, but also after a GPE Block
+ * Device has been added or if any new GPE methods have been added via a
+ * dynamic table load.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_update_all_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_update_all_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        if (acpi_gbl_all_gpes_initialized) {
+                goto unlock_and_exit;
+        }
+
+        status = acpi_ev_walk_gpe_list(acpi_ev_initialize_gpe_block, NULL);
+        if (ACPI_SUCCESS(status)) {
+                acpi_gbl_all_gpes_initialized = TRUE;
+        }
+
+unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_update_all_gpes)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Add a reference to a GPE. On the first reference, the GPE is
+ *              hardware-enabled.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Ensure that we have a valid GPE number */
+
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (gpe_event_info) {
+                status = acpi_ev_add_gpe_reference(gpe_event_info);
+        }
+
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_disable_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a reference to a GPE. When the last reference is
+ *              removed, only then is the GPE disabled (for runtime GPEs), or
+ *              the GPE mask bit disabled (for wake GPEs)
+ *
+ ******************************************************************************/
+
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Ensure that we have a valid GPE number */
+
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (gpe_event_info) {
+                status = acpi_ev_remove_gpe_reference(gpe_event_info) ;
+        }
+
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_setup_gpe_for_wake
+ *
+ * PARAMETERS:  wake_device         - Device associated with the GPE (via _PRW)
+ *              gpe_device          - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number          - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Mark a GPE as having the ability to wake the system. This
+ *              interface is intended to be used as the host executes the
+ *              _PRW methods (Power Resources for Wake) in the system tables.
+ *              Each _PRW appears under a Device Object (The wake_device), and
+ *              contains the info for the wake GPE associated with the
+ *              wake_device.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_setup_gpe_for_wake(acpi_handle wake_device,
+                        acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_namespace_node *device_node;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_setup_gpe_for_wake);
+
+        /* Parameter Validation */
+
+        if (!wake_device) {
+                /*
+                 * By forcing wake_device to be valid, we automatically enable the
+                 * implicit notify feature on all hosts.
+                 */
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        /* Validate wake_device is of type Device */
+
+        device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
+        if (device_node->type != ACPI_TYPE_DEVICE) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Ensure that we have a valid GPE number */
+
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (gpe_event_info) {
+                /*
+                 * If there is no method or handler for this GPE, then the
+                 * wake_device will be notified whenever this GPE fires (aka
+                 * "implicit notify") Note: The GPE is assumed to be
+                 * level-triggered (for windows compatibility).
+                 */
+                if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
+                    ACPI_GPE_DISPATCH_NONE) {
+                        gpe_event_info->flags =
+                            (ACPI_GPE_DISPATCH_NOTIFY |
+                             ACPI_GPE_LEVEL_TRIGGERED);
+                        gpe_event_info->dispatch.device_node = device_node;
+                }
+
+                gpe_event_info->flags |= ACPI_GPE_CAN_WAKE;
+                status = AE_OK;
+        }
+
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_set_gpe_wake_mask
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *              Action          - Enable or Disable
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Set or clear the GPE's wakeup enable mask bit. The GPE must
+ *              already be marked as a WAKE GPE.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
+{
+        acpi_status status = AE_OK;
+        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_gpe_register_info *gpe_register_info;
+        acpi_cpu_flags flags;
+        u32 register_bit;
+
+        ACPI_FUNCTION_TRACE(acpi_set_gpe_wake_mask);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /*
+         * Ensure that we have a valid GPE number and that this GPE is in
+         * fact a wake GPE
+         */
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (!gpe_event_info) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        if (!(gpe_event_info->flags & ACPI_GPE_CAN_WAKE)) {
+                status = AE_TYPE;
+                goto unlock_and_exit;
+        }
+
+        gpe_register_info = gpe_event_info->register_info;
+        if (!gpe_register_info) {
+                status = AE_NOT_EXIST;
+                goto unlock_and_exit;
+        }
+
+        register_bit =
+            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
+
+        /* Perform the action */
+
+        switch (action) {
+        case ACPI_GPE_ENABLE:
+                ACPI_SET_BIT(gpe_register_info->enable_for_wake,
+                             (u8)register_bit);
+                break;
+
+        case ACPI_GPE_DISABLE:
+                ACPI_CLEAR_BIT(gpe_register_info->enable_for_wake,
+                               (u8)register_bit);
+                break;
+
+        default:
+                ACPI_ERROR((AE_INFO, "%u, Invalid action", action));
+                status = AE_BAD_PARAMETER;
+                break;
+        }
+
+unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_set_gpe_wake_mask)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_clear_gpe
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Clear an ACPI event (general purpose)
+ *
+ ******************************************************************************/
+acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number)
+{
+        acpi_status status = AE_OK;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Ensure that we have a valid GPE number */
+
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (!gpe_event_info) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        status = acpi_hw_clear_gpe(gpe_event_info);
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_gpe_status
+ *
+ * PARAMETERS:  gpe_device      - Parent GPE Device. NULL for GPE0/GPE1
+ *              gpe_number      - GPE level within the GPE block
+ *              event_status    - Where the current status of the event will
+ *                                be returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get the current status of a GPE (signalled/not_signalled)
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_gpe_status(acpi_handle gpe_device,
+                    u32 gpe_number, acpi_event_status *event_status)
+{
+        acpi_status status = AE_OK;
+        struct acpi_gpe_event_info *gpe_event_info;
+        acpi_cpu_flags flags;
+
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
+
+        flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+
+        /* Ensure that we have a valid GPE number */
+
+        gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
+        if (!gpe_event_info) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /* Obtain status on the requested GPE number */
+
+        status = acpi_hw_get_gpe_status(gpe_event_info, event_status);
+
+        if (gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK)
+                *event_status |= ACPI_EVENT_FLAG_HANDLE;
+
+      unlock_and_exit:
+        acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_disable_all_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Disable and clear all GPEs in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_disable_all_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_disable_all_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_disable_all_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_disable_all_gpes)
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_enable_all_runtime_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Enable all "runtime" GPEs, in all GPE blocks
+ *
+ ******************************************************************************/
+
+acpi_status acpi_enable_all_runtime_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_enable_all_runtime_gpes);
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        status = acpi_hw_enable_all_runtime_gpes();
+        (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
+
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_enable_all_runtime_gpes)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_install_gpe_block
+ *
+ * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
+ *              gpe_block_address   - Address and space_iD
+ *              register_count      - Number of GPE register pairs in the block
+ *              interrupt_number    - H/W interrupt for the block
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create and Install a block of GPE registers. The GPEs are not
+ *              enabled here.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_install_gpe_block(acpi_handle gpe_device,
+                       struct acpi_generic_address *gpe_block_address,
+                       u32 register_count, u32 interrupt_number)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        struct acpi_namespace_node *node;
+        struct acpi_gpe_block_info *gpe_block;
+
+        ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
+
+        if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        node = acpi_ns_validate_handle(gpe_device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /*
+         * For user-installed GPE Block Devices, the gpe_block_base_number
+         * is always zero
+         */
+        status =
+            acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
+                                     interrupt_number, &gpe_block);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+
+        /* Install block in the device_object attached to the node */
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
+
+                /*
+                 * No object, create a new one (Device nodes do not always have
+                 * an attached object)
+                 */
+                obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
+                if (!obj_desc) {
+                        status = AE_NO_MEMORY;
+                        goto unlock_and_exit;
+                }
+
+                status =
+                    acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);
+
+                /* Remove local reference to the object */
+
+                acpi_ut_remove_reference(obj_desc);
+
+                if (ACPI_FAILURE(status)) {
+                        goto unlock_and_exit;
+                }
+        }
+
+        /* Now install the GPE block in the device_object */
+
+        obj_desc->device.gpe_block = gpe_block;
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_remove_gpe_block
+ *
+ * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Remove a previously installed block of GPE registers
+ *
+ ******************************************************************************/
+acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
+{
+        union acpi_operand_object *obj_desc;
+        acpi_status status;
+        struct acpi_namespace_node *node;
+
+        ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
+
+        if (!gpe_device) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        node = acpi_ns_validate_handle(gpe_device);
+        if (!node) {
+                status = AE_BAD_PARAMETER;
+                goto unlock_and_exit;
+        }
+
+        /* Get the device_object attached to the node */
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc || !obj_desc->device.gpe_block) {
+                return_ACPI_STATUS(AE_NULL_OBJECT);
+        }
+
+        /* Delete the GPE block (but not the device_object) */
+
+        status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block);
+        if (ACPI_SUCCESS(status)) {
+                obj_desc->device.gpe_block = NULL;
+        }
+
+      unlock_and_exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_gpe_device
+ *
+ * PARAMETERS:  Index               - System GPE index (0-current_gpe_count)
+ *              gpe_device          - Where the parent GPE Device is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Obtain the GPE device associated with the input index. A NULL
+ *              gpe device indicates that the gpe number is contained in one of
+ *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
+ *
+ ******************************************************************************/
+acpi_status
+acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
+{
+        struct acpi_gpe_device_info info;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_device);
+
+        if (!gpe_device) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
+        }
+
+        if (index >= acpi_current_gpe_count) {
+                return_ACPI_STATUS(AE_NOT_EXIST);
+        }
+
+        /* Setup and walk the GPE list */
+
+        info.index = index;
+        info.status = AE_NOT_EXIST;
+        info.gpe_device = NULL;
+        info.next_block_base_index = 0;
+
+        status = acpi_ev_walk_gpe_list(acpi_ev_get_gpe_device, &info);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        *gpe_device = ACPI_CAST_PTR(acpi_handle, info.gpe_device);
+        return_ACPI_STATUS(info.status);
+}
+
+ACPI_EXPORT_SYMBOL(acpi_get_gpe_device)
diff --git a/drivers/acpi/acpica/evxfregn.c b/drivers/acpi/acpica/evxfregn.c
index ce9314f79451..eb7386763712 100644
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 18832205b631..745a42b401f5 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index b73bc50c5b76..74162a11817d 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 3c61b48c73f5..e7b372d17667 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -482,13 +482,11 @@ acpi_ex_create_method(u8 * aml_start,
         obj_desc->method.aml_length = aml_length;
 
         /*
-         * Disassemble the method flags. Split off the Arg Count
-         * for efficiency
+         * Disassemble the method flags. Split off the arg_count, Serialized
+         * flag, and sync_level for efficiency.
          */
         method_flags = (u8) operand[1]->integer.value;
 
-        obj_desc->method.method_flags =
-            (u8) (method_flags & ~AML_METHOD_ARG_COUNT);
         obj_desc->method.param_count =
             (u8) (method_flags & AML_METHOD_ARG_COUNT);
 
@@ -497,6 +495,8 @@ acpi_ex_create_method(u8 * aml_start,
          * created for this method when it is parsed.
          */
         if (method_flags & AML_METHOD_SERIALIZED) {
+                obj_desc->method.info_flags = ACPI_METHOD_SERIALIZED;
+
                 /*
                  * ACPI 1.0: sync_level = 0
                  * ACPI 2.0: sync_level = sync_level in method declaration
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index be8c98b480d7..c7a2f1edd282 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index f067bbb0d961..61b8c0e8b74d 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -122,7 +122,7 @@ static struct acpi_exdump_info acpi_ex_dump_event[2] = {
 
 static struct acpi_exdump_info acpi_ex_dump_method[9] = {
         {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},
-        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.method_flags), "Method Flags"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.info_flags), "Info Flags"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count),
          "Parameter Count"},
         {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.sync_level), "Sync Level"},
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index f17d2ff0031b..0bde2230c028 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index 38293fd3e088..6c79c29f082d 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 95db4be0877b..703d88ed0b3d 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 6af14e43f839..be1c56ead653 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index d11e539ef763..49ec049c157e 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 84e4d185aa25..236ead14b7f7 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 10e104cf0fb9..2571b4a310f4 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 7a08d23befcd..1b48d9d28c9a 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 4b50730cf9a0..f4a2787e8e92 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 7aae29f73d3f..cc95e2000406 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index de17e10da0ed..f0d5e14f1f2c 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index 1fa4289a687e..55997e46948b 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index 7ca35ea8acea..db502cd7d934 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 8c97cfd6a0fd..e3bb00ccdff5 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 1624436ba4c5..c0c8842dd344 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index d4af684620ca..a979017d56b8 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index e972b667b09b..dc665cc554de 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index 675aaa91a770..df66e7b686be 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 4093522eed45..8ad93146dd32 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index b44274a0b62c..fc380d3d45ab 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 14750db2a1b8..f610d88a66be 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,10 +62,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
  * PARAMETERS:  gpe_event_info      - Info block for the GPE
  *              gpe_register_info   - Info block for the GPE register
  *
- * RETURN:      Status
+ * RETURN:      Register mask with a one in the GPE bit position
  *
- * DESCRIPTION: Compute GPE enable mask with one bit corresponding to the given
- *              GPE set.
+ * DESCRIPTION: Compute the register mask for this GPE. One bit is set in the
+ *              correct position for the input GPE.
  *
  ******************************************************************************/
 
@@ -85,12 +85,12 @@ u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enable or disable a single GPE in its enable register.
+ * DESCRIPTION: Enable or disable a single GPE in the parent enable register.
  *
  ******************************************************************************/
 
 acpi_status
-acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
+acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u32 action)
 {
         struct acpi_gpe_register_info *gpe_register_info;
         acpi_status status;
@@ -113,14 +113,20 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
                 return (status);
         }
 
-        /* Set ot clear just the bit that corresponds to this GPE */
+        /* Set or clear just the bit that corresponds to this GPE */
 
         register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
                                                 gpe_register_info);
         switch (action) {
-        case ACPI_GPE_COND_ENABLE:
-                if (!(register_bit & gpe_register_info->enable_for_run))
+        case ACPI_GPE_CONDITIONAL_ENABLE:
+
+                /* Only enable if the enable_for_run bit is set */
+
+                if (!(register_bit & gpe_register_info->enable_for_run)) {
                         return (AE_BAD_PARAMETER);
+                }
+
+                /*lint -fallthrough */
 
         case ACPI_GPE_ENABLE:
                 ACPI_SET_BIT(enable_mask, register_bit);
@@ -131,7 +137,7 @@ acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action)
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO, "Invalid action\n"));
+                ACPI_ERROR((AE_INFO, "Invalid GPE Action, %u\n", action));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -168,13 +174,13 @@ acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
                 return (AE_NOT_EXIST);
         }
 
-        register_bit = acpi_hw_get_gpe_register_bit(gpe_event_info,
-                                                gpe_register_info);
-
         /*
          * Write a one to the appropriate bit in the status register to
          * clear this GPE.
          */
+        register_bit =
+            acpi_hw_get_gpe_register_bit(gpe_event_info, gpe_register_info);
+
         status = acpi_hw_write(register_bit,
                                &gpe_register_info->status_address);
 
@@ -201,8 +207,8 @@ acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
         u32 in_byte;
         u32 register_bit;
         struct acpi_gpe_register_info *gpe_register_info;
-        acpi_status status;
         acpi_event_status local_event_status = 0;
+        acpi_status status;
 
         ACPI_FUNCTION_ENTRY();
 
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index ad21c7d8bf4f..050fd227951b 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 5d1273b660ae..55accb7018bb 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index 3796811276ac..2ac28bbe8827 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index 1ef8e0bb250b..9c8eb71a12fb 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index e1d9c777b213..5f1605874655 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 50cc3be77724..6f98d210e71c 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 0cd925be5fc1..d93172fd15a8 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -163,9 +163,9 @@ acpi_status acpi_ns_root_initialize(void)
 #else
                                 /* Mark this as a very SPECIAL method */
 
-                                obj_desc->method.method_flags =
-                                    AML_METHOD_INTERNAL_ONLY;
-                                obj_desc->method.extra.implementation =
+                                obj_desc->method.info_flags =
+                                    ACPI_METHOD_INTERNAL_ONLY;
+                                obj_desc->method.dispatch.implementation =
                                     acpi_ut_osi_implementation;
 #endif
                                 break;
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index 1e5ff803d9ad..1d0ef15d158f 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,8 @@ void acpi_ns_install_node(struct acpi_walk_state *walk_state, struct acpi_namesp
                          * modified the namespace. This is used for cleanup when the
                          * method exits.
                          */
-                        walk_state->method_desc->method.flags |=
-                            AOPOBJ_MODIFIED_NAMESPACE;
+                        walk_state->method_desc->method.info_flags |=
+                            ACPI_METHOD_MODIFIED_NAMESPACE;
                 }
         }
 
@@ -341,6 +341,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
 {
         struct acpi_namespace_node *child_node = NULL;
         u32 level = 1;
+        acpi_status status;
 
         ACPI_FUNCTION_TRACE(ns_delete_namespace_subtree);
 
@@ -348,6 +349,13 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
                 return_VOID;
         }
 
+        /* Lock namespace for possible update */
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_VOID;
+        }
+
         /*
          * Traverse the tree of objects until we bubble back up
          * to where we started.
@@ -397,6 +405,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
                 }
         }
 
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
         return_VOID;
 }
 
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index a54dc39e304b..b683cc2ff9d3 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -624,9 +624,22 @@ acpi_ns_dump_objects(acpi_object_type type,
                      acpi_owner_id owner_id, acpi_handle start_handle)
 {
         struct acpi_walk_info info;
+        acpi_status status;
 
         ACPI_FUNCTION_ENTRY();
 
+        /*
+         * Just lock the entire namespace for the duration of the dump.
+         * We don't want any changes to the namespace during this time,
+         * especially the temporary nodes since we are going to display
+         * them also.
+         */
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_printf("Could not acquire namespace mutex\n");
+                return;
+        }
+
         info.debug_level = ACPI_LV_TABLES;
         info.owner_id = owner_id;
         info.display_type = display_type;
@@ -636,6 +649,8 @@ acpi_ns_dump_objects(acpi_object_type type,
                                      ACPI_NS_WALK_TEMP_NODES,
                                      acpi_ns_dump_one_object, NULL,
                                      (void *)&info, NULL);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 }
 #endif                          /* ACPI_FUTURE_USAGE */
 
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c
index d2a97921e249..2ed294b7a4db 100644
--- a/drivers/acpi/acpica/nsdumpdv.c
+++ b/drivers/acpi/acpica/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index f52829cc294b..c1bd02b1a058 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -389,7 +389,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
          * acpi_gbl_root_node->Object is NULL at PASS1.
          */
         if ((type == ACPI_TYPE_DEVICE) && parent_node->object) {
-                method_obj->method.extra.handler =
+                method_obj->method.dispatch.handler =
                     parent_node->object->device.handler;
         }
 
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 0cac7ec0d2ec..fd7c6380e294 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index df18be94fefe..5f7dc691c183 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index d3104af57e13..d5fa520c3de5 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index 41a9213dd5af..3bb8bf105ea2 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 5808c89e9fac..b3234fa795b8 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 7096bcda0c72..9fb03fa8ffde 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index d1c136692667..1d76ac85b5e7 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 4ef9f43ea926..973883babee1 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 41102a84272f..28b0d7a62b99 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index a7d6ad9c111b..cb1b104a69a2 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 2cd5be8fe10f..345f0c3c6ad2 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index ebef8a7fd707..c53f0040e490 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index b01e45a415e3..3fd4526f3dba 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -603,10 +603,9 @@ acpi_status acpi_install_method(u8 *buffer)
         method_obj->method.param_count = (u8)
             (method_flags & AML_METHOD_ARG_COUNT);
 
-        method_obj->method.method_flags = (u8)
-            (method_flags & ~AML_METHOD_ARG_COUNT);
-
         if (method_flags & AML_METHOD_SERIALIZED) {
+                method_obj->method.info_flags = ACPI_METHOD_SERIALIZED;
+
                 method_obj->method.sync_level = (u8)
                     ((method_flags & AML_METHOD_SYNC_LEVEL) >> 4);
         }
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index a1f04e9b8030..db7660f8b869 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 7df1a4c95274..e1fad0ee0136 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 2f2e7760938c..01dd70d1de51 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -655,7 +655,7 @@ acpi_ps_link_module_code(union acpi_parse_object *parent_op,
                 method_obj->method.aml_start = aml_start;
                 method_obj->method.aml_length = aml_length;
                 method_obj->method.owner_id = owner_id;
-                method_obj->method.flags |= AOPOBJ_MODULE_LEVEL;
+                method_obj->method.info_flags |= ACPI_METHOD_MODULE_LEVEL;
 
                 /*
                  * Save the parent node in next_object. This is cheating, but we
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index 2b0c3be2b1b8..bed08de7528c 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 8d81542194d4..9bb0cbd37b5e 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,6 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "amlcode.h"
-#include "acnamesp.h"
 #include "acinterp.h"
 
 #define _COMPONENT          ACPI_PARSER
@@ -539,24 +538,16 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                         /* Check for possible multi-thread reentrancy problem */
 
                         if ((status == AE_ALREADY_EXISTS) &&
-                            (!walk_state->method_desc->method.mutex)) {
-                                ACPI_INFO((AE_INFO,
-                                           "Marking method %4.4s as Serialized because of AE_ALREADY_EXISTS error",
-                                           walk_state->method_node->name.
-                                           ascii));
-
+                            (!(walk_state->method_desc->method.
+                               info_flags & ACPI_METHOD_SERIALIZED))) {
                                 /*
-                                 * Method tried to create an object twice. The probable cause is
-                                 * that the method cannot handle reentrancy.
-                                 *
-                                 * The method is marked not_serialized, but it tried to create
-                                 * a named object, causing the second thread entrance to fail.
-                                 * Workaround this problem by marking the method permanently
-                                 * as Serialized.
+                                 * Method is not serialized and tried to create an object
+                                 * twice. The probable cause is that the method cannot
+                                 * handle reentrancy. Mark as "pending serialized" now, and
+                                 * then mark "serialized" when the last thread exits.
                                  */
-                                walk_state->method_desc->method.method_flags |=
-                                    AML_METHOD_SERIALIZED;
-                                walk_state->method_desc->method.sync_level = 0;
+                                walk_state->method_desc->method.info_flags |=
+                                    ACPI_METHOD_SERIALIZED_PENDING;
                         }
                 }
 
diff --git a/drivers/acpi/acpica/psscope.c b/drivers/acpi/acpica/psscope.c
index 40e2b279ea12..a5faa1323a02 100644
--- a/drivers/acpi/acpica/psscope.c
+++ b/drivers/acpi/acpica/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pstree.c b/drivers/acpi/acpica/pstree.c
index d4b970c3630b..f1464c03aa42 100644
--- a/drivers/acpi/acpica/pstree.c
+++ b/drivers/acpi/acpica/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index fe29eee5adb1..7eda78503422 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/pswalk.c b/drivers/acpi/acpica/pswalk.c
index 8abb9629443d..3312d6368bf1 100644
--- a/drivers/acpi/acpica/pswalk.c
+++ b/drivers/acpi/acpica/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index c42f067cff9d..8086805d4494 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,6 @@
 #include "acdispat.h"
 #include "acinterp.h"
 #include "actables.h"
-#include "amlcode.h"
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psxface")
@@ -285,15 +284,15 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
                 goto cleanup;
         }
 
-        if (info->obj_desc->method.flags & AOPOBJ_MODULE_LEVEL) {
+        if (info->obj_desc->method.info_flags & ACPI_METHOD_MODULE_LEVEL) {
                 walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
         }
 
         /* Invoke an internal method if necessary */
 
-        if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
+        if (info->obj_desc->method.info_flags & ACPI_METHOD_INTERNAL_ONLY) {
                 status =
-                    info->obj_desc->method.extra.implementation(walk_state);
+                    info->obj_desc->method.dispatch.implementation(walk_state);
                 info->return_object = walk_state->return_desc;
 
                 /* Cleanup states */
diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
index 226c806ae986..9e66f9078426 100644
--- a/drivers/acpi/acpica/rsaddr.c
+++ b/drivers/acpi/acpica/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index d6ebf7ec622d..3a8a89ec2ca4 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index c80a2eea3a01..4ce6e1147e80 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index f859b0386fe4..33db7520c74b 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index 1fd868b964fd..f9ea60872aa4 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsio.c b/drivers/acpi/acpica/rsio.c
index 33bff17c0bbc..0c7efef008be 100644
--- a/drivers/acpi/acpica/rsio.c
+++ b/drivers/acpi/acpica/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index 545da40d7fa7..50b8ad211167 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 7335f22aac20..1bfcef736c50 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 887b8ba8c432..7cc6d8625f1e 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index f8cd9e87d987..410264b22a29 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 491191e6cf69..231811e56939 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
index 9f6a6e7e1c8e..2ff657a28f26 100644
--- a/drivers/acpi/acpica/rsxface.c
+++ b/drivers/acpi/acpica/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index d2ff4325c427..428d44e2d162 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 989d5c867864..a55cb2bb5abb 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 83d7af8d0905..48db0944ce4a 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 34f9c2bc5e1f..0f2d395feaba 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 4a8b9e6ea57a..4b7085dfc683 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index fd2c07d1d3ac..7eb6c6cc1edf 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index 8f0896281567..0a697351cf69 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 6fef83f04bcd..aded299a2fa8 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index f21c486929a5..a9bcd816dc29 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utdelete.c b/drivers/acpi/acpica/utdelete.c
index ed794cd033ea..31f5a7832ef1 100644
--- a/drivers/acpi/acpica/utdelete.c
+++ b/drivers/acpi/acpica/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index 22f59ef604e0..18f73c9d10bc 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index e87bc6760be6..97dd9bbf055a 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -768,7 +768,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_gpe_fadt_blocks[0] = NULL;
         acpi_gbl_gpe_fadt_blocks[1] = NULL;
         acpi_current_gpe_count = 0;
-        acpi_all_gpes_initialized = FALSE;
+        acpi_gbl_all_gpes_initialized = FALSE;
 
         /* Global handlers */
 
@@ -778,6 +778,7 @@ acpi_status acpi_ut_init_globals(void)
         acpi_gbl_init_handler = NULL;
         acpi_gbl_table_handler = NULL;
         acpi_gbl_interface_handler = NULL;
+        acpi_gbl_global_event_handler = NULL;
 
         /* Global Lock support */
 
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index d2906328535d..b679ea693545 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index c1b1c803ea9b..191b6828cce9 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index b081cd46a15f..f6bb75c6faf5 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index 49cf7b7fd816..ce481da9bb45 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index c7d0e05ef5a4..c33a852d4f42 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index d9efa495b433..a946c689f03b 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,7 @@ acpi_status acpi_ut_mutex_initialize(void)
 
         spin_lock_init(acpi_gbl_gpe_lock);
         spin_lock_init(acpi_gbl_hardware_lock);
+        spin_lock_init(acpi_ev_global_lock_pending_lock);
 
         /* Mutex for _OSI support */
         status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index fd1fa2749ea5..188340a017b4 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c
index 18c59a85fdca..1fb10cb8f11d 100644
--- a/drivers/acpi/acpica/utosi.c
+++ b/drivers/acpi/acpica/utosi.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index 7965919000b1..84e051844247 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index d35d109b8da2..30c21e1a9360 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index 1f484c9a6888..98ad125e14ff 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 6f12e314fbae..916ae097c43c 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2010, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index 18df1e940276..ef0581f2094d 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -109,6 +109,8 @@ static inline u32 apei_estatus_len(struct acpi_hest_generic_status *estatus)
                 return sizeof(*estatus) + estatus->data_length;
 }
 
+void apei_estatus_print(const char *pfx,
+                        const struct acpi_hest_generic_status *estatus);
 int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus);
 int apei_estatus_check(const struct acpi_hest_generic_status *estatus);
 #endif
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
index f4cf2fc4c8c1..31464a006d76 100644
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
@@ -46,6 +46,317 @@ u64 cper_next_record_id(void)
 }
 EXPORT_SYMBOL_GPL(cper_next_record_id);
 
+static const char *cper_severity_strs[] = {
+        "recoverable",
+        "fatal",
+        "corrected",
+        "info",
+};
+
+static const char *cper_severity_str(unsigned int severity)
+{
+        return severity < ARRAY_SIZE(cper_severity_strs) ?
+                cper_severity_strs[severity] : "unknown";
+}
+
+/*
+ * cper_print_bits - print strings for set bits
+ * @pfx: prefix for each line, including log level and prefix string
+ * @bits: bit mask
+ * @strs: string array, indexed by bit position
+ * @strs_size: size of the string array: @strs
+ *
+ * For each set bit in @bits, print the corresponding string in @strs.
+ * If the output length is longer than 80, multiple line will be
+ * printed, with @pfx is printed at the beginning of each line.
+ */
+static void cper_print_bits(const char *pfx, unsigned int bits,
+                            const char *strs[], unsigned int strs_size)
+{
+        int i, len = 0;
+        const char *str;
+        char buf[84];
+
+        for (i = 0; i < strs_size; i++) {
+                if (!(bits & (1U << i)))
+                        continue;
+                str = strs[i];
+                if (len && len + strlen(str) + 2 > 80) {
+                        printk("%s\n", buf);
+                        len = 0;
+                }
+                if (!len)
+                        len = snprintf(buf, sizeof(buf), "%s%s", pfx, str);
+                else
+                        len += snprintf(buf+len, sizeof(buf)-len, ", %s", str);
+        }
+        if (len)
+                printk("%s\n", buf);
+}
+
+static const char *cper_proc_type_strs[] = {
+        "IA32/X64",
+        "IA64",
+};
+
+static const char *cper_proc_isa_strs[] = {
+        "IA32",
+        "IA64",
+        "X64",
+};
+
+static const char *cper_proc_error_type_strs[] = {
+        "cache error",
+        "TLB error",
+        "bus error",
+        "micro-architectural error",
+};
+
+static const char *cper_proc_op_strs[] = {
+        "unknown or generic",
+        "data read",
+        "data write",
+        "instruction execution",
+};
+
+static const char *cper_proc_flag_strs[] = {
+        "restartable",
+        "precise IP",
+        "overflow",
+        "corrected",
+};
+
+static void cper_print_proc_generic(const char *pfx,
+                                    const struct cper_sec_proc_generic *proc)
+{
+        if (proc->validation_bits & CPER_PROC_VALID_TYPE)
+                printk("%s""processor_type: %d, %s\n", pfx, proc->proc_type,
+                       proc->proc_type < ARRAY_SIZE(cper_proc_type_strs) ?
+                       cper_proc_type_strs[proc->proc_type] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_ISA)
+                printk("%s""processor_isa: %d, %s\n", pfx, proc->proc_isa,
+                       proc->proc_isa < ARRAY_SIZE(cper_proc_isa_strs) ?
+                       cper_proc_isa_strs[proc->proc_isa] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_ERROR_TYPE) {
+                printk("%s""error_type: 0x%02x\n", pfx, proc->proc_error_type);
+                cper_print_bits(pfx, proc->proc_error_type,
+                                cper_proc_error_type_strs,
+                                ARRAY_SIZE(cper_proc_error_type_strs));
+        }
+        if (proc->validation_bits & CPER_PROC_VALID_OPERATION)
+                printk("%s""operation: %d, %s\n", pfx, proc->operation,
+                       proc->operation < ARRAY_SIZE(cper_proc_op_strs) ?
+                       cper_proc_op_strs[proc->operation] : "unknown");
+        if (proc->validation_bits & CPER_PROC_VALID_FLAGS) {
+                printk("%s""flags: 0x%02x\n", pfx, proc->flags);
+                cper_print_bits(pfx, proc->flags, cper_proc_flag_strs,
+                                ARRAY_SIZE(cper_proc_flag_strs));
+        }
+        if (proc->validation_bits & CPER_PROC_VALID_LEVEL)
+                printk("%s""level: %d\n", pfx, proc->level);
+        if (proc->validation_bits & CPER_PROC_VALID_VERSION)
+                printk("%s""version_info: 0x%016llx\n", pfx, proc->cpu_version);
+        if (proc->validation_bits & CPER_PROC_VALID_ID)
+                printk("%s""processor_id: 0x%016llx\n", pfx, proc->proc_id);
+        if (proc->validation_bits & CPER_PROC_VALID_TARGET_ADDRESS)
+                printk("%s""target_address: 0x%016llx\n",
+                       pfx, proc->target_addr);
+        if (proc->validation_bits & CPER_PROC_VALID_REQUESTOR_ID)
+                printk("%s""requestor_id: 0x%016llx\n",
+                       pfx, proc->requestor_id);
+        if (proc->validation_bits & CPER_PROC_VALID_RESPONDER_ID)
+                printk("%s""responder_id: 0x%016llx\n",
+                       pfx, proc->responder_id);
+        if (proc->validation_bits & CPER_PROC_VALID_IP)
+                printk("%s""IP: 0x%016llx\n", pfx, proc->ip);
+}
+
+static const char *cper_mem_err_type_strs[] = {
+        "unknown",
+        "no error",
+        "single-bit ECC",
+        "multi-bit ECC",
+        "single-symbol chipkill ECC",
+        "multi-symbol chipkill ECC",
+        "master abort",
+        "target abort",
+        "parity error",
+        "watchdog timeout",
+        "invalid address",
+        "mirror Broken",
+        "memory sparing",
+        "scrub corrected error",
+        "scrub uncorrected error",
+};
+
+static void cper_print_mem(const char *pfx, const struct cper_sec_mem_err *mem)
+{
+        if (mem->validation_bits & CPER_MEM_VALID_ERROR_STATUS)
+                printk("%s""error_status: 0x%016llx\n", pfx, mem->error_status);
+        if (mem->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS)
+                printk("%s""physical_address: 0x%016llx\n",
+                       pfx, mem->physical_addr);
+        if (mem->validation_bits & CPER_MEM_VALID_PHYSICAL_ADDRESS_MASK)
+                printk("%s""physical_address_mask: 0x%016llx\n",
+                       pfx, mem->physical_addr_mask);
+        if (mem->validation_bits & CPER_MEM_VALID_NODE)
+                printk("%s""node: %d\n", pfx, mem->node);
+        if (mem->validation_bits & CPER_MEM_VALID_CARD)
+                printk("%s""card: %d\n", pfx, mem->card);
+        if (mem->validation_bits & CPER_MEM_VALID_MODULE)
+                printk("%s""module: %d\n", pfx, mem->module);
+        if (mem->validation_bits & CPER_MEM_VALID_BANK)
+                printk("%s""bank: %d\n", pfx, mem->bank);
+        if (mem->validation_bits & CPER_MEM_VALID_DEVICE)
+                printk("%s""device: %d\n", pfx, mem->device);
+        if (mem->validation_bits & CPER_MEM_VALID_ROW)
+                printk("%s""row: %d\n", pfx, mem->row);
+        if (mem->validation_bits & CPER_MEM_VALID_COLUMN)
+                printk("%s""column: %d\n", pfx, mem->column);
+        if (mem->validation_bits & CPER_MEM_VALID_BIT_POSITION)
+                printk("%s""bit_position: %d\n", pfx, mem->bit_pos);
+        if (mem->validation_bits & CPER_MEM_VALID_REQUESTOR_ID)
+                printk("%s""requestor_id: 0x%016llx\n", pfx, mem->requestor_id);
+        if (mem->validation_bits & CPER_MEM_VALID_RESPONDER_ID)
+                printk("%s""responder_id: 0x%016llx\n", pfx, mem->responder_id);
+        if (mem->validation_bits & CPER_MEM_VALID_TARGET_ID)
+                printk("%s""target_id: 0x%016llx\n", pfx, mem->target_id);
+        if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE) {
+                u8 etype = mem->error_type;
+                printk("%s""error_type: %d, %s\n", pfx, etype,
+                       etype < ARRAY_SIZE(cper_mem_err_type_strs) ?
+                       cper_mem_err_type_strs[etype] : "unknown");
+        }
+}
+
+static const char *cper_pcie_port_type_strs[] = {
+        "PCIe end point",
+        "legacy PCI end point",
+        "unknown",
+        "unknown",
+        "root port",
+        "upstream switch port",
+        "downstream switch port",
+        "PCIe to PCI/PCI-X bridge",
+        "PCI/PCI-X to PCIe bridge",
+        "root complex integrated endpoint device",
+        "root complex event collector",
+};
+
+static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie)
+{
+        if (pcie->validation_bits & CPER_PCIE_VALID_PORT_TYPE)
+                printk("%s""port_type: %d, %s\n", pfx, pcie->port_type,
+                       pcie->port_type < ARRAY_SIZE(cper_pcie_port_type_strs) ?
+                       cper_pcie_port_type_strs[pcie->port_type] : "unknown");
+        if (pcie->validation_bits & CPER_PCIE_VALID_VERSION)
+                printk("%s""version: %d.%d\n", pfx,
+                       pcie->version.major, pcie->version.minor);
+        if (pcie->validation_bits & CPER_PCIE_VALID_COMMAND_STATUS)
+                printk("%s""command: 0x%04x, status: 0x%04x\n", pfx,
+                       pcie->command, pcie->status);
+        if (pcie->validation_bits & CPER_PCIE_VALID_DEVICE_ID) {
+                const __u8 *p;
+                printk("%s""device_id: %04x:%02x:%02x.%x\n", pfx,
+                       pcie->device_id.segment, pcie->device_id.bus,
+                       pcie->device_id.device, pcie->device_id.function);
+                printk("%s""slot: %d\n", pfx,
+                       pcie->device_id.slot >> CPER_PCIE_SLOT_SHIFT);
+                printk("%s""secondary_bus: 0x%02x\n", pfx,
+                       pcie->device_id.secondary_bus);
+                printk("%s""vendor_id: 0x%04x, device_id: 0x%04x\n", pfx,
+                       pcie->device_id.vendor_id, pcie->device_id.device_id);
+                p = pcie->device_id.class_code;
+                printk("%s""class_code: %02x%02x%02x\n", pfx, p[0], p[1], p[2]);
+        }
+        if (pcie->validation_bits & CPER_PCIE_VALID_SERIAL_NUMBER)
+                printk("%s""serial number: 0x%04x, 0x%04x\n", pfx,
+                       pcie->serial_number.lower, pcie->serial_number.upper);
+        if (pcie->validation_bits & CPER_PCIE_VALID_BRIDGE_CONTROL_STATUS)
+                printk(
+        "%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n",
+        pfx, pcie->bridge.secondary_status, pcie->bridge.control);
+}
+
+static const char *apei_estatus_section_flag_strs[] = {
+        "primary",
+        "containment warning",
+        "reset",
+        "threshold exceeded",
+        "resource not accessible",
+        "latent error",
+};
+
+static void apei_estatus_print_section(
+        const char *pfx, const struct acpi_hest_generic_data *gdata, int sec_no)
+{
+        uuid_le *sec_type = (uuid_le *)gdata->section_type;
+        __u16 severity;
+
+        severity = gdata->error_severity;
+        printk("%s""section: %d, severity: %d, %s\n", pfx, sec_no, severity,
+               cper_severity_str(severity));
+        printk("%s""flags: 0x%02x\n", pfx, gdata->flags);
+        cper_print_bits(pfx, gdata->flags, apei_estatus_section_flag_strs,
+                        ARRAY_SIZE(apei_estatus_section_flag_strs));
+        if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)
+                printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id);
+        if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)
+                printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text);
+
+        if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) {
+                struct cper_sec_proc_generic *proc_err = (void *)(gdata + 1);
+                printk("%s""section_type: general processor error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*proc_err))
+                        cper_print_proc_generic(pfx, proc_err);
+                else
+                        goto err_section_too_small;
+        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) {
+                struct cper_sec_mem_err *mem_err = (void *)(gdata + 1);
+                printk("%s""section_type: memory error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*mem_err))
+                        cper_print_mem(pfx, mem_err);
+                else
+                        goto err_section_too_small;
+        } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) {
+                struct cper_sec_pcie *pcie = (void *)(gdata + 1);
+                printk("%s""section_type: PCIe error\n", pfx);
+                if (gdata->error_data_length >= sizeof(*pcie))
+                        cper_print_pcie(pfx, pcie);
+                else
+                        goto err_section_too_small;
+        } else
+                printk("%s""section type: unknown, %pUl\n", pfx, sec_type);
+
+        return;
+
+err_section_too_small:
+        pr_err(FW_WARN "error section length is too small\n");
+}
+
+void apei_estatus_print(const char *pfx,
+                        const struct acpi_hest_generic_status *estatus)
+{
+        struct acpi_hest_generic_data *gdata;
+        unsigned int data_len, gedata_len;
+        int sec_no = 0;
+        __u16 severity;
+
+        printk("%s""APEI generic hardware error status\n", pfx);
+        severity = estatus->error_severity;
+        printk("%s""severity: %d, %s\n", pfx, severity,
+               cper_severity_str(severity));
+        data_len = estatus->data_length;
+        gdata = (struct acpi_hest_generic_data *)(estatus + 1);
+        while (data_len > sizeof(*gdata)) {
+                gedata_len = gdata->error_data_length;
+                apei_estatus_print_section(pfx, gdata, sec_no);
+                data_len -= gedata_len + sizeof(*gdata);
+                sec_no++;
+        }
+}
+EXPORT_SYMBOL_GPL(apei_estatus_print);
+
 int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus)
 {
         if (estatus->data_length &&
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 0d505e59214d..d1d484d4a06a 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -12,10 +12,6 @@
  * For more information about Generic Hardware Error Source, please
  * refer to ACPI Specification version 4.0, section 17.3.2.6
  *
- * Now, only SCI notification type and memory errors are
- * supported. More notification type and hardware error type will be
- * added later.
- *
  * Copyright 2010 Intel Corp.
  *   Author: Huang Ying <ying.huang@intel.com>
  *
@@ -39,14 +35,18 @@
 #include <linux/acpi.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
+#include <linux/timer.h>
 #include <linux/cper.h>
 #include <linux/kdebug.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
+#include <linux/ratelimit.h>
+#include <linux/vmalloc.h>
 #include <acpi/apei.h>
 #include <acpi/atomicio.h>
 #include <acpi/hed.h>
 #include <asm/mce.h>
+#include <asm/tlbflush.h>
 
 #include "apei-internal.h"
 
@@ -55,42 +55,131 @@
 #define GHES_ESTATUS_MAX_SIZE           65536
 
 /*
- * One struct ghes is created for each generic hardware error
- * source.
- *
+ * One struct ghes is created for each generic hardware error source.
  * It provides the context for APEI hardware error timer/IRQ/SCI/NMI
- * handler. Handler for one generic hardware error source is only
- * triggered after the previous one is done. So handler can uses
- * struct ghes without locking.
+ * handler.
  *
  * estatus: memory buffer for error status block, allocated during
  * HEST parsing.
  */
 #define GHES_TO_CLEAR           0x0001
+#define GHES_EXITING            0x0002
 
 struct ghes {
         struct acpi_hest_generic *generic;
         struct acpi_hest_generic_status *estatus;
-        struct list_head list;
         u64 buffer_paddr;
         unsigned long flags;
+        union {
+                struct list_head list;
+                struct timer_list timer;
+                unsigned int irq;
+        };
 };
 
+static int ghes_panic_timeout   __read_mostly = 30;
+
 /*
- * Error source lists, one list for each notification method. The
- * members in lists are struct ghes.
+ * All error sources notified with SCI shares one notifier function,
+ * so they need to be linked and checked one by one.  This is applied
+ * to NMI too.
  *
- * The list members are only added in HEST parsing and deleted during
- * module_exit, that is, single-threaded. So no lock is needed for
- * that.
- *
- * But the mutual exclusion is needed between members adding/deleting
- * and timer/IRQ/SCI/NMI handler, which may traverse the list. RCU is
- * used for that.
+ * RCU is used for these lists, so ghes_list_mutex is only used for
+ * list changing, not for traversing.
  */
 static LIST_HEAD(ghes_sci);
+static LIST_HEAD(ghes_nmi);
 static DEFINE_MUTEX(ghes_list_mutex);
 
+/*
+ * NMI may be triggered on any CPU, so ghes_nmi_lock is used for
+ * mutual exclusion.
+ */
+static DEFINE_RAW_SPINLOCK(ghes_nmi_lock);
+
+/*
+ * Because the memory area used to transfer hardware error information
+ * from BIOS to Linux can be determined only in NMI, IRQ or timer
+ * handler, but general ioremap can not be used in atomic context, so
+ * a special version of atomic ioremap is implemented for that.
+ */
+
+/*
+ * Two virtual pages are used, one for NMI context, the other for
+ * IRQ/PROCESS context
+ */
+#define GHES_IOREMAP_PAGES              2
+#define GHES_IOREMAP_NMI_PAGE(base)     (base)
+#define GHES_IOREMAP_IRQ_PAGE(base)     ((base) + PAGE_SIZE)
+
+/* virtual memory area for atomic ioremap */
+static struct vm_struct *ghes_ioremap_area;
+/*
+ * These 2 spinlock is used to prevent atomic ioremap virtual memory
+ * area from being mapped simultaneously.
+ */
+static DEFINE_RAW_SPINLOCK(ghes_ioremap_lock_nmi);
+static DEFINE_SPINLOCK(ghes_ioremap_lock_irq);
+
+static int ghes_ioremap_init(void)
+{
+        ghes_ioremap_area = __get_vm_area(PAGE_SIZE * GHES_IOREMAP_PAGES,
+                VM_IOREMAP, VMALLOC_START, VMALLOC_END);
+        if (!ghes_ioremap_area) {
+                pr_err(GHES_PFX "Failed to allocate virtual memory area for atomic ioremap.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void ghes_ioremap_exit(void)
+{
+        free_vm_area(ghes_ioremap_area);
+}
+
+static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
+{
+        unsigned long vaddr;
+
+        vaddr = (unsigned long)GHES_IOREMAP_NMI_PAGE(ghes_ioremap_area->addr);
+        ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+                           pfn << PAGE_SHIFT, PAGE_KERNEL);
+
+        return (void __iomem *)vaddr;
+}
+
+static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
+{
+        unsigned long vaddr;
+
+        vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);
+        ioremap_page_range(vaddr, vaddr + PAGE_SIZE,
+                           pfn << PAGE_SHIFT, PAGE_KERNEL);
+
+        return (void __iomem *)vaddr;
+}
+
+static void ghes_iounmap_nmi(void __iomem *vaddr_ptr)
+{
+        unsigned long vaddr = (unsigned long __force)vaddr_ptr;
+        void *base = ghes_ioremap_area->addr;
+
+        BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_NMI_PAGE(base));
+        unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
+        __flush_tlb_one(vaddr);
+}
+
+static void ghes_iounmap_irq(void __iomem *vaddr_ptr)
+{
+        unsigned long vaddr = (unsigned long __force)vaddr_ptr;
+        void *base = ghes_ioremap_area->addr;
+
+        BUG_ON(vaddr != (unsigned long)GHES_IOREMAP_IRQ_PAGE(base));
+        unmap_kernel_range_noflush(vaddr, PAGE_SIZE);
+        __flush_tlb_one(vaddr);
+}
+
 static struct ghes *ghes_new(struct acpi_hest_generic *generic)
 {
         struct ghes *ghes;
@@ -101,7 +190,6 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
         if (!ghes)
                 return ERR_PTR(-ENOMEM);
         ghes->generic = generic;
-        INIT_LIST_HEAD(&ghes->list);
         rc = acpi_pre_map_gar(&generic->error_status_address);
         if (rc)
                 goto err_free;
@@ -158,22 +246,41 @@ static inline int ghes_severity(int severity)
         }
 }
 
-/* SCI handler run in work queue, so ioremap can be used here */
-static int ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
-                                 int from_phys)
+static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len,
+                                  int from_phys)
 {
-        void *vaddr;
-
-        vaddr = ioremap_cache(paddr, len);
-        if (!vaddr)
-                return -ENOMEM;
-        if (from_phys)
-                memcpy(buffer, vaddr, len);
-        else
-                memcpy(vaddr, buffer, len);
-        iounmap(vaddr);
-
-        return 0;
+        void __iomem *vaddr;
+        unsigned long flags = 0;
+        int in_nmi = in_nmi();
+        u64 offset;
+        u32 trunk;
+
+        while (len > 0) {
+                offset = paddr - (paddr & PAGE_MASK);
+                if (in_nmi) {
+                        raw_spin_lock(&ghes_ioremap_lock_nmi);
+                        vaddr = ghes_ioremap_pfn_nmi(paddr >> PAGE_SHIFT);
+                } else {
+                        spin_lock_irqsave(&ghes_ioremap_lock_irq, flags);
+                        vaddr = ghes_ioremap_pfn_irq(paddr >> PAGE_SHIFT);
+                }
+                trunk = PAGE_SIZE - offset;
+                trunk = min(trunk, len);
+                if (from_phys)
+                        memcpy_fromio(buffer, vaddr + offset, trunk);
+                else
+                        memcpy_toio(vaddr + offset, buffer, trunk);
+                len -= trunk;
+                paddr += trunk;
+                buffer += trunk;
+                if (in_nmi) {
+                        ghes_iounmap_nmi(vaddr);
+                        raw_spin_unlock(&ghes_ioremap_lock_nmi);
+                } else {
+                        ghes_iounmap_irq(vaddr);
+                        spin_unlock_irqrestore(&ghes_ioremap_lock_irq, flags);
+                }
+        }
 }
 
 static int ghes_read_estatus(struct ghes *ghes, int silent)
@@ -194,10 +301,8 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
         if (!buf_paddr)
                 return -ENOENT;
 
-        rc = ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
-                                   sizeof(*ghes->estatus), 1);
-        if (rc)
-                return rc;
+        ghes_copy_tofrom_phys(ghes->estatus, buf_paddr,
+                              sizeof(*ghes->estatus), 1);
         if (!ghes->estatus->block_status)
                 return -ENOENT;
 
@@ -212,17 +317,15 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
                 goto err_read_block;
         if (apei_estatus_check_header(ghes->estatus))
                 goto err_read_block;
-        rc = ghes_copy_tofrom_phys(ghes->estatus + 1,
-                                   buf_paddr + sizeof(*ghes->estatus),
-                                   len - sizeof(*ghes->estatus), 1);
-        if (rc)
-                return rc;
+        ghes_copy_tofrom_phys(ghes->estatus + 1,
+                              buf_paddr + sizeof(*ghes->estatus),
+                              len - sizeof(*ghes->estatus), 1);
         if (apei_estatus_check(ghes->estatus))
                 goto err_read_block;
         rc = 0;
 
 err_read_block:
-        if (rc && !silent)
+        if (rc && !silent && printk_ratelimit())
                 pr_warning(FW_WARN GHES_PFX
                            "Failed to read error status block!\n");
         return rc;
@@ -255,11 +358,26 @@ static void ghes_do_proc(struct ghes *ghes)
                 }
 #endif
         }
+}
 
-        if (!processed && printk_ratelimit())
-                pr_warning(GHES_PFX
-                "Unknown error record from generic hardware error source: %d\n",
-                           ghes->generic->header.source_id);
+static void ghes_print_estatus(const char *pfx, struct ghes *ghes)
+{
+        /* Not more than 2 messages every 5 seconds */
+        static DEFINE_RATELIMIT_STATE(ratelimit, 5*HZ, 2);
+
+        if (pfx == NULL) {
+                if (ghes_severity(ghes->estatus->error_severity) <=
+                    GHES_SEV_CORRECTED)
+                        pfx = KERN_WARNING HW_ERR;
+                else
+                        pfx = KERN_ERR HW_ERR;
+        }
+        if (__ratelimit(&ratelimit)) {
+                printk(
+        "%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
+        pfx, ghes->generic->header.source_id);
+                apei_estatus_print(pfx, ghes->estatus);
+        }
 }
 
 static int ghes_proc(struct ghes *ghes)
@@ -269,6 +387,7 @@ static int ghes_proc(struct ghes *ghes)
         rc = ghes_read_estatus(ghes, 0);
         if (rc)
                 goto out;
+        ghes_print_estatus(NULL, ghes);
         ghes_do_proc(ghes);
 
 out:
@@ -276,6 +395,42 @@ out:
         return 0;
 }
 
+static void ghes_add_timer(struct ghes *ghes)
+{
+        struct acpi_hest_generic *g = ghes->generic;
+        unsigned long expire;
+
+        if (!g->notify.poll_interval) {
+                pr_warning(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
+                           g->header.source_id);
+                return;
+        }
+        expire = jiffies + msecs_to_jiffies(g->notify.poll_interval);
+        ghes->timer.expires = round_jiffies_relative(expire);
+        add_timer(&ghes->timer);
+}
+
+static void ghes_poll_func(unsigned long data)
+{
+        struct ghes *ghes = (void *)data;
+
+        ghes_proc(ghes);
+        if (!(ghes->flags & GHES_EXITING))
+                ghes_add_timer(ghes);
+}
+
+static irqreturn_t ghes_irq_func(int irq, void *data)
+{
+        struct ghes *ghes = data;
+        int rc;
+
+        rc = ghes_proc(ghes);
+        if (rc)
+                return IRQ_NONE;
+
+        return IRQ_HANDLED;
+}
+
 static int ghes_notify_sci(struct notifier_block *this,
                                   unsigned long event, void *data)
 {
@@ -292,10 +447,63 @@ static int ghes_notify_sci(struct notifier_block *this,
         return ret;
 }
 
+static int ghes_notify_nmi(struct notifier_block *this,
+                                  unsigned long cmd, void *data)
+{
+        struct ghes *ghes, *ghes_global = NULL;
+        int sev, sev_global = -1;
+        int ret = NOTIFY_DONE;
+
+        if (cmd != DIE_NMI)
+                return ret;
+
+        raw_spin_lock(&ghes_nmi_lock);
+        list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
+                if (ghes_read_estatus(ghes, 1)) {
+                        ghes_clear_estatus(ghes);
+                        continue;
+                }
+                sev = ghes_severity(ghes->estatus->error_severity);
+                if (sev > sev_global) {
+                        sev_global = sev;
+                        ghes_global = ghes;
+                }
+                ret = NOTIFY_STOP;
+        }
+
+        if (ret == NOTIFY_DONE)
+                goto out;
+
+        if (sev_global >= GHES_SEV_PANIC) {
+                oops_begin();
+                ghes_print_estatus(KERN_EMERG HW_ERR, ghes_global);
+                /* reboot to log the error! */
+                if (panic_timeout == 0)
+                        panic_timeout = ghes_panic_timeout;
+                panic("Fatal hardware error!");
+        }
+
+        list_for_each_entry_rcu(ghes, &ghes_nmi, list) {
+                if (!(ghes->flags & GHES_TO_CLEAR))
+                        continue;
+                /* Do not print estatus because printk is not NMI safe */
+                ghes_do_proc(ghes);
+                ghes_clear_estatus(ghes);
+        }
+
+out:
+        raw_spin_unlock(&ghes_nmi_lock);
+        return ret;
+}
+
 static struct notifier_block ghes_notifier_sci = {
         .notifier_call = ghes_notify_sci,
 };
 
+static struct notifier_block ghes_notifier_nmi = {
+        .notifier_call = ghes_notify_nmi,
+};
+
 static int __devinit ghes_probe(struct platform_device *ghes_dev)
 {
         struct acpi_hest_generic *generic;
@@ -306,18 +514,27 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)
         if (!generic->enabled)
                 return -ENODEV;
 
-        if (generic->error_block_length <
-            sizeof(struct acpi_hest_generic_status)) {
-                pr_warning(FW_BUG GHES_PFX
-"Invalid error block length: %u for generic hardware error source: %d\n",
-                           generic->error_block_length,
+        switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+        case ACPI_HEST_NOTIFY_SCI:
+        case ACPI_HEST_NOTIFY_NMI:
+                break;
+        case ACPI_HEST_NOTIFY_LOCAL:
+                pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
                            generic->header.source_id);
                 goto err;
+        default:
+                pr_warning(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
+                           generic->notify.type, generic->header.source_id);
+                goto err;
         }
-        if (generic->records_to_preallocate == 0) {
-                pr_warning(FW_BUG GHES_PFX
-"Invalid records to preallocate: %u for generic hardware error source: %d\n",
-                           generic->records_to_preallocate,
+
+        rc = -EIO;
+        if (generic->error_block_length <
+            sizeof(struct acpi_hest_generic_status)) {
+                pr_warning(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
+                           generic->error_block_length,
                            generic->header.source_id);
                 goto err;
         }
@@ -327,38 +544,43 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)
                 ghes = NULL;
                 goto err;
         }
-        if (generic->notify.type == ACPI_HEST_NOTIFY_SCI) {
+        switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+                ghes->timer.function = ghes_poll_func;
+                ghes->timer.data = (unsigned long)ghes;
+                init_timer_deferrable(&ghes->timer);
+                ghes_add_timer(ghes);
+                break;
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+                /* External interrupt vector is GSI */
+                if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) {
+                        pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n",
+                               generic->header.source_id);
+                        goto err;
+                }
+                if (request_irq(ghes->irq, ghes_irq_func,
+                                0, "GHES IRQ", ghes)) {
+                        pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
+                               generic->header.source_id);
+                        goto err;
+                }
+                break;
+        case ACPI_HEST_NOTIFY_SCI:
                 mutex_lock(&ghes_list_mutex);
                 if (list_empty(&ghes_sci))
                         register_acpi_hed_notifier(&ghes_notifier_sci);
                 list_add_rcu(&ghes->list, &ghes_sci);
                 mutex_unlock(&ghes_list_mutex);
-        } else {
-                unsigned char *notify = NULL;
-
-                switch (generic->notify.type) {
-                case ACPI_HEST_NOTIFY_POLLED:
-                        notify = "POLL";
-                        break;
-                case ACPI_HEST_NOTIFY_EXTERNAL:
-                case ACPI_HEST_NOTIFY_LOCAL:
-                        notify = "IRQ";
-                        break;
-                case ACPI_HEST_NOTIFY_NMI:
-                        notify = "NMI";
-                        break;
-                }
-                if (notify) {
-                        pr_warning(GHES_PFX
-"Generic hardware error source: %d notified via %s is not supported!\n",
-                                   generic->header.source_id, notify);
-                } else {
-                        pr_warning(FW_WARN GHES_PFX
-"Unknown notification type: %u for generic hardware error source: %d\n",
-                        generic->notify.type, generic->header.source_id);
-                }
-                rc = -ENODEV;
-                goto err;
+                break;
+        case ACPI_HEST_NOTIFY_NMI:
+                mutex_lock(&ghes_list_mutex);
+                if (list_empty(&ghes_nmi))
+                        register_die_notifier(&ghes_notifier_nmi);
+                list_add_rcu(&ghes->list, &ghes_nmi);
+                mutex_unlock(&ghes_list_mutex);
+                break;
+        default:
+                BUG();
         }
         platform_set_drvdata(ghes_dev, ghes);
 
@@ -379,7 +601,14 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)
         ghes = platform_get_drvdata(ghes_dev);
         generic = ghes->generic;
 
+        ghes->flags |= GHES_EXITING;
         switch (generic->notify.type) {
+        case ACPI_HEST_NOTIFY_POLLED:
+                del_timer_sync(&ghes->timer);
+                break;
+        case ACPI_HEST_NOTIFY_EXTERNAL:
+                free_irq(ghes->irq, ghes);
+                break;
         case ACPI_HEST_NOTIFY_SCI:
                 mutex_lock(&ghes_list_mutex);
                 list_del_rcu(&ghes->list);
@@ -387,12 +616,23 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)
                         unregister_acpi_hed_notifier(&ghes_notifier_sci);
                 mutex_unlock(&ghes_list_mutex);
                 break;
+        case ACPI_HEST_NOTIFY_NMI:
+                mutex_lock(&ghes_list_mutex);
+                list_del_rcu(&ghes->list);
+                if (list_empty(&ghes_nmi))
+                        unregister_die_notifier(&ghes_notifier_nmi);
+                mutex_unlock(&ghes_list_mutex);
+                /*
+                 * To synchronize with NMI handler, ghes can only be
+                 * freed after NMI handler finishes.
+                 */
+                synchronize_rcu();
+                break;
         default:
                 BUG();
                 break;
         }
 
-        synchronize_rcu();
         ghes_fini(ghes);
         kfree(ghes);
 
@@ -412,6 +652,8 @@ static struct platform_driver ghes_platform_driver = {
 
 static int __init ghes_init(void)
 {
+        int rc;
+
         if (acpi_disabled)
                 return -ENODEV;
 
@@ -420,12 +662,25 @@ static int __init ghes_init(void)
                 return -EINVAL;
         }
 
-        return platform_driver_register(&ghes_platform_driver);
+        rc = ghes_ioremap_init();
+        if (rc)
+                goto err;
+
+        rc = platform_driver_register(&ghes_platform_driver);
+        if (rc)
+                goto err_ioremap_exit;
+
+        return 0;
+err_ioremap_exit:
+        ghes_ioremap_exit();
+err:
+        return rc;
 }
 
 static void __exit ghes_exit(void)
 {
         platform_driver_unregister(&ghes_platform_driver);
+        ghes_ioremap_exit();
 }
 
 module_init(ghes_init);
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index daa7bc63f1d4..abda3786a5d7 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -195,24 +195,24 @@ static int __init setup_hest_disable(char *str)
 
 __setup("hest_disable", setup_hest_disable);
 
-static int __init hest_init(void)
+void __init acpi_hest_init(void)
 {
         acpi_status status;
         int rc = -ENODEV;
         unsigned int ghes_count = 0;
 
-        if (acpi_disabled)
-                goto err;
-
         if (hest_disable) {
-                pr_info(HEST_PFX "HEST tabling parsing is disabled.\n");
-                goto err;
+                pr_info(HEST_PFX "Table parsing disabled.\n");
+                return;
         }
 
+        if (acpi_disabled)
+                goto err;
+
         status = acpi_get_table(ACPI_SIG_HEST, 0,
                                 (struct acpi_table_header **)&hest_tab);
         if (status == AE_NOT_FOUND) {
-                pr_info(HEST_PFX "Table is not found!\n");
+                pr_info(HEST_PFX "Table not found.\n");
                 goto err;
         } else if (ACPI_FAILURE(status)) {
                 const char *msg = acpi_format_exception(status);
@@ -226,15 +226,11 @@ static int __init hest_init(void)
                 goto err;
 
         rc = hest_ghes_dev_register(ghes_count);
-        if (rc)
-                goto err;
-
-        pr_info(HEST_PFX "HEST table parsing is initialized.\n");
+        if (!rc) {
+                pr_info(HEST_PFX "Table parsing has been initialized.\n");
+                return;
+        }
 
-        return 0;
 err:
         hest_disable = 1;
-        return rc;
 }
-
-subsys_initcall(hest_init);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 95649d373071..ac1a599f5147 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -631,6 +631,17 @@ static int acpi_battery_update(struct acpi_battery *battery)
         return result;
 }
 
+static void acpi_battery_refresh(struct acpi_battery *battery)
+{
+        if (!battery->bat.dev)
+                return;
+
+        acpi_battery_get_info(battery);
+        /* The battery may have changed its reporting units. */
+        sysfs_remove_battery(battery);
+        sysfs_add_battery(battery);
+}
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -868,6 +879,8 @@ static int acpi_battery_add_fs(struct acpi_device *device)
         struct proc_dir_entry *entry = NULL;
         int i;
 
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_battery_dir);
@@ -914,6 +927,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
         if (!battery)
                 return;
         old = battery->bat.dev;
+        if (event == ACPI_BATTERY_NOTIFY_INFO)
+                acpi_battery_refresh(battery);
         acpi_battery_update(battery);
         acpi_bus_generate_proc_event(device, event,
                                      acpi_battery_present(battery));
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index d68bd61072bb..7ced61f39492 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -52,22 +52,6 @@ EXPORT_SYMBOL(acpi_root_dir);
 
 #define STRUCT_TO_INT(s)        (*((int*)&s))
 
-static int set_power_nocheck(const struct dmi_system_id *id)
-{
-        printk(KERN_NOTICE PREFIX "%s detected - "
-                "disable power check in power transition\n", id->ident);
-        acpi_power_nocheck = 1;
-        return 0;
-}
-static struct dmi_system_id __cpuinitdata power_nocheck_dmi_table[] = {
-        {
-        set_power_nocheck, "HP Pavilion 05", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-        DMI_MATCH(DMI_SYS_VENDOR, "HP Pavilion 05"),
-        DMI_MATCH(DMI_PRODUCT_VERSION, "2001211RE101GLEND") }, NULL},
-        {},
-};
-
 
 #ifdef CONFIG_X86
 static int set_copy_dsdt(const struct dmi_system_id *id)
@@ -196,33 +180,24 @@ EXPORT_SYMBOL(acpi_bus_get_private_data);
                                  Power Management
    -------------------------------------------------------------------------- */
 
-int acpi_bus_get_power(acpi_handle handle, int *state)
+static int __acpi_bus_get_power(struct acpi_device *device, int *state)
 {
         int result = 0;
         acpi_status status = 0;
-        struct acpi_device *device = NULL;
         unsigned long long psc = 0;
 
-
-        result = acpi_bus_get_device(handle, &device);
-        if (result)
-                return result;
+        if (!device || !state)
+                return -EINVAL;
 
         *state = ACPI_STATE_UNKNOWN;
 
-        if (!device->flags.power_manageable) {
-                /* TBD: Non-recursive algorithm for walking up hierarchy */
-                if (device->parent)
-                        *state = device->parent->power.state;
-                else
-                        *state = ACPI_STATE_D0;
-        } else {
+        if (device->flags.power_manageable) {
                 /*
                  * Get the device's power state either directly (via _PSC) or
                  * indirectly (via power resources).
                  */
                 if (device->power.flags.power_resources) {
-                        result = acpi_power_get_inferred_state(device);
+                        result = acpi_power_get_inferred_state(device, state);
                         if (result)
                                 return result;
                 } else if (device->power.flags.explicit_get) {
@@ -230,59 +205,33 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
                                                        NULL, &psc);
                         if (ACPI_FAILURE(status))
                                 return -ENODEV;
-                        device->power.state = (int)psc;
+                        *state = (int)psc;
                 }
-
-                *state = device->power.state;
+        } else {
+                /* TBD: Non-recursive algorithm for walking up hierarchy. */
+                *state = device->parent ?
+                        device->parent->power.state : ACPI_STATE_D0;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
-                          device->pnp.bus_id, device->power.state));
+                          device->pnp.bus_id, *state));
 
         return 0;
 }
 
-EXPORT_SYMBOL(acpi_bus_get_power);
 
-int acpi_bus_set_power(acpi_handle handle, int state)
+static int __acpi_bus_set_power(struct acpi_device *device, int state)
 {
         int result = 0;
         acpi_status status = AE_OK;
-        struct acpi_device *device = NULL;
         char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' };
 
-
-        result = acpi_bus_get_device(handle, &device);
-        if (result)
-                return result;
-
-        if ((state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
+        if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                 return -EINVAL;
 
         /* Make sure this is a valid target state */
 
-        if (!device->flags.power_manageable) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable\n",
-                                kobject_name(&device->dev.kobj)));
-                return -ENODEV;
-        }
-        /*
-         * Get device's current power state
-         */
-        if (!acpi_power_nocheck) {
-                /*
-                 * Maybe the incorrect power state is returned on the bogus
-                 * bios, which is different with the real power state.
-                 * For example: the bios returns D0 state and the real power
-                 * state is D3. OS expects to set the device to D0 state. In
-                 * such case if OS uses the power state returned by the BIOS,
-                 * the device can't be transisted to the correct power state.
-                 * So if the acpi_power_nocheck is set, it is unnecessary to
-                 * get the power state by calling acpi_bus_get_power.
-                 */
-                acpi_bus_get_power(device->handle, &device->power.state);
-        }
-        if ((state == device->power.state) && !device->flags.force_power_state) {
+        if (state == device->power.state) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
                                   state));
                 return 0;
@@ -351,8 +300,75 @@ int acpi_bus_set_power(acpi_handle handle, int state)
         return result;
 }
 
+
+int acpi_bus_set_power(acpi_handle handle, int state)
+{
+        struct acpi_device *device;
+        int result;
+
+        result = acpi_bus_get_device(handle, &device);
+        if (result)
+                return result;
+
+        if (!device->flags.power_manageable) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                "Device [%s] is not power manageable\n",
+                                dev_name(&device->dev)));
+                return -ENODEV;
+        }
+
+        return __acpi_bus_set_power(device, state);
+}
 EXPORT_SYMBOL(acpi_bus_set_power);
 
+
+int acpi_bus_init_power(struct acpi_device *device)
+{
+        int state;
+        int result;
+
+        if (!device)
+                return -EINVAL;
+
+        device->power.state = ACPI_STATE_UNKNOWN;
+
+        result = __acpi_bus_get_power(device, &state);
+        if (result)
+                return result;
+
+        if (device->power.flags.power_resources)
+                result = acpi_power_on_resources(device, state);
+
+        if (!result)
+                device->power.state = state;
+
+        return result;
+}
+
+
+int acpi_bus_update_power(acpi_handle handle, int *state_p)
+{
+        struct acpi_device *device;
+        int state;
+        int result;
+
+        result = acpi_bus_get_device(handle, &device);
+        if (result)
+                return result;
+
+        result = __acpi_bus_get_power(device, &state);
+        if (result)
+                return result;
+
+        result = __acpi_bus_set_power(device, state);
+        if (!result && state_p)
+                *state_p = state;
+
+        return result;
+}
+EXPORT_SYMBOL_GPL(acpi_bus_update_power);
+
+
 bool acpi_bus_power_manageable(acpi_handle handle)
 {
         struct acpi_device *device;
@@ -1023,15 +1039,8 @@ static int __init acpi_init(void)
         if (acpi_disabled)
                 return result;
 
-        /*
-         * If the laptop falls into the DMI check table, the power state check
-         * will be disabled in the course of device power transition.
-         */
-        dmi_check_system(power_nocheck_dmi_table);
-
         acpi_scan_init();
         acpi_ec_init();
-        acpi_power_init();
         acpi_debugfs_init();
         acpi_sleep_proc_init();
         acpi_wakeup_device_init();
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 71ef9cd0735f..76bbb78a5ad9 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -279,6 +279,9 @@ static int acpi_lid_send_state(struct acpi_device *device)
         input_report_switch(button->input, SW_LID, !state);
         input_sync(button->input);
 
+        if (state)
+                pm_wakeup_event(&device->dev, 0);
+
         ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
         if (ret == NOTIFY_DONE)
                 ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
@@ -314,6 +317,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
                         input_sync(input);
                         input_report_key(input, keycode, 0);
                         input_sync(input);
+
+                        pm_wakeup_event(&device->dev, 0);
                 }
 
                 acpi_bus_generate_proc_event(device, event, ++button->pushed);
@@ -426,7 +431,7 @@ static int acpi_button_add(struct acpi_device *device)
                 acpi_enable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
                 device->wakeup.run_wake_count++;
-                device->wakeup.state.enabled = 1;
+                device_set_wakeup_enable(&device->dev, true);
         }
 
         printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
@@ -449,7 +454,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
                 acpi_disable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
                 device->wakeup.run_wake_count--;
-                device->wakeup.state.enabled = 0;
+                device_set_wakeup_enable(&device->dev, false);
         }
 
         acpi_button_remove_fs(device);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 81514a4918cc..1864ad3cf895 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -725,7 +725,7 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
                         complete_dock(ds);
                         dock_event(ds, event, DOCK_EVENT);
                         dock_lock(ds, 1);
-                        acpi_update_gpes();
+                        acpi_update_all_gpes();
                         break;
                 }
                 if (dock_present(ds) || dock_in_progress(ds))
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 302b31ed31f1..fa848c4116a8 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -606,7 +606,8 @@ static int ec_check_sci(struct acpi_ec *ec, u8 state)
         return 0;
 }
 
-static u32 acpi_ec_gpe_handler(void *data)
+static u32 acpi_ec_gpe_handler(acpi_handle gpe_device,
+        u32 gpe_number, void *data)
 {
         struct acpi_ec *ec = data;
 
@@ -618,7 +619,7 @@ static u32 acpi_ec_gpe_handler(void *data)
                 wake_up(&ec->wait);
                 ec_check_sci(ec, acpi_ec_read_status(ec));
         }
-        return ACPI_INTERRUPT_HANDLED;
+        return ACPI_INTERRUPT_HANDLED | ACPI_REENABLE_GPE;
 }
 
 /* --------------------------------------------------------------------------
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 60049080c869..467479f07c1f 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -86,7 +86,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &acpi_state);
+        result = acpi_bus_update_power(device->handle, &acpi_state);
         if (result)
                 return result;
 
@@ -123,7 +123,6 @@ static struct thermal_cooling_device_ops fan_cooling_ops = {
 static int acpi_fan_add(struct acpi_device *device)
 {
         int result = 0;
-        int state = 0;
         struct thermal_cooling_device *cdev;
 
         if (!device)
@@ -132,16 +131,12 @@ static int acpi_fan_add(struct acpi_device *device)
         strcpy(acpi_device_name(device), "Fan");
         strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
 
-        result = acpi_bus_get_power(device->handle, &state);
+        result = acpi_bus_update_power(device->handle, NULL);
         if (result) {
-                printk(KERN_ERR PREFIX "Reading power state\n");
+                printk(KERN_ERR PREFIX "Setting initial power state\n");
                 goto end;
         }
 
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, state);
-        device->flags.force_power_state = 0;
-
         cdev = thermal_cooling_device_register("Fan", device,
                                                 &fan_cooling_ops);
         if (IS_ERR(cdev)) {
@@ -200,22 +195,14 @@ static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
 
 static int acpi_fan_resume(struct acpi_device *device)
 {
-        int result = 0;
-        int power_state = 0;
+        int result;
 
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &power_state);
-        if (result) {
-                printk(KERN_ERR PREFIX
-                                  "Error reading fan power state\n");
-                return result;
-        }
-
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, power_state);
-        device->flags.force_power_state = 0;
+        result = acpi_bus_update_power(device->handle, NULL);
+        if (result)
+                printk(KERN_ERR PREFIX "Error updating fan power state\n");
 
         return result;
 }
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 78b0164c35b2..7c47ed55e528 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -167,11 +167,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                 "firmware_node");
                 ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                 "physical_node");
-                if (acpi_dev->wakeup.flags.valid) {
+                if (acpi_dev->wakeup.flags.valid)
                         device_set_wakeup_capable(dev, true);
-                        device_set_wakeup_enable(dev,
-                                                acpi_dev->wakeup.state.enabled);
-                }
         }
 
         return 0;
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a212bfeddf8c..b1cc81a0431b 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -41,9 +41,10 @@ static inline int acpi_debugfs_init(void) { return 0; }
 int acpi_power_init(void);
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
-int acpi_power_get_inferred_state(struct acpi_device *device);
+int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
+int acpi_power_on_resources(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
-extern int acpi_power_nocheck;
+int acpi_bus_init_power(struct acpi_device *device);
 
 int acpi_wakeup_device_init(void);
 void acpi_early_processor_set_pdc(void);
@@ -82,8 +83,16 @@ extern int acpi_sleep_init(void);
 
 #ifdef CONFIG_ACPI_SLEEP
 int acpi_sleep_proc_init(void);
+int suspend_nvs_alloc(void);
+void suspend_nvs_free(void);
+int suspend_nvs_save(void);
+void suspend_nvs_restore(void);
 #else
 static inline int acpi_sleep_proc_init(void) { return 0; }
+static inline int suspend_nvs_alloc(void) { return 0; }
+static inline void suspend_nvs_free(void) {}
+static inline int suspend_nvs_save(void) { return 0; }
+static inline void suspend_nvs_restore(void) {}
 #endif
 
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index d9926afec110..5eb25eb3ea48 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -275,23 +275,19 @@ acpi_table_parse_srat(enum acpi_srat_type id,
 int __init acpi_numa_init(void)
 {
         int ret = 0;
-        int nr_cpu_entries = nr_cpu_ids;
 
-#ifdef CONFIG_X86
         /*
          * Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
          * SRAT cpu entries could have different order with that in MADT.
          * So go over all cpu entries in SRAT to get apicid to node mapping.
          */
-        nr_cpu_entries = MAX_LOCAL_APIC;
-#endif
 
         /* SRAT: Static Resource Affinity Table */
         if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
-                                     acpi_parse_x2apic_affinity, nr_cpu_entries);
+                                     acpi_parse_x2apic_affinity, 0);
                 acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
-                                     acpi_parse_processor_affinity, nr_cpu_entries);
+                                     acpi_parse_processor_affinity, 0);
                 ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
                                             acpi_parse_memory_affinity,
                                             NR_NODE_MEMBLKS);
diff --git a/drivers/acpi/nvs.c b/drivers/acpi/nvs.c
new file mode 100644
index 000000000000..fa5a1df42b79
--- /dev/null
+++ b/drivers/acpi/nvs.c
@@ -0,0 +1,145 @@
+/*
+ * nvs.c - Routines for saving and restoring ACPI NVS memory region
+ *
+ * Copyright (C) 2008-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
+ *
+ * This file is released under the GPLv2.
+ */
+
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/acpi.h>
+#include <linux/acpi_io.h>
+#include <acpi/acpiosxf.h>
+
+/*
+ * Platforms, like ACPI, may want us to save some memory used by them during
+ * suspend and to restore the contents of this memory during the subsequent
+ * resume.  The code below implements a mechanism allowing us to do that.
+ */
+
+struct nvs_page {
+        unsigned long phys_start;
+        unsigned int size;
+        void *kaddr;
+        void *data;
+        struct list_head node;
+};
+
+static LIST_HEAD(nvs_list);
+
+/**
+ *      suspend_nvs_register - register platform NVS memory region to save
+ *      @start - physical address of the region
+ *      @size - size of the region
+ *
+ *      The NVS region need not be page-aligned (both ends) and we arrange
+ *      things so that the data from page-aligned addresses in this region will
+ *      be copied into separate RAM pages.
+ */
+int suspend_nvs_register(unsigned long start, unsigned long size)
+{
+        struct nvs_page *entry, *next;
+
+        while (size > 0) {
+                unsigned int nr_bytes;
+
+                entry = kzalloc(sizeof(struct nvs_page), GFP_KERNEL);
+                if (!entry)
+                        goto Error;
+
+                list_add_tail(&entry->node, &nvs_list);
+                entry->phys_start = start;
+                nr_bytes = PAGE_SIZE - (start & ~PAGE_MASK);
+                entry->size = (size < nr_bytes) ? size : nr_bytes;
+
+                start += entry->size;
+                size -= entry->size;
+        }
+        return 0;
+
+ Error:
+        list_for_each_entry_safe(entry, next, &nvs_list, node) {
+                list_del(&entry->node);
+                kfree(entry);
+        }
+        return -ENOMEM;
+}
+
+/**
+ *      suspend_nvs_free - free data pages allocated for saving NVS regions
+ */
+void suspend_nvs_free(void)
+{
+        struct nvs_page *entry;
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data) {
+                        free_page((unsigned long)entry->data);
+                        entry->data = NULL;
+                        if (entry->kaddr) {
+                                iounmap(entry->kaddr);
+                                entry->kaddr = NULL;
+                        }
+                }
+}
+
+/**
+ *      suspend_nvs_alloc - allocate memory necessary for saving NVS regions
+ */
+int suspend_nvs_alloc(void)
+{
+        struct nvs_page *entry;
+
+        list_for_each_entry(entry, &nvs_list, node) {
+                entry->data = (void *)__get_free_page(GFP_KERNEL);
+                if (!entry->data) {
+                        suspend_nvs_free();
+                        return -ENOMEM;
+                }
+        }
+        return 0;
+}
+
+/**
+ *      suspend_nvs_save - save NVS memory regions
+ */
+int suspend_nvs_save(void)
+{
+        struct nvs_page *entry;
+
+        printk(KERN_INFO "PM: Saving platform NVS memory\n");
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data) {
+                        entry->kaddr = acpi_os_ioremap(entry->phys_start,
+                                                    entry->size);
+                        if (!entry->kaddr) {
+                                suspend_nvs_free();
+                                return -ENOMEM;
+                        }
+                        memcpy(entry->data, entry->kaddr, entry->size);
+                }
+
+        return 0;
+}
+
+/**
+ *      suspend_nvs_restore - restore NVS memory regions
+ *
+ *      This function is going to be called with interrupts disabled, so it
+ *      cannot iounmap the virtual addresses used to access the NVS region.
+ */
+void suspend_nvs_restore(void)
+{
+        struct nvs_page *entry;
+
+        printk(KERN_INFO "PM: Restoring platform NVS memory\n");
+
+        list_for_each_entry(entry, &nvs_list, node)
+                if (entry->data)
+                        memcpy(entry->kaddr, entry->data, entry->size);
+}
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 055d7b701fff..b0931818cf98 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -38,6 +38,7 @@
 #include <linux/workqueue.h>
 #include <linux/nmi.h>
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <linux/efi.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
@@ -302,9 +303,10 @@ void __iomem *__init_refok
 acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
         struct acpi_ioremap *map, *tmp_map;
-        unsigned long flags, pg_sz;
+        unsigned long flags;
         void __iomem *virt;
-        phys_addr_t pg_off;
+        acpi_physical_address pg_off;
+        acpi_size pg_sz;
 
         if (phys > ULONG_MAX) {
                 printk(KERN_ERR PREFIX "Cannot map memory that high\n");
@@ -320,7 +322,7 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 
         pg_off = round_down(phys, PAGE_SIZE);
         pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off;
-        virt = ioremap(pg_off, pg_sz);
+        virt = acpi_os_ioremap(pg_off, pg_sz);
         if (!virt) {
                 kfree(map);
                 return NULL;
@@ -642,7 +644,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
         virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
         rcu_read_unlock();
         if (!virt_addr) {
-                virt_addr = ioremap(phys_addr, size);
+                virt_addr = acpi_os_ioremap(phys_addr, size);
                 unmap = 1;
         }
         if (!value)
@@ -678,7 +680,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
         virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
         rcu_read_unlock();
         if (!virt_addr) {
-                virt_addr = ioremap(phys_addr, size);
+                virt_addr = acpi_os_ioremap(phys_addr, size);
                 unmap = 1;
         }
 
@@ -1233,8 +1235,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);
 int acpi_check_resource_conflict(const struct resource *res)
 {
         struct acpi_res_list *res_list_elem;
-        int ioport;
-        int clash = 0;
+        int ioport = 0, clash = 0;
 
         if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)
                 return 0;
@@ -1264,9 +1265,13 @@ int acpi_check_resource_conflict(const struct resource *res)
         if (clash) {
                 if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {
                         printk(KERN_WARNING "ACPI: resource %s %pR"
-                               " conflicts with ACPI region %s %pR\n",
+                               " conflicts with ACPI region %s "
+                               "[%s 0x%zx-0x%zx]\n",
                                res->name, res, res_list_elem->name,
-                               res_list_elem);
+                               (res_list_elem->resource_type ==
+                                ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",
+                               (size_t) res_list_elem->start,
+                               (size_t) res_list_elem->end);
                         if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)
                                 printk(KERN_NOTICE "ACPI: This conflict may"
                                        " cause random problems and system"
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 96668ad09622..85249395623b 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -36,6 +36,7 @@
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <acpi/apei.h>
 
 #define PREFIX "ACPI: "
 
@@ -47,6 +48,11 @@ static int acpi_pci_root_add(struct acpi_device *device);
 static int acpi_pci_root_remove(struct acpi_device *device, int type);
 static int acpi_pci_root_start(struct acpi_device *device);
 
+#define ACPI_PCIE_REQ_SUPPORT (OSC_EXT_PCI_CONFIG_SUPPORT \
+                                | OSC_ACTIVE_STATE_PWR_SUPPORT \
+                                | OSC_CLOCK_PWR_CAPABILITY_SUPPORT \
+                                | OSC_MSI_SUPPORT)
+
 static const struct acpi_device_id root_device_ids[] = {
         {"PNP0A03", 0},
         {"", 0},
@@ -566,6 +572,33 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
         if (flags != base_flags)
                 acpi_pci_osc_support(root, flags);
 
+        if (!pcie_ports_disabled
+            && (flags & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) {
+                flags = OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL
+                        | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL
+                        | OSC_PCI_EXPRESS_PME_CONTROL;
+
+                if (pci_aer_available()) {
+                        if (aer_acpi_firmware_first())
+                                dev_dbg(root->bus->bridge,
+                                        "PCIe errors handled by BIOS.\n");
+                        else
+                                flags |= OSC_PCI_EXPRESS_AER_CONTROL;
+                }
+
+                dev_info(root->bus->bridge,
+                        "Requesting ACPI _OSC control (0x%02x)\n", flags);
+
+                status = acpi_pci_osc_control_set(device->handle, &flags,
+                                        OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
+                if (ACPI_SUCCESS(status))
+                        dev_info(root->bus->bridge,
+                                "ACPI _OSC control (0x%02x) granted\n", flags);
+                else
+                        dev_dbg(root->bus->bridge,
+                                "ACPI _OSC request failed (code %d)\n", status);
+        }
+
         pci_acpi_add_bus_pm_notifier(device, root->bus);
         if (device->wakeup.flags.run_wake)
                 device_set_run_wake(root->bus->bridge, true);
@@ -600,6 +633,8 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 
 static int __init acpi_pci_root_init(void)
 {
+        acpi_hest_init();
+
         if (acpi_pci_disabled)
                 return 0;
 
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 4c9c2fb5d98f..9ac2a9fa90ff 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -56,9 +56,6 @@ ACPI_MODULE_NAME("power");
 #define ACPI_POWER_RESOURCE_STATE_ON    0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
 
-int acpi_power_nocheck;
-module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
-
 static int acpi_power_add(struct acpi_device *device);
 static int acpi_power_remove(struct acpi_device *device, int type);
 static int acpi_power_resume(struct acpi_device *device);
@@ -148,9 +145,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
 
 static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
 {
-        int result = 0, state1;
-        u32 i = 0;
-
+        int cur_state;
+        int i = 0;
 
         if (!list || !state)
                 return -EINVAL;
@@ -158,25 +154,33 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
         /* The state of the list is 'on' IFF all resources are 'on'. */
 
         for (i = 0; i < list->count; i++) {
-                /*
-                 * The state of the power resource can be obtained by
-                 * using the ACPI handle. In such case it is unnecessary to
-                 * get the Power resource first and then get its state again.
-                 */
-                result = acpi_power_get_state(list->handles[i], &state1);
+                struct acpi_power_resource *resource;
+                acpi_handle handle = list->handles[i];
+                int result;
+
+                result = acpi_power_get_context(handle, &resource);
                 if (result)
                         return result;
 
-                *state = state1;
+                mutex_lock(&resource->resource_lock);
 
-                if (*state != ACPI_POWER_RESOURCE_STATE_ON)
+                result = acpi_power_get_state(handle, &cur_state);
+
+                mutex_unlock(&resource->resource_lock);
+
+                if (result)
+                        return result;
+
+                if (cur_state != ACPI_POWER_RESOURCE_STATE_ON)
                         break;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource list is %s\n",
-                          *state ? "on" : "off"));
+                          cur_state ? "on" : "off"));
 
-        return result;
+        *state = cur_state;
+
+        return 0;
 }
 
 static int __acpi_power_on(struct acpi_power_resource *resource)
@@ -222,7 +226,7 @@ static int acpi_power_on(acpi_handle handle)
         return result;
 }
 
-static int acpi_power_off_device(acpi_handle handle)
+static int acpi_power_off(acpi_handle handle)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -266,6 +270,35 @@ static int acpi_power_off_device(acpi_handle handle)
         return result;
 }
 
+static void __acpi_power_off_list(struct acpi_handle_list *list, int num_res)
+{
+        int i;
+
+        for (i = num_res - 1; i >= 0 ; i--)
+                acpi_power_off(list->handles[i]);
+}
+
+static void acpi_power_off_list(struct acpi_handle_list *list)
+{
+        __acpi_power_off_list(list, list->count);
+}
+
+static int acpi_power_on_list(struct acpi_handle_list *list)
+{
+        int result = 0;
+        int i;
+
+        for (i = 0; i < list->count; i++) {
+                result = acpi_power_on(list->handles[i]);
+                if (result) {
+                        __acpi_power_off_list(list, i);
+                        break;
+                }
+        }
+
+        return result;
+}
+
 /**
  * acpi_device_sleep_wake - execute _DSW (Device Sleep Wake) or (deprecated in
  *                          ACPI 3.0) _PSW (Power State Wake)
@@ -404,8 +437,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
 
         /* Close power resource */
         for (i = 0; i < dev->wakeup.resources.count; i++) {
-                int ret = acpi_power_off_device(
-                                dev->wakeup.resources.handles[i]);
+                int ret = acpi_power_off(dev->wakeup.resources.handles[i]);
                 if (ret) {
                         printk(KERN_ERR PREFIX "Transition power state\n");
                         dev->wakeup.flags.valid = 0;
@@ -423,19 +455,16 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
                              Device Power Management
    -------------------------------------------------------------------------- */
 
-int acpi_power_get_inferred_state(struct acpi_device *device)
+int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
 {
         int result = 0;
         struct acpi_handle_list *list = NULL;
         int list_state = 0;
         int i = 0;
 
-
-        if (!device)
+        if (!device || !state)
                 return -EINVAL;
 
-        device->power.state = ACPI_STATE_UNKNOWN;
-
         /*
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
@@ -450,22 +479,26 @@ int acpi_power_get_inferred_state(struct acpi_device *device)
                         return result;
 
                 if (list_state == ACPI_POWER_RESOURCE_STATE_ON) {
-                        device->power.state = i;
+                        *state = i;
                         return 0;
                 }
         }
 
-        device->power.state = ACPI_STATE_D3;
-
+        *state = ACPI_STATE_D3;
         return 0;
 }
 
+int acpi_power_on_resources(struct acpi_device *device, int state)
+{
+        if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3)
+                return -EINVAL;
+
+        return acpi_power_on_list(&device->power.states[state].resources);
+}
+
 int acpi_power_transition(struct acpi_device *device, int state)
 {
-        int result = 0;
-        struct acpi_handle_list *cl = NULL;     /* Current Resources */
-        struct acpi_handle_list *tl = NULL;     /* Target Resources */
-        int i = 0;
+        int result;
 
         if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                 return -EINVAL;
@@ -477,37 +510,20 @@ int acpi_power_transition(struct acpi_device *device, int state)
             || (device->power.state > ACPI_STATE_D3))
                 return -ENODEV;
 
-        cl = &device->power.states[device->power.state].resources;
-        tl = &device->power.states[state].resources;
-
         /* TBD: Resources must be ordered. */
 
         /*
          * First we reference all power resources required in the target list
-         * (e.g. so the device doesn't lose power while transitioning).
+         * (e.g. so the device doesn't lose power while transitioning).  Then,
+         * we dereference all power resources used in the current list.
          */
-        for (i = 0; i < tl->count; i++) {
-                result = acpi_power_on(tl->handles[i]);
-                if (result)
-                        goto end;
-        }
+        result = acpi_power_on_list(&device->power.states[state].resources);
+        if (!result)
+                acpi_power_off_list(
+                        &device->power.states[device->power.state].resources);
 
-        /*
-         * Then we dereference all power resources used in the current list.
-         */
-        for (i = 0; i < cl->count; i++) {
-                result = acpi_power_off_device(cl->handles[i]);
-                if (result)
-                        goto end;
-        }
-
-     end:
-        if (result)
-                device->power.state = ACPI_STATE_UNKNOWN;
-        else {
-        /* We shouldn't change the state till all above operations succeed */
-                device->power.state = state;
-        }
+        /* We shouldn't change the state unless the above operations succeed. */
+        device->power.state = result ? ACPI_STATE_UNKNOWN : state;
 
         return result;
 }
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index afad67769db6..f5f986991b52 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -311,7 +311,9 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                            dev->pnp.bus_id,
                            (u32) dev->wakeup.sleep_state,
                            dev->wakeup.flags.run_wake ? '*' : ' ',
-                           dev->wakeup.state.enabled ? "enabled" : "disabled");
+                           (device_may_wakeup(&dev->dev)
+                             || (ldev && device_may_wakeup(ldev))) ?
+                               "enabled" : "disabled");
                 if (ldev)
                         seq_printf(seq, "%s:%s",
                                    ldev->bus ? ldev->bus->name : "no-bus",
@@ -328,8 +330,10 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)
 {
         struct device *dev = acpi_get_physical_device(adev->handle);
 
-        if (dev && device_can_wakeup(dev))
-                device_set_wakeup_enable(dev, adev->wakeup.state.enabled);
+        if (dev && device_can_wakeup(dev)) {
+                bool enable = !device_may_wakeup(dev);
+                device_set_wakeup_enable(dev, enable);
+        }
 }
 
 static ssize_t
@@ -341,7 +345,6 @@ acpi_system_write_wakeup_device(struct file *file,
         char strbuf[5];
         char str[5] = "";
         unsigned int len = count;
-        struct acpi_device *found_dev = NULL;
 
         if (len > 4)
                 len = 4;
@@ -361,33 +364,13 @@ acpi_system_write_wakeup_device(struct file *file,
                         continue;
 
                 if (!strncmp(dev->pnp.bus_id, str, 4)) {
-                        dev->wakeup.state.enabled =
-                            dev->wakeup.state.enabled ? 0 : 1;
-                        found_dev = dev;
-                        break;
-                }
-        }
-        if (found_dev) {
-                physical_device_enable_wakeup(found_dev);
-                list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-                        struct acpi_device *dev = container_of(node,
-                                                               struct
-                                                               acpi_device,
-                                                               wakeup_list);
-
-                        if ((dev != found_dev) &&
-                            (dev->wakeup.gpe_number ==
-                             found_dev->wakeup.gpe_number)
-                            && (dev->wakeup.gpe_device ==
-                                found_dev->wakeup.gpe_device)) {
-                                printk(KERN_WARNING
-                                       "ACPI: '%s' and '%s' have the same GPE, "
-                                       "can't disable/enable one separately\n",
-                                       dev->pnp.bus_id, found_dev->pnp.bus_id);
-                                dev->wakeup.state.enabled =
-                                    found_dev->wakeup.state.enabled;
+                        if (device_can_wakeup(&dev->dev)) {
+                                bool enable = !device_may_wakeup(&dev->dev);
+                                device_set_wakeup_enable(&dev->dev, enable);
+                        } else {
                                 physical_device_enable_wakeup(dev);
                         }
+                        break;
                 }
         }
         mutex_unlock(&acpi_device_lock);
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index bec561c14beb..3c1a2fec8cda 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -23,7 +23,7 @@ static int set_no_mwait(const struct dmi_system_id *id)
 {
         printk(KERN_NOTICE PREFIX "%s detected - "
                 "disabling mwait for CPU C-states\n", id->ident);
-        idle_nomwait = 1;
+        boot_option_idle_override = IDLE_NOMWAIT;
         return 0;
 }
 
@@ -283,7 +283,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
 {
         acpi_status status = AE_OK;
 
-        if (idle_nomwait) {
+        if (boot_option_idle_override == IDLE_NOMWAIT) {
                 /*
                  * If mwait is disabled for CPU C-states, the C2C3_FFH access
                  * mode will be disabled in the parameter of _PDC object.
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 85e48047d7b0..360a74e6add0 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -40,10 +40,6 @@
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
 #include <linux/cpu.h>
-#ifdef CONFIG_ACPI_PROCFS
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#endif
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
 #include <linux/cpuidle.h>
@@ -246,53 +242,6 @@ static int acpi_processor_errata(struct acpi_processor *pr)
         return result;
 }
 
-#ifdef CONFIG_ACPI_PROCFS
-static struct proc_dir_entry *acpi_processor_dir = NULL;
-
-static int __cpuinit acpi_processor_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-
-
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_processor_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-
-        /* 'throttling' [R/W] */
-        entry = proc_create_data(ACPI_PROCESSOR_FILE_THROTTLING,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device),
-                                 &acpi_processor_throttling_fops,
-                                 acpi_driver_data(device));
-        if (!entry)
-                return -EIO;
-        return 0;
-}
-static int acpi_processor_remove_fs(struct acpi_device *device)
-{
-
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_PROCESSOR_FILE_THROTTLING,
-                                  acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_processor_dir);
-                acpi_device_dir(device) = NULL;
-        }
-
-        return 0;
-}
-#else
-static inline int acpi_processor_add_fs(struct acpi_device *device)
-{
-        return 0;
-}
-static inline int acpi_processor_remove_fs(struct acpi_device *device)
-{
-        return 0;
-}
-#endif
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
@@ -478,8 +427,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         if (action == CPU_ONLINE && pr) {
                 acpi_processor_ppc_has_changed(pr, 0);
                 acpi_processor_cst_has_changed(pr);
+                acpi_processor_reevaluate_tstate(pr, action);
                 acpi_processor_tstate_has_changed(pr);
         }
+        if (action == CPU_DEAD && pr) {
+                /* invalidate the flag.throttling after one CPU is offline */
+                acpi_processor_reevaluate_tstate(pr, action);
+        }
         return NOTIFY_OK;
 }
 
@@ -537,14 +491,10 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
 
         per_cpu(processors, pr->id) = pr;
 
-        result = acpi_processor_add_fs(device);
-        if (result)
-                goto err_free_cpumask;
-
         sysdev = get_cpu_sysdev(pr->id);
         if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
                 result = -EFAULT;
-                goto err_remove_fs;
+                goto err_free_cpumask;
         }
 
 #ifdef CONFIG_CPU_FREQ
@@ -590,8 +540,6 @@ err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
 err_power_exit:
         acpi_processor_power_exit(pr, device);
-err_remove_fs:
-        acpi_processor_remove_fs(device);
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
 
@@ -620,8 +568,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 
-        acpi_processor_remove_fs(device);
-
         if (pr->cdev) {
                 sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
                 sysfs_remove_link(&pr->cdev->device.kobj, "device");
@@ -854,12 +800,6 @@ static int __init acpi_processor_init(void)
 
         memset(&errata, 0, sizeof(errata));
 
-#ifdef CONFIG_ACPI_PROCFS
-        acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-        if (!acpi_processor_dir)
-                return -ENOMEM;
-#endif
-
         if (!cpuidle_register_driver(&acpi_idle_driver)) {
                 printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
                         acpi_idle_driver.name);
@@ -885,10 +825,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-#ifdef CONFIG_ACPI_PROCFS
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-#endif
-
         return result;
 }
 
@@ -907,10 +843,6 @@ static void __exit acpi_processor_exit(void)
 
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-#ifdef CONFIG_ACPI_PROCFS
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-#endif
-
         return;
 }
 
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index a765b823aa9e..d615b7d69bca 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -79,6 +79,13 @@ module_param(bm_check_disable, uint, 0000);
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
 
+static int disabled_by_idle_boot_param(void)
+{
+        return boot_option_idle_override == IDLE_POLL ||
+                boot_option_idle_override == IDLE_FORCE_MWAIT ||
+                boot_option_idle_override == IDLE_HALT;
+}
+
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
  * For now disable this. Probably a bug somewhere else.
@@ -455,7 +462,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                                 continue;
                         }
                         if (cx.type == ACPI_STATE_C1 &&
-                                        (idle_halt || idle_nomwait)) {
+                            (boot_option_idle_override == IDLE_NOMWAIT)) {
                                 /*
                                  * In most cases the C1 space_id obtained from
                                  * _CST object is FIXED_HARDWARE access mode.
@@ -1016,7 +1023,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 state->flags = 0;
                 switch (cx->type) {
                         case ACPI_STATE_C1:
-                        state->flags |= CPUIDLE_FLAG_SHALLOW;
                         if (cx->entry_method == ACPI_CSTATE_FFH)
                                 state->flags |= CPUIDLE_FLAG_TIME_VALID;
 
@@ -1025,16 +1031,13 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                         break;
 
                         case ACPI_STATE_C2:
-                        state->flags |= CPUIDLE_FLAG_BALANCED;
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
                         state->enter = acpi_idle_enter_simple;
                         dev->safe_state = state;
                         break;
 
                         case ACPI_STATE_C3:
-                        state->flags |= CPUIDLE_FLAG_DEEP;
                         state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                        state->flags |= CPUIDLE_FLAG_CHECK_BM;
                         state->enter = pr->flags.bm_check ?
                                         acpi_idle_enter_bm :
                                         acpi_idle_enter_simple;
@@ -1058,7 +1061,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
         int ret = 0;
 
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         if (!pr)
@@ -1089,19 +1092,10 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
         acpi_status status = 0;
         static int first_run;
 
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         if (!first_run) {
-                if (idle_halt) {
-                        /*
-                         * When the boot option of "idle=halt" is added, halt
-                         * is used for CPU IDLE.
-                         * In such case C2/C3 is meaningless. So the max_cstate
-                         * is set to one.
-                         */
-                        max_cstate = 1;
-                }
                 dmi_check_system(processor_power_dmi_table);
                 max_cstate = acpi_processor_cstate_check(max_cstate);
                 if (max_cstate < ACPI_C_STATES_MAX)
@@ -1142,7 +1136,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
 int acpi_processor_power_exit(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
-        if (boot_option_idle_override)
+        if (disabled_by_idle_boot_param())
                 return 0;
 
         cpuidle_unregister_device(&pr->power.dev);
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index ff3632717c51..fa84e9744330 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -32,10 +32,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/cpufreq.h>
-#ifdef CONFIG_ACPI_PROCFS
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#endif
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -370,6 +366,58 @@ int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
 }
 
 /*
+ * This function is used to reevaluate whether the T-state is valid
+ * after one CPU is onlined/offlined.
+ * It is noted that it won't reevaluate the following properties for
+ * the T-state.
+ *      1. Control method.
+ *      2. the number of supported T-state
+ *      3. TSD domain
+ */
+void acpi_processor_reevaluate_tstate(struct acpi_processor *pr,
+                                        unsigned long action)
+{
+        int result = 0;
+
+        if (action == CPU_DEAD) {
+                /* When one CPU is offline, the T-state throttling
+                 * will be invalidated.
+                 */
+                pr->flags.throttling = 0;
+                return;
+        }
+        /* the following is to recheck whether the T-state is valid for
+         * the online CPU
+         */
+        if (!pr->throttling.state_count) {
+                /* If the number of T-state is invalid, it is
+                 * invalidated.
+                 */
+                pr->flags.throttling = 0;
+                return;
+        }
+        pr->flags.throttling = 1;
+
+        /* Disable throttling (if enabled).  We'll let subsequent
+         * policy (e.g.thermal) decide to lower performance if it
+         * so chooses, but for now we'll crank up the speed.
+         */
+
+        result = acpi_processor_get_throttling(pr);
+        if (result)
+                goto end;
+
+        if (pr->throttling.state) {
+                result = acpi_processor_set_throttling(pr, 0, false);
+                if (result)
+                        goto end;
+        }
+
+end:
+        if (result)
+                pr->flags.throttling = 0;
+}
+/*
  * _PTC - Processor Throttling Control (and status) register location
  */
 static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
@@ -876,7 +924,11 @@ static int acpi_processor_get_throttling(struct acpi_processor *pr)
          */
         cpumask_copy(saved_mask, &current->cpus_allowed);
         /* FIXME: use work_on_cpu() */
-        set_cpus_allowed_ptr(current, cpumask_of(pr->id));
+        if (set_cpus_allowed_ptr(current, cpumask_of(pr->id))) {
+                /* Can't migrate to the target pr->id CPU. Exit */
+                free_cpumask_var(saved_mask);
+                return -ENODEV;
+        }
         ret = pr->throttling.acpi_processor_get_throttling(pr);
         /* restore the previous state */
         set_cpus_allowed_ptr(current, saved_mask);
@@ -1051,6 +1103,14 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
                 return -ENOMEM;
         }
 
+        if (cpu_is_offline(pr->id)) {
+                /*
+                 * the cpu pointed by pr->id is offline. Unnecessary to change
+                 * the throttling state any more.
+                 */
+                return -ENODEV;
+        }
+
         cpumask_copy(saved_mask, &current->cpus_allowed);
         t_state.target_state = state;
         p_throttling = &(pr->throttling);
@@ -1074,7 +1134,11 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
          */
         if (p_throttling->shared_type == DOMAIN_COORD_TYPE_SW_ANY) {
                 /* FIXME: use work_on_cpu() */
-                set_cpus_allowed_ptr(current, cpumask_of(pr->id));
+                if (set_cpus_allowed_ptr(current, cpumask_of(pr->id))) {
+                        /* Can't migrate to the pr->id CPU. Exit */
+                        ret = -ENODEV;
+                        goto exit;
+                }
                 ret = p_throttling->acpi_processor_set_throttling(pr,
                                                 t_state.target_state, force);
         } else {
@@ -1106,7 +1170,8 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
                         }
                         t_state.cpu = i;
                         /* FIXME: use work_on_cpu() */
-                        set_cpus_allowed_ptr(current, cpumask_of(i));
+                        if (set_cpus_allowed_ptr(current, cpumask_of(i)))
+                                continue;
                         ret = match_pr->throttling.
                                 acpi_processor_set_throttling(
                                 match_pr, t_state.target_state, force);
@@ -1126,6 +1191,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
         /* restore the previous state */
         /* FIXME: use work_on_cpu() */
         set_cpus_allowed_ptr(current, saved_mask);
+exit:
         free_cpumask_var(online_throttling_cpus);
         free_cpumask_var(saved_mask);
         return ret;
@@ -1216,113 +1282,3 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr)
         return result;
 }
 
-#ifdef CONFIG_ACPI_PROCFS
-/* proc interface */
-static int acpi_processor_throttling_seq_show(struct seq_file *seq,
-                                              void *offset)
-{
-        struct acpi_processor *pr = seq->private;
-        int i = 0;
-        int result = 0;
-
-        if (!pr)
-                goto end;
-
-        if (!(pr->throttling.state_count > 0)) {
-                seq_puts(seq, "<not supported>\n");
-                goto end;
-        }
-
-        result = acpi_processor_get_throttling(pr);
-
-        if (result) {
-                seq_puts(seq,
-                         "Could not determine current throttling state.\n");
-                goto end;
-        }
-
-        seq_printf(seq, "state count:             %d\n"
-                   "active state:            T%d\n"
-                   "state available: T%d to T%d\n",
-                   pr->throttling.state_count, pr->throttling.state,
-                   pr->throttling_platform_limit,
-                   pr->throttling.state_count - 1);
-
-        seq_puts(seq, "states:\n");
-        if (pr->throttling.acpi_processor_get_throttling ==
-                        acpi_processor_get_throttling_fadt) {
-                for (i = 0; i < pr->throttling.state_count; i++)
-                        seq_printf(seq, "   %cT%d:                  %02d%%\n",
-                                   (i == pr->throttling.state ? '*' : ' '), i,
-                                   (pr->throttling.states[i].performance ? pr->
-                                    throttling.states[i].performance / 10 : 0));
-        } else {
-                for (i = 0; i < pr->throttling.state_count; i++)
-                        seq_printf(seq, "   %cT%d:                  %02d%%\n",
-                                   (i == pr->throttling.state ? '*' : ' '), i,
-                                   (int)pr->throttling.states_tss[i].
-                                   freqpercentage);
-        }
-
-      end:
-        return 0;
-}
-
-static int acpi_processor_throttling_open_fs(struct inode *inode,
-                                             struct file *file)
-{
-        return single_open(file, acpi_processor_throttling_seq_show,
-                           PDE(inode)->data);
-}
-
-static ssize_t acpi_processor_write_throttling(struct file *file,
-                                               const char __user * buffer,
-                                               size_t count, loff_t * data)
-{
-        int result = 0;
-        struct seq_file *m = file->private_data;
-        struct acpi_processor *pr = m->private;
-        char state_string[5] = "";
-        char *charp = NULL;
-        size_t state_val = 0;
-        char tmpbuf[5] = "";
-
-        if (!pr || (count > sizeof(state_string) - 1))
-                return -EINVAL;
-
-        if (copy_from_user(state_string, buffer, count))
-                return -EFAULT;
-
-        state_string[count] = '\0';
-        if ((count > 0) && (state_string[count-1] == '\n'))
-                state_string[count-1] = '\0';
-
-        charp = state_string;
-        if ((state_string[0] == 't') || (state_string[0] == 'T'))
-                charp++;
-
-        state_val = simple_strtoul(charp, NULL, 0);
-        if (state_val >= pr->throttling.state_count)
-                return -EINVAL;
-
-        snprintf(tmpbuf, 5, "%zu", state_val);
-
-        if (strcmp(tmpbuf, charp) != 0)
-                return -EINVAL;
-
-        result = acpi_processor_set_throttling(pr, state_val, false);
-        if (result)
-                return result;
-
-        return count;
-}
-
-const struct file_operations acpi_processor_throttling_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_processor_throttling_open_fs,
-        .read = seq_read,
-        .write = acpi_processor_write_throttling,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-#endif
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index e5dbedb16bbf..51ae3794ec7f 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -484,6 +484,8 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir,
                 const struct file_operations *state_fops,
                 const struct file_operations *alarm_fops, void *data)
 {
+        printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded,"
+                        " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!*dir) {
                 *dir = proc_mkdir(dir_name, parent_dir);
                 if (!*dir) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 29ef505c487b..b99e62494607 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -778,7 +778,7 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
                 wakeup->resources.handles[i] = element->reference.handle;
         }
 
-        acpi_gpe_can_wake(wakeup->gpe_device, wakeup->gpe_number);
+        acpi_setup_gpe_for_wake(handle, wakeup->gpe_device, wakeup->gpe_number);
 
  out:
         kfree(buffer.pointer);
@@ -803,7 +803,7 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
         /* Power button, Lid switch always enable wakeup */
         if (!acpi_match_device_ids(device, button_device_ids)) {
                 device->wakeup.flags.run_wake = 1;
-                device->wakeup.flags.always_enabled = 1;
+                device_set_wakeup_capable(&device->dev, true);
                 return;
         }
 
@@ -815,16 +815,22 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
                                 !!(event_status & ACPI_EVENT_FLAG_HANDLE);
 }
 
-static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
+static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
 {
+        acpi_handle temp;
         acpi_status status = 0;
         int psw_error;
 
+        /* Presence of _PRW indicates wake capable */
+        status = acpi_get_handle(device->handle, "_PRW", &temp);
+        if (ACPI_FAILURE(status))
+                return;
+
         status = acpi_bus_extract_wakeup_device_power_package(device->handle,
                                                               &device->wakeup);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package"));
-                goto end;
+                return;
         }
 
         device->wakeup.flags.valid = 1;
@@ -840,13 +846,10 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
         if (psw_error)
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                 "error in _DSW or _PSW evaluation\n"));
-
-end:
-        if (ACPI_FAILURE(status))
-                device->flags.wake_capable = 0;
-        return 0;
 }
 
+static void acpi_bus_add_power_resource(acpi_handle handle);
+
 static int acpi_bus_get_power_flags(struct acpi_device *device)
 {
         acpi_status status = 0;
@@ -875,8 +878,12 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                 acpi_evaluate_reference(device->handle, object_name, NULL,
                                         &ps->resources);
                 if (ps->resources.count) {
+                        int j;
+
                         device->power.flags.power_resources = 1;
                         ps->flags.valid = 1;
+                        for (j = 0; j < ps->resources.count; j++)
+                                acpi_bus_add_power_resource(ps->resources.handles[j]);
                 }
 
                 /* Evaluate "_PSx" to see if we can do explicit sets */
@@ -901,10 +908,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         device->power.states[ACPI_STATE_D3].flags.valid = 1;
         device->power.states[ACPI_STATE_D3].power = 0;
 
-        /* TBD: System wake support and resource requirements. */
-
-        device->power.state = ACPI_STATE_UNKNOWN;
-        acpi_bus_get_power(device->handle, &(device->power.state));
+        acpi_bus_init_power(device);
 
         return 0;
 }
@@ -947,11 +951,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
         if (ACPI_SUCCESS(status))
                 device->flags.power_manageable = 1;
 
-        /* Presence of _PRW indicates wake capable */
-        status = acpi_get_handle(device->handle, "_PRW", &temp);
-        if (ACPI_SUCCESS(status))
-                device->flags.wake_capable = 1;
-
         /* TBD: Performance management */
 
         return 0;
@@ -1278,11 +1277,7 @@ static int acpi_add_single_object(struct acpi_device **child,
          * Wakeup device management
          *-----------------------
          */
-        if (device->flags.wake_capable) {
-                result = acpi_bus_get_wakeup_device_flags(device);
-                if (result)
-                        goto end;
-        }
+        acpi_bus_get_wakeup_device_flags(device);
 
         /*
          * Performance Management
@@ -1326,6 +1321,20 @@ end:
 #define ACPI_STA_DEFAULT (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | \
                           ACPI_STA_DEVICE_UI      | ACPI_STA_DEVICE_FUNCTIONING)
 
+static void acpi_bus_add_power_resource(acpi_handle handle)
+{
+        struct acpi_bus_ops ops = {
+                .acpi_op_add = 1,
+                .acpi_op_start = 1,
+        };
+        struct acpi_device *device = NULL;
+
+        acpi_bus_get_device(handle, &device);
+        if (!device)
+                acpi_add_single_object(&device, handle, ACPI_BUS_TYPE_POWER,
+                                        ACPI_STA_DEFAULT, &ops);
+}
+
 static int acpi_bus_type_and_status(acpi_handle handle, int *type,
                                     unsigned long long *sta)
 {
@@ -1371,7 +1380,6 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
         struct acpi_bus_ops *ops = context;
         int type;
         unsigned long long sta;
-        struct acpi_device_wakeup wakeup;
         struct acpi_device *device;
         acpi_status status;
         int result;
@@ -1382,7 +1390,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
 
         if (!(sta & ACPI_STA_DEVICE_PRESENT) &&
             !(sta & ACPI_STA_DEVICE_FUNCTIONING)) {
-                acpi_bus_extract_wakeup_device_power_package(handle, &wakeup);
+                struct acpi_device_wakeup wakeup;
+                acpi_handle temp;
+
+                status = acpi_get_handle(handle, "_PRW", &temp);
+                if (ACPI_SUCCESS(status))
+                        acpi_bus_extract_wakeup_device_power_package(handle,
+                                                                     &wakeup);
                 return AE_CTRL_DEPTH;
         }
 
@@ -1467,7 +1481,7 @@ int acpi_bus_start(struct acpi_device *device)
 
         result = acpi_bus_scan(device->handle, &ops, NULL);
 
-        acpi_update_gpes();
+        acpi_update_all_gpes();
 
         return result;
 }
@@ -1573,6 +1587,8 @@ int __init acpi_scan_init(void)
                 printk(KERN_ERR PREFIX "Could not register bus type\n");
         }
 
+        acpi_power_init();
+
         /*
          * Enumerate devices in the ACPI namespace.
          */
@@ -1584,7 +1600,7 @@ int __init acpi_scan_init(void)
         if (result)
                 acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
         else
-                acpi_update_gpes();
+                acpi_update_all_gpes();
 
         return result;
 }
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index c423231b952b..d6a8cd14de2e 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -124,8 +124,7 @@ static int acpi_pm_freeze(void)
 static int acpi_pm_pre_suspend(void)
 {
         acpi_pm_freeze();
-        suspend_nvs_save();
-        return 0;
+        return suspend_nvs_save();
 }
 
 /**
@@ -151,7 +150,7 @@ static int acpi_pm_prepare(void)
 {
         int error = __acpi_pm_prepare();
         if (!error)
-                acpi_pm_pre_suspend();
+                error = acpi_pm_pre_suspend();
 
         return error;
 }
@@ -167,6 +166,7 @@ static void acpi_pm_finish(void)
         u32 acpi_state = acpi_target_sleep_state;
 
         acpi_ec_unblock_transactions();
+        suspend_nvs_free();
 
         if (acpi_state == ACPI_STATE_S0)
                 return;
@@ -187,7 +187,6 @@ static void acpi_pm_finish(void)
  */
 static void acpi_pm_end(void)
 {
-        suspend_nvs_free();
         /*
          * This is necessary in case acpi_pm_finish() is not called during a
          * failing transition to a sleep state.
@@ -435,6 +434,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
                 },
         },
+        {
+        .callback = init_nvs_nosave,
+        .ident = "Averatec AV1020-ED2",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
+                },
+        },
         {},
 };
 #endif /* CONFIG_SUSPEND */
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index f8588f81048a..61891e75583d 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -438,7 +438,7 @@ static void delete_gpe_attr_array(void)
         return;
 }
 
-void acpi_os_gpe_count(u32 gpe_number)
+static void gpe_count(u32 gpe_number)
 {
         acpi_gpe_count++;
 
@@ -454,7 +454,7 @@ void acpi_os_gpe_count(u32 gpe_number)
         return;
 }
 
-void acpi_os_fixed_event_count(u32 event_number)
+static void fixed_event_count(u32 event_number)
 {
         if (!all_counters)
                 return;
@@ -468,6 +468,16 @@ void acpi_os_fixed_event_count(u32 event_number)
         return;
 }
 
+static void acpi_gbl_event_handler(u32 event_type, acpi_handle device,
+        u32 event_number, void *context)
+{
+        if (event_type == ACPI_EVENT_TYPE_GPE)
+                gpe_count(event_number);
+
+        if (event_type == ACPI_EVENT_TYPE_FIXED)
+                fixed_event_count(event_number);
+}
+
 static int get_status(u32 index, acpi_event_status *status,
                       acpi_handle *handle)
 {
@@ -601,6 +611,7 @@ end:
 
 void acpi_irq_stats_init(void)
 {
+        acpi_status status;
         int i;
 
         if (all_counters)
@@ -619,6 +630,10 @@ void acpi_irq_stats_init(void)
         if (all_counters == NULL)
                 goto fail;
 
+        status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL);
+        if (ACPI_FAILURE(status))
+                goto fail;
+
         counter_attrs = kzalloc(sizeof(struct kobj_attribute) * (num_counters),
                                 GFP_KERNEL);
         if (counter_attrs == NULL)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 5a27b0a31315..2607e17b520f 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1059,8 +1059,9 @@ static int acpi_thermal_resume(struct acpi_device *device)
                         break;
                 tz->trips.active[i].flags.enabled = 1;
                 for (j = 0; j < tz->trips.active[i].devices.count; j++) {
-                        result = acpi_bus_get_power(tz->trips.active[i].devices.
-                            handles[j], &power_state);
+                        result = acpi_bus_update_power(
+                                        tz->trips.active[i].devices.handles[j],
+                                        &power_state);
                         if (result || (power_state != ACPI_STATE_D0)) {
                                 tz->trips.active[i].flags.enabled = 0;
                                 break;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 15a0fde4b32a..90f8f7676d1f 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -33,7 +33,6 @@
 #include <linux/input.h>
 #include <linux/backlight.h>
 #include <linux/thermal.h>
-#include <linux/video_output.h>
 #include <linux/sort.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
@@ -81,6 +80,13 @@ module_param(brightness_switch_enabled, bool, 0644);
 static int allow_duplicates;
 module_param(allow_duplicates, bool, 0644);
 
+/*
+ * Some BIOSes claim they use minimum backlight at boot,
+ * and this may bring dimming screen after boot
+ */
+static int use_bios_initial_backlight = 1;
+module_param(use_bios_initial_backlight, bool, 0644);
+
 static int register_count = 0;
 static int acpi_video_bus_add(struct acpi_device *device);
 static int acpi_video_bus_remove(struct acpi_device *device, int type);
@@ -172,9 +178,6 @@ struct acpi_video_device_cap {
         u8 _BQC:1;              /* Get current brightness level */
         u8 _BCQ:1;              /* Some buggy BIOS uses _BCQ instead of _BQC */
         u8 _DDC:1;              /*Return the EDID for this device */
-        u8 _DCS:1;              /*Return status of output device */
-        u8 _DGS:1;              /*Query graphics state */
-        u8 _DSS:1;              /*Device state set */
 };
 
 struct acpi_video_brightness_flags {
@@ -202,7 +205,6 @@ struct acpi_video_device {
         struct acpi_video_device_brightness *brightness;
         struct backlight_device *backlight;
         struct thermal_cooling_device *cooling_dev;
-        struct output_device *output_dev;
 };
 
 static const char device_decode[][30] = {
@@ -226,10 +228,6 @@ static int acpi_video_get_next_level(struct acpi_video_device *device,
                                      u32 level_current, u32 event);
 static int acpi_video_switch_brightness(struct acpi_video_device *device,
                                          int event);
-static int acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long long *state);
-static int acpi_video_output_get(struct output_device *od);
-static int acpi_video_device_set_state(struct acpi_video_device *device, int state);
 
 /*backlight device sysfs support*/
 static int acpi_video_get_brightness(struct backlight_device *bd)
@@ -265,30 +263,6 @@ static const struct backlight_ops acpi_backlight_ops = {
         .update_status  = acpi_video_set_brightness,
 };
 
-/*video output device sysfs support*/
-static int acpi_video_output_get(struct output_device *od)
-{
-        unsigned long long state;
-        struct acpi_video_device *vd =
-                (struct acpi_video_device *)dev_get_drvdata(&od->dev);
-        acpi_video_device_get_state(vd, &state);
-        return (int)state;
-}
-
-static int acpi_video_output_set(struct output_device *od)
-{
-        unsigned long state = od->request_state;
-        struct acpi_video_device *vd=
-                (struct acpi_video_device *)dev_get_drvdata(&od->dev);
-        return acpi_video_device_set_state(vd, state);
-}
-
-static struct output_properties acpi_output_properties = {
-        .set_state = acpi_video_output_set,
-        .get_status = acpi_video_output_get,
-};
-
-
 /* thermal cooling device callbacks */
 static int video_get_max_state(struct thermal_cooling_device *cooling_dev, unsigned
                                long *state)
@@ -344,34 +318,6 @@ static struct thermal_cooling_device_ops video_cooling_ops = {
                                Video Management
    -------------------------------------------------------------------------- */
 
-/* device */
-
-static int
-acpi_video_device_get_state(struct acpi_video_device *device,
-                            unsigned long long *state)
-{
-        int status;
-
-        status = acpi_evaluate_integer(device->dev->handle, "_DCS", NULL, state);
-
-        return status;
-}
-
-static int
-acpi_video_device_set_state(struct acpi_video_device *device, int state)
-{
-        int status;
-        union acpi_object arg0 = { ACPI_TYPE_INTEGER };
-        struct acpi_object_list args = { 1, &arg0 };
-        unsigned long long ret;
-
-
-        arg0.integer.value = state;
-        status = acpi_evaluate_integer(device->dev->handle, "_DSS", &args, &ret);
-
-        return status;
-}
-
 static int
 acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
                                    union acpi_object **levels)
@@ -766,9 +712,11 @@ acpi_video_init_brightness(struct acpi_video_device *device)
                  * when invoked for the first time, i.e. level_old is invalid.
                  * set the backlight to max_level in this case
                  */
-                for (i = 2; i < br->count; i++)
-                        if (level_old == br->levels[i])
-                                level = level_old;
+                if (use_bios_initial_backlight) {
+                        for (i = 2; i < br->count; i++)
+                                if (level_old == br->levels[i])
+                                        level = level_old;
+                }
                 goto set_level;
         }
 
@@ -831,15 +779,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
         if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
                 device->cap._DDC = 1;
         }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DCS", &h_dummy1))) {
-                device->cap._DCS = 1;
-        }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DGS", &h_dummy1))) {
-                device->cap._DGS = 1;
-        }
-        if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DSS", &h_dummy1))) {
-                device->cap._DSS = 1;
-        }
 
         if (acpi_video_backlight_support()) {
                 struct backlight_properties props;
@@ -904,21 +843,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                         printk(KERN_ERR PREFIX "Create sysfs link\n");
 
         }
-
-        if (acpi_video_display_switch_support()) {
-
-                if (device->cap._DCS && device->cap._DSS) {
-                        static int count;
-                        char *name;
-                        name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
-                        if (!name)
-                                return;
-                        count++;
-                        device->output_dev = video_output_register(name,
-                                        NULL, device, &acpi_output_properties);
-                        kfree(name);
-                }
-        }
 }
 
 /*
@@ -1360,6 +1284,9 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,
                 if (!video_device)
                         continue;
 
+                if (!video_device->cap._DDC)
+                        continue;
+
                 if (type) {
                         switch (type) {
                         case ACPI_VIDEO_DISPLAY_CRT:
@@ -1452,7 +1379,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
                 thermal_cooling_device_unregister(device->cooling_dev);
                 device->cooling_dev = NULL;
         }
-        video_output_unregister(device->output_dev);
 
         return 0;
 }
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index b83676126598..42d3d72dae85 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -17,15 +17,14 @@
  * capabilities the graphics cards plugged in support. The check for general
  * video capabilities will be triggered by the first caller of
  * acpi_video_get_capabilities(NULL); which will happen when the first
- * backlight (or display output) switching supporting driver calls:
+ * backlight switching supporting driver calls:
  * acpi_video_backlight_support();
  *
  * Depending on whether ACPI graphics extensions (cmp. ACPI spec Appendix B)
  * are available, video.ko should be used to handle the device.
  *
  * Otherwise vendor specific drivers like thinkpad_acpi, asus_acpi,
- * sony_acpi,... can take care about backlight brightness and display output
- * switching.
+ * sony_acpi,... can take care about backlight brightness.
  *
  * If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module (m)
  * this file will not be compiled, acpi_video_get_capabilities() and
@@ -83,11 +82,6 @@ long acpi_is_video_device(struct acpi_device *device)
         if (!device)
                 return 0;
 
-        /* Is this device able to support video switching ? */
-        if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) ||
-            ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
-                video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING;
-
         /* Is this device able to retrieve a video ROM ? */
         if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
                 video_caps |= ACPI_VIDEO_ROM_AVAILABLE;
@@ -161,8 +155,6 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)
                  *
                  *   if (dmi_name_in_vendors("XY")) {
                  *      acpi_video_support |=
-                 *              ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR;
-                 *      acpi_video_support |=
                  *              ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
                  *}
                  */
@@ -212,33 +204,8 @@ int acpi_video_backlight_support(void)
 EXPORT_SYMBOL(acpi_video_backlight_support);
 
 /*
- * Returns true if video.ko can do display output switching.
- * This does not work well/at all with binary graphics drivers
- * which disable system io ranges and do it on their own.
- */
-int acpi_video_display_switch_support(void)
-{
-        if (!acpi_video_caps_checked)
-                acpi_video_get_capabilities(NULL);
-
-        if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR)
-                return 0;
-        else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO)
-                return 1;
-
-        if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR)
-                return 0;
-        else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO)
-                return 1;
-
-        return acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING;
-}
-EXPORT_SYMBOL(acpi_video_display_switch_support);
-
-/*
- * Use acpi_display_output=vendor/video or acpi_backlight=vendor/video
- * To force that backlight or display output switching is processed by vendor
- * specific acpi drivers or video.ko driver.
+ * Use acpi_backlight=vendor/video to force that backlight switching
+ * is processed by vendor specific acpi drivers or video.ko driver.
  */
 static int __init acpi_backlight(char *str)
 {
@@ -255,19 +222,3 @@ static int __init acpi_backlight(char *str)
         return 1;
 }
 __setup("acpi_backlight=", acpi_backlight);
-
-static int __init acpi_display_output(char *str)
-{
-        if (str == NULL || *str == '\0')
-                return 1;
-        else {
-                if (!strcmp("vendor", str))
-                        acpi_video_support |=
-                                ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
-                if (!strcmp("video", str))
-                        acpi_video_support |=
-                                ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
-        }
-        return 1;
-}
-__setup("acpi_display_output=", acpi_display_output);
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index f62a50c3ed34..ed6501452507 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -37,15 +37,16 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
                         container_of(node, struct acpi_device, wakeup_list);
 
                 if (!dev->wakeup.flags.valid
-                    || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
-                    || sleep_state > (u32) dev->wakeup.sleep_state)
+                    || sleep_state > (u32) dev->wakeup.sleep_state
+                    || !(device_may_wakeup(&dev->dev)
+                        || dev->wakeup.prepare_count))
                         continue;
 
-                if (dev->wakeup.state.enabled)
+                if (device_may_wakeup(&dev->dev))
                         acpi_enable_wakeup_device_power(dev, sleep_state);
 
                 /* The wake-up power should have been enabled already. */
-                acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+                acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                 ACPI_GPE_ENABLE);
         }
 }
@@ -63,14 +64,15 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
                         container_of(node, struct acpi_device, wakeup_list);
 
                 if (!dev->wakeup.flags.valid
-                    || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
-                    || (sleep_state > (u32) dev->wakeup.sleep_state))
+                    || sleep_state > (u32) dev->wakeup.sleep_state
+                    || !(device_may_wakeup(&dev->dev)
+                        || dev->wakeup.prepare_count))
                         continue;
 
-                acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+                acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                 ACPI_GPE_DISABLE);
 
-                if (dev->wakeup.state.enabled)
+                if (device_may_wakeup(&dev->dev))
                         acpi_disable_wakeup_device_power(dev);
         }
 }
@@ -84,8 +86,8 @@ int __init acpi_wakeup_device_init(void)
                 struct acpi_device *dev = container_of(node,
                                                        struct acpi_device,
                                                        wakeup_list);
-                if (dev->wakeup.flags.always_enabled)
-                        dev->wakeup.state.enabled = 1;
+                if (device_can_wakeup(&dev->dev))
+                        device_set_wakeup_enable(&dev->dev, true);
         }
         mutex_unlock(&acpi_device_lock);
         return 0;
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index c6b298d4c136..c2328aed0836 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -783,7 +783,7 @@ config PATA_PCMCIA
 
 config PATA_PLATFORM
         tristate "Generic platform device PATA support"
-        depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM
+        depends on EXPERT || PPC || HAVE_PATA_PLATFORM
         help
           This option enables support for generic directly connected ATA
           devices commonly found on embedded systems.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 328826381a2d..b8d96ce37fc9 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -260,6 +260,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */
         { PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */
         { PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */
+        { PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */
 
         /* JMicron 360/1/3/5/6, match class to avoid IDE function */
         { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -379,6 +380,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
         { PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },        /* 6121 */
         { PCI_DEVICE(0x1b4b, 0x9123),
+          .class = PCI_CLASS_STORAGE_SATA_AHCI,
+          .class_mask = 0xffffff,
           .driver_data = board_ahci_yes_fbs },                  /* 88se9128 */
 
         /* Promise */
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index a31fe96f7de6..d4e52e214859 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4138,6 +4138,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
          * device and controller are SATA.
          */
         { "PIONEER DVD-RW  DVRTD08",    "1.00", ATA_HORKAGE_NOSETXFER },
+        { "PIONEER DVD-RW  DVR-212D",   "1.28", ATA_HORKAGE_NOSETXFER },
 
         /* End Marker */
         { }
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 5defc74973d7..600f6353ecf8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1099,9 +1099,9 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
                 struct request_queue *q = sdev->request_queue;
                 void *buf;
 
-                /* set the min alignment and padding */
-                blk_queue_update_dma_alignment(sdev->request_queue,
-                                               ATA_DMA_PAD_SZ - 1);
+                sdev->sector_size = ATA_SECT_SIZE;
+
+                /* set DMA padding */
                 blk_queue_update_dma_pad(sdev->request_queue,
                                          ATA_DMA_PAD_SZ - 1);
 
@@ -1115,13 +1115,25 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
 
                 blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN);
         } else {
-                /* ATA devices must be sector aligned */
                 sdev->sector_size = ata_id_logical_sector_size(dev->id);
-                blk_queue_update_dma_alignment(sdev->request_queue,
-                                               sdev->sector_size - 1);
                 sdev->manage_start_stop = 1;
         }
 
+        /*
+         * ata_pio_sectors() expects buffer for each sector to not cross
+         * page boundary.  Enforce it by requiring buffers to be sector
+         * aligned, which works iff sector_size is not larger than
+         * PAGE_SIZE.  ATAPI devices also need the alignment as
+         * IDENTIFY_PACKET is executed as ATA_PROT_PIO.
+         */
+        if (sdev->sector_size > PAGE_SIZE)
+                ata_dev_printk(dev, KERN_WARNING,
+                        "sector_size=%u > PAGE_SIZE, PIO may malfunction\n",
+                        sdev->sector_size);
+
+        blk_queue_update_dma_alignment(sdev->request_queue,
+                                       sdev->sector_size - 1);
+
         if (dev->flags & ATA_DFLAG_AN)
                 set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
 
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index d7e57db36bc8..538ec38ba995 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_hpt366"
-#define DRV_VERSION     "0.6.9"
+#define DRV_VERSION     "0.6.10"
 
 struct hpt_clock {
         u8      xfer_mode;
@@ -160,8 +160,8 @@ static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr,
 
         while (list[i] != NULL) {
                 if (!strcmp(list[i], model_num)) {
-                        printk(KERN_WARNING DRV_NAME ": %s is not supported for %s.\n",
-                                modestr, list[i]);
+                        pr_warning(DRV_NAME ": %s is not supported for %s.\n",
+                                   modestr, list[i]);
                         return 1;
                 }
                 i++;
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index efdd18bc8663..4c5b5183225e 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -24,7 +24,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_hpt37x"
-#define DRV_VERSION     "0.6.18"
+#define DRV_VERSION     "0.6.22"
 
 struct hpt_clock {
         u8      xfer_speed;
@@ -229,8 +229,8 @@ static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr,
 
         while (list[i] != NULL) {
                 if (!strcmp(list[i], model_num)) {
-                        printk(KERN_WARNING DRV_NAME ": %s is not supported for %s.\n",
-                                modestr, list[i]);
+                        pr_warning(DRV_NAME ": %s is not supported for %s.\n",
+                                   modestr, list[i]);
                         return 1;
                 }
                 i++;
@@ -642,7 +642,6 @@ static struct ata_port_operations hpt372_port_ops = {
 static struct ata_port_operations hpt374_fn1_port_ops = {
         .inherits       = &hpt372_port_ops,
         .cable_detect   = hpt374_fn1_cable_detect,
-        .prereset       = hpt37x_pre_reset,
 };
 
 /**
@@ -803,7 +802,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .udma_mask = ATA_UDMA6,
                 .port_ops = &hpt302_port_ops
         };
-        /* HPT374 - UDMA100, function 1 uses different prereset method */
+        /* HPT374 - UDMA100, function 1 uses different cable_detect method */
         static const struct ata_port_info info_hpt374_fn0 = {
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = ATA_PIO4,
@@ -838,7 +837,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         if (rc)
                 return rc;
 
-        if (dev->device == PCI_DEVICE_ID_TTI_HPT366) {
+        switch (dev->device) {
+        case PCI_DEVICE_ID_TTI_HPT366:
                 /* May be a later chip in disguise. Check */
                 /* Older chips are in the HPT366 driver. Ignore them */
                 if (rev < 3)
@@ -863,54 +863,50 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                         chip_table = &hpt372;
                         break;
                 default:
-                        printk(KERN_ERR "pata_hpt37x: Unknown HPT366 subtype, "
+                        pr_err(DRV_NAME ": Unknown HPT366 subtype, "
                                "please report (%d).\n", rev);
                         return -ENODEV;
                 }
-        } else {
-                switch (dev->device) {
-                case PCI_DEVICE_ID_TTI_HPT372:
-                        /* 372N if rev >= 2 */
-                        if (rev >= 2)
-                                return -ENODEV;
-                        ppi[0] = &info_hpt372;
-                        chip_table = &hpt372a;
-                        break;
-                case PCI_DEVICE_ID_TTI_HPT302:
-                        /* 302N if rev > 1 */
-                        if (rev > 1)
-                                return -ENODEV;
-                        ppi[0] = &info_hpt302;
-                        /* Check this */
-                        chip_table = &hpt302;
-                        break;
-                case PCI_DEVICE_ID_TTI_HPT371:
-                        if (rev > 1)
-                                return -ENODEV;
-                        ppi[0] = &info_hpt302;
-                        chip_table = &hpt371;
-                        /*
-                         * Single channel device, master is not present
-                         * but the BIOS (or us for non x86) must mark it
-                         * absent
-                         */
-                        pci_read_config_byte(dev, 0x50, &mcr1);
-                        mcr1 &= ~0x04;
-                        pci_write_config_byte(dev, 0x50, mcr1);
-                        break;
-                case PCI_DEVICE_ID_TTI_HPT374:
-                        chip_table = &hpt374;
-                        if (!(PCI_FUNC(dev->devfn) & 1))
-                                *ppi = &info_hpt374_fn0;
-                        else
-                                *ppi = &info_hpt374_fn1;
-                        break;
-                default:
-                        printk(KERN_ERR
-                               "pata_hpt37x: PCI table is bogus, please report (%d).\n",
-                               dev->device);
-                                return -ENODEV;
-                }
+                break;
+        case PCI_DEVICE_ID_TTI_HPT372:
+                /* 372N if rev >= 2 */
+                if (rev >= 2)
+                        return -ENODEV;
+                ppi[0] = &info_hpt372;
+                chip_table = &hpt372a;
+                break;
+        case PCI_DEVICE_ID_TTI_HPT302:
+                /* 302N if rev > 1 */
+                if (rev > 1)
+                        return -ENODEV;
+                ppi[0] = &info_hpt302;
+                /* Check this */
+                chip_table = &hpt302;
+                break;
+        case PCI_DEVICE_ID_TTI_HPT371:
+                if (rev > 1)
+                        return -ENODEV;
+                ppi[0] = &info_hpt302;
+                chip_table = &hpt371;
+                /*
+                 * Single channel device, master is not present but the BIOS
+                 * (or us for non x86) must mark it absent
+                 */
+                pci_read_config_byte(dev, 0x50, &mcr1);
+                mcr1 &= ~0x04;
+                pci_write_config_byte(dev, 0x50, mcr1);
+                break;
+        case PCI_DEVICE_ID_TTI_HPT374:
+                chip_table = &hpt374;
+                if (!(PCI_FUNC(dev->devfn) & 1))
+                        *ppi = &info_hpt374_fn0;
+                else
+                        *ppi = &info_hpt374_fn1;
+                break;
+        default:
+                pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n",
+                       dev->device);
+                return -ENODEV;
         }
         /* Ok so this is a chip we support */
 
@@ -957,8 +953,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 u8 sr;
                 u32 total = 0;
 
-                printk(KERN_WARNING
-                       "pata_hpt37x: BIOS has not set timing clocks.\n");
+                pr_warning(DRV_NAME ": BIOS has not set timing clocks.\n");
 
                 /* This is the process the HPT371 BIOS is reported to use */
                 for (i = 0; i < 128; i++) {
@@ -1014,7 +1009,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                                                (f_high << 16) | f_low | 0x100);
                 }
                 if (adjust == 8) {
-                        printk(KERN_ERR "pata_hpt37x: DPLL did not stabilize!\n");
+                        pr_err(DRV_NAME ": DPLL did not stabilize!\n");
                         return -ENODEV;
                 }
                 if (dpll == 3)
@@ -1022,8 +1017,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 else
                         private_data = (void *)hpt37x_timings_50;
 
-                printk(KERN_INFO "pata_hpt37x: bus clock %dMHz, using %dMHz DPLL.\n",
-                       MHz[clock_slot], MHz[dpll]);
+                pr_info(DRV_NAME ": bus clock %dMHz, using %dMHz DPLL.\n",
+                        MHz[clock_slot], MHz[dpll]);
         } else {
                 private_data = (void *)chip_table->clocks[clock_slot];
                 /*
@@ -1036,8 +1031,9 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                         ppi[0] = &info_hpt370_33;
                 if (clock_slot < 2 && ppi[0] == &info_hpt370a)
                         ppi[0] = &info_hpt370a_33;
-                printk(KERN_INFO "pata_hpt37x: %s using %dMHz bus clock.\n",
-                       chip_table->name, MHz[clock_slot]);
+
+                pr_info(DRV_NAME ": %s using %dMHz bus clock.\n",
+                        chip_table->name, MHz[clock_slot]);
         }
 
         /* Now kick off ATA set up */
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index d2239bbdb798..eca68caf5f46 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_hpt3x2n"
-#define DRV_VERSION     "0.3.13"
+#define DRV_VERSION     "0.3.14"
 
 enum {
         HPT_PCI_FAST    =       (1 << 31),
@@ -418,7 +418,7 @@ static int hpt3x2n_pci_clock(struct pci_dev *pdev)
                 u16 sr;
                 u32 total = 0;
 
-                printk(KERN_WARNING "pata_hpt3x2n: BIOS clock data not set.\n");
+                pr_warning(DRV_NAME ": BIOS clock data not set.\n");
 
                 /* This is the process the HPT371 BIOS is reported to use */
                 for (i = 0; i < 128; i++) {
@@ -528,8 +528,7 @@ hpt372n:
                 ppi[0] = &info_hpt372n;
                 break;
         default:
-                printk(KERN_ERR
-                       "pata_hpt3x2n: PCI table is bogus please report (%d).\n",
+                pr_err(DRV_NAME ": PCI table is bogus, please report (%d).\n",
                        dev->device);
                 return -ENODEV;
         }
@@ -579,12 +578,11 @@ hpt372n:
                 pci_write_config_dword(dev, 0x5C, (f_high << 16) | f_low);
         }
         if (adjust == 8) {
-                printk(KERN_ERR "pata_hpt3x2n: DPLL did not stabilize!\n");
+                pr_err(DRV_NAME ": DPLL did not stabilize!\n");
                 return -ENODEV;
         }
 
-        printk(KERN_INFO "pata_hpt37x: bus clock %dMHz, using 66MHz DPLL.\n",
-               pci_mhz);
+        pr_info(DRV_NAME ": bus clock %dMHz, using 66MHz DPLL.\n", pci_mhz);
 
         /*
          * Set our private data up. We only need a few flags
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 8cc536e49a0a..d7d8026cde99 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -610,7 +610,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
 };
 
 static struct ata_port_operations mpc52xx_ata_port_ops = {
-        .inherits               = &ata_sff_port_ops,
+        .inherits               = &ata_bmdma_port_ops,
         .sff_dev_select         = mpc52xx_ata_dev_select,
         .set_piomode            = mpc52xx_ata_set_piomode,
         .set_dmamode            = mpc52xx_ata_set_dmamode,
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index bca9cb89a118..487a54739854 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -151,7 +151,7 @@ static int fetch_stats(struct atm_dev *dev,struct idt77105_stats __user *arg,int
         spin_unlock_irqrestore(&idt77105_priv_lock, flags);
         if (arg == NULL)
                 return 0;
-        return copy_to_user(arg, &PRIV(dev)->stats,
+        return copy_to_user(arg, &stats,
                     sizeof(struct idt77105_stats)) ? -EFAULT : 0;
 }
 
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index fd96345bc35c..d57e8d0fb823 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -70,7 +70,7 @@ config PREVENT_FIRMWARE_BUILD
           If unsure say Y here.
 
 config FW_LOADER
-        tristate "Userspace firmware loading support" if EMBEDDED
+        tristate "Userspace firmware loading support" if EXPERT
         default y
         ---help---
           This option is provided for the case where no in-kernel-tree modules
diff --git a/drivers/base/node.c b/drivers/base/node.c
index ce012a9c6201..36b43052001d 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -117,12 +117,21 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                        "Node %d WritebackTmp:   %8lu kB\n"
                        "Node %d Slab:           %8lu kB\n"
                        "Node %d SReclaimable:   %8lu kB\n"
-                       "Node %d SUnreclaim:     %8lu kB\n",
+                       "Node %d SUnreclaim:     %8lu kB\n"
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                       "Node %d AnonHugePages:  %8lu kB\n"
+#endif
+                        ,
                        nid, K(node_page_state(nid, NR_FILE_DIRTY)),
                        nid, K(node_page_state(nid, NR_WRITEBACK)),
                        nid, K(node_page_state(nid, NR_FILE_PAGES)),
                        nid, K(node_page_state(nid, NR_FILE_MAPPED)),
-                       nid, K(node_page_state(nid, NR_ANON_PAGES)),
+                       nid, K(node_page_state(nid, NR_ANON_PAGES)
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                        + node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                        HPAGE_PMD_NR
+#endif
+                       ),
                        nid, K(node_page_state(nid, NR_SHMEM)),
                        nid, node_page_state(nid, NR_KERNEL_STACK) *
                                 THREAD_SIZE / 1024,
@@ -133,7 +142,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                        nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
                                 node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
                        nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
-                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
+                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                        , nid,
+                        K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                        HPAGE_PMD_NR)
+#endif
+                       );
         n += hugetlb_report_node_meminfo(nid, buf + n);
         return n;
 }
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 656493a5e073..42615b419dfb 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -407,12 +407,15 @@ static int rpm_suspend(struct device *dev, int rpmflags)
                 goto out;
         }
 
+        /* Maybe the parent is now able to suspend. */
         if (parent && !parent->power.ignore_children && !dev->power.irq_safe) {
-                spin_unlock_irq(&dev->power.lock);
+                spin_unlock(&dev->power.lock);
 
-                pm_request_idle(parent);
+                spin_lock(&parent->power.lock);
+                rpm_idle(parent, RPM_ASYNC);
+                spin_unlock(&parent->power.lock);
 
-                spin_lock_irq(&dev->power.lock);
+                spin_lock(&dev->power.lock);
         }
 
  out:
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index d7f463d6312d..40528ba56d1b 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -39,4 +39,4 @@ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
 obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 
-swim_mod-objs   := swim.o swim_asm.o
+swim_mod-y      := swim.o swim_asm.o
diff --git a/drivers/block/aoe/Makefile b/drivers/block/aoe/Makefile
index e76d997183c6..06ea82cdf27d 100644
--- a/drivers/block/aoe/Makefile
+++ b/drivers/block/aoe/Makefile
@@ -3,4 +3,4 @@
 #
 
 obj-$(CONFIG_ATA_OVER_ETH)      += aoe.o
-aoe-objs := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o
+aoe-y := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 516d5bbec2b6..9279272b3732 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2833,7 +2833,7 @@ static int cciss_revalidate(struct gendisk *disk)
         sector_t total_size;
         InquiryData_struct *inq_buff = NULL;
 
-        for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
+        for (logvol = 0; logvol <= h->highest_lun; logvol++) {
                 if (!h->drv[logvol])
                         continue;
                 if (memcmp(h->drv[logvol]->LunID, drv->LunID,
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 44e18c073c44..49e6a545eb63 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1641,6 +1641,9 @@ out:
 
 static void loop_free(struct loop_device *lo)
 {
+        if (!lo->lo_queue->queue_lock)
+                lo->lo_queue->queue_lock = &lo->lo_queue->__queue_lock;
+
         blk_cleanup_queue(lo->lo_queue);
         put_disk(lo->lo_disk);
         list_del(&lo->lo_list);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index a32fb41246f8..e6fc716aca45 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -53,7 +53,6 @@
 #define DBG_BLKDEV      0x0100
 #define DBG_RX          0x0200
 #define DBG_TX          0x0400
-static DEFINE_MUTEX(nbd_mutex);
 static unsigned int debugflags;
 #endif /* NDEBUG */
 
@@ -718,11 +717,9 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
         dprintk(DBG_IOCTL, "%s: nbd_ioctl cmd=%s(0x%x) arg=%lu\n",
                         lo->disk->disk_name, ioctl_cmd_to_ascii(cmd), cmd, arg);
 
-        mutex_lock(&nbd_mutex);
         mutex_lock(&lo->tx_lock);
         error = __nbd_ioctl(bdev, lo, cmd, arg);
         mutex_unlock(&lo->tx_lock);
-        mutex_unlock(&nbd_mutex);
 
         return error;
 }
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 949ed09c6361..a126e614601f 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -47,46 +47,40 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);
 #define USB_REQ_DFU_DNLOAD      1
 #define BULK_SIZE               4096
 
-struct ath3k_data {
-        struct usb_device *udev;
-        u8 *fw_data;
-        u32 fw_size;
-        u32 fw_sent;
-};
-
-static int ath3k_load_firmware(struct ath3k_data *data,
-                                unsigned char *firmware,
-                                int count)
+static int ath3k_load_firmware(struct usb_device *udev,
+                                const struct firmware *firmware)
 {
         u8 *send_buf;
         int err, pipe, len, size, sent = 0;
+        int count = firmware->size;
 
-        BT_DBG("ath3k %p udev %p", data, data->udev);
+        BT_DBG("udev %p", udev);
 
-        pipe = usb_sndctrlpipe(data->udev, 0);
+        pipe = usb_sndctrlpipe(udev, 0);
 
-        if ((usb_control_msg(data->udev, pipe,
+        send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC);
+        if (!send_buf) {
+                BT_ERR("Can't allocate memory chunk for firmware");
+                return -ENOMEM;
+        }
+
+        memcpy(send_buf, firmware->data, 20);
+        if ((err = usb_control_msg(udev, pipe,
                                 USB_REQ_DFU_DNLOAD,
                                 USB_TYPE_VENDOR, 0, 0,
-                                firmware, 20, USB_CTRL_SET_TIMEOUT)) < 0) {
+                                send_buf, 20, USB_CTRL_SET_TIMEOUT)) < 0) {
                 BT_ERR("Can't change to loading configuration err");
-                return -EBUSY;
+                goto error;
         }
         sent += 20;
         count -= 20;
 
-        send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC);
-        if (!send_buf) {
-                BT_ERR("Can't allocate memory chunk for firmware");
-                return -ENOMEM;
-        }
-
         while (count) {
                 size = min_t(uint, count, BULK_SIZE);
-                pipe = usb_sndbulkpipe(data->udev, 0x02);
-                memcpy(send_buf, firmware + sent, size);
+                pipe = usb_sndbulkpipe(udev, 0x02);
+                memcpy(send_buf, firmware->data + sent, size);
 
-                err = usb_bulk_msg(data->udev, pipe, send_buf, size,
+                err = usb_bulk_msg(udev, pipe, send_buf, size,
                                         &len, 3000);
 
                 if (err || (len != size)) {
@@ -112,57 +106,28 @@ static int ath3k_probe(struct usb_interface *intf,
 {
         const struct firmware *firmware;
         struct usb_device *udev = interface_to_usbdev(intf);
-        struct ath3k_data *data;
-        int size;
 
         BT_DBG("intf %p id %p", intf, id);
 
         if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
                 return -ENODEV;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        data->udev = udev;
-
         if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
-                kfree(data);
                 return -EIO;
         }
 
-        size = max_t(uint, firmware->size, 4096);
-        data->fw_data = kmalloc(size, GFP_KERNEL);
-        if (!data->fw_data) {
+        if (ath3k_load_firmware(udev, firmware)) {
                 release_firmware(firmware);
-                kfree(data);
-                return -ENOMEM;
-        }
-
-        memcpy(data->fw_data, firmware->data, firmware->size);
-        data->fw_size = firmware->size;
-        data->fw_sent = 0;
-        release_firmware(firmware);
-
-        usb_set_intfdata(intf, data);
-        if (ath3k_load_firmware(data, data->fw_data, data->fw_size)) {
-                usb_set_intfdata(intf, NULL);
-                kfree(data->fw_data);
-                kfree(data);
                 return -EIO;
         }
+        release_firmware(firmware);
 
         return 0;
 }
 
 static void ath3k_disconnect(struct usb_interface *intf)
 {
-        struct ath3k_data *data = usb_get_intfdata(intf);
-
         BT_DBG("ath3k_disconnect intf %p", intf);
-
-        kfree(data->fw_data);
-        kfree(data);
 }
 
 static struct usb_driver ath3k_driver = {
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 14033a36bcd0..e2c48a7eccff 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -409,7 +409,8 @@ int register_cdrom(struct cdrom_device_info *cdi)
         }
 
         ENSURE(drive_status, CDC_DRIVE_STATUS );
-        ENSURE(media_changed, CDC_MEDIA_CHANGED);
+        if (cdo->check_events == NULL && cdo->media_changed == NULL)
+                *change_capability = ~(CDC_MEDIA_CHANGED | CDC_SELECT_DISC);
         ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY);
         ENSURE(lock_door, CDC_LOCK);
         ENSURE(select_speed, CDC_SELECT_SPEED);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 0f175a866ef0..b7980a83ce2d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -5,7 +5,7 @@
 menu "Character devices"
 
 config VT
-        bool "Virtual terminal" if EMBEDDED
+        bool "Virtual terminal" if EXPERT
         depends on !S390
         select INPUT
         default y
@@ -39,13 +39,13 @@ config VT
 config CONSOLE_TRANSLATIONS
         depends on VT
         default y
-        bool "Enable character translations in console" if EMBEDDED
+        bool "Enable character translations in console" if EXPERT
         ---help---
           This enables support for font mapping and Unicode translation
           on virtual consoles.
 
 config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EMBEDDED
+        bool "Support for console on virtual terminal" if EXPERT
         depends on VT
         default y
         ---help---
@@ -426,10 +426,10 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
-source "drivers/serial/Kconfig"
+source "drivers/tty/serial/Kconfig"
 
 config UNIX98_PTYS
-        bool "Unix98 PTY support" if EMBEDDED
+        bool "Unix98 PTY support" if EXPERT
         default y
         ---help---
           A pseudo terminal (PTY) is a software device consisting of two
@@ -495,7 +495,7 @@ config LEGACY_PTY_COUNT
 
 config TTY_PRINTK
         bool "TTY driver to output user messages via printk"
-        depends on EMBEDDED
+        depends on EXPERT
         default n
         ---help---
           If you say Y here, the support for writing user messages (i.e.
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1e9dffb33778..8238f89f73c9 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,17 +30,6 @@ obj-$(CONFIG_SYNCLINK_GT)	+= synclink_gt.o
 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_SX)                += sx.o generic_serial.o
 obj-$(CONFIG_RIO)               += rio/ generic_serial.o
-obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
-obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
-obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
-obj-$(CONFIG_HVC_TILE)          += hvc_tile.o
-obj-$(CONFIG_HVC_DCC)           += hvc_dcc.o
-obj-$(CONFIG_HVC_BEAT)          += hvc_beat.o
-obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
-obj-$(CONFIG_HVC_IRQ)           += hvc_irq.o
-obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
-obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
-obj-$(CONFIG_HVC_UDBG)          += hvc_udbg.o
 obj-$(CONFIG_VIRTIO_CONSOLE)    += virtio_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
@@ -48,7 +37,6 @@ obj-$(CONFIG_MSPEC)		+= mspec.o
 obj-$(CONFIG_MMTIMER)           += mmtimer.o
 obj-$(CONFIG_UV_MMTIMER)        += uv_mmtimer.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
-obj-$(CONFIG_HVCS)              += hvcs.o
 obj-$(CONFIG_IBM_BSR)           += bsr.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
 obj-$(CONFIG_BRIQ_PANEL)        += briq_panel.o
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index fcd867d923ba..d8b1b576556c 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -50,7 +50,7 @@ config AGP_ATI
 
 config AGP_AMD
         tristate "AMD Irongate, 761, and 762 chipset support"
-        depends on AGP && (X86_32 || ALPHA)
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           X on AMD Irongate, 761, and 762 chipsets.
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index b1b4362bc648..45681c0ff3b6 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -41,22 +41,8 @@ static int amd_create_page_map(struct amd_page_map *page_map)
         if (page_map->real == NULL)
                 return -ENOMEM;
 
-#ifndef CONFIG_X86
-        SetPageReserved(virt_to_page(page_map->real));
-        global_cache_flush();
-        page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
-                                            PAGE_SIZE);
-        if (page_map->remapped == NULL) {
-                ClearPageReserved(virt_to_page(page_map->real));
-                free_page((unsigned long) page_map->real);
-                page_map->real = NULL;
-                return -ENOMEM;
-        }
-        global_cache_flush();
-#else
         set_memory_uc((unsigned long)page_map->real, 1);
         page_map->remapped = page_map->real;
-#endif
 
         for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
@@ -68,12 +54,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
 
 static void amd_free_page_map(struct amd_page_map *page_map)
 {
-#ifndef CONFIG_X86
-        iounmap(page_map->remapped);
-        ClearPageReserved(virt_to_page(page_map->real));
-#else
         set_memory_wb((unsigned long)page_map->real, 1);
-#endif
         free_page((unsigned long) page_map->real);
 }
 
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 07e9796fead7..b0a0dccc98c1 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -717,8 +717,8 @@ static const struct intel_agp_driver_description {
         { PCI_DEVICE_ID_INTEL_82820_UP_HB, "i820", &intel_820_driver },
         { PCI_DEVICE_ID_INTEL_82830_HB, "830M", &intel_830mp_driver },
         { PCI_DEVICE_ID_INTEL_82840_HB, "i840", &intel_840_driver },
-        { PCI_DEVICE_ID_INTEL_82845_HB, "845G", &intel_845_driver },
-        { PCI_DEVICE_ID_INTEL_82845G_HB, "830M", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82845_HB, "i845", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82845G_HB, "845G", &intel_845_driver },
         { PCI_DEVICE_ID_INTEL_82850_HB, "i850", &intel_850_driver },
         { PCI_DEVICE_ID_INTEL_82854_HB, "854", &intel_845_driver },
         { PCI_DEVICE_ID_INTEL_82855PM_HB, "855PM", &intel_845_driver },
@@ -774,20 +774,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
         dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);
 
         /*
-        * If the device has not been properly setup, the following will catch
-        * the problem and should stop the system from crashing.
-        * 20030610 - hamish@zot.org
-        */
-        if (pci_enable_device(pdev)) {
-                dev_err(&pdev->dev, "can't enable PCI device\n");
-                agp_put_bridge(bridge);
-                return -ENODEV;
-        }
-
-        /*
         * The following fixes the case where the BIOS has "forgotten" to
         * provide an address range for the GART.
         * 20030610 - hamish@zot.org
+        * This happens before pci_enable_device() intentionally;
+        * calling pci_enable_device() before assigning the resource
+        * will result in the GART being disabled on machines with such
+        * BIOSs (the GART ends up with a BAR starting at 0, which
+        * conflicts a lot of other devices).
         */
         r = &pdev->resource[0];
         if (!r->start && r->end) {
@@ -798,6 +792,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 }
         }
 
+        /*
+        * If the device has not been properly setup, the following will catch
+        * the problem and should stop the system from crashing.
+        * 20030610 - hamish@zot.org
+        */
+        if (pci_enable_device(pdev)) {
+                dev_err(&pdev->dev, "can't enable PCI device\n");
+                agp_put_bridge(bridge);
+                return -ENODEV;
+        }
+
         /* Fill in the mode register */
         if (cap_ptr) {
                 pci_read_config_dword(pdev,
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index e921b693412b..fab3d3265adb 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -68,6 +68,7 @@ static struct _intel_private {
         phys_addr_t gma_bus_addr;
         u32 PGETBL_save;
         u32 __iomem *gtt;               /* I915G */
+        bool clear_fake_agp; /* on first access via agp, fill with scratch */
         int num_dcache_entries;
         union {
                 void __iomem *i9xx_flush_page;
@@ -869,21 +870,12 @@ static int intel_fake_agp_free_gatt_table(struct agp_bridge_data *bridge)
 
 static int intel_fake_agp_configure(void)
 {
-        int i;
-
         if (!intel_enable_gtt())
             return -EIO;
 
+        intel_private.clear_fake_agp = true;
         agp_bridge->gart_bus_addr = intel_private.gma_bus_addr;
 
-        for (i = 0; i < intel_private.base.gtt_total_entries; i++) {
-                intel_private.driver->write_entry(intel_private.scratch_page_dma,
-                                                  i, 0);
-        }
-        readl(intel_private.gtt+i-1);   /* PCI Posting. */
-
-        global_cache_flush();
-
         return 0;
 }
 
@@ -945,6 +937,13 @@ static int intel_fake_agp_insert_entries(struct agp_memory *mem,
 {
         int ret = -EINVAL;
 
+        if (intel_private.clear_fake_agp) {
+                int start = intel_private.base.stolen_size / PAGE_SIZE;
+                int end = intel_private.base.gtt_mappable_entries;
+                intel_gtt_clear_range(start, end - start);
+                intel_private.clear_fake_agp = false;
+        }
+
         if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)
                 return i810_insert_dcache_entries(mem, pg_start, type);
 
@@ -1361,7 +1360,7 @@ static const struct intel_gtt_driver_description {
                 &i81x_gtt_driver},
         { PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
                 &i8xx_gtt_driver},
-        { PCI_DEVICE_ID_INTEL_82845G_IG, "830M",
+        { PCI_DEVICE_ID_INTEL_82845G_IG, "845G",
                 &i8xx_gtt_driver},
         { PCI_DEVICE_ID_INTEL_82854_IG, "854",
                 &i8xx_gtt_driver},
diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/char/bfin_jtag_comm.c
index e397df3ad98e..16402445f2b2 100644
--- a/drivers/char/bfin_jtag_comm.c
+++ b/drivers/char/bfin_jtag_comm.c
@@ -183,16 +183,16 @@ bfin_jc_circ_write(const unsigned char *buf, int count)
 }
 
 #ifndef CONFIG_BFIN_JTAG_COMM_CONSOLE
-# define acquire_console_sem()
-# define release_console_sem()
+# define console_lock()
+# define console_unlock()
 #endif
 static int
 bfin_jc_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
         int i;
-        acquire_console_sem();
+        console_lock();
         i = bfin_jc_circ_write(buf, count);
-        release_console_sem();
+        console_unlock();
         wake_up_process(bfin_jc_kthread);
         return i;
 }
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 2fe72f8edf44..38223e93aa98 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -970,6 +970,33 @@ out_kfree:
 }
 EXPORT_SYMBOL(ipmi_create_user);
 
+int ipmi_get_smi_info(int if_num, struct ipmi_smi_info *data)
+{
+        int           rv = 0;
+        ipmi_smi_t    intf;
+        struct ipmi_smi_handlers *handlers;
+
+        mutex_lock(&ipmi_interfaces_mutex);
+        list_for_each_entry_rcu(intf, &ipmi_interfaces, link) {
+                if (intf->intf_num == if_num)
+                        goto found;
+        }
+        /* Not found, return an error */
+        rv = -EINVAL;
+        mutex_unlock(&ipmi_interfaces_mutex);
+        return rv;
+
+found:
+        handlers = intf->handlers;
+        rv = -ENOSYS;
+        if (handlers->get_smi_info)
+                rv = handlers->get_smi_info(intf->send_info, data);
+        mutex_unlock(&ipmi_interfaces_mutex);
+
+        return rv;
+}
+EXPORT_SYMBOL(ipmi_get_smi_info);
+
 static void free_user(struct kref *ref)
 {
         ipmi_user_t user = container_of(ref, struct ipmi_user, refcount);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f27c04e18aaa..7855f9f45b8e 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -57,6 +57,7 @@
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
+#include <linux/ipmi.h>
 #include <linux/ipmi_smi.h>
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
@@ -109,10 +110,6 @@ enum si_type {
 };
 static char *si_to_str[] = { "kcs", "smic", "bt" };
 
-enum ipmi_addr_src {
-        SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS,
-        SI_PCI, SI_DEVICETREE, SI_DEFAULT
-};
 static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI",
                                         "ACPI", "SMBIOS", "PCI",
                                         "device-tree", "default" };
@@ -293,6 +290,7 @@ struct smi_info {
         struct task_struct *thread;
 
         struct list_head link;
+        union ipmi_smi_info_union addr_info;
 };
 
 #define smi_inc_stat(smi, stat) \
@@ -322,6 +320,7 @@ static int unload_when_empty = 1;
 static int add_smi(struct smi_info *smi);
 static int try_smi_init(struct smi_info *smi);
 static void cleanup_one_si(struct smi_info *to_clean);
+static void cleanup_ipmi_si(void);
 
 static ATOMIC_NOTIFIER_HEAD(xaction_notifier_list);
 static int register_xaction_notifier(struct notifier_block *nb)
@@ -1188,6 +1187,18 @@ static int smi_start_processing(void       *send_info,
         return 0;
 }
 
+static int get_smi_info(void *send_info, struct ipmi_smi_info *data)
+{
+        struct smi_info *smi = send_info;
+
+        data->addr_src = smi->addr_source;
+        data->dev = smi->dev;
+        data->addr_info = smi->addr_info;
+        get_device(smi->dev);
+
+        return 0;
+}
+
 static void set_maintenance_mode(void *send_info, int enable)
 {
         struct smi_info   *smi_info = send_info;
@@ -1199,6 +1210,7 @@ static void set_maintenance_mode(void *send_info, int enable)
 static struct ipmi_smi_handlers handlers = {
         .owner                  = THIS_MODULE,
         .start_processing       = smi_start_processing,
+        .get_smi_info           = get_smi_info,
         .sender                 = sender,
         .request_events         = request_events,
         .set_maintenance_mode   = set_maintenance_mode,
@@ -1930,7 +1942,8 @@ static void __devinit hardcode_find_bmc(void)
 static int acpi_failure;
 
 /* For GPE-type interrupts. */
-static u32 ipmi_acpi_gpe(void *context)
+static u32 ipmi_acpi_gpe(acpi_handle gpe_device,
+        u32 gpe_number, void *context)
 {
         struct smi_info *smi_info = context;
         unsigned long   flags;
@@ -2158,6 +2171,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
         printk(KERN_INFO PFX "probing via ACPI\n");
 
         handle = acpi_dev->handle;
+        info->addr_info.acpi_info.acpi_handle = handle;
 
         /* _IFT tells us the interface type: KCS, BT, etc */
         status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
@@ -3437,16 +3451,7 @@ static int __devinit init_ipmi_si(void)
         mutex_lock(&smi_infos_lock);
         if (unload_when_empty && list_empty(&smi_infos)) {
                 mutex_unlock(&smi_infos_lock);
-#ifdef CONFIG_PCI
-                if (pci_registered)
-                        pci_unregister_driver(&ipmi_pci_driver);
-#endif
-
-#ifdef CONFIG_PPC_OF
-                if (of_registered)
-                        of_unregister_platform_driver(&ipmi_of_platform_driver);
-#endif
-                driver_unregister(&ipmi_driver.driver);
+                cleanup_ipmi_si();
                 printk(KERN_WARNING PFX
                        "Unable to find any System Interface(s)\n");
                 return -ENODEV;
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 1f46f1cd9225..faf5a2c65926 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -364,12 +364,14 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip,
                     tpm_protected_ordinal_duration[ordinal &
                                                    TPM_PROTECTED_ORDINAL_MASK];
 
-        if (duration_idx != TPM_UNDEFINED)
+        if (duration_idx != TPM_UNDEFINED) {
                 duration = chip->vendor.duration[duration_idx];
-        if (duration <= 0)
+                /* if duration is 0, it's because chip->vendor.duration wasn't */
+                /* filled yet, so we set the lowest timeout just to give enough */
+                /* time for tpm_get_timeouts() to succeed */
+                return (duration <= 0 ? HZ : duration);
+        } else
                 return 2 * 60 * HZ;
-        else
-                return duration;
 }
 EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);
 
@@ -575,9 +577,11 @@ duration:
         if (rc)
                 return;
 
-        if (be32_to_cpu(tpm_cmd.header.out.return_code)
-            != 3 * sizeof(u32))
+        if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 ||
+            be32_to_cpu(tpm_cmd.header.out.length)
+            != sizeof(tpm_cmd.header.out) + sizeof(u32) + 3 * sizeof(u32))
                 return;
+
         duration_cap = &tpm_cmd.params.getcap_out.cap.duration;
         chip->vendor.duration[TPM_SHORT] =
             usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_short));
@@ -937,6 +941,18 @@ ssize_t tpm_show_caps_1_2(struct device * dev,
 }
 EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);
 
+ssize_t tpm_show_timeouts(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        struct tpm_chip *chip = dev_get_drvdata(dev);
+
+        return sprintf(buf, "%d %d %d\n",
+                       jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
+                       jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),
+                       jiffies_to_usecs(chip->vendor.duration[TPM_LONG]));
+}
+EXPORT_SYMBOL_GPL(tpm_show_timeouts);
+
 ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr,
                         const char *buf, size_t count)
 {
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 72ddb031b69a..d84ff772c26f 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -56,6 +56,8 @@ extern ssize_t tpm_show_owned(struct device *, struct device_attribute *attr,
                                 char *);
 extern ssize_t tpm_show_temp_deactivated(struct device *,
                                          struct device_attribute *attr, char *);
+extern ssize_t tpm_show_timeouts(struct device *,
+                                 struct device_attribute *attr, char *);
 
 struct tpm_chip;
 
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c17a305ecb28..0d1d38e5f266 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -376,6 +376,7 @@ static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated,
                    NULL);
 static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps_1_2, NULL);
 static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel);
+static DEVICE_ATTR(timeouts, S_IRUGO, tpm_show_timeouts, NULL);
 
 static struct attribute *tis_attrs[] = {
         &dev_attr_pubek.attr,
@@ -385,7 +386,8 @@ static struct attribute *tis_attrs[] = {
         &dev_attr_owned.attr,
         &dev_attr_temp_deactivated.attr,
         &dev_attr_caps.attr,
-        &dev_attr_cancel.attr, NULL,
+        &dev_attr_cancel.attr,
+        &dev_attr_timeouts.attr, NULL,
 };
 
 static struct attribute_group tis_attr_grp = {
@@ -493,9 +495,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
                  "1.2 TPM (device-id 0x%X, rev-id %d)\n",
                  vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));
 
-        if (is_itpm(to_pnp_dev(dev)))
-                itpm = 1;
-
         if (itpm)
                 dev_info(dev, "Intel iTPM workaround enabled\n");
 
@@ -637,6 +636,9 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
         else
                 interrupts = 0;
 
+        if (is_itpm(pnp_dev))
+                itpm = 1;
+
         return tpm_tis_init(&pnp_dev->dev, start, len, irq);
 }
 
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 896a2ced1d27..490393186338 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2006, 2007, 2009 Rusty Russell, IBM Corporation
- * Copyright (C) 2009, 2010 Red Hat, Inc.
+ * Copyright (C) 2009, 2010, 2011 Red Hat, Inc.
+ * Copyright (C) 2009, 2010, 2011 Amit Shah <amit.shah@redhat.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
@@ -31,7 +32,7 @@
 #include <linux/virtio_console.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
-#include "hvc_console.h"
+#include "../tty/hvc/hvc_console.h"
 
 /*
  * This is a global struct for storing common data for all the devices
@@ -1462,6 +1463,17 @@ static void control_work_handler(struct work_struct *work)
         spin_unlock(&portdev->cvq_lock);
 }
 
+static void out_intr(struct virtqueue *vq)
+{
+        struct port *port;
+
+        port = find_port_by_vq(vq->vdev->priv, vq);
+        if (!port)
+                return;
+
+        wake_up_interruptible(&port->waitqueue);
+}
+
 static void in_intr(struct virtqueue *vq)
 {
         struct port *port;
@@ -1566,7 +1578,7 @@ static int init_vqs(struct ports_device *portdev)
          */
         j = 0;
         io_callbacks[j] = in_intr;
-        io_callbacks[j + 1] = NULL;
+        io_callbacks[j + 1] = out_intr;
         io_names[j] = "input";
         io_names[j + 1] = "output";
         j += 2;
@@ -1580,7 +1592,7 @@ static int init_vqs(struct ports_device *portdev)
                 for (i = 1; i < nr_ports; i++) {
                         j += 2;
                         io_callbacks[j] = in_intr;
-                        io_callbacks[j + 1] = NULL;
+                        io_callbacks[j + 1] = out_intr;
                         io_names[j] = "input";
                         io_names[j + 1] = "output";
                 }
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index cfb0f5278415..effe7974aa9a 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -202,17 +202,21 @@ static int __init init_acpi_pm_clocksource(void)
                         printk(KERN_INFO "PM-Timer had inconsistent results:"
                                " 0x%#llx, 0x%#llx - aborting.\n",
                                value1, value2);
+                        pmtmr_ioport = 0;
                         return -EINVAL;
                 }
                 if (i == ACPI_PM_READ_CHECKS) {
                         printk(KERN_INFO "PM-Timer failed consistency check "
                                " (0x%#llx) - aborting.\n", value1);
+                        pmtmr_ioport = 0;
                         return -ENODEV;
                 }
         }
 
-        if (verify_pmtmr_rate() != 0)
+        if (verify_pmtmr_rate() != 0){
+                pmtmr_ioport = 0;
                 return -ENODEV;
+        }
 
         return clocksource_register_hz(&clocksource_acpi_pm,
                                                 PMTMR_TICKS_PER_SEC);
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 01b886e68822..79c47e88d5d1 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -196,9 +196,9 @@ static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
         clkevt.clkevt.min_delta_ns = clockevent_delta2ns(1, &clkevt.clkevt) + 1;
         clkevt.clkevt.cpumask = cpumask_of(0);
 
-        setup_irq(irq, &tc_irqaction);
-
         clockevents_register_device(&clkevt.clkevt);
+
+        setup_irq(irq, &tc_irqaction);
 }
 
 #else /* !CONFIG_GENERIC_CLOCKEVENTS */
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index a8c8d9c19d74..ca8ee8093d6c 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -71,7 +71,7 @@ config CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 
 config CPU_FREQ_DEFAULT_GOV_POWERSAVE
         bool "powersave"
-        depends on EMBEDDED
+        depends on EXPERT
         select CPU_FREQ_GOV_POWERSAVE
         help
           Use the CPUFreq governor 'powersave' as default. This sets
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 386888f10df0..bf5092455a8f 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -96,7 +96,15 @@ static void cpuidle_idle_call(void)
 
         /* enter the state and update stats */
         dev->last_state = target_state;
+
+        trace_power_start(POWER_CSTATE, next_state, dev->cpu);
+        trace_cpu_idle(next_state, dev->cpu);
+
         dev->last_residency = target_state->enter(dev, target_state);
+
+        trace_power_end(dev->cpu);
+        trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
+
         if (dev->last_state)
                 target_state = dev->last_state;
 
@@ -106,8 +114,6 @@ static void cpuidle_idle_call(void)
         /* give the governor an opportunity to reflect on the outcome */
         if (cpuidle_curr_governor->reflect)
                 cpuidle_curr_governor->reflect(dev);
-        trace_power_end(smp_processor_id());
-        trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
 }
 
 /**
@@ -155,6 +161,45 @@ void cpuidle_resume_and_unlock(void)
 
 EXPORT_SYMBOL_GPL(cpuidle_resume_and_unlock);
 
+#ifdef CONFIG_ARCH_HAS_CPU_RELAX
+static int poll_idle(struct cpuidle_device *dev, struct cpuidle_state *st)
+{
+        ktime_t t1, t2;
+        s64 diff;
+        int ret;
+
+        t1 = ktime_get();
+        local_irq_enable();
+        while (!need_resched())
+                cpu_relax();
+
+        t2 = ktime_get();
+        diff = ktime_to_us(ktime_sub(t2, t1));
+        if (diff > INT_MAX)
+                diff = INT_MAX;
+
+        ret = (int) diff;
+        return ret;
+}
+
+static void poll_idle_init(struct cpuidle_device *dev)
+{
+        struct cpuidle_state *state = &dev->states[0];
+
+        cpuidle_set_statedata(state, NULL);
+
+        snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
+        snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
+        state->exit_latency = 0;
+        state->target_residency = 0;
+        state->power_usage = -1;
+        state->flags = 0;
+        state->enter = poll_idle;
+}
+#else
+static void poll_idle_init(struct cpuidle_device *dev) {}
+#endif /* CONFIG_ARCH_HAS_CPU_RELAX */
+
 /**
  * cpuidle_enable_device - enables idle PM for a CPU
  * @dev: the CPU
@@ -179,6 +224,8 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
                         return ret;
         }
 
+        poll_idle_init(dev);
+
         if ((ret = cpuidle_add_state_sysfs(dev)))
                 return ret;
 
@@ -233,45 +280,6 @@ void cpuidle_disable_device(struct cpuidle_device *dev)
 
 EXPORT_SYMBOL_GPL(cpuidle_disable_device);
 
-#ifdef CONFIG_ARCH_HAS_CPU_RELAX
-static int poll_idle(struct cpuidle_device *dev, struct cpuidle_state *st)
-{
-        ktime_t t1, t2;
-        s64 diff;
-        int ret;
-
-        t1 = ktime_get();
-        local_irq_enable();
-        while (!need_resched())
-                cpu_relax();
-
-        t2 = ktime_get();
-        diff = ktime_to_us(ktime_sub(t2, t1));
-        if (diff > INT_MAX)
-                diff = INT_MAX;
-
-        ret = (int) diff;
-        return ret;
-}
-
-static void poll_idle_init(struct cpuidle_device *dev)
-{
-        struct cpuidle_state *state = &dev->states[0];
-
-        cpuidle_set_statedata(state, NULL);
-
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C0");
-        snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
-        state->exit_latency = 0;
-        state->target_residency = 0;
-        state->power_usage = -1;
-        state->flags = CPUIDLE_FLAG_POLL;
-        state->enter = poll_idle;
-}
-#else
-static void poll_idle_init(struct cpuidle_device *dev) {}
-#endif /* CONFIG_ARCH_HAS_CPU_RELAX */
-
 /**
  * __cpuidle_register_device - internal register function called before register
  * and enable routines
@@ -292,8 +300,6 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
 
         init_completion(&dev->kobj_unregister);
 
-        poll_idle_init(dev);
-
         /*
          * cpuidle driver should set the dev->power_specified bit
          * before registering the device if the driver provides
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index ef138731c0ea..1c28816152fa 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -200,11 +200,16 @@ config PL330_DMA
           platform_data for a dma-pl330 device.
 
 config PCH_DMA
-        tristate "Topcliff (Intel EG20T) PCH DMA support"
+        tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH DMA support"
         depends on PCI && X86
         select DMA_ENGINE
         help
-          Enable support for the Topcliff (Intel EG20T) PCH DMA engine.
+          Enable support for Intel EG20T PCH DMA engine.
+
+          This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/
+          Output Hub) which is for IVI(In-Vehicle Infotainment) use.
+          ML7213 is companion chip for Intel Atom E6xx series.
+          ML7213 is completely compatible for Intel EG20T PCH.
 
 config IMX_SDMA
         tristate "i.MX SDMA support"
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index b605cc9ac3a2..297f48b0cba9 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -19,14 +19,14 @@
  * this program; if not, write to the Free Software Foundation, Inc., 59
  * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * The full GNU General Public License is iin this distribution in the
- * file called COPYING.
+ * The full GNU General Public License is in this distribution in the file
+ * called COPYING.
  *
  * Documentation: ARM DDI 0196G == PL080
- * Documentation: ARM DDI 0218E == PL081
+ * Documentation: ARM DDI 0218E == PL081
  *
- * PL080 & PL081 both have 16 sets of DMA signals that can be routed to
- * any channel.
+ * PL080 & PL081 both have 16 sets of DMA signals that can be routed to any
+ * channel.
  *
  * The PL080 has 8 channels available for simultaneous use, and the PL081
  * has only two channels. So on these DMA controllers the number of channels
@@ -53,7 +53,23 @@
  *
  * ASSUMES default (little) endianness for DMA transfers
  *
- * Only DMAC flow control is implemented
+ * The PL08x has two flow control settings:
+ *  - DMAC flow control: the transfer size defines the number of transfers
+ *    which occur for the current LLI entry, and the DMAC raises TC at the
+ *    end of every LLI entry.  Observed behaviour shows the DMAC listening
+ *    to both the BREQ and SREQ signals (contrary to documented),
+ *    transferring data if either is active.  The LBREQ and LSREQ signals
+ *    are ignored.
+ *
+ *  - Peripheral flow control: the transfer size is ignored (and should be
+ *    zero).  The data is transferred from the current LLI entry, until
+ *    after the final transfer signalled by LBREQ or LSREQ.  The DMAC
+ *    will then move to the next LLI entry.
+ *
+ * Only the former works sanely with scatter lists, so we only implement
+ * the DMAC flow control method.  However, peripherals which use the LBREQ
+ * and LSREQ signals (eg, MMCI) are unable to use this mode, which through
+ * these hardware restrictions prevents them from using scatter DMA.
  *
  * Global TODO:
  * - Break out common code from arch/arm/mach-s3c64xx and share
@@ -61,50 +77,39 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/dmapool.h>
-#include <linux/amba/bus.h>
 #include <linux/dmaengine.h>
+#include <linux/amba/bus.h>
 #include <linux/amba/pl08x.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
 #include <asm/hardware/pl080.h>
-#include <asm/dma.h>
-#include <asm/mach/dma.h>
-#include <asm/atomic.h>
-#include <asm/processor.h>
-#include <asm/cacheflush.h>
 
 #define DRIVER_NAME     "pl08xdmac"
 
 /**
- * struct vendor_data - vendor-specific config parameters
- * for PL08x derivates
- * @name: the name of this specific variant
+ * struct vendor_data - vendor-specific config parameters for PL08x derivatives
  * @channels: the number of channels available in this variant
- * @dualmaster: whether this version supports dual AHB masters
- * or not.
+ * @dualmaster: whether this version supports dual AHB masters or not.
  */
 struct vendor_data {
-        char *name;
         u8 channels;
         bool dualmaster;
 };
 
 /*
  * PL08X private data structures
- * An LLI struct - see pl08x TRM
- * Note that next uses bit[0] as a bus bit,
- * start & end do not - their bus bit info
- * is in cctl
+ * An LLI struct - see PL08x TRM.  Note that next uses bit[0] as a bus bit,
+ * start & end do not - their bus bit info is in cctl.  Also note that these
+ * are fixed 32-bit quantities.
  */
-struct lli {
-        dma_addr_t src;
-        dma_addr_t dst;
-        dma_addr_t next;
+struct pl08x_lli {
+        u32 src;
+        u32 dst;
+        u32 lli;
         u32 cctl;
 };
 
@@ -119,6 +124,8 @@ struct lli {
  * @phy_chans: array of data for the physical channels
  * @pool: a pool for the LLI descriptors
  * @pool_ctr: counter of LLIs in the pool
+ * @lli_buses: bitmask to or in to LLI pointer selecting AHB port for LLI fetches
+ * @mem_buses: set to indicate memory transfers on AHB2.
  * @lock: a spinlock for this struct
  */
 struct pl08x_driver_data {
@@ -126,11 +133,13 @@ struct pl08x_driver_data {
         struct dma_device memcpy;
         void __iomem *base;
         struct amba_device *adev;
-        struct vendor_data *vd;
+        const struct vendor_data *vd;
         struct pl08x_platform_data *pd;
         struct pl08x_phy_chan *phy_chans;
         struct dma_pool *pool;
         int pool_ctr;
+        u8 lli_buses;
+        u8 mem_buses;
         spinlock_t lock;
 };
 
@@ -152,9 +161,9 @@ struct pl08x_driver_data {
 /* Size (bytes) of each LLI buffer allocated for one transfer */
 # define PL08X_LLI_TSFR_SIZE    0x2000
 
-/* Maximimum times we call dma_pool_alloc on this pool without freeing */
+/* Maximum times we call dma_pool_alloc on this pool without freeing */
 #define PL08X_MAX_ALLOCS        0x40
-#define MAX_NUM_TSFR_LLIS       (PL08X_LLI_TSFR_SIZE/sizeof(struct lli))
+#define MAX_NUM_TSFR_LLIS       (PL08X_LLI_TSFR_SIZE/sizeof(struct pl08x_lli))
 #define PL08X_ALIGN             8
 
 static inline struct pl08x_dma_chan *to_pl08x_chan(struct dma_chan *chan)
@@ -162,6 +171,11 @@ static inline struct pl08x_dma_chan *to_pl08x_chan(struct dma_chan *chan)
         return container_of(chan, struct pl08x_dma_chan, chan);
 }
 
+static inline struct pl08x_txd *to_pl08x_txd(struct dma_async_tx_descriptor *tx)
+{
+        return container_of(tx, struct pl08x_txd, tx);
+}
+
 /*
  * Physical channel handling
  */
@@ -177,88 +191,47 @@ static int pl08x_phy_channel_busy(struct pl08x_phy_chan *ch)
 
 /*
  * Set the initial DMA register values i.e. those for the first LLI
- * The next lli pointer and the configuration interrupt bit have
- * been set when the LLIs were constructed
+ * The next LLI pointer and the configuration interrupt bit have
+ * been set when the LLIs were constructed.  Poke them into the hardware
+ * and start the transfer.
  */
-static void pl08x_set_cregs(struct pl08x_driver_data *pl08x,
-                            struct pl08x_phy_chan *ch)
-{
-        /* Wait for channel inactive */
-        while (pl08x_phy_channel_busy(ch))
-                ;
-
-        dev_vdbg(&pl08x->adev->dev,
-                "WRITE channel %d: csrc=%08x, cdst=%08x, "
-                 "cctl=%08x, clli=%08x, ccfg=%08x\n",
-                ch->id,
-                ch->csrc,
-                ch->cdst,
-                ch->cctl,
-                ch->clli,
-                ch->ccfg);
-
-        writel(ch->csrc, ch->base + PL080_CH_SRC_ADDR);
-        writel(ch->cdst, ch->base + PL080_CH_DST_ADDR);
-        writel(ch->clli, ch->base + PL080_CH_LLI);
-        writel(ch->cctl, ch->base + PL080_CH_CONTROL);
-        writel(ch->ccfg, ch->base + PL080_CH_CONFIG);
-}
-
-static inline void pl08x_config_phychan_for_txd(struct pl08x_dma_chan *plchan)
+static void pl08x_start_txd(struct pl08x_dma_chan *plchan,
+        struct pl08x_txd *txd)
 {
-        struct pl08x_channel_data *cd = plchan->cd;
+        struct pl08x_driver_data *pl08x = plchan->host;
         struct pl08x_phy_chan *phychan = plchan->phychan;
-        struct pl08x_txd *txd = plchan->at;
-
-        /* Copy the basic control register calculated at transfer config */
-        phychan->csrc = txd->csrc;
-        phychan->cdst = txd->cdst;
-        phychan->clli = txd->clli;
-        phychan->cctl = txd->cctl;
-
-        /* Assign the signal to the proper control registers */
-        phychan->ccfg = cd->ccfg;
-        phychan->ccfg &= ~PL080_CONFIG_SRC_SEL_MASK;
-        phychan->ccfg &= ~PL080_CONFIG_DST_SEL_MASK;
-        /* If it wasn't set from AMBA, ignore it */
-        if (txd->direction == DMA_TO_DEVICE)
-                /* Select signal as destination */
-                phychan->ccfg |=
-                        (phychan->signal << PL080_CONFIG_DST_SEL_SHIFT);
-        else if (txd->direction == DMA_FROM_DEVICE)
-                /* Select signal as source */
-                phychan->ccfg |=
-                        (phychan->signal << PL080_CONFIG_SRC_SEL_SHIFT);
-        /* Always enable error interrupts */
-        phychan->ccfg |= PL080_CONFIG_ERR_IRQ_MASK;
-        /* Always enable terminal interrupts */
-        phychan->ccfg |= PL080_CONFIG_TC_IRQ_MASK;
-}
-
-/*
- * Enable the DMA channel
- * Assumes all other configuration bits have been set
- * as desired before this code is called
- */
-static void pl08x_enable_phy_chan(struct pl08x_driver_data *pl08x,
-                                  struct pl08x_phy_chan *ch)
-{
+        struct pl08x_lli *lli = &txd->llis_va[0];
         u32 val;
 
-        /*
-         * Do not access config register until channel shows as disabled
-         */
-        while (readl(pl08x->base + PL080_EN_CHAN) & (1 << ch->id))
-                ;
+        plchan->at = txd;
 
-        /*
-         * Do not access config register until channel shows as inactive
-         */
-        val = readl(ch->base + PL080_CH_CONFIG);
+        /* Wait for channel inactive */
+        while (pl08x_phy_channel_busy(phychan))
+                cpu_relax();
+
+        dev_vdbg(&pl08x->adev->dev,
+                "WRITE channel %d: csrc=0x%08x, cdst=0x%08x, "
+                "clli=0x%08x, cctl=0x%08x, ccfg=0x%08x\n",
+                phychan->id, lli->src, lli->dst, lli->lli, lli->cctl,
+                txd->ccfg);
+
+        writel(lli->src, phychan->base + PL080_CH_SRC_ADDR);
+        writel(lli->dst, phychan->base + PL080_CH_DST_ADDR);
+        writel(lli->lli, phychan->base + PL080_CH_LLI);
+        writel(lli->cctl, phychan->base + PL080_CH_CONTROL);
+        writel(txd->ccfg, phychan->base + PL080_CH_CONFIG);
+
+        /* Enable the DMA channel */
+        /* Do not access config register until channel shows as disabled */
+        while (readl(pl08x->base + PL080_EN_CHAN) & (1 << phychan->id))
+                cpu_relax();
+
+        /* Do not access config register until channel shows as inactive */
+        val = readl(phychan->base + PL080_CH_CONFIG);
         while ((val & PL080_CONFIG_ACTIVE) || (val & PL080_CONFIG_ENABLE))
-                val = readl(ch->base + PL080_CH_CONFIG);
+                val = readl(phychan->base + PL080_CH_CONFIG);
 
-        writel(val | PL080_CONFIG_ENABLE, ch->base + PL080_CH_CONFIG);
+        writel(val | PL080_CONFIG_ENABLE, phychan->base + PL080_CH_CONFIG);
 }
 
 /*
@@ -266,10 +239,8 @@ static void pl08x_enable_phy_chan(struct pl08x_driver_data *pl08x,
  *
  * Disabling individual channels could lose data.
  *
- * Disable the peripheral DMA after disabling the DMAC
- * in order to allow the DMAC FIFO to drain, and
- * hence allow the channel to show inactive
- *
+ * Disable the peripheral DMA after disabling the DMAC in order to allow
+ * the DMAC FIFO to drain, and hence allow the channel to show inactive
  */
 static void pl08x_pause_phy_chan(struct pl08x_phy_chan *ch)
 {
@@ -282,7 +253,7 @@ static void pl08x_pause_phy_chan(struct pl08x_phy_chan *ch)
 
         /* Wait for channel inactive */
         while (pl08x_phy_channel_busy(ch))
-                ;
+                cpu_relax();
 }
 
 static void pl08x_resume_phy_chan(struct pl08x_phy_chan *ch)
@@ -333,54 +304,56 @@ static inline u32 get_bytes_in_cctl(u32 cctl)
 static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
 {
         struct pl08x_phy_chan *ch;
-        struct pl08x_txd *txdi = NULL;
         struct pl08x_txd *txd;
         unsigned long flags;
-        u32 bytes = 0;
+        size_t bytes = 0;
 
         spin_lock_irqsave(&plchan->lock, flags);
-
         ch = plchan->phychan;
         txd = plchan->at;
 
         /*
-         * Next follow the LLIs to get the number of pending bytes in the
-         * currently active transaction.
+         * Follow the LLIs to get the number of remaining
+         * bytes in the currently active transaction.
          */
         if (ch && txd) {
-                struct lli *llis_va = txd->llis_va;
-                struct lli *llis_bus = (struct lli *) txd->llis_bus;
-                u32 clli = readl(ch->base + PL080_CH_LLI);
+                u32 clli = readl(ch->base + PL080_CH_LLI) & ~PL080_LLI_LM_AHB2;
 
-                /* First get the bytes in the current active LLI */
+                /* First get the remaining bytes in the active transfer */
                 bytes = get_bytes_in_cctl(readl(ch->base + PL080_CH_CONTROL));
 
                 if (clli) {
-                        int i = 0;
+                        struct pl08x_lli *llis_va = txd->llis_va;
+                        dma_addr_t llis_bus = txd->llis_bus;
+                        int index;
+
+                        BUG_ON(clli < llis_bus || clli >= llis_bus +
+                                sizeof(struct pl08x_lli) * MAX_NUM_TSFR_LLIS);
+
+                        /*
+                         * Locate the next LLI - as this is an array,
+                         * it's simple maths to find.
+                         */
+                        index = (clli - llis_bus) / sizeof(struct pl08x_lli);
 
-                        /* Forward to the LLI pointed to by clli */
-                        while ((clli != (u32) &(llis_bus[i])) &&
-                               (i < MAX_NUM_TSFR_LLIS))
-                                i++;
+                        for (; index < MAX_NUM_TSFR_LLIS; index++) {
+                                bytes += get_bytes_in_cctl(llis_va[index].cctl);
 
-                        while (clli) {
-                                bytes += get_bytes_in_cctl(llis_va[i].cctl);
                                 /*
-                                 * A clli of 0x00000000 will terminate the
-                                 * LLI list
+                                 * A LLI pointer of 0 terminates the LLI list
                                  */
-                                clli = llis_va[i].next;
-                                i++;
+                                if (!llis_va[index].lli)
+                                        break;
                         }
                 }
         }
 
         /* Sum up all queued transactions */
-        if (!list_empty(&plchan->desc_list)) {
-                list_for_each_entry(txdi, &plchan->desc_list, node) {
+        if (!list_empty(&plchan->pend_list)) {
+                struct pl08x_txd *txdi;
+                list_for_each_entry(txdi, &plchan->pend_list, node) {
                         bytes += txdi->len;
                 }
-
         }
 
         spin_unlock_irqrestore(&plchan->lock, flags);
@@ -390,6 +363,10 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
 
 /*
  * Allocate a physical channel for a virtual channel
+ *
+ * Try to locate a physical channel to be used for this transfer. If all
+ * are taken return NULL and the requester will have to cope by using
+ * some fallback PIO mode or retrying later.
  */
 static struct pl08x_phy_chan *
 pl08x_get_phy_channel(struct pl08x_driver_data *pl08x,
@@ -399,12 +376,6 @@ pl08x_get_phy_channel(struct pl08x_driver_data *pl08x,
         unsigned long flags;
         int i;
 
-        /*
-         * Try to locate a physical channel to be used for
-         * this transfer. If all are taken return NULL and
-         * the requester will have to cope by using some fallback
-         * PIO mode or retrying later.
-         */
         for (i = 0; i < pl08x->vd->channels; i++) {
                 ch = &pl08x->phy_chans[i];
 
@@ -465,11 +436,11 @@ static inline unsigned int pl08x_get_bytes_for_cctl(unsigned int coded)
 }
 
 static inline u32 pl08x_cctl_bits(u32 cctl, u8 srcwidth, u8 dstwidth,
-                                  u32 tsize)
+                                  size_t tsize)
 {
         u32 retbits = cctl;
 
-        /* Remove all src, dst and transfersize bits */
+        /* Remove all src, dst and transfer size bits */
         retbits &= ~PL080_CONTROL_DWIDTH_MASK;
         retbits &= ~PL080_CONTROL_SWIDTH_MASK;
         retbits &= ~PL080_CONTROL_TRANSFER_SIZE_MASK;
@@ -509,95 +480,87 @@ static inline u32 pl08x_cctl_bits(u32 cctl, u8 srcwidth, u8 dstwidth,
         return retbits;
 }
 
+struct pl08x_lli_build_data {
+        struct pl08x_txd *txd;
+        struct pl08x_driver_data *pl08x;
+        struct pl08x_bus_data srcbus;
+        struct pl08x_bus_data dstbus;
+        size_t remainder;
+};
+
 /*
- * Autoselect a master bus to use for the transfer
- * this prefers the destination bus if both available
- * if fixed address on one bus the other will be chosen
+ * Autoselect a master bus to use for the transfer this prefers the
+ * destination bus if both available if fixed address on one bus the
+ * other will be chosen
  */
-void pl08x_choose_master_bus(struct pl08x_bus_data *src_bus,
-        struct pl08x_bus_data *dst_bus, struct pl08x_bus_data **mbus,
-        struct pl08x_bus_data **sbus, u32 cctl)
+static void pl08x_choose_master_bus(struct pl08x_lli_build_data *bd,
+        struct pl08x_bus_data **mbus, struct pl08x_bus_data **sbus, u32 cctl)
 {
         if (!(cctl & PL080_CONTROL_DST_INCR)) {
-                *mbus = src_bus;
-                *sbus = dst_bus;
+                *mbus = &bd->srcbus;
+                *sbus = &bd->dstbus;
         } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
-                *mbus = dst_bus;
-                *sbus = src_bus;
+                *mbus = &bd->dstbus;
+                *sbus = &bd->srcbus;
         } else {
-                if (dst_bus->buswidth == 4) {
-                        *mbus = dst_bus;
-                        *sbus = src_bus;
-                } else if (src_bus->buswidth == 4) {
-                        *mbus = src_bus;
-                        *sbus = dst_bus;
-                } else if (dst_bus->buswidth == 2) {
-                        *mbus = dst_bus;
-                        *sbus = src_bus;
-                } else if (src_bus->buswidth == 2) {
-                        *mbus = src_bus;
-                        *sbus = dst_bus;
+                if (bd->dstbus.buswidth == 4) {
+                        *mbus = &bd->dstbus;
+                        *sbus = &bd->srcbus;
+                } else if (bd->srcbus.buswidth == 4) {
+                        *mbus = &bd->srcbus;
+                        *sbus = &bd->dstbus;
+                } else if (bd->dstbus.buswidth == 2) {
+                        *mbus = &bd->dstbus;
+                        *sbus = &bd->srcbus;
+                } else if (bd->srcbus.buswidth == 2) {
+                        *mbus = &bd->srcbus;
+                        *sbus = &bd->dstbus;
                 } else {
-                        /* src_bus->buswidth == 1 */
-                        *mbus = dst_bus;
-                        *sbus = src_bus;
+                        /* bd->srcbus.buswidth == 1 */
+                        *mbus = &bd->dstbus;
+                        *sbus = &bd->srcbus;
                 }
         }
 }
 
 /*
- * Fills in one LLI for a certain transfer descriptor
- * and advance the counter
+ * Fills in one LLI for a certain transfer descriptor and advance the counter
  */
-int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
-                            struct pl08x_txd *txd, int num_llis, int len,
-                            u32 cctl, u32 *remainder)
+static void pl08x_fill_lli_for_desc(struct pl08x_lli_build_data *bd,
+        int num_llis, int len, u32 cctl)
 {
-        struct lli *llis_va = txd->llis_va;
-        struct lli *llis_bus = (struct lli *) txd->llis_bus;
+        struct pl08x_lli *llis_va = bd->txd->llis_va;
+        dma_addr_t llis_bus = bd->txd->llis_bus;
 
         BUG_ON(num_llis >= MAX_NUM_TSFR_LLIS);
 
-        llis_va[num_llis].cctl          = cctl;
-        llis_va[num_llis].src           = txd->srcbus.addr;
-        llis_va[num_llis].dst           = txd->dstbus.addr;
-
-        /*
-         * On versions with dual masters, you can optionally AND on
-         * PL080_LLI_LM_AHB2 to the LLI to tell the hardware to read
-         * in new LLIs with that controller, but we always try to
-         * choose AHB1 to point into memory. The idea is to have AHB2
-         * fixed on the peripheral and AHB1 messing around in the
-         * memory. So we don't manipulate this bit currently.
-         */
-
-        llis_va[num_llis].next =
-                (dma_addr_t)((u32) &(llis_bus[num_llis + 1]));
+        llis_va[num_llis].cctl = cctl;
+        llis_va[num_llis].src = bd->srcbus.addr;
+        llis_va[num_llis].dst = bd->dstbus.addr;
+        llis_va[num_llis].lli = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
+        if (bd->pl08x->lli_buses & PL08X_AHB2)
+                llis_va[num_llis].lli |= PL080_LLI_LM_AHB2;
 
         if (cctl & PL080_CONTROL_SRC_INCR)
-                txd->srcbus.addr += len;
+                bd->srcbus.addr += len;
         if (cctl & PL080_CONTROL_DST_INCR)
-                txd->dstbus.addr += len;
+                bd->dstbus.addr += len;
 
-        *remainder -= len;
+        BUG_ON(bd->remainder < len);
 
-        return num_llis + 1;
+        bd->remainder -= len;
 }
 
 /*
- * Return number of bytes to fill to boundary, or len
+ * Return number of bytes to fill to boundary, or len.
+ * This calculation works for any value of addr.
  */
-static inline u32 pl08x_pre_boundary(u32 addr, u32 len)
+static inline size_t pl08x_pre_boundary(u32 addr, size_t len)
 {
-        u32 boundary;
-
-        boundary = ((addr >> PL08X_BOUNDARY_SHIFT) + 1)
-                << PL08X_BOUNDARY_SHIFT;
+        size_t boundary_len = PL08X_BOUNDARY_SIZE -
+                        (addr & (PL08X_BOUNDARY_SIZE - 1));
 
-        if (boundary < addr + len)
-                return boundary - addr;
-        else
-                return len;
+        return min(boundary_len, len);
 }
 
 /*
@@ -608,20 +571,13 @@ static inline u32 pl08x_pre_boundary(u32 addr, u32 len)
 static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                               struct pl08x_txd *txd)
 {
-        struct pl08x_channel_data *cd = txd->cd;
         struct pl08x_bus_data *mbus, *sbus;
-        u32 remainder;
+        struct pl08x_lli_build_data bd;
         int num_llis = 0;
         u32 cctl;
-        int max_bytes_per_lli;
-        int total_bytes = 0;
-        struct lli *llis_va;
-        struct lli *llis_bus;
-
-        if (!txd) {
-                dev_err(&pl08x->adev->dev, "%s no descriptor\n", __func__);
-                return 0;
-        }
+        size_t max_bytes_per_lli;
+        size_t total_bytes = 0;
+        struct pl08x_lli *llis_va;
 
         txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT,
                                       &txd->llis_bus);
@@ -632,121 +588,79 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 
         pl08x->pool_ctr++;
 
-        /*
-         * Initialize bus values for this transfer
-         * from the passed optimal values
-         */
-        if (!cd) {
-                dev_err(&pl08x->adev->dev, "%s no channel data\n", __func__);
-                return 0;
-        }
+        /* Get the default CCTL */
+        cctl = txd->cctl;
 
-        /* Get the default CCTL from the platform data */
-        cctl = cd->cctl;
-
-        /*
-         * On the PL080 we have two bus masters and we
-         * should select one for source and one for
-         * destination. We try to use AHB2 for the
-         * bus which does not increment (typically the
-         * peripheral) else we just choose something.
-         */
-        cctl &= ~(PL080_CONTROL_DST_AHB2 | PL080_CONTROL_SRC_AHB2);
-        if (pl08x->vd->dualmaster) {
-                if (cctl & PL080_CONTROL_SRC_INCR)
-                        /* Source increments, use AHB2 for destination */
-                        cctl |= PL080_CONTROL_DST_AHB2;
-                else if (cctl & PL080_CONTROL_DST_INCR)
-                        /* Destination increments, use AHB2 for source */
-                        cctl |= PL080_CONTROL_SRC_AHB2;
-                else
-                        /* Just pick something, source AHB1 dest AHB2 */
-                        cctl |= PL080_CONTROL_DST_AHB2;
-        }
+        bd.txd = txd;
+        bd.pl08x = pl08x;
+        bd.srcbus.addr = txd->src_addr;
+        bd.dstbus.addr = txd->dst_addr;
 
         /* Find maximum width of the source bus */
-        txd->srcbus.maxwidth =
+        bd.srcbus.maxwidth =
                 pl08x_get_bytes_for_cctl((cctl & PL080_CONTROL_SWIDTH_MASK) >>
                                        PL080_CONTROL_SWIDTH_SHIFT);
 
         /* Find maximum width of the destination bus */
-        txd->dstbus.maxwidth =
+        bd.dstbus.maxwidth =
                 pl08x_get_bytes_for_cctl((cctl & PL080_CONTROL_DWIDTH_MASK) >>
                                        PL080_CONTROL_DWIDTH_SHIFT);
 
         /* Set up the bus widths to the maximum */
-        txd->srcbus.buswidth = txd->srcbus.maxwidth;
-        txd->dstbus.buswidth = txd->dstbus.maxwidth;
+        bd.srcbus.buswidth = bd.srcbus.maxwidth;
+        bd.dstbus.buswidth = bd.dstbus.maxwidth;
         dev_vdbg(&pl08x->adev->dev,
                  "%s source bus is %d bytes wide, dest bus is %d bytes wide\n",
-                 __func__, txd->srcbus.buswidth, txd->dstbus.buswidth);
+                 __func__, bd.srcbus.buswidth, bd.dstbus.buswidth);
 
 
         /*
          * Bytes transferred == tsize * MIN(buswidths), not max(buswidths)
          */
-        max_bytes_per_lli = min(txd->srcbus.buswidth, txd->dstbus.buswidth) *
+        max_bytes_per_lli = min(bd.srcbus.buswidth, bd.dstbus.buswidth) *
                 PL080_CONTROL_TRANSFER_SIZE_MASK;
         dev_vdbg(&pl08x->adev->dev,
-                 "%s max bytes per lli = %d\n",
+                 "%s max bytes per lli = %zu\n",
                  __func__, max_bytes_per_lli);
 
         /* We need to count this down to zero */
-        remainder = txd->len;
+        bd.remainder = txd->len;
         dev_vdbg(&pl08x->adev->dev,
-                 "%s remainder = %d\n",
-                 __func__, remainder);
+                 "%s remainder = %zu\n",
+                 __func__, bd.remainder);
 
         /*
          * Choose bus to align to
          * - prefers destination bus if both available
          * - if fixed address on one bus chooses other
-         * - modifies cctl to choose an apropriate master
-         */
-        pl08x_choose_master_bus(&txd->srcbus, &txd->dstbus,
-                                &mbus, &sbus, cctl);
-
-
-        /*
-         * The lowest bit of the LLI register
-         * is also used to indicate which master to
-         * use for reading the LLIs.
          */
+        pl08x_choose_master_bus(&bd, &mbus, &sbus, cctl);
 
         if (txd->len < mbus->buswidth) {
-                /*
-                 * Less than a bus width available
-                 * - send as single bytes
-                 */
-                while (remainder) {
+                /* Less than a bus width available - send as single bytes */
+                while (bd.remainder) {
                         dev_vdbg(&pl08x->adev->dev,
                                  "%s single byte LLIs for a transfer of "
-                                 "less than a bus width (remain %08x)\n",
-                                 __func__, remainder);
+                                 "less than a bus width (remain 0x%08x)\n",
+                                 __func__, bd.remainder);
                         cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
-                        num_llis =
-                                pl08x_fill_lli_for_desc(pl08x, txd, num_llis, 1,
-                                        cctl, &remainder);
+                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
                         total_bytes++;
                 }
         } else {
-                /*
-                 *  Make one byte LLIs until master bus is aligned
-                 *  - slave will then be aligned also
-                 */
+                /* Make one byte LLIs until master bus is aligned */
                 while ((mbus->addr) % (mbus->buswidth)) {
                         dev_vdbg(&pl08x->adev->dev,
                                 "%s adjustment lli for less than bus width "
-                                 "(remain %08x)\n",
-                                 __func__, remainder);
+                                 "(remain 0x%08x)\n",
+                                 __func__, bd.remainder);
                         cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
-                        num_llis = pl08x_fill_lli_for_desc
-                                (pl08x, txd, num_llis, 1, cctl, &remainder);
+                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
                         total_bytes++;
                 }
 
                 /*
-                 *  Master now aligned
+                 * Master now aligned
                  * - if slave is not then we must set its width down
                  */
                 if (sbus->addr % sbus->buswidth) {
@@ -761,63 +675,51 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                  * Make largest possible LLIs until less than one bus
                  * width left
                  */
-                while (remainder > (mbus->buswidth - 1)) {
-                        int lli_len, target_len;
-                        int tsize;
-                        int odd_bytes;
+                while (bd.remainder > (mbus->buswidth - 1)) {
+                        size_t lli_len, target_len, tsize, odd_bytes;
 
                         /*
                          * If enough left try to send max possible,
                          * otherwise try to send the remainder
                          */
-                        target_len = remainder;
-                        if (remainder > max_bytes_per_lli)
-                                target_len = max_bytes_per_lli;
+                        target_len = min(bd.remainder, max_bytes_per_lli);
 
                         /*
-                         * Set bus lengths for incrementing busses
-                         * to number of bytes which fill to next memory
-                         * boundary
+                         * Set bus lengths for incrementing buses to the
+                         * number of bytes which fill to next memory boundary,
+                         * limiting on the target length calculated above.
                          */
                         if (cctl & PL080_CONTROL_SRC_INCR)
-                                txd->srcbus.fill_bytes =
-                                        pl08x_pre_boundary(
-                                                txd->srcbus.addr,
-                                                remainder);
+                                bd.srcbus.fill_bytes =
+                                        pl08x_pre_boundary(bd.srcbus.addr,
+                                                target_len);
                         else
-                                txd->srcbus.fill_bytes =
-                                        max_bytes_per_lli;
+                                bd.srcbus.fill_bytes = target_len;
 
                         if (cctl & PL080_CONTROL_DST_INCR)
-                                txd->dstbus.fill_bytes =
-                                        pl08x_pre_boundary(
-                                                txd->dstbus.addr,
-                                                remainder);
+                                bd.dstbus.fill_bytes =
+                                        pl08x_pre_boundary(bd.dstbus.addr,
+                                                target_len);
                         else
-                                txd->dstbus.fill_bytes =
-                                                max_bytes_per_lli;
+                                bd.dstbus.fill_bytes = target_len;
 
-                        /*
-                         *  Find the nearest
-                         */
-                        lli_len = min(txd->srcbus.fill_bytes,
-                                txd->dstbus.fill_bytes);
+                        /* Find the nearest */
+                        lli_len = min(bd.srcbus.fill_bytes,
+                                      bd.dstbus.fill_bytes);
 
-                        BUG_ON(lli_len > remainder);
+                        BUG_ON(lli_len > bd.remainder);
 
                         if (lli_len <= 0) {
                                 dev_err(&pl08x->adev->dev,
-                                        "%s lli_len is %d, <= 0\n",
+                                        "%s lli_len is %zu, <= 0\n",
                                                 __func__, lli_len);
                                 return 0;
                         }
 
                         if (lli_len == target_len) {
                                 /*
-                                 * Can send what we wanted
-                                 */
-                                /*
-                                 *  Maintain alignment
+                                 * Can send what we wanted.
+                                 * Maintain alignment
                                  */
                                 lli_len = (lli_len/mbus->buswidth) *
                                                         mbus->buswidth;
@@ -825,17 +727,14 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                         } else {
                                 /*
                                  * So now we know how many bytes to transfer
-                                 * to get to the nearest boundary
-                                 * The next lli will past the boundary
-                                 * - however we may be working to a boundary
-                                 *   on the slave bus
-                                 *   We need to ensure the master stays aligned
+                                 * to get to the nearest boundary.  The next
+                                 * LLI will past the boundary.  However, we
+                                 * may be working to a boundary on the slave
+                                 * bus.  We need to ensure the master stays
+                                 * aligned, and that we are working in
+                                 * multiples of the bus widths.
                                  */
                                 odd_bytes = lli_len % mbus->buswidth;
-                                /*
-                                 * - and that we are working in multiples
-                                 *   of the bus widths
-                                 */
                                 lli_len -= odd_bytes;
 
                         }
@@ -855,41 +754,38 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 
                                 if (target_len != lli_len) {
                                         dev_vdbg(&pl08x->adev->dev,
-                                        "%s can't send what we want. Desired %08x, lli of %08x bytes in txd of %08x\n",
+                                        "%s can't send what we want. Desired 0x%08zx, lli of 0x%08zx bytes in txd of 0x%08zx\n",
                                         __func__, target_len, lli_len, txd->len);
                                 }
 
                                 cctl = pl08x_cctl_bits(cctl,
-                                                       txd->srcbus.buswidth,
-                                                       txd->dstbus.buswidth,
+                                                       bd.srcbus.buswidth,
+                                                       bd.dstbus.buswidth,
                                                        tsize);
 
                                 dev_vdbg(&pl08x->adev->dev,
-                                        "%s fill lli with single lli chunk of size %08x (remainder %08x)\n",
-                                        __func__, lli_len, remainder);
-                                num_llis = pl08x_fill_lli_for_desc(pl08x, txd,
-                                                num_llis, lli_len, cctl,
-                                                &remainder);
+                                        "%s fill lli with single lli chunk of size 0x%08zx (remainder 0x%08zx)\n",
+                                        __func__, lli_len, bd.remainder);
+                                pl08x_fill_lli_for_desc(&bd, num_llis++,
+                                        lli_len, cctl);
                                 total_bytes += lli_len;
                         }
 
 
                         if (odd_bytes) {
                                 /*
-                                 * Creep past the boundary,
-                                 * maintaining master alignment
+                                 * Creep past the boundary, maintaining
+                                 * master alignment
                                  */
                                 int j;
                                 for (j = 0; (j < mbus->buswidth)
-                                                && (remainder); j++) {
+                                                && (bd.remainder); j++) {
                                         cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
                                         dev_vdbg(&pl08x->adev->dev,
-                                                "%s align with boundardy, single byte (remain %08x)\n",
-                                                __func__, remainder);
-                                        num_llis =
-                                                pl08x_fill_lli_for_desc(pl08x,
-                                                        txd, num_llis, 1,
-                                                        cctl, &remainder);
+                                                "%s align with boundary, single byte (remain 0x%08zx)\n",
+                                                __func__, bd.remainder);
+                                        pl08x_fill_lli_for_desc(&bd,
+                                                num_llis++, 1, cctl);
                                         total_bytes++;
                                 }
                         }
@@ -898,25 +794,18 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                 /*
                  * Send any odd bytes
                  */
-                if (remainder < 0) {
-                        dev_err(&pl08x->adev->dev, "%s remainder not fitted 0x%08x bytes\n",
-                                        __func__, remainder);
-                        return 0;
-                }
-
-                while (remainder) {
+                while (bd.remainder) {
                         cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
                         dev_vdbg(&pl08x->adev->dev,
-                                "%s align with boundardy, single odd byte (remain %d)\n",
-                                __func__, remainder);
-                        num_llis = pl08x_fill_lli_for_desc(pl08x, txd, num_llis,
-                                        1, cctl, &remainder);
+                                "%s align with boundary, single odd byte (remain %zu)\n",
+                                __func__, bd.remainder);
+                        pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl);
                         total_bytes++;
                 }
         }
         if (total_bytes != txd->len) {
                 dev_err(&pl08x->adev->dev,
-                        "%s size of encoded lli:s don't match total txd, transferred 0x%08x from size 0x%08x\n",
+                        "%s size of encoded lli:s don't match total txd, transferred 0x%08zx from size 0x%08zx\n",
                         __func__, total_bytes, txd->len);
                 return 0;
         }
@@ -927,41 +816,12 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
                         __func__, (u32) MAX_NUM_TSFR_LLIS);
                 return 0;
         }
-        /*
-         * Decide whether this is a loop or a terminated transfer
-         */
-        llis_va = txd->llis_va;
-        llis_bus = (struct lli *) txd->llis_bus;
 
-        if (cd->circular_buffer) {
-                /*
-                 * Loop the circular buffer so that the next element
-                 * points back to the beginning of the LLI.
-                 */
-                llis_va[num_llis - 1].next =
-                        (dma_addr_t)((unsigned int)&(llis_bus[0]));
-        } else {
-                /*
-                 * On non-circular buffers, the final LLI terminates
-                 * the LLI.
-                 */
-                llis_va[num_llis - 1].next = 0;
-                /*
-                 * The final LLI element shall also fire an interrupt
-                 */
-                llis_va[num_llis - 1].cctl |= PL080_CONTROL_TC_IRQ_EN;
-        }
-
-        /* Now store the channel register values */
-        txd->csrc = llis_va[0].src;
-        txd->cdst = llis_va[0].dst;
-        if (num_llis > 1)
-                txd->clli = llis_va[0].next;
-        else
-                txd->clli = 0;
-
-        txd->cctl = llis_va[0].cctl;
-        /* ccfg will be set at physical channel allocation time */
+        llis_va = txd->llis_va;
+        /* The final LLI terminates the LLI. */
+        llis_va[num_llis - 1].lli = 0;
+        /* The final LLI element shall also fire an interrupt. */
+        llis_va[num_llis - 1].cctl |= PL080_CONTROL_TC_IRQ_EN;
 
 #ifdef VERBOSE_DEBUG
         {
@@ -969,13 +829,13 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 
                 for (i = 0; i < num_llis; i++) {
                         dev_vdbg(&pl08x->adev->dev,
-                                 "lli %d @%p: csrc=%08x, cdst=%08x, cctl=%08x, clli=%08x\n",
+                                 "lli %d @%p: csrc=0x%08x, cdst=0x%08x, cctl=0x%08x, clli=0x%08x\n",
                                  i,
                                  &llis_va[i],
                                  llis_va[i].src,
                                  llis_va[i].dst,
                                  llis_va[i].cctl,
-                                 llis_va[i].next
+                                 llis_va[i].lli
                                 );
                 }
         }
@@ -988,14 +848,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
 static void pl08x_free_txd(struct pl08x_driver_data *pl08x,
                            struct pl08x_txd *txd)
 {
-        if (!txd)
-                dev_err(&pl08x->adev->dev,
-                        "%s no descriptor to free\n",
-                        __func__);
-
         /* Free the LLI */
-        dma_pool_free(pl08x->pool, txd->llis_va,
-                      txd->llis_bus);
+        dma_pool_free(pl08x->pool, txd->llis_va, txd->llis_bus);
 
         pl08x->pool_ctr--;
 
@@ -1008,13 +862,12 @@ static void pl08x_free_txd_list(struct pl08x_driver_data *pl08x,
         struct pl08x_txd *txdi = NULL;
         struct pl08x_txd *next;
 
-        if (!list_empty(&plchan->desc_list)) {
+        if (!list_empty(&plchan->pend_list)) {
                 list_for_each_entry_safe(txdi,
-                                         next, &plchan->desc_list, node) {
+                                         next, &plchan->pend_list, node) {
                         list_del(&txdi->node);
                         pl08x_free_txd(pl08x, txdi);
                 }
-
         }
 }
 
@@ -1069,6 +922,12 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
                         return -EBUSY;
                 }
                 ch->signal = ret;
+
+                /* Assign the flow control signal to this channel */
+                if (txd->direction == DMA_TO_DEVICE)
+                        txd->ccfg |= ch->signal << PL080_CONFIG_DST_SEL_SHIFT;
+                else if (txd->direction == DMA_FROM_DEVICE)
+                        txd->ccfg |= ch->signal << PL080_CONFIG_SRC_SEL_SHIFT;
         }
 
         dev_dbg(&pl08x->adev->dev, "allocated physical channel %d and signal %d for xfer on %s\n",
@@ -1076,19 +935,54 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
                  ch->signal,
                  plchan->name);
 
+        plchan->phychan_hold++;
         plchan->phychan = ch;
 
         return 0;
 }
 
+static void release_phy_channel(struct pl08x_dma_chan *plchan)
+{
+        struct pl08x_driver_data *pl08x = plchan->host;
+
+        if ((plchan->phychan->signal >= 0) && pl08x->pd->put_signal) {
+                pl08x->pd->put_signal(plchan);
+                plchan->phychan->signal = -1;
+        }
+        pl08x_put_phy_channel(pl08x, plchan->phychan);
+        plchan->phychan = NULL;
+}
+
 static dma_cookie_t pl08x_tx_submit(struct dma_async_tx_descriptor *tx)
 {
         struct pl08x_dma_chan *plchan = to_pl08x_chan(tx->chan);
+        struct pl08x_txd *txd = to_pl08x_txd(tx);
+        unsigned long flags;
 
-        atomic_inc(&plchan->last_issued);
-        tx->cookie = atomic_read(&plchan->last_issued);
-        /* This unlock follows the lock in the prep() function */
-        spin_unlock_irqrestore(&plchan->lock, plchan->lockflags);
+        spin_lock_irqsave(&plchan->lock, flags);
+
+        plchan->chan.cookie += 1;
+        if (plchan->chan.cookie < 0)
+                plchan->chan.cookie = 1;
+        tx->cookie = plchan->chan.cookie;
+
+        /* Put this onto the pending list */
+        list_add_tail(&txd->node, &plchan->pend_list);
+
+        /*
+         * If there was no physical channel available for this memcpy,
+         * stack the request up and indicate that the channel is waiting
+         * for a free physical channel.
+         */
+        if (!plchan->slave && !plchan->phychan) {
+                /* Do this memcpy whenever there is a channel ready */
+                plchan->state = PL08X_CHAN_WAITING;
+                plchan->waiting = txd;
+        } else {
+                plchan->phychan_hold--;
+        }
+
+        spin_unlock_irqrestore(&plchan->lock, flags);
 
         return tx->cookie;
 }
@@ -1102,10 +996,9 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_interrupt(
 }
 
 /*
- * Code accessing dma_async_is_complete() in a tight loop
- * may give problems - could schedule where indicated.
- * If slaves are relying on interrupts to signal completion this
- * function must not be called with interrupts disabled
+ * Code accessing dma_async_is_complete() in a tight loop may give problems.
+ * If slaves are relying on interrupts to signal completion this function
+ * must not be called with interrupts disabled.
  */
 static enum dma_status
 pl08x_dma_tx_status(struct dma_chan *chan,
@@ -1118,7 +1011,7 @@ pl08x_dma_tx_status(struct dma_chan *chan,
         enum dma_status ret;
         u32 bytesleft = 0;
 
-        last_used = atomic_read(&plchan->last_issued);
+        last_used = plchan->chan.cookie;
         last_complete = plchan->lc;
 
         ret = dma_async_is_complete(cookie, last_complete, last_used);
@@ -1128,13 +1021,9 @@ pl08x_dma_tx_status(struct dma_chan *chan,
         }
 
         /*
-         * schedule(); could be inserted here
-         */
-
-        /*
          * This cookie not complete yet
          */
-        last_used = atomic_read(&plchan->last_issued);
+        last_used = plchan->chan.cookie;
         last_complete = plchan->lc;
 
         /* Get number of bytes left in the active transactions and queue */
@@ -1199,37 +1088,35 @@ static const struct burst_table burst_sizes[] = {
         },
 };
 
-static void dma_set_runtime_config(struct dma_chan *chan,
-                               struct dma_slave_config *config)
+static int dma_set_runtime_config(struct dma_chan *chan,
+                                  struct dma_slave_config *config)
 {
         struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
         struct pl08x_driver_data *pl08x = plchan->host;
         struct pl08x_channel_data *cd = plchan->cd;
         enum dma_slave_buswidth addr_width;
+        dma_addr_t addr;
         u32 maxburst;
         u32 cctl = 0;
-        /* Mask out all except src and dst channel */
-        u32 ccfg = cd->ccfg & 0x000003DEU;
-        int i = 0;
+        int i;
+
+        if (!plchan->slave)
+                return -EINVAL;
 
         /* Transfer direction */
         plchan->runtime_direction = config->direction;
         if (config->direction == DMA_TO_DEVICE) {
-                plchan->runtime_addr = config->dst_addr;
-                cctl |= PL080_CONTROL_SRC_INCR;
-                ccfg |= PL080_FLOW_MEM2PER << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+                addr = config->dst_addr;
                 addr_width = config->dst_addr_width;
                 maxburst = config->dst_maxburst;
         } else if (config->direction == DMA_FROM_DEVICE) {
-                plchan->runtime_addr = config->src_addr;
-                cctl |= PL080_CONTROL_DST_INCR;
-                ccfg |= PL080_FLOW_PER2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+                addr = config->src_addr;
                 addr_width = config->src_addr_width;
                 maxburst = config->src_maxburst;
         } else {
                 dev_err(&pl08x->adev->dev,
                         "bad runtime_config: alien transfer direction\n");
-                return;
+                return -EINVAL;
         }
 
         switch (addr_width) {
@@ -1248,42 +1135,40 @@ static void dma_set_runtime_config(struct dma_chan *chan,
         default:
                 dev_err(&pl08x->adev->dev,
                         "bad runtime_config: alien address width\n");
-                return;
+                return -EINVAL;
         }
 
         /*
          * Now decide on a maxburst:
-         * If this channel will only request single transfers, set
-         * this down to ONE element.
+         * If this channel will only request single transfers, set this
+         * down to ONE element.  Also select one element if no maxburst
+         * is specified.
          */
-        if (plchan->cd->single) {
+        if (plchan->cd->single || maxburst == 0) {
                 cctl |= (PL080_BSIZE_1 << PL080_CONTROL_SB_SIZE_SHIFT) |
                         (PL080_BSIZE_1 << PL080_CONTROL_DB_SIZE_SHIFT);
         } else {
-                while (i < ARRAY_SIZE(burst_sizes)) {
+                for (i = 0; i < ARRAY_SIZE(burst_sizes); i++)
                         if (burst_sizes[i].burstwords <= maxburst)
                                 break;
-                        i++;
-                }
                 cctl |= burst_sizes[i].reg;
         }
 
-        /* Access the cell in privileged mode, non-bufferable, non-cacheable */
-        cctl &= ~PL080_CONTROL_PROT_MASK;
-        cctl |= PL080_CONTROL_PROT_SYS;
+        plchan->runtime_addr = addr;
 
         /* Modify the default channel data to fit PrimeCell request */
         cd->cctl = cctl;
-        cd->ccfg = ccfg;
 
         dev_dbg(&pl08x->adev->dev,
                 "configured channel %s (%s) for %s, data width %d, "
-                "maxburst %d words, LE, CCTL=%08x, CCFG=%08x\n",
+                "maxburst %d words, LE, CCTL=0x%08x\n",
                 dma_chan_name(chan), plchan->name,
                 (config->direction == DMA_FROM_DEVICE) ? "RX" : "TX",
                 addr_width,
                 maxburst,
-                cctl, ccfg);
+                cctl);
+
+        return 0;
 }
 
 /*
@@ -1293,35 +1178,26 @@ static void dma_set_runtime_config(struct dma_chan *chan,
 static void pl08x_issue_pending(struct dma_chan *chan)
 {
         struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
-        struct pl08x_driver_data *pl08x = plchan->host;
         unsigned long flags;
 
         spin_lock_irqsave(&plchan->lock, flags);
-        /* Something is already active */
-        if (plchan->at) {
-                        spin_unlock_irqrestore(&plchan->lock, flags);
-                        return;
-        }
-
-        /* Didn't get a physical channel so waiting for it ... */
-        if (plchan->state == PL08X_CHAN_WAITING)
+        /* Something is already active, or we're waiting for a channel... */
+        if (plchan->at || plchan->state == PL08X_CHAN_WAITING) {
+                spin_unlock_irqrestore(&plchan->lock, flags);
                 return;
+        }
 
         /* Take the first element in the queue and execute it */
-        if (!list_empty(&plchan->desc_list)) {
+        if (!list_empty(&plchan->pend_list)) {
                 struct pl08x_txd *next;
 
-                next = list_first_entry(&plchan->desc_list,
+                next = list_first_entry(&plchan->pend_list,
                                         struct pl08x_txd,
                                         node);
                 list_del(&next->node);
-                plchan->at = next;
                 plchan->state = PL08X_CHAN_RUNNING;
 
-                /* Configure the physical channel for the active txd */
-                pl08x_config_phychan_for_txd(plchan);
-                pl08x_set_cregs(pl08x, plchan->phychan);
-                pl08x_enable_phy_chan(pl08x, plchan->phychan);
+                pl08x_start_txd(plchan, next);
         }
 
         spin_unlock_irqrestore(&plchan->lock, flags);
@@ -1330,30 +1206,17 @@ static void pl08x_issue_pending(struct dma_chan *chan)
 static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
                                         struct pl08x_txd *txd)
 {
-        int num_llis;
         struct pl08x_driver_data *pl08x = plchan->host;
-        int ret;
+        unsigned long flags;
+        int num_llis, ret;
 
         num_llis = pl08x_fill_llis_for_desc(pl08x, txd);
-
-        if (!num_llis)
+        if (!num_llis) {
+                kfree(txd);
                 return -EINVAL;
+        }
 
-        spin_lock_irqsave(&plchan->lock, plchan->lockflags);
-
-        /*
-         * If this device is not using a circular buffer then
-         * queue this new descriptor for transfer.
-         * The descriptor for a circular buffer continues
-         * to be used until the channel is freed.
-         */
-        if (txd->cd->circular_buffer)
-                dev_err(&pl08x->adev->dev,
-                        "%s attempting to queue a circular buffer\n",
-                        __func__);
-        else
-                list_add_tail(&txd->node,
-                              &plchan->desc_list);
+        spin_lock_irqsave(&plchan->lock, flags);
 
         /*
          * See if we already have a physical channel allocated,
@@ -1362,45 +1225,74 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
         ret = prep_phy_channel(plchan, txd);
         if (ret) {
                 /*
-                 * No physical channel available, we will
-                 * stack up the memcpy channels until there is a channel
-                 * available to handle it whereas slave transfers may
-                 * have been denied due to platform channel muxing restrictions
-                 * and since there is no guarantee that this will ever be
-                 * resolved, and since the signal must be aquired AFTER
-                 * aquiring the physical channel, we will let them be NACK:ed
-                 * with -EBUSY here. The drivers can alway retry the prep()
-                 * call if they are eager on doing this using DMA.
+                 * No physical channel was available.
+                 *
+                 * memcpy transfers can be sorted out at submission time.
+                 *
+                 * Slave transfers may have been denied due to platform
+                 * channel muxing restrictions.  Since there is no guarantee
+                 * that this will ever be resolved, and the signal must be
+                 * acquired AFTER acquiring the physical channel, we will let
+                 * them be NACK:ed with -EBUSY here. The drivers can retry
+                 * the prep() call if they are eager on doing this using DMA.
                  */
                 if (plchan->slave) {
                         pl08x_free_txd_list(pl08x, plchan);
-                        spin_unlock_irqrestore(&plchan->lock, plchan->lockflags);
+                        pl08x_free_txd(pl08x, txd);
+                        spin_unlock_irqrestore(&plchan->lock, flags);
                         return -EBUSY;
                 }
-                /* Do this memcpy whenever there is a channel ready */
-                plchan->state = PL08X_CHAN_WAITING;
-                plchan->waiting = txd;
         } else
                 /*
-                 * Else we're all set, paused and ready to roll,
-                 * status will switch to PL08X_CHAN_RUNNING when
-                 * we call issue_pending(). If there is something
-                 * running on the channel already we don't change
-                 * its state.
+                 * Else we're all set, paused and ready to roll, status
+                 * will switch to PL08X_CHAN_RUNNING when we call
+                 * issue_pending(). If there is something running on the
+                 * channel already we don't change its state.
                  */
                 if (plchan->state == PL08X_CHAN_IDLE)
                         plchan->state = PL08X_CHAN_PAUSED;
 
-        /*
-         * Notice that we leave plchan->lock locked on purpose:
-         * it will be unlocked in the subsequent tx_submit()
-         * call. This is a consequence of the current API.
-         */
+        spin_unlock_irqrestore(&plchan->lock, flags);
 
         return 0;
 }
 
 /*
+ * Given the source and destination available bus masks, select which
+ * will be routed to each port.  We try to have source and destination
+ * on separate ports, but always respect the allowable settings.
+ */
+static u32 pl08x_select_bus(struct pl08x_driver_data *pl08x, u8 src, u8 dst)
+{
+        u32 cctl = 0;
+
+        if (!(dst & PL08X_AHB1) || ((dst & PL08X_AHB2) && (src & PL08X_AHB1)))
+                cctl |= PL080_CONTROL_DST_AHB2;
+        if (!(src & PL08X_AHB1) || ((src & PL08X_AHB2) && !(dst & PL08X_AHB2)))
+                cctl |= PL080_CONTROL_SRC_AHB2;
+
+        return cctl;
+}
+
+static struct pl08x_txd *pl08x_get_txd(struct pl08x_dma_chan *plchan,
+        unsigned long flags)
+{
+        struct pl08x_txd *txd = kzalloc(sizeof(struct pl08x_txd), GFP_NOWAIT);
+
+        if (txd) {
+                dma_async_tx_descriptor_init(&txd->tx, &plchan->chan);
+                txd->tx.flags = flags;
+                txd->tx.tx_submit = pl08x_tx_submit;
+                INIT_LIST_HEAD(&txd->node);
+
+                /* Always enable error and terminal interrupts */
+                txd->ccfg = PL080_CONFIG_ERR_IRQ_MASK |
+                            PL080_CONFIG_TC_IRQ_MASK;
+        }
+        return txd;
+}
+
+/*
  * Initialize a descriptor to be used by memcpy submit
  */
 static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(
@@ -1412,40 +1304,38 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(
         struct pl08x_txd *txd;
         int ret;
 
-        txd = kzalloc(sizeof(struct pl08x_txd), GFP_NOWAIT);
+        txd = pl08x_get_txd(plchan, flags);
         if (!txd) {
                 dev_err(&pl08x->adev->dev,
                         "%s no memory for descriptor\n", __func__);
                 return NULL;
         }
 
-        dma_async_tx_descriptor_init(&txd->tx, chan);
         txd->direction = DMA_NONE;
-        txd->srcbus.addr = src;
-        txd->dstbus.addr = dest;
+        txd->src_addr = src;
+        txd->dst_addr = dest;
+        txd->len = len;
 
         /* Set platform data for m2m */
-        txd->cd = &pl08x->pd->memcpy_channel;
+        txd->ccfg |= PL080_FLOW_MEM2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+        txd->cctl = pl08x->pd->memcpy_channel.cctl &
+                        ~(PL080_CONTROL_DST_AHB2 | PL080_CONTROL_SRC_AHB2);
+
         /* Both to be incremented or the code will break */
-        txd->cd->cctl |= PL080_CONTROL_SRC_INCR | PL080_CONTROL_DST_INCR;
-        txd->tx.tx_submit = pl08x_tx_submit;
-        txd->tx.callback = NULL;
-        txd->tx.callback_param = NULL;
-        txd->len = len;
+        txd->cctl |= PL080_CONTROL_SRC_INCR | PL080_CONTROL_DST_INCR;
+
+        if (pl08x->vd->dualmaster)
+                txd->cctl |= pl08x_select_bus(pl08x,
+                                        pl08x->mem_buses, pl08x->mem_buses);
 
-        INIT_LIST_HEAD(&txd->node);
         ret = pl08x_prep_channel_resources(plchan, txd);
         if (ret)
                 return NULL;
-        /*
-         * NB: the channel lock is held at this point so tx_submit()
-         * must be called in direct succession.
-         */
 
         return &txd->tx;
 }
 
-struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
+static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
                 struct dma_chan *chan, struct scatterlist *sgl,
                 unsigned int sg_len, enum dma_data_direction direction,
                 unsigned long flags)
@@ -1453,6 +1343,7 @@ struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
         struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
         struct pl08x_driver_data *pl08x = plchan->host;
         struct pl08x_txd *txd;
+        u8 src_buses, dst_buses;
         int ret;
 
         /*
@@ -1467,14 +1358,12 @@ struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
         dev_dbg(&pl08x->adev->dev, "%s prepare transaction of %d bytes from %s\n",
                 __func__, sgl->length, plchan->name);
 
-        txd = kzalloc(sizeof(struct pl08x_txd), GFP_NOWAIT);
+        txd = pl08x_get_txd(plchan, flags);
         if (!txd) {
                 dev_err(&pl08x->adev->dev, "%s no txd\n", __func__);
                 return NULL;
         }
 
-        dma_async_tx_descriptor_init(&txd->tx, chan);
-
         if (direction != plchan->runtime_direction)
                 dev_err(&pl08x->adev->dev, "%s DMA setup does not match "
                         "the direction configured for the PrimeCell\n",
@@ -1486,37 +1375,47 @@ struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
          * channel target address dynamically at runtime.
          */
         txd->direction = direction;
+        txd->len = sgl->length;
+
+        txd->cctl = plchan->cd->cctl &
+                        ~(PL080_CONTROL_SRC_AHB2 | PL080_CONTROL_DST_AHB2 |
+                          PL080_CONTROL_SRC_INCR | PL080_CONTROL_DST_INCR |
+                          PL080_CONTROL_PROT_MASK);
+
+        /* Access the cell in privileged mode, non-bufferable, non-cacheable */
+        txd->cctl |= PL080_CONTROL_PROT_SYS;
+
         if (direction == DMA_TO_DEVICE) {
-                txd->srcbus.addr = sgl->dma_address;
+                txd->ccfg |= PL080_FLOW_MEM2PER << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+                txd->cctl |= PL080_CONTROL_SRC_INCR;
+                txd->src_addr = sgl->dma_address;
                 if (plchan->runtime_addr)
-                        txd->dstbus.addr = plchan->runtime_addr;
+                        txd->dst_addr = plchan->runtime_addr;
                 else
-                        txd->dstbus.addr = plchan->cd->addr;
+                        txd->dst_addr = plchan->cd->addr;
+                src_buses = pl08x->mem_buses;
+                dst_buses = plchan->cd->periph_buses;
         } else if (direction == DMA_FROM_DEVICE) {
+                txd->ccfg |= PL080_FLOW_PER2MEM << PL080_CONFIG_FLOW_CONTROL_SHIFT;
+                txd->cctl |= PL080_CONTROL_DST_INCR;
                 if (plchan->runtime_addr)
-                        txd->srcbus.addr = plchan->runtime_addr;
+                        txd->src_addr = plchan->runtime_addr;
                 else
-                        txd->srcbus.addr = plchan->cd->addr;
-                txd->dstbus.addr = sgl->dma_address;
+                        txd->src_addr = plchan->cd->addr;
+                txd->dst_addr = sgl->dma_address;
+                src_buses = plchan->cd->periph_buses;
+                dst_buses = pl08x->mem_buses;
         } else {
                 dev_err(&pl08x->adev->dev,
                         "%s direction unsupported\n", __func__);
                 return NULL;
         }
-        txd->cd = plchan->cd;
-        txd->tx.tx_submit = pl08x_tx_submit;
-        txd->tx.callback = NULL;
-        txd->tx.callback_param = NULL;
-        txd->len = sgl->length;
-        INIT_LIST_HEAD(&txd->node);
+
+        txd->cctl |= pl08x_select_bus(pl08x, src_buses, dst_buses);
 
         ret = pl08x_prep_channel_resources(plchan, txd);
         if (ret)
                 return NULL;
-        /*
-         * NB: the channel lock is held at this point so tx_submit()
-         * must be called in direct succession.
-         */
 
         return &txd->tx;
 }
@@ -1531,10 +1430,8 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 
         /* Controls applicable to inactive channels */
         if (cmd == DMA_SLAVE_CONFIG) {
-                dma_set_runtime_config(chan,
-                                       (struct dma_slave_config *)
-                                       arg);
-                return 0;
+                return dma_set_runtime_config(chan,
+                                              (struct dma_slave_config *)arg);
         }
 
         /*
@@ -1558,16 +1455,8 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                          * Mark physical channel as free and free any slave
                          * signal
                          */
-                        if ((plchan->phychan->signal >= 0) &&
-                            pl08x->pd->put_signal) {
-                                pl08x->pd->put_signal(plchan);
-                                plchan->phychan->signal = -1;
-                        }
-                        pl08x_put_phy_channel(pl08x, plchan->phychan);
-                        plchan->phychan = NULL;
+                        release_phy_channel(plchan);
                 }
-                /* Stop any pending tasklet */
-                tasklet_disable(&plchan->tasklet);
                 /* Dequeue jobs and free LLIs */
                 if (plchan->at) {
                         pl08x_free_txd(pl08x, plchan->at);
@@ -1609,10 +1498,9 @@ bool pl08x_filter_id(struct dma_chan *chan, void *chan_id)
 
 /*
  * Just check that the device is there and active
- * TODO: turn this bit on/off depending on the number of
- * physical channels actually used, if it is zero... well
- * shut it off. That will save some power. Cut the clock
- * at the same time.
+ * TODO: turn this bit on/off depending on the number of physical channels
+ * actually used, if it is zero... well shut it off. That will save some
+ * power. Cut the clock at the same time.
  */
 static void pl08x_ensure_on(struct pl08x_driver_data *pl08x)
 {
@@ -1620,78 +1508,66 @@ static void pl08x_ensure_on(struct pl08x_driver_data *pl08x)
 
         val = readl(pl08x->base + PL080_CONFIG);
         val &= ~(PL080_CONFIG_M2_BE | PL080_CONFIG_M1_BE | PL080_CONFIG_ENABLE);
-        /* We implictly clear bit 1 and that means little-endian mode */
+        /* We implicitly clear bit 1 and that means little-endian mode */
         val |= PL080_CONFIG_ENABLE;
         writel(val, pl08x->base + PL080_CONFIG);
 }
 
+static void pl08x_unmap_buffers(struct pl08x_txd *txd)
+{
+        struct device *dev = txd->tx.chan->device->dev;
+
+        if (!(txd->tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
+                if (txd->tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)
+                        dma_unmap_single(dev, txd->src_addr, txd->len,
+                                DMA_TO_DEVICE);
+                else
+                        dma_unmap_page(dev, txd->src_addr, txd->len,
+                                DMA_TO_DEVICE);
+        }
+        if (!(txd->tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
+                if (txd->tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)
+                        dma_unmap_single(dev, txd->dst_addr, txd->len,
+                                DMA_FROM_DEVICE);
+                else
+                        dma_unmap_page(dev, txd->dst_addr, txd->len,
+                                DMA_FROM_DEVICE);
+        }
+}
+
 static void pl08x_tasklet(unsigned long data)
 {
         struct pl08x_dma_chan *plchan = (struct pl08x_dma_chan *) data;
-        struct pl08x_phy_chan *phychan = plchan->phychan;
         struct pl08x_driver_data *pl08x = plchan->host;
+        struct pl08x_txd *txd;
+        unsigned long flags;
 
-        if (!plchan)
-                BUG();
-
-        spin_lock(&plchan->lock);
-
-        if (plchan->at) {
-                dma_async_tx_callback callback =
-                        plchan->at->tx.callback;
-                void *callback_param =
-                        plchan->at->tx.callback_param;
-
-                /*
-                 * Update last completed
-                 */
-                plchan->lc =
-                        (plchan->at->tx.cookie);
-
-                /*
-                 * Callback to signal completion
-                 */
-                if (callback)
-                        callback(callback_param);
+        spin_lock_irqsave(&plchan->lock, flags);
 
-                /*
-                 * Device callbacks should NOT clear
-                 * the current transaction on the channel
-                 * Linus: sometimes they should?
-                 */
-                if (!plchan->at)
-                        BUG();
+        txd = plchan->at;
+        plchan->at = NULL;
 
-                /*
-                 * Free the descriptor if it's not for a device
-                 * using a circular buffer
-                 */
-                if (!plchan->at->cd->circular_buffer) {
-                        pl08x_free_txd(pl08x, plchan->at);
-                        plchan->at = NULL;
-                }
-                /*
-                 * else descriptor for circular
-                 * buffers only freed when
-                 * client has disabled dma
-                 */
+        if (txd) {
+                /* Update last completed */
+                plchan->lc = txd->tx.cookie;
         }
-        /*
-         * If a new descriptor is queued, set it up
-         * plchan->at is NULL here
-         */
-        if (!list_empty(&plchan->desc_list)) {
+
+        /* If a new descriptor is queued, set it up plchan->at is NULL here */
+        if (!list_empty(&plchan->pend_list)) {
                 struct pl08x_txd *next;
 
-                next = list_first_entry(&plchan->desc_list,
+                next = list_first_entry(&plchan->pend_list,
                                         struct pl08x_txd,
                                         node);
                 list_del(&next->node);
-                plchan->at = next;
-                /* Configure the physical channel for the next txd */
-                pl08x_config_phychan_for_txd(plchan);
-                pl08x_set_cregs(pl08x, plchan->phychan);
-                pl08x_enable_phy_chan(pl08x, plchan->phychan);
+
+                pl08x_start_txd(plchan, next);
+        } else if (plchan->phychan_hold) {
+                /*
+                 * This channel is still in use - we have a new txd being
+                 * prepared and will soon be queued.  Don't give up the
+                 * physical channel.
+                 */
         } else {
                 struct pl08x_dma_chan *waiting = NULL;
 
@@ -1699,20 +1575,14 @@ static void pl08x_tasklet(unsigned long data)
                  * No more jobs, so free up the physical channel
                  * Free any allocated signal on slave transfers too
                  */
-                if ((phychan->signal >= 0) && pl08x->pd->put_signal) {
-                        pl08x->pd->put_signal(plchan);
-                        phychan->signal = -1;
-                }
-                pl08x_put_phy_channel(pl08x, phychan);
-                plchan->phychan = NULL;
+                release_phy_channel(plchan);
                 plchan->state = PL08X_CHAN_IDLE;
 
                 /*
-                 * And NOW before anyone else can grab that free:d
-                 * up physical channel, see if there is some memcpy
-                 * pending that seriously needs to start because of
-                 * being stacked up while we were choking the
-                 * physical channels with data.
+                 * And NOW before anyone else can grab that free:d up
+                 * physical channel, see if there is some memcpy pending
+                 * that seriously needs to start because of being stacked
+                 * up while we were choking the physical channels with data.
                  */
                 list_for_each_entry(waiting, &pl08x->memcpy.channels,
                                     chan.device_node) {
@@ -1724,6 +1594,7 @@ static void pl08x_tasklet(unsigned long data)
                                 ret = prep_phy_channel(waiting,
                                                        waiting->waiting);
                                 BUG_ON(ret);
+                                waiting->phychan_hold--;
                                 waiting->state = PL08X_CHAN_RUNNING;
                                 waiting->waiting = NULL;
                                 pl08x_issue_pending(&waiting->chan);
@@ -1732,7 +1603,25 @@ static void pl08x_tasklet(unsigned long data)
                 }
         }
 
-        spin_unlock(&plchan->lock);
+        spin_unlock_irqrestore(&plchan->lock, flags);
+
+        if (txd) {
+                dma_async_tx_callback callback = txd->tx.callback;
+                void *callback_param = txd->tx.callback_param;
+
+                /* Don't try to unmap buffers on slave channels */
+                if (!plchan->slave)
+                        pl08x_unmap_buffers(txd);
+
+                /* Free the descriptor */
+                spin_lock_irqsave(&plchan->lock, flags);
+                pl08x_free_txd(pl08x, txd);
+                spin_unlock_irqrestore(&plchan->lock, flags);
+
+                /* Callback to signal completion */
+                if (callback)
+                        callback(callback_param);
+        }
 }
 
 static irqreturn_t pl08x_irq(int irq, void *dev)
@@ -1744,9 +1633,7 @@ static irqreturn_t pl08x_irq(int irq, void *dev)
 
         val = readl(pl08x->base + PL080_ERR_STATUS);
         if (val) {
-                /*
-                 * An error interrupt (on one or more channels)
-                 */
+                /* An error interrupt (on one or more channels) */
                 dev_err(&pl08x->adev->dev,
                         "%s error interrupt, register value 0x%08x\n",
                                 __func__, val);
@@ -1770,9 +1657,7 @@ static irqreturn_t pl08x_irq(int irq, void *dev)
                         mask |= (1 << i);
                 }
         }
-        /*
-         * Clear only the terminal interrupts on channels we processed
-         */
+        /* Clear only the terminal interrupts on channels we processed */
         writel(mask, pl08x->base + PL080_TC_CLEAR);
 
         return mask ? IRQ_HANDLED : IRQ_NONE;
@@ -1791,6 +1676,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
         int i;
 
         INIT_LIST_HEAD(&dmadev->channels);
+
         /*
          * Register as many many memcpy as we have physical channels,
          * we won't always be able to use all but the code will have
@@ -1819,16 +1705,23 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
                                 return -ENOMEM;
                         }
                 }
+                if (chan->cd->circular_buffer) {
+                        dev_err(&pl08x->adev->dev,
+                                "channel %s: circular buffers not supported\n",
+                                chan->name);
+                        kfree(chan);
+                        continue;
+                }
                 dev_info(&pl08x->adev->dev,
                          "initialize virtual channel \"%s\"\n",
                          chan->name);
 
                 chan->chan.device = dmadev;
-                atomic_set(&chan->last_issued, 0);
-                chan->lc = atomic_read(&chan->last_issued);
+                chan->chan.cookie = 0;
+                chan->lc = 0;
 
                 spin_lock_init(&chan->lock);
-                INIT_LIST_HEAD(&chan->desc_list);
+                INIT_LIST_HEAD(&chan->pend_list);
                 tasklet_init(&chan->tasklet, pl08x_tasklet,
                              (unsigned long) chan);
 
@@ -1898,7 +1791,7 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data)
         seq_printf(s, "CHANNEL:\tSTATE:\n");
         seq_printf(s, "--------\t------\n");
         list_for_each_entry(chan, &pl08x->memcpy.channels, chan.device_node) {
-                seq_printf(s, "%s\t\t\%s\n", chan->name,
+                seq_printf(s, "%s\t\t%s\n", chan->name,
                            pl08x_state_str(chan->state));
         }
 
@@ -1906,7 +1799,7 @@ static int pl08x_debugfs_show(struct seq_file *s, void *data)
         seq_printf(s, "CHANNEL:\tSTATE:\n");
         seq_printf(s, "--------\t------\n");
         list_for_each_entry(chan, &pl08x->slave.channels, chan.device_node) {
-                seq_printf(s, "%s\t\t\%s\n", chan->name,
+                seq_printf(s, "%s\t\t%s\n", chan->name,
                            pl08x_state_str(chan->state));
         }
 
@@ -1942,7 +1835,7 @@ static inline void init_pl08x_debugfs(struct pl08x_driver_data *pl08x)
 static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
 {
         struct pl08x_driver_data *pl08x;
-        struct vendor_data *vd = id->data;
+        const struct vendor_data *vd = id->data;
         int ret = 0;
         int i;
 
@@ -1990,6 +1883,14 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
         pl08x->adev = adev;
         pl08x->vd = vd;
 
+        /* By default, AHB1 only.  If dualmaster, from platform */
+        pl08x->lli_buses = PL08X_AHB1;
+        pl08x->mem_buses = PL08X_AHB1;
+        if (pl08x->vd->dualmaster) {
+                pl08x->lli_buses = pl08x->pd->lli_buses;
+                pl08x->mem_buses = pl08x->pd->mem_buses;
+        }
+
         /* A DMA memory pool for LLIs, align on 1-byte boundary */
         pl08x->pool = dma_pool_create(DRIVER_NAME, &pl08x->adev->dev,
                         PL08X_LLI_TSFR_SIZE, PL08X_ALIGN, 0);
@@ -2009,14 +1910,12 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
         /* Turn on the PL08x */
         pl08x_ensure_on(pl08x);
 
-        /*
-         * Attach the interrupt handler
-         */
+        /* Attach the interrupt handler */
         writel(0x000000FF, pl08x->base + PL080_ERR_CLEAR);
         writel(0x000000FF, pl08x->base + PL080_TC_CLEAR);
 
         ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED,
-                          vd->name, pl08x);
+                          DRIVER_NAME, pl08x);
         if (ret) {
                 dev_err(&adev->dev, "%s failed to request interrupt %d\n",
                         __func__, adev->irq[0]);
@@ -2087,8 +1986,9 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
 
         amba_set_drvdata(adev, pl08x);
         init_pl08x_debugfs(pl08x);
-        dev_info(&pl08x->adev->dev, "ARM(R) %s DMA block initialized @%08x\n",
-                vd->name, adev->res.start);
+        dev_info(&pl08x->adev->dev, "DMA: PL%03x rev%u at 0x%08llx irq %d\n",
+                 amba_part(adev), amba_rev(adev),
+                 (unsigned long long)adev->res.start, adev->irq[0]);
         return 0;
 
 out_no_slave_reg:
@@ -2115,13 +2015,11 @@ out_no_pl08x:
 
 /* PL080 has 8 channels and the PL080 have just 2 */
 static struct vendor_data vendor_pl080 = {
-        .name = "PL080",
         .channels = 8,
         .dualmaster = true,
 };
 
 static struct vendor_data vendor_pl081 = {
-        .name = "PL081",
         .channels = 2,
         .dualmaster = false,
 };
@@ -2160,7 +2058,7 @@ static int __init pl08x_init(void)
         retval = amba_driver_register(&pl08x_amba_driver);
         if (retval)
                 printk(KERN_WARNING DRIVER_NAME
-                       "failed to register as an amba device (%d)\n",
+                       "failed to register as an AMBA device (%d)\n",
                        retval);
         return retval;
 }
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index ea0ee81cff53..3d7d705f026f 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -253,7 +253,7 @@ atc_chain_complete(struct at_dma_chan *atchan, struct at_desc *desc)
         /* move myself to free_list */
         list_move(&desc->desc_node, &atchan->free_list);
 
-        /* unmap dma addresses */
+        /* unmap dma addresses (not on slave channels) */
         if (!atchan->chan_common.private) {
                 struct device *parent = chan2parent(&atchan->chan_common);
                 if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
@@ -583,7 +583,6 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
                 desc->lli.ctrlb = ctrlb;
 
                 desc->txd.cookie = 0;
-                async_tx_ack(&desc->txd);
 
                 if (!first) {
                         first = desc;
@@ -604,7 +603,7 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
         /* set end-of-link to the last link descriptor of list*/
         set_desc_eol(desc);
 
-        desc->txd.flags = flags; /* client is in control of this ack */
+        first->txd.flags = flags; /* client is in control of this ack */
 
         return &first->txd;
 
@@ -670,7 +669,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                         if (!desc)
                                 goto err_desc_get;
 
-                        mem = sg_phys(sg);
+                        mem = sg_dma_address(sg);
                         len = sg_dma_len(sg);
                         mem_width = 2;
                         if (unlikely(mem & 3 || len & 3))
@@ -712,7 +711,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                         if (!desc)
                                 goto err_desc_get;
 
-                        mem = sg_phys(sg);
+                        mem = sg_dma_address(sg);
                         len = sg_dma_len(sg);
                         mem_width = 2;
                         if (unlikely(mem & 3 || len & 3))
@@ -749,8 +748,8 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
         first->txd.cookie = -EBUSY;
         first->len = total_len;
 
-        /* last link descriptor of list is responsible of flags */
-        prev->txd.flags = flags; /* client is in control of this ack */
+        /* first link descriptor of list is responsible of flags */
+        first->txd.flags = flags; /* client is in control of this ack */
 
         return &first->txd;
 
@@ -854,11 +853,11 @@ static void atc_issue_pending(struct dma_chan *chan)
 
         dev_vdbg(chan2dev(chan), "issue_pending\n");
 
+        spin_lock_bh(&atchan->lock);
         if (!atc_chan_is_enabled(atchan)) {
-                spin_lock_bh(&atchan->lock);
                 atc_advance_work(atchan);
-                spin_unlock_bh(&atchan->lock);
         }
+        spin_unlock_bh(&atchan->lock);
 }
 
 /**
@@ -1210,7 +1209,7 @@ static int __init at_dma_init(void)
 {
         return platform_driver_probe(&at_dma_driver, at_dma_probe);
 }
-module_init(at_dma_init);
+subsys_initcall(at_dma_init);
 
 static void __exit at_dma_exit(void)
 {
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index e5e172d21692..4de947a450fc 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1,7 +1,7 @@
 /*
  * Freescale MPC85xx, MPC83xx DMA Engine support
  *
- * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2007-2010 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author:
  *   Zhang Wei <wei.zhang@freescale.com>, Jul 2007
@@ -1324,6 +1324,8 @@ static int __devinit fsldma_of_probe(struct platform_device *op,
         fdev->common.device_control = fsl_dma_device_control;
         fdev->common.dev = &op->dev;
 
+        dma_set_mask(&(op->dev), DMA_BIT_MASK(36));
+
         dev_set_drvdata(&op->dev, fdev);
 
         /*
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 78266382797e..798f46a4590d 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -664,11 +664,20 @@ static struct dma_async_tx_descriptor *intel_mid_dma_prep_memcpy(
         /*calculate CTL_LO*/
         ctl_lo.ctl_lo = 0;
         ctl_lo.ctlx.int_en = 1;
-        ctl_lo.ctlx.dst_tr_width = mids->dma_slave.dst_addr_width;
-        ctl_lo.ctlx.src_tr_width = mids->dma_slave.src_addr_width;
         ctl_lo.ctlx.dst_msize = mids->dma_slave.src_maxburst;
         ctl_lo.ctlx.src_msize = mids->dma_slave.dst_maxburst;
 
+        /*
+         * Here we need some translation from "enum dma_slave_buswidth"
+         * to the format for our dma controller
+         *              standard        intel_mid_dmac's format
+         *               1 Byte                 0b000
+         *               2 Bytes                0b001
+         *               4 Bytes                0b010
+         */
+        ctl_lo.ctlx.dst_tr_width = mids->dma_slave.dst_addr_width / 2;
+        ctl_lo.ctlx.src_tr_width = mids->dma_slave.src_addr_width / 2;
+
         if (mids->cfg_mode == LNW_DMA_MEM_TO_MEM) {
                 ctl_lo.ctlx.tt_fc = 0;
                 ctl_lo.ctlx.sinc = 0;
@@ -746,8 +755,18 @@ static struct dma_async_tx_descriptor *intel_mid_dma_prep_slave_sg(
         BUG_ON(!mids);
 
         if (!midc->dma->pimr_mask) {
-                pr_debug("MDMA: SG list is not supported by this controller\n");
-                return  NULL;
+                /* We can still handle sg list with only one item */
+                if (sg_len == 1) {
+                        txd = intel_mid_dma_prep_memcpy(chan,
+                                                mids->dma_slave.dst_addr,
+                                                mids->dma_slave.src_addr,
+                                                sgl->length,
+                                                flags);
+                        return txd;
+                } else {
+                        pr_warn("MDMA: SG list is not supported by this controller\n");
+                        return  NULL;
+                }
         }
 
         pr_debug("MDMA: SG Length = %d, direction = %d, Flags = %#lx\n",
@@ -758,6 +777,7 @@ static struct dma_async_tx_descriptor *intel_mid_dma_prep_slave_sg(
                 pr_err("MDMA: Prep memcpy failed\n");
                 return NULL;
         }
+
         desc = to_intel_mid_dma_desc(txd);
         desc->dirn = direction;
         ctl_lo.ctl_lo = desc->ctl_lo;
@@ -1021,11 +1041,6 @@ static irqreturn_t intel_mid_dma_interrupt(int irq, void *data)
 
         /*DMA Interrupt*/
         pr_debug("MDMA:Got an interrupt on irq %d\n", irq);
-        if (!mid) {
-                pr_err("ERR_MDMA:null pointer mid\n");
-                return -EINVAL;
-        }
-
         pr_debug("MDMA: Status %x, Mask %x\n", tfr_status, mid->intr_mask);
         tfr_status &= mid->intr_mask;
         if (tfr_status) {
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 161c452923b8..c6b01f535b29 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1261,7 +1261,7 @@ out:
         return err;
 }
 
-#ifdef CONFIG_MD_RAID6_PQ
+#ifdef CONFIG_RAID6_PQ
 static int __devinit
 iop_adma_pq_zero_sum_self_test(struct iop_adma_device *device)
 {
@@ -1584,7 +1584,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
 
         if (dma_has_cap(DMA_PQ, dma_dev->cap_mask) &&
             dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask)) {
-                #ifdef CONFIG_MD_RAID6_PQ
+                #ifdef CONFIG_RAID6_PQ
                 ret = iop_adma_pq_zero_sum_self_test(adev);
                 dev_dbg(&pdev->dev, "pq self test returned %d\n", ret);
                 #else
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index c064c89420d0..1c38418ae61f 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -1,6 +1,7 @@
 /*
  * Topcliff PCH DMA controller driver
  * Copyright (c) 2010 Intel Corporation
+ * Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD.
  *
  * 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
@@ -921,12 +922,19 @@ static void __devexit pch_dma_remove(struct pci_dev *pdev)
 }
 
 /* PCI Device ID of DMA device */
-#define PCI_DEVICE_ID_PCH_DMA_8CH        0x8810
-#define PCI_DEVICE_ID_PCH_DMA_4CH        0x8815
+#define PCI_VENDOR_ID_ROHM             0x10DB
+#define PCI_DEVICE_ID_EG20T_PCH_DMA_8CH        0x8810
+#define PCI_DEVICE_ID_EG20T_PCH_DMA_4CH        0x8815
+#define PCI_DEVICE_ID_ML7213_DMA1_8CH   0x8026
+#define PCI_DEVICE_ID_ML7213_DMA2_8CH   0x802B
+#define PCI_DEVICE_ID_ML7213_DMA3_4CH   0x8034
 
 static const struct pci_device_id pch_dma_id_table[] = {
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_8CH), 8 },
-        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_DMA_4CH), 4 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },
+        { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_4CH), 4 },
+        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA1_8CH), 8}, /* UART Video */
+        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA2_8CH), 8}, /* PCMIF SPI */
+        { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA3_4CH), 4}, /* FPGA */
         { 0, },
 };
 
@@ -954,6 +962,7 @@ static void __exit pch_dma_exit(void)
 module_init(pch_dma_init);
 module_exit(pch_dma_exit);
 
-MODULE_DESCRIPTION("Topcliff PCH DMA controller driver");
+MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH "
+                   "DMA controller driver");
 MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index fab68a553205..6e1d46a65d0e 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) ST-Ericsson SA 2007-2010
+ * Copyright (C) Ericsson AB 2007-2008
+ * Copyright (C) ST-Ericsson SA 2008-2010
  * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson
  * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson
  * License terms: GNU General Public License (GPL) version 2
@@ -554,8 +555,66 @@ static struct d40_desc *d40_last_queued(struct d40_chan *d40c)
         return d;
 }
 
-/* Support functions for logical channels */
+static int d40_psize_2_burst_size(bool is_log, int psize)
+{
+        if (is_log) {
+                if (psize == STEDMA40_PSIZE_LOG_1)
+                        return 1;
+        } else {
+                if (psize == STEDMA40_PSIZE_PHY_1)
+                        return 1;
+        }
+
+        return 2 << psize;
+}
+
+/*
+ * The dma only supports transmitting packages up to
+ * STEDMA40_MAX_SEG_SIZE << data_width. Calculate the total number of
+ * dma elements required to send the entire sg list
+ */
+static int d40_size_2_dmalen(int size, u32 data_width1, u32 data_width2)
+{
+        int dmalen;
+        u32 max_w = max(data_width1, data_width2);
+        u32 min_w = min(data_width1, data_width2);
+        u32 seg_max = ALIGN(STEDMA40_MAX_SEG_SIZE << min_w, 1 << max_w);
+
+        if (seg_max > STEDMA40_MAX_SEG_SIZE)
+                seg_max -= (1 << max_w);
+
+        if (!IS_ALIGNED(size, 1 << max_w))
+                return -EINVAL;
+
+        if (size <= seg_max)
+                dmalen = 1;
+        else {
+                dmalen = size / seg_max;
+                if (dmalen * seg_max < size)
+                        dmalen++;
+        }
+        return dmalen;
+}
+
+static int d40_sg_2_dmalen(struct scatterlist *sgl, int sg_len,
+                           u32 data_width1, u32 data_width2)
+{
+        struct scatterlist *sg;
+        int i;
+        int len = 0;
+        int ret;
+
+        for_each_sg(sgl, sg, sg_len, i) {
+                ret = d40_size_2_dmalen(sg_dma_len(sg),
+                                        data_width1, data_width2);
+                if (ret < 0)
+                        return ret;
+                len += ret;
+        }
+        return len;
+}
 
+/* Support functions for logical channels */
 
 static int d40_channel_execute_command(struct d40_chan *d40c,
                                        enum d40_command command)
@@ -1241,6 +1300,21 @@ static int d40_validate_conf(struct d40_chan *d40c,
                 res = -EINVAL;
         }
 
+        if (d40_psize_2_burst_size(is_log, conf->src_info.psize) *
+            (1 << conf->src_info.data_width) !=
+            d40_psize_2_burst_size(is_log, conf->dst_info.psize) *
+            (1 << conf->dst_info.data_width)) {
+                /*
+                 * The DMAC hardware only supports
+                 * src (burst x width) == dst (burst x width)
+                 */
+
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] src (burst x width) != dst (burst x width)\n",
+                        __func__);
+                res = -EINVAL;
+        }
+
         return res;
 }
 
@@ -1638,13 +1712,21 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan,
         if (d40d == NULL)
                 goto err;
 
-        d40d->lli_len = sgl_len;
+        d40d->lli_len = d40_sg_2_dmalen(sgl_dst, sgl_len,
+                                        d40c->dma_cfg.src_info.data_width,
+                                        d40c->dma_cfg.dst_info.data_width);
+        if (d40d->lli_len < 0) {
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Unaligned size\n", __func__);
+                goto err;
+        }
+
         d40d->lli_current = 0;
         d40d->txd.flags = dma_flags;
 
         if (d40c->log_num != D40_PHY_CHAN) {
 
-                if (d40_pool_lli_alloc(d40d, sgl_len, true) < 0) {
+                if (d40_pool_lli_alloc(d40d, d40d->lli_len, true) < 0) {
                         dev_err(&d40c->chan.dev->device,
                                 "[%s] Out of memory\n", __func__);
                         goto err;
@@ -1654,15 +1736,17 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan,
                                          sgl_len,
                                          d40d->lli_log.src,
                                          d40c->log_def.lcsp1,
-                                         d40c->dma_cfg.src_info.data_width);
+                                         d40c->dma_cfg.src_info.data_width,
+                                         d40c->dma_cfg.dst_info.data_width);
 
                 (void) d40_log_sg_to_lli(sgl_dst,
                                          sgl_len,
                                          d40d->lli_log.dst,
                                          d40c->log_def.lcsp3,
-                                         d40c->dma_cfg.dst_info.data_width);
+                                         d40c->dma_cfg.dst_info.data_width,
+                                         d40c->dma_cfg.src_info.data_width);
         } else {
-                if (d40_pool_lli_alloc(d40d, sgl_len, false) < 0) {
+                if (d40_pool_lli_alloc(d40d, d40d->lli_len, false) < 0) {
                         dev_err(&d40c->chan.dev->device,
                                 "[%s] Out of memory\n", __func__);
                         goto err;
@@ -1675,6 +1759,7 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan,
                                         virt_to_phys(d40d->lli_phy.src),
                                         d40c->src_def_cfg,
                                         d40c->dma_cfg.src_info.data_width,
+                                        d40c->dma_cfg.dst_info.data_width,
                                         d40c->dma_cfg.src_info.psize);
 
                 if (res < 0)
@@ -1687,6 +1772,7 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan,
                                         virt_to_phys(d40d->lli_phy.dst),
                                         d40c->dst_def_cfg,
                                         d40c->dma_cfg.dst_info.data_width,
+                                        d40c->dma_cfg.src_info.data_width,
                                         d40c->dma_cfg.dst_info.psize);
 
                 if (res < 0)
@@ -1826,7 +1912,6 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
         struct d40_chan *d40c = container_of(chan, struct d40_chan,
                                              chan);
         unsigned long flags;
-        int err = 0;
 
         if (d40c->phy_chan == NULL) {
                 dev_err(&d40c->chan.dev->device,
@@ -1844,6 +1929,15 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
         }
 
         d40d->txd.flags = dma_flags;
+        d40d->lli_len = d40_size_2_dmalen(size,
+                                          d40c->dma_cfg.src_info.data_width,
+                                          d40c->dma_cfg.dst_info.data_width);
+        if (d40d->lli_len < 0) {
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Unaligned size\n", __func__);
+                goto err;
+        }
+
 
         dma_async_tx_descriptor_init(&d40d->txd, chan);
 
@@ -1851,37 +1945,40 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
 
         if (d40c->log_num != D40_PHY_CHAN) {
 
-                if (d40_pool_lli_alloc(d40d, 1, true) < 0) {
+                if (d40_pool_lli_alloc(d40d, d40d->lli_len, true) < 0) {
                         dev_err(&d40c->chan.dev->device,
                                 "[%s] Out of memory\n", __func__);
                         goto err;
                 }
-                d40d->lli_len = 1;
                 d40d->lli_current = 0;
 
-                d40_log_fill_lli(d40d->lli_log.src,
-                                 src,
-                                 size,
-                                 d40c->log_def.lcsp1,
-                                 d40c->dma_cfg.src_info.data_width,
-                                 true);
+                if (d40_log_buf_to_lli(d40d->lli_log.src,
+                                       src,
+                                       size,
+                                       d40c->log_def.lcsp1,
+                                       d40c->dma_cfg.src_info.data_width,
+                                       d40c->dma_cfg.dst_info.data_width,
+                                       true) == NULL)
+                        goto err;
 
-                d40_log_fill_lli(d40d->lli_log.dst,
-                                 dst,
-                                 size,
-                                 d40c->log_def.lcsp3,
-                                 d40c->dma_cfg.dst_info.data_width,
-                                 true);
+                if (d40_log_buf_to_lli(d40d->lli_log.dst,
+                                       dst,
+                                       size,
+                                       d40c->log_def.lcsp3,
+                                       d40c->dma_cfg.dst_info.data_width,
+                                       d40c->dma_cfg.src_info.data_width,
+                                       true) == NULL)
+                        goto err;
 
         } else {
 
-                if (d40_pool_lli_alloc(d40d, 1, false) < 0) {
+                if (d40_pool_lli_alloc(d40d, d40d->lli_len, false) < 0) {
                         dev_err(&d40c->chan.dev->device,
                                 "[%s] Out of memory\n", __func__);
                         goto err;
                 }
 
-                err = d40_phy_fill_lli(d40d->lli_phy.src,
+                if (d40_phy_buf_to_lli(d40d->lli_phy.src,
                                        src,
                                        size,
                                        d40c->dma_cfg.src_info.psize,
@@ -1889,11 +1986,11 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
                                        d40c->src_def_cfg,
                                        true,
                                        d40c->dma_cfg.src_info.data_width,
-                                       false);
-                if (err)
-                        goto err_fill_lli;
+                                       d40c->dma_cfg.dst_info.data_width,
+                                       false) == NULL)
+                        goto err;
 
-                err = d40_phy_fill_lli(d40d->lli_phy.dst,
+                if (d40_phy_buf_to_lli(d40d->lli_phy.dst,
                                        dst,
                                        size,
                                        d40c->dma_cfg.dst_info.psize,
@@ -1901,10 +1998,9 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
                                        d40c->dst_def_cfg,
                                        true,
                                        d40c->dma_cfg.dst_info.data_width,
-                                       false);
-
-                if (err)
-                        goto err_fill_lli;
+                                       d40c->dma_cfg.src_info.data_width,
+                                       false) == NULL)
+                        goto err;
 
                 (void) dma_map_single(d40c->base->dev, d40d->lli_phy.src,
                                       d40d->lli_pool.size, DMA_TO_DEVICE);
@@ -1913,9 +2009,6 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
         spin_unlock_irqrestore(&d40c->lock, flags);
         return &d40d->txd;
 
-err_fill_lli:
-        dev_err(&d40c->chan.dev->device,
-                "[%s] Failed filling in PHY LLI\n", __func__);
 err:
         if (d40d)
                 d40_desc_free(d40c, d40d);
@@ -1945,13 +2038,21 @@ static int d40_prep_slave_sg_log(struct d40_desc *d40d,
         dma_addr_t dev_addr = 0;
         int total_size;
 
-        if (d40_pool_lli_alloc(d40d, sg_len, true) < 0) {
+        d40d->lli_len = d40_sg_2_dmalen(sgl, sg_len,
+                                        d40c->dma_cfg.src_info.data_width,
+                                        d40c->dma_cfg.dst_info.data_width);
+        if (d40d->lli_len < 0) {
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Unaligned size\n", __func__);
+                return -EINVAL;
+        }
+
+        if (d40_pool_lli_alloc(d40d, d40d->lli_len, true) < 0) {
                 dev_err(&d40c->chan.dev->device,
                         "[%s] Out of memory\n", __func__);
                 return -ENOMEM;
         }
 
-        d40d->lli_len = sg_len;
         d40d->lli_current = 0;
 
         if (direction == DMA_FROM_DEVICE)
@@ -1993,13 +2094,21 @@ static int d40_prep_slave_sg_phy(struct d40_desc *d40d,
         dma_addr_t dst_dev_addr;
         int res;
 
-        if (d40_pool_lli_alloc(d40d, sgl_len, false) < 0) {
+        d40d->lli_len = d40_sg_2_dmalen(sgl, sgl_len,
+                                        d40c->dma_cfg.src_info.data_width,
+                                        d40c->dma_cfg.dst_info.data_width);
+        if (d40d->lli_len < 0) {
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Unaligned size\n", __func__);
+                return -EINVAL;
+        }
+
+        if (d40_pool_lli_alloc(d40d, d40d->lli_len, false) < 0) {
                 dev_err(&d40c->chan.dev->device,
                         "[%s] Out of memory\n", __func__);
                 return -ENOMEM;
         }
 
-        d40d->lli_len = sgl_len;
         d40d->lli_current = 0;
 
         if (direction == DMA_FROM_DEVICE) {
@@ -2024,6 +2133,7 @@ static int d40_prep_slave_sg_phy(struct d40_desc *d40d,
                                 virt_to_phys(d40d->lli_phy.src),
                                 d40c->src_def_cfg,
                                 d40c->dma_cfg.src_info.data_width,
+                                d40c->dma_cfg.dst_info.data_width,
                                 d40c->dma_cfg.src_info.psize);
         if (res < 0)
                 return res;
@@ -2035,6 +2145,7 @@ static int d40_prep_slave_sg_phy(struct d40_desc *d40d,
                                 virt_to_phys(d40d->lli_phy.dst),
                                 d40c->dst_def_cfg,
                                 d40c->dma_cfg.dst_info.data_width,
+                                d40c->dma_cfg.src_info.data_width,
                                 d40c->dma_cfg.dst_info.psize);
         if (res < 0)
                 return res;
@@ -2244,6 +2355,8 @@ static void d40_set_runtime_config(struct dma_chan *chan,
                         psize = STEDMA40_PSIZE_PHY_8;
                 else if (config_maxburst >= 4)
                         psize = STEDMA40_PSIZE_PHY_4;
+                else if (config_maxburst >= 2)
+                        psize = STEDMA40_PSIZE_PHY_2;
                 else
                         psize = STEDMA40_PSIZE_PHY_1;
         }
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 8557cb88b255..0b096a38322d 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson SA 2007-2010
- * Author: Per Friden <per.friden@stericsson.com> for ST-Ericsson
+ * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson
  * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson
  * License terms: GNU General Public License (GPL) version 2
  */
@@ -122,15 +122,15 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg,
         *dst_cfg = dst;
 }
 
-int d40_phy_fill_lli(struct d40_phy_lli *lli,
-                     dma_addr_t data,
-                     u32 data_size,
-                     int psize,
-                     dma_addr_t next_lli,
-                     u32 reg_cfg,
-                     bool term_int,
-                     u32 data_width,
-                     bool is_device)
+static int d40_phy_fill_lli(struct d40_phy_lli *lli,
+                            dma_addr_t data,
+                            u32 data_size,
+                            int psize,
+                            dma_addr_t next_lli,
+                            u32 reg_cfg,
+                            bool term_int,
+                            u32 data_width,
+                            bool is_device)
 {
         int num_elems;
 
@@ -139,13 +139,6 @@ int d40_phy_fill_lli(struct d40_phy_lli *lli,
         else
                 num_elems = 2 << psize;
 
-        /*
-         * Size is 16bit. data_width is 8, 16, 32 or 64 bit
-         * Block large than 64 KiB must be split.
-         */
-        if (data_size > (0xffff << data_width))
-                return -EINVAL;
-
         /* Must be aligned */
         if (!IS_ALIGNED(data, 0x1 << data_width))
                 return -EINVAL;
@@ -187,55 +180,118 @@ int d40_phy_fill_lli(struct d40_phy_lli *lli,
         return 0;
 }
 
+static int d40_seg_size(int size, int data_width1, int data_width2)
+{
+        u32 max_w = max(data_width1, data_width2);
+        u32 min_w = min(data_width1, data_width2);
+        u32 seg_max = ALIGN(STEDMA40_MAX_SEG_SIZE << min_w, 1 << max_w);
+
+        if (seg_max > STEDMA40_MAX_SEG_SIZE)
+                seg_max -= (1 << max_w);
+
+        if (size <= seg_max)
+                return size;
+
+        if (size <= 2 * seg_max)
+                return ALIGN(size / 2, 1 << max_w);
+
+        return seg_max;
+}
+
+struct d40_phy_lli *d40_phy_buf_to_lli(struct d40_phy_lli *lli,
+                                       dma_addr_t addr,
+                                       u32 size,
+                                       int psize,
+                                       dma_addr_t lli_phys,
+                                       u32 reg_cfg,
+                                       bool term_int,
+                                       u32 data_width1,
+                                       u32 data_width2,
+                                       bool is_device)
+{
+        int err;
+        dma_addr_t next = lli_phys;
+        int size_rest = size;
+        int size_seg = 0;
+
+        do {
+                size_seg = d40_seg_size(size_rest, data_width1, data_width2);
+                size_rest -= size_seg;
+
+                if (term_int && size_rest == 0)
+                        next = 0;
+                else
+                        next = ALIGN(next + sizeof(struct d40_phy_lli),
+                                     D40_LLI_ALIGN);
+
+                err = d40_phy_fill_lli(lli,
+                                       addr,
+                                       size_seg,
+                                       psize,
+                                       next,
+                                       reg_cfg,
+                                       !next,
+                                       data_width1,
+                                       is_device);
+
+                if (err)
+                        goto err;
+
+                lli++;
+                if (!is_device)
+                        addr += size_seg;
+        } while (size_rest);
+
+        return lli;
+
+ err:
+        return NULL;
+}
+
 int d40_phy_sg_to_lli(struct scatterlist *sg,
                       int sg_len,
                       dma_addr_t target,
-                      struct d40_phy_lli *lli,
+                      struct d40_phy_lli *lli_sg,
                       dma_addr_t lli_phys,
                       u32 reg_cfg,
-                      u32 data_width,
+                      u32 data_width1,
+                      u32 data_width2,
                       int psize)
 {
         int total_size = 0;
         int i;
         struct scatterlist *current_sg = sg;
-        dma_addr_t next_lli_phys;
         dma_addr_t dst;
-        int err = 0;
+        struct d40_phy_lli *lli = lli_sg;
+        dma_addr_t l_phys = lli_phys;
 
         for_each_sg(sg, current_sg, sg_len, i) {
 
                 total_size += sg_dma_len(current_sg);
 
-                /* If this scatter list entry is the last one, no next link */
-                if (sg_len - 1 == i)
-                        next_lli_phys = 0;
-                else
-                        next_lli_phys = ALIGN(lli_phys + (i + 1) *
-                                              sizeof(struct d40_phy_lli),
-                                              D40_LLI_ALIGN);
-
                 if (target)
                         dst = target;
                 else
                         dst = sg_phys(current_sg);
 
-                err = d40_phy_fill_lli(&lli[i],
-                                       dst,
-                                       sg_dma_len(current_sg),
-                                       psize,
-                                       next_lli_phys,
-                                       reg_cfg,
-                                       !next_lli_phys,
-                                       data_width,
-                                       target == dst);
-                if (err)
-                        goto err;
+                l_phys = ALIGN(lli_phys + (lli - lli_sg) *
+                               sizeof(struct d40_phy_lli), D40_LLI_ALIGN);
+
+                lli = d40_phy_buf_to_lli(lli,
+                                         dst,
+                                         sg_dma_len(current_sg),
+                                         psize,
+                                         l_phys,
+                                         reg_cfg,
+                                         sg_len - 1 == i,
+                                         data_width1,
+                                         data_width2,
+                                         target == dst);
+                if (lli == NULL)
+                        return -EINVAL;
         }
 
         return total_size;
-err:
-        return err;
 }
 
 
@@ -315,17 +371,20 @@ void d40_log_lli_lcla_write(struct d40_log_lli *lcla,
         writel(lli_dst->lcsp13, &lcla[1].lcsp13);
 }
 
-void d40_log_fill_lli(struct d40_log_lli *lli,
-                      dma_addr_t data, u32 data_size,
-                      u32 reg_cfg,
-                      u32 data_width,
-                      bool addr_inc)
+static void d40_log_fill_lli(struct d40_log_lli *lli,
+                             dma_addr_t data, u32 data_size,
+                             u32 reg_cfg,
+                             u32 data_width,
+                             bool addr_inc)
 {
         lli->lcsp13 = reg_cfg;
 
         /* The number of elements to transfer */
         lli->lcsp02 = ((data_size >> data_width) <<
                        D40_MEM_LCSP0_ECNT_POS) & D40_MEM_LCSP0_ECNT_MASK;
+
+        BUG_ON((data_size >> data_width) > STEDMA40_MAX_SEG_SIZE);
+
         /* 16 LSBs address of the current element */
         lli->lcsp02 |= data & D40_MEM_LCSP0_SPTR_MASK;
         /* 16 MSBs address of the current element */
@@ -348,55 +407,94 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
         int total_size = 0;
         struct scatterlist *current_sg = sg;
         int i;
+        struct d40_log_lli *lli_src = lli->src;
+        struct d40_log_lli *lli_dst = lli->dst;
 
         for_each_sg(sg, current_sg, sg_len, i) {
                 total_size += sg_dma_len(current_sg);
 
                 if (direction == DMA_TO_DEVICE) {
-                        d40_log_fill_lli(&lli->src[i],
-                                         sg_phys(current_sg),
-                                         sg_dma_len(current_sg),
-                                         lcsp->lcsp1, src_data_width,
-                                         true);
-                        d40_log_fill_lli(&lli->dst[i],
-                                         dev_addr,
-                                         sg_dma_len(current_sg),
-                                         lcsp->lcsp3, dst_data_width,
-                                         false);
+                        lli_src =
+                                d40_log_buf_to_lli(lli_src,
+                                                   sg_phys(current_sg),
+                                                   sg_dma_len(current_sg),
+                                                   lcsp->lcsp1, src_data_width,
+                                                   dst_data_width,
+                                                   true);
+                        lli_dst =
+                                d40_log_buf_to_lli(lli_dst,
+                                                   dev_addr,
+                                                   sg_dma_len(current_sg),
+                                                   lcsp->lcsp3, dst_data_width,
+                                                   src_data_width,
+                                                   false);
                 } else {
-                        d40_log_fill_lli(&lli->dst[i],
-                                         sg_phys(current_sg),
-                                         sg_dma_len(current_sg),
-                                         lcsp->lcsp3, dst_data_width,
-                                         true);
-                        d40_log_fill_lli(&lli->src[i],
-                                         dev_addr,
-                                         sg_dma_len(current_sg),
-                                         lcsp->lcsp1, src_data_width,
-                                         false);
+                        lli_dst =
+                                d40_log_buf_to_lli(lli_dst,
+                                                   sg_phys(current_sg),
+                                                   sg_dma_len(current_sg),
+                                                   lcsp->lcsp3, dst_data_width,
+                                                   src_data_width,
+                                                   true);
+                        lli_src =
+                                d40_log_buf_to_lli(lli_src,
+                                                   dev_addr,
+                                                   sg_dma_len(current_sg),
+                                                   lcsp->lcsp1, src_data_width,
+                                                   dst_data_width,
+                                                   false);
                 }
         }
         return total_size;
 }
 
+struct d40_log_lli *d40_log_buf_to_lli(struct d40_log_lli *lli_sg,
+                                       dma_addr_t addr,
+                                       int size,
+                                       u32 lcsp13, /* src or dst*/
+                                       u32 data_width1,
+                                       u32 data_width2,
+                                       bool addr_inc)
+{
+        struct d40_log_lli *lli = lli_sg;
+        int size_rest = size;
+        int size_seg = 0;
+
+        do {
+                size_seg = d40_seg_size(size_rest, data_width1, data_width2);
+                size_rest -= size_seg;
+
+                d40_log_fill_lli(lli,
+                                 addr,
+                                 size_seg,
+                                 lcsp13, data_width1,
+                                 addr_inc);
+                if (addr_inc)
+                        addr += size_seg;
+                lli++;
+        } while (size_rest);
+
+        return lli;
+}
+
 int d40_log_sg_to_lli(struct scatterlist *sg,
                       int sg_len,
                       struct d40_log_lli *lli_sg,
                       u32 lcsp13, /* src or dst*/
-                      u32 data_width)
+                      u32 data_width1, u32 data_width2)
 {
         int total_size = 0;
         struct scatterlist *current_sg = sg;
         int i;
+        struct d40_log_lli *lli = lli_sg;
 
         for_each_sg(sg, current_sg, sg_len, i) {
                 total_size += sg_dma_len(current_sg);
-
-                d40_log_fill_lli(&lli_sg[i],
-                                 sg_phys(current_sg),
-                                 sg_dma_len(current_sg),
-                                 lcsp13, data_width,
-                                 true);
+                lli = d40_log_buf_to_lli(lli,
+                                         sg_phys(current_sg),
+                                         sg_dma_len(current_sg),
+                                         lcsp13,
+                                         data_width1, data_width2, true);
         }
         return total_size;
 }
diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h
index 9e419b907544..9cc43495bea2 100644
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
@@ -292,18 +292,20 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
                       struct d40_phy_lli *lli,
                       dma_addr_t lli_phys,
                       u32 reg_cfg,
-                      u32 data_width,
+                      u32 data_width1,
+                      u32 data_width2,
                       int psize);
 
-int d40_phy_fill_lli(struct d40_phy_lli *lli,
-                     dma_addr_t data,
-                     u32 data_size,
-                     int psize,
-                     dma_addr_t next_lli,
-                     u32 reg_cfg,
-                     bool term_int,
-                     u32 data_width,
-                     bool is_device);
+struct d40_phy_lli *d40_phy_buf_to_lli(struct d40_phy_lli *lli,
+                                       dma_addr_t data,
+                                       u32 data_size,
+                                       int psize,
+                                       dma_addr_t next_lli,
+                                       u32 reg_cfg,
+                                       bool term_int,
+                                       u32 data_width1,
+                                       u32 data_width2,
+                                       bool is_device);
 
 void d40_phy_lli_write(void __iomem *virtbase,
                        u32 phy_chan_num,
@@ -312,12 +314,12 @@ void d40_phy_lli_write(void __iomem *virtbase,
 
 /* Logical channels */
 
-void d40_log_fill_lli(struct d40_log_lli *lli,
-                      dma_addr_t data,
-                      u32 data_size,
-                      u32 reg_cfg,
-                      u32 data_width,
-                      bool addr_inc);
+struct d40_log_lli *d40_log_buf_to_lli(struct d40_log_lli *lli_sg,
+                                       dma_addr_t addr,
+                                       int size,
+                                       u32 lcsp13, /* src or dst*/
+                                       u32 data_width1, u32 data_width2,
+                                       bool addr_inc);
 
 int d40_log_sg_to_dev(struct scatterlist *sg,
                       int sg_len,
@@ -332,7 +334,7 @@ int d40_log_sg_to_lli(struct scatterlist *sg,
                       int sg_len,
                       struct d40_log_lli *lli_sg,
                       u32 lcsp13, /* src or dst*/
-                      u32 data_width);
+                      u32 data_width1, u32 data_width2);
 
 void d40_log_lli_lcpa_write(struct d40_log_lli_full *lcpa,
                             struct d40_log_lli *lli_dst,
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 4a5ecc58025d..23e03554f0d3 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -826,8 +826,6 @@ static void amd64_dump_dramcfg_low(u32 dclr, int chan)
 /* Display and decode various NB registers for debug purposes. */
 static void amd64_dump_misc_regs(struct amd64_pvt *pvt)
 {
-        int ganged;
-
         debugf1("F3xE8 (NB Cap): 0x%08x\n", pvt->nbcap);
 
         debugf1("  NB two channel DRAM capable: %s\n",
@@ -851,28 +849,19 @@ static void amd64_dump_misc_regs(struct amd64_pvt *pvt)
         debugf1("  DramHoleValid: %s\n",
                 (pvt->dhar & DHAR_VALID) ? "yes" : "no");
 
+        amd64_debug_display_dimm_sizes(0, pvt);
+
         /* everything below this point is Fam10h and above */
-        if (boot_cpu_data.x86 == 0xf) {
-                amd64_debug_display_dimm_sizes(0, pvt);
+        if (boot_cpu_data.x86 == 0xf)
                 return;
-        }
+
+        amd64_debug_display_dimm_sizes(1, pvt);
 
         amd64_info("using %s syndromes.\n", ((pvt->syn_type == 8) ? "x8" : "x4"));
 
         /* Only if NOT ganged does dclr1 have valid info */
         if (!dct_ganging_enabled(pvt))
                 amd64_dump_dramcfg_low(pvt->dclr1, 1);
-
-        /*
-         * Determine if ganged and then dump memory sizes for first controller,
-         * and if NOT ganged dump info for 2nd controller.
-         */
-        ganged = dct_ganging_enabled(pvt);
-
-        amd64_debug_display_dimm_sizes(0, pvt);
-
-        if (!ganged)
-                amd64_debug_display_dimm_sizes(1, pvt);
 }
 
 /* Read in both of DBAM registers */
@@ -1644,11 +1633,10 @@ static void amd64_debug_display_dimm_sizes(int ctrl, struct amd64_pvt *pvt)
                        WARN_ON(ctrl != 0);
         }
 
-        debugf1("F2x%d80 (DRAM Bank Address Mapping): 0x%08x\n",
-                ctrl, ctrl ? pvt->dbam1 : pvt->dbam0);
+        dbam = (ctrl && !dct_ganging_enabled(pvt)) ? pvt->dbam1 : pvt->dbam0;
+        dcsb = (ctrl && !dct_ganging_enabled(pvt)) ? pvt->dcsb1 : pvt->dcsb0;
 
-        dbam = ctrl ? pvt->dbam1 : pvt->dbam0;
-        dcsb = ctrl ? pvt->dcsb1 : pvt->dcsb0;
+        debugf1("F2x%d80 (DRAM Bank Address Mapping): 0x%08x\n", ctrl, dbam);
 
         edac_printk(KERN_DEBUG, EDAC_MC, "DCT%d chip selects:\n", ctrl);
 
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 68f942cb30f2..0c56989cd907 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -49,15 +49,13 @@ config FIREWIRE_SBP2
           configuration section.
 
 config FIREWIRE_NET
-        tristate "IP networking over 1394 (EXPERIMENTAL)"
-        depends on FIREWIRE && INET && EXPERIMENTAL
+        tristate "IP networking over 1394"
+        depends on FIREWIRE && INET
         help
           This enables IPv4 over IEEE 1394, providing IP connectivity with
           other implementations of RFC 2734 as found on several operating
           systems.  Multicast support is currently limited.
 
-          NOTE, this driver is not stable yet!
-
           To compile this driver as a module, say M here:  The module will be
           called firewire-net.
 
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index be0492398ef9..24ff35511e2b 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -75,6 +75,8 @@ static size_t config_rom_length = 1 + 4 + 1 + 1;
 #define BIB_IRMC                ((1) << 31)
 #define NODE_CAPABILITIES       0x0c0083c0 /* per IEEE 1394 clause 8.3.2.6.5.2 */
 
+#define CANON_OUI               0x000085
+
 static void generate_config_rom(struct fw_card *card, __be32 *config_rom)
 {
         struct fw_descriptor *desc;
@@ -284,6 +286,7 @@ static void bm_work(struct work_struct *work)
         bool root_device_is_running;
         bool root_device_is_cmc;
         bool irm_is_1394_1995_only;
+        bool keep_this_irm;
 
         spin_lock_irq(&card->lock);
 
@@ -305,6 +308,10 @@ static void bm_work(struct work_struct *work)
         irm_is_1394_1995_only = irm_device && irm_device->config_rom &&
                         (irm_device->config_rom[2] & 0x000000f0) == 0;
 
+        /* Canon MV5i works unreliably if it is not root node. */
+        keep_this_irm = irm_device && irm_device->config_rom &&
+                        irm_device->config_rom[3] >> 8 == CANON_OUI;
+
         root_id  = root_node->node_id;
         irm_id   = card->irm_node->node_id;
         local_id = card->local_node->node_id;
@@ -333,7 +340,7 @@ static void bm_work(struct work_struct *work)
                         goto pick_me;
                 }
 
-                if (irm_is_1394_1995_only) {
+                if (irm_is_1394_1995_only && !keep_this_irm) {
                         new_root_id = local_id;
                         fw_notify("%s, making local node (%02x) root.\n",
                                   "IRM is not 1394a compliant", new_root_id);
@@ -382,7 +389,7 @@ static void bm_work(struct work_struct *work)
 
                 spin_lock_irq(&card->lock);
 
-                if (rcode != RCODE_COMPLETE) {
+                if (rcode != RCODE_COMPLETE && !keep_this_irm) {
                         /*
                          * The lock request failed, maybe the IRM
                          * isn't really IRM capable after all. Let's
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index c2e194c58667..7ed08fd1214e 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -191,6 +191,7 @@ struct fwnet_peer {
         struct fwnet_device *dev;
         u64 guid;
         u64 fifo;
+        __be32 ip;
 
         /* guarded by dev->lock */
         struct list_head pd_list; /* received partial datagrams */
@@ -570,6 +571,8 @@ static int fwnet_finish_incoming_packet(struct net_device *net,
                                 peer->speed = sspd;
                         if (peer->max_payload > max_payload)
                                 peer->max_payload = max_payload;
+
+                        peer->ip = arp1394->sip;
                 }
                 spin_unlock_irqrestore(&dev->lock, flags);
 
@@ -1470,6 +1473,7 @@ static int fwnet_add_peer(struct fwnet_device *dev,
         peer->dev = dev;
         peer->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
         peer->fifo = FWNET_NO_FIFO_ADDR;
+        peer->ip = 0;
         INIT_LIST_HEAD(&peer->pd_list);
         peer->pdg_size = 0;
         peer->datagram_label = 0;
@@ -1589,10 +1593,13 @@ static int fwnet_remove(struct device *_dev)
 
         mutex_lock(&fwnet_device_mutex);
 
+        net = dev->netdev;
+        if (net && peer->ip)
+                arp_invalidate(net, peer->ip);
+
         fwnet_remove_peer(peer, dev);
 
         if (list_empty(&dev->peer_list)) {
-                net = dev->netdev;
                 unregister_netdev(net);
 
                 if (dev->local_fifo != FWNET_NO_FIFO_ADDR)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index e8b6a13515bd..e710424b59ea 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -27,7 +27,7 @@ config EDD_OFF
           using the kernel parameter 'edd={on|skipmbr|off}'.
 
 config FIRMWARE_MEMMAP
-    bool "Add firmware-provided memory map to sysfs" if EMBEDDED
+    bool "Add firmware-provided memory map to sysfs" if EXPERT
     default X86
     help
       Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap.
diff --git a/drivers/gpio/cs5535-gpio.c b/drivers/gpio/cs5535-gpio.c
index 815d98b2c1ba..0d05ea7d499b 100644
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
@@ -11,14 +11,13 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/module.h>
-#include <linux/pci.h>
+#include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/cs5535.h>
 #include <asm/msr.h>
 
 #define DRV_NAME "cs5535-gpio"
-#define GPIO_BAR 1
 
 /*
  * Some GPIO pins
@@ -47,7 +46,7 @@ static struct cs5535_gpio_chip {
         struct gpio_chip chip;
         resource_size_t base;
 
-        struct pci_dev *pdev;
+        struct platform_device *pdev;
         spinlock_t lock;
 } cs5535_gpio_chip;
 
@@ -301,10 +300,10 @@ static struct cs5535_gpio_chip cs5535_gpio_chip = {
         },
 };
 
-static int __init cs5535_gpio_probe(struct pci_dev *pdev,
-                const struct pci_device_id *pci_id)
+static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
 {
-        int err;
+        struct resource *res;
+        int err = -EIO;
         ulong mask_orig = mask;
 
         /* There are two ways to get the GPIO base address; one is by
@@ -314,25 +313,23 @@ static int __init cs5535_gpio_probe(struct pci_dev *pdev,
          * it turns out to be unreliable in the face of crappy BIOSes, we
          * can always go back to using MSRs.. */
 
-        err = pci_enable_device_io(pdev);
-        if (err) {
-                dev_err(&pdev->dev, "can't enable device IO\n");
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "can't fetch device resource info\n");
                 goto done;
         }
 
-        err = pci_request_region(pdev, GPIO_BAR, DRV_NAME);
-        if (err) {
-                dev_err(&pdev->dev, "can't alloc PCI BAR #%d\n", GPIO_BAR);
+        if (!request_region(res->start, resource_size(res), pdev->name)) {
+                dev_err(&pdev->dev, "can't request region\n");
                 goto done;
         }
 
         /* set up the driver-specific struct */
-        cs5535_gpio_chip.base = pci_resource_start(pdev, GPIO_BAR);
+        cs5535_gpio_chip.base = res->start;
         cs5535_gpio_chip.pdev = pdev;
         spin_lock_init(&cs5535_gpio_chip.lock);
 
-        dev_info(&pdev->dev, "allocated PCI BAR #%d: base 0x%llx\n", GPIO_BAR,
-                        (unsigned long long) cs5535_gpio_chip.base);
+        dev_info(&pdev->dev, "reserved resource region %pR\n", res);
 
         /* mask out reserved pins */
         mask &= 0x1F7FFFFF;
@@ -350,78 +347,49 @@ static int __init cs5535_gpio_probe(struct pci_dev *pdev,
         if (err)
                 goto release_region;
 
-        dev_info(&pdev->dev, DRV_NAME ": GPIO support successfully loaded.\n");
+        dev_info(&pdev->dev, "GPIO support successfully loaded.\n");
         return 0;
 
 release_region:
-        pci_release_region(pdev, GPIO_BAR);
+        release_region(res->start, resource_size(res));
 done:
         return err;
 }
 
-static void __exit cs5535_gpio_remove(struct pci_dev *pdev)
+static int __devexit cs5535_gpio_remove(struct platform_device *pdev)
 {
+        struct resource *r;
         int err;
 
         err = gpiochip_remove(&cs5535_gpio_chip.chip);
         if (err) {
                 /* uhh? */
                 dev_err(&pdev->dev, "unable to remove gpio_chip?\n");
+                return err;
         }
-        pci_release_region(pdev, GPIO_BAR);
-}
-
-static struct pci_device_id cs5535_gpio_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
-        { 0, },
-};
-MODULE_DEVICE_TABLE(pci, cs5535_gpio_pci_tbl);
 
-/*
- * We can't use the standard PCI driver registration stuff here, since
- * that allows only one driver to bind to each PCI device (and we want
- * multiple drivers to be able to bind to the device).  Instead, manually
- * scan for the PCI device, request a single region, and keep track of the
- * devices that we're using.
- */
-
-static int __init cs5535_gpio_scan_pci(void)
-{
-        struct pci_dev *pdev;
-        int err = -ENODEV;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(cs5535_gpio_pci_tbl); i++) {
-                pdev = pci_get_device(cs5535_gpio_pci_tbl[i].vendor,
-                                cs5535_gpio_pci_tbl[i].device, NULL);
-                if (pdev) {
-                        err = cs5535_gpio_probe(pdev, &cs5535_gpio_pci_tbl[i]);
-                        if (err)
-                                pci_dev_put(pdev);
-
-                        /* we only support a single CS5535/6 southbridge */
-                        break;
-                }
-        }
-
-        return err;
+        r = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        release_region(r->start, resource_size(r));
+        return 0;
 }
 
-static void __exit cs5535_gpio_free_pci(void)
-{
-        cs5535_gpio_remove(cs5535_gpio_chip.pdev);
-        pci_dev_put(cs5535_gpio_chip.pdev);
-}
+static struct platform_driver cs5535_gpio_drv = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = cs5535_gpio_probe,
+        .remove = __devexit_p(cs5535_gpio_remove),
+};
 
 static int __init cs5535_gpio_init(void)
 {
-        return cs5535_gpio_scan_pci();
+        return platform_driver_register(&cs5535_gpio_drv);
 }
 
 static void __exit cs5535_gpio_exit(void)
 {
-        cs5535_gpio_free_pci();
+        platform_driver_unregister(&cs5535_gpio_drv);
 }
 
 module_init(cs5535_gpio_init);
@@ -430,3 +398,4 @@ module_exit(cs5535_gpio_exit);
 MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
 MODULE_DESCRIPTION("AMD CS5535/CS5536 GPIO driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index d81cc748e77f..54d70a47afc1 100644
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -187,7 +187,7 @@ MODULE_DEVICE_TABLE(pci, lnw_gpio_ids);
 
 static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
 {
-        struct lnw_gpio *lnw = (struct lnw_gpio *)get_irq_data(irq);
+        struct lnw_gpio *lnw = get_irq_data(irq);
         u32 base, gpio;
         void __iomem *gedr;
         u32 gedr_v;
@@ -206,7 +206,12 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
                 /* clear the edge detect status bit */
                 writel(gedr_v, gedr);
         }
-        desc->chip->eoi(irq);
+
+        if (desc->chip->irq_eoi)
+                desc->chip->irq_eoi(irq_get_irq_data(irq));
+        else
+                dev_warn(lnw->chip.dev, "missing EOI handler for irq %d\n", irq);
+
 }
 
 static int __devinit lnw_gpio_probe(struct pci_dev *pdev,
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index a261972f603d..b473429eee75 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -60,6 +60,7 @@ struct pca953x_chip {
         unsigned gpio_start;
         uint16_t reg_output;
         uint16_t reg_direction;
+        struct mutex i2c_lock;
 
 #ifdef CONFIG_GPIO_PCA953X_IRQ
         struct mutex irq_lock;
@@ -119,13 +120,17 @@ static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off)
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         reg_val = chip->reg_direction | (1u << off);
         ret = pca953x_write_reg(chip, PCA953X_DIRECTION, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_direction = reg_val;
-        return 0;
+        ret = 0;
+exit:
+        mutex_unlock(&chip->i2c_lock);
+        return ret;
 }
 
 static int pca953x_gpio_direction_output(struct gpio_chip *gc,
@@ -137,6 +142,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         /* set output level */
         if (val)
                 reg_val = chip->reg_output | (1u << off);
@@ -145,7 +151,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
 
         ret = pca953x_write_reg(chip, PCA953X_OUTPUT, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_output = reg_val;
 
@@ -153,10 +159,13 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc,
         reg_val = chip->reg_direction & ~(1u << off);
         ret = pca953x_write_reg(chip, PCA953X_DIRECTION, reg_val);
         if (ret)
-                return ret;
+                goto exit;
 
         chip->reg_direction = reg_val;
-        return 0;
+        ret = 0;
+exit:
+        mutex_unlock(&chip->i2c_lock);
+        return ret;
 }
 
 static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
@@ -167,7 +176,9 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off)
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         ret = pca953x_read_reg(chip, PCA953X_INPUT, &reg_val);
+        mutex_unlock(&chip->i2c_lock);
         if (ret < 0) {
                 /* NOTE:  diagnostic already emitted; that's all we should
                  * do unless gpio_*_value_cansleep() calls become different
@@ -187,6 +198,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
 
         chip = container_of(gc, struct pca953x_chip, gpio_chip);
 
+        mutex_lock(&chip->i2c_lock);
         if (val)
                 reg_val = chip->reg_output | (1u << off);
         else
@@ -194,9 +206,11 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
 
         ret = pca953x_write_reg(chip, PCA953X_OUTPUT, reg_val);
         if (ret)
-                return;
+                goto exit;
 
         chip->reg_output = reg_val;
+exit:
+        mutex_unlock(&chip->i2c_lock);
 }
 
 static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
@@ -517,6 +531,8 @@ static int __devinit pca953x_probe(struct i2c_client *client,
 
         chip->names = pdata->names;
 
+        mutex_init(&chip->i2c_lock);
+
         /* initialize cached registers from their original values.
          * we can't share this chip with another i2c master.
          */
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
index 349131eb1ce0..58c8f30352dd 100644
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@ -193,13 +193,13 @@ out:
         return ret;
 }
 
-static void timbgpio_irq(struct irq_data *d, struct irq_desc *desc)
+static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct timbgpio *tgpio = irq_data_get_irq_data(d);
+        struct timbgpio *tgpio = get_irq_data(irq);
         unsigned long ipr;
         int offset;
 
-        desc->irq_data.chip->ack(irq_get_irq_data(d));
+        desc->irq_data.chip->irq_ack(irq_get_irq_data(irq));
         ipr = ioread32(tgpio->membase + TGPIO_IPR);
         iowrite32(ipr, tgpio->membase + TGPIO_ICR);
 
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 7af443672626..0902d4460039 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -23,7 +23,7 @@ config DRM_KMS_HELPER
         tristate
         depends on DRM
         select FB
-        select FRAMEBUFFER_CONSOLE if !EMBEDDED
+        select FRAMEBUFFER_CONSOLE if !EXPERT
         help
           FB and CRTC helpers for KMS drivers.
 
@@ -100,14 +100,16 @@ config DRM_I830
 config DRM_I915
         tristate "i915 driver"
         depends on AGP_INTEL
+        # we need shmfs for the swappable backing store, and in particular
+        # the shmem_readpage() which depends upon tmpfs
         select SHMEM
+        select TMPFS
         select DRM_KMS_HELPER
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         # i915 depends on ACPI_VIDEO when ACPI is enabled
         # but for select to work, need to select ACPI_VIDEO's dependencies, ick
-        select VIDEO_OUTPUT_CONTROL if ACPI
         select BACKLIGHT_CLASS_DEVICE if ACPI
         select INPUT if ACPI
         select ACPI_VIDEO if ACPI
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 2baa6708e44c..654faa803dcb 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -2674,3 +2674,23 @@ out:
         mutex_unlock(&dev->mode_config.mutex);
         return ret;
 }
+
+void drm_mode_config_reset(struct drm_device *dev)
+{
+        struct drm_crtc *crtc;
+        struct drm_encoder *encoder;
+        struct drm_connector *connector;
+
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
+                if (crtc->funcs->reset)
+                        crtc->funcs->reset(crtc);
+
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
+                if (encoder->funcs->reset)
+                        encoder->funcs->reset(encoder);
+
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+                if (connector->funcs->reset)
+                        connector->funcs->reset(connector);
+}
+EXPORT_SYMBOL(drm_mode_config_reset);
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 952b3d4fb2a6..92369655dca3 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -343,13 +343,12 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
         struct drm_encoder *encoder;
         bool ret = true;
 
-        adjusted_mode = drm_mode_duplicate(dev, mode);
-
         crtc->enabled = drm_helper_crtc_in_use(crtc);
-
         if (!crtc->enabled)
                 return true;
 
+        adjusted_mode = drm_mode_duplicate(dev, mode);
+
         saved_hwmode = crtc->hwmode;
         saved_mode = crtc->mode;
         saved_x = crtc->x;
@@ -437,10 +436,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
          */
         drm_calc_timestamping_constants(crtc);
 
-        /* XXX free adjustedmode */
-        drm_mode_destroy(dev, adjusted_mode);
         /* FIXME: add subpixel order */
 done:
+        drm_mode_destroy(dev, adjusted_mode);
         if (!ret) {
                 crtc->hwmode = saved_hwmode;
                 crtc->mode = saved_mode;
@@ -497,14 +495,17 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 
         crtc_funcs = set->crtc->helper_private;
 
+        if (!set->mode)
+                set->fb = NULL;
+
         if (set->fb) {
                 DRM_DEBUG_KMS("[CRTC:%d] [FB:%d] #connectors=%d (x y) (%i %i)\n",
                                 set->crtc->base.id, set->fb->base.id,
                                 (int)set->num_connectors, set->x, set->y);
         } else {
-                DRM_DEBUG_KMS("[CRTC:%d] [NOFB] #connectors=%d (x y) (%i %i)\n",
-                                set->crtc->base.id, (int)set->num_connectors,
-                                set->x, set->y);
+                DRM_DEBUG_KMS("[CRTC:%d] [NOFB]\n", set->crtc->base.id);
+                set->mode = NULL;
+                set->num_connectors = 0;
         }
 
         dev = set->crtc->dev;
@@ -649,8 +650,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 mode_changed = true;
 
         if (mode_changed) {
-                set->crtc->enabled = (set->mode != NULL);
-                if (set->mode != NULL) {
+                set->crtc->enabled = drm_helper_crtc_in_use(set->crtc);
+                if (set->crtc->enabled) {
                         DRM_DEBUG_KMS("attempting to set mode from"
                                         " userspace\n");
                         drm_mode_debug_printmodeline(set->mode);
@@ -665,6 +666,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                                 ret = -EINVAL;
                                 goto fail;
                         }
+                        DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
+                        for (i = 0; i < set->num_connectors; i++) {
+                                DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
+                                              drm_get_connector_name(set->connectors[i]));
+                                set->connectors[i]->dpms = DRM_MODE_DPMS_ON;
+                        }
                 }
                 drm_helper_disable_unused_functions(dev);
         } else if (fb_changed) {
@@ -681,12 +688,6 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                         goto fail;
                 }
         }
-        DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
-        for (i = 0; i < set->num_connectors; i++) {
-                DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
-                              drm_get_connector_name(set->connectors[i]));
-                set->connectors[i]->dpms = DRM_MODE_DPMS_ON;
-        }
 
         kfree(save_connectors);
         kfree(save_encoders);
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 0307d601f5e5..6977a1ce9d98 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -607,25 +607,6 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
 }
 EXPORT_SYMBOL(drm_fb_helper_fini);
 
-void drm_fb_helper_fill_fix(struct fb_info *info, struct drm_framebuffer *fb)
-{
-        info->fix.type = FB_TYPE_PACKED_PIXELS;
-        info->fix.visual = fb->depth == 8 ? FB_VISUAL_PSEUDOCOLOR :
-                FB_VISUAL_TRUECOLOR;
-        info->fix.mmio_start = 0;
-        info->fix.mmio_len = 0;
-        info->fix.type_aux = 0;
-        info->fix.xpanstep = 1; /* doing it in hw */
-        info->fix.ypanstep = 1; /* doing it in hw */
-        info->fix.ywrapstep = 0;
-        info->fix.accel = FB_ACCEL_NONE;
-        info->fix.type_aux = 0;
-
-        info->fix.line_length = fb->pitch;
-        return;
-}
-EXPORT_SYMBOL(drm_fb_helper_fill_fix);
-
 static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
                      u16 blue, u16 regno, struct fb_info *info)
 {
@@ -835,7 +816,6 @@ int drm_fb_helper_set_par(struct fb_info *info)
                         mutex_unlock(&dev->mode_config.mutex);
                         return ret;
                 }
-                drm_fb_helper_fill_fix(info, fb_helper->fb);
         }
         mutex_unlock(&dev->mode_config.mutex);
 
@@ -973,7 +953,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 
         if (new_fb) {
                 info->var.pixclock = 0;
-                drm_fb_helper_fill_fix(info, fb_helper->fb);
                 if (register_framebuffer(info) < 0) {
                         return -EINVAL;
                 }
@@ -1000,6 +979,26 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 }
 EXPORT_SYMBOL(drm_fb_helper_single_fb_probe);
 
+void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
+                            uint32_t depth)
+{
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :
+                FB_VISUAL_TRUECOLOR;
+        info->fix.mmio_start = 0;
+        info->fix.mmio_len = 0;
+        info->fix.type_aux = 0;
+        info->fix.xpanstep = 1; /* doing it in hw */
+        info->fix.ypanstep = 1; /* doing it in hw */
+        info->fix.ywrapstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->fix.type_aux = 0;
+
+        info->fix.line_length = pitch;
+        return;
+}
+EXPORT_SYMBOL(drm_fb_helper_fill_fix);
+
 void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
                             uint32_t fb_width, uint32_t fb_height)
 {
@@ -1534,11 +1533,11 @@ bool drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
 }
 EXPORT_SYMBOL(drm_fb_helper_hotplug_event);
 
-/* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EMBEDDED)
+/* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT)
  * but the module doesn't depend on any fb console symbols.  At least
  * attempt to load fbcon to avoid leaving the system without a usable console.
  */
-#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EMBEDDED)
+#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EXPERT)
 static int __init drm_fb_helper_modinit(void)
 {
         const char *name = "fbcon";
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 0054e957203f..3dadfa2a8528 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -1250,7 +1250,7 @@ void drm_handle_vblank_events(struct drm_device *dev, int crtc)
  * Drivers should call this routine in their vblank interrupt handlers to
  * update the vblank counter and send any signals that may be pending.
  */
-void drm_handle_vblank(struct drm_device *dev, int crtc)
+bool drm_handle_vblank(struct drm_device *dev, int crtc)
 {
         u32 vblcount;
         s64 diff_ns;
@@ -1258,7 +1258,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
         unsigned long irqflags;
 
         if (!dev->num_crtcs)
-                return;
+                return false;
 
         /* Need timestamp lock to prevent concurrent execution with
          * vblank enable/disable, as this would cause inconsistent
@@ -1269,7 +1269,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
         /* Vblank irq handling disabled. Nothing to do. */
         if (!dev->vblank_enabled[crtc]) {
                 spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
-                return;
+                return false;
         }
 
         /* Fetch corresponding timestamp for this vblank interval from
@@ -1311,5 +1311,6 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
         drm_handle_vblank_events(dev, crtc);
 
         spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);
+        return true;
 }
 EXPORT_SYMBOL(drm_handle_vblank);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 19a3d58044dd..3601466c5502 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -703,7 +703,7 @@ static void print_error_buffers(struct seq_file *m,
         seq_printf(m, "%s [%d]:\n", name, count);
 
         while (count--) {
-                seq_printf(m, "  %08x %8zd %04x %04x %08x%s%s%s%s%s%s",
+                seq_printf(m, "  %08x %8u %04x %04x %08x%s%s%s%s%s%s",
                            err->gtt_offset,
                            err->size,
                            err->read_domains,
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 844f3c972b04..17bd766f2081 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -152,7 +152,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
-        struct intel_ring_buffer *ring = LP_RING(dev_priv);
+        int ret;
 
         master_priv->sarea = drm_getsarea(dev);
         if (master_priv->sarea) {
@@ -163,33 +163,22 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
         }
 
         if (init->ring_size != 0) {
-                if (ring->obj != NULL) {
+                if (LP_RING(dev_priv)->obj != NULL) {
                         i915_dma_cleanup(dev);
                         DRM_ERROR("Client tried to initialize ringbuffer in "
                                   "GEM mode\n");
                         return -EINVAL;
                 }
 
-                ring->size = init->ring_size;
-
-                ring->map.offset = init->ring_start;
-                ring->map.size = init->ring_size;
-                ring->map.type = 0;
-                ring->map.flags = 0;
-                ring->map.mtrr = 0;
-
-                drm_core_ioremap_wc(&ring->map, dev);
-
-                if (ring->map.handle == NULL) {
+                ret = intel_render_ring_init_dri(dev,
+                                                 init->ring_start,
+                                                 init->ring_size);
+                if (ret) {
                         i915_dma_cleanup(dev);
-                        DRM_ERROR("can not ioremap virtual address for"
-                                  " ring buffer\n");
-                        return -ENOMEM;
+                        return ret;
                 }
         }
 
-        ring->virtual_start = ring->map.handle;
-
         dev_priv->cpp = init->cpp;
         dev_priv->back_offset = init->back_offset;
         dev_priv->front_offset = init->front_offset;
@@ -1226,9 +1215,15 @@ static int i915_load_modeset_init(struct drm_device *dev)
         if (ret)
                 DRM_INFO("failed to find VBIOS tables\n");
 
-        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
+        /* If we have > 1 VGA cards, then we need to arbitrate access
+         * to the common VGA resources.
+         *
+         * If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),
+         * then we do not take part in VGA arbitration and the
+         * vga_client_register() fails with -ENODEV.
+         */
         ret = vga_client_register(dev->pdev, dev, NULL, i915_vga_set_decode);
-        if (ret)
+        if (ret && ret != -ENODEV)
                 goto cleanup_ringbuffer;
 
         intel_register_dsm_handler();
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0de75a23f8e7..cfb56d0ff367 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -49,6 +49,9 @@ module_param_named(powersave, i915_powersave, int, 0600);
 unsigned int i915_lvds_downclock = 0;
 module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
 
+unsigned int i915_panel_use_ssc = 1;
+module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600);
+
 bool i915_try_reset = true;
 module_param_named(reset, i915_try_reset, bool, 0600);
 
@@ -57,7 +60,7 @@ extern int intel_agp_enabled;
 
 #define INTEL_VGA_DEVICE(id, info) {            \
         .class = PCI_CLASS_DISPLAY_VGA << 8,    \
-        .class_mask = 0xffff00,                 \
+        .class_mask = 0xff0000,                 \
         .vendor = 0x8086,                       \
         .device = id,                           \
         .subvendor = PCI_ANY_ID,                \
@@ -351,6 +354,7 @@ static int i915_drm_thaw(struct drm_device *dev)
                 error = i915_gem_init_ringbuffer(dev);
                 mutex_unlock(&dev->struct_mutex);
 
+                drm_mode_config_reset(dev);
                 drm_irq_install(dev);
 
                 /* Resume the modeset for every activated CRTC */
@@ -539,6 +543,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
 
                 mutex_unlock(&dev->struct_mutex);
                 drm_irq_uninstall(dev);
+                drm_mode_config_reset(dev);
                 drm_irq_install(dev);
                 mutex_lock(&dev->struct_mutex);
         }
@@ -563,6 +568,14 @@ int i915_reset(struct drm_device *dev, u8 flags)
 static int __devinit
 i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        /* Only bind to function 0 of the device. Early generations
+         * used function 1 as a placeholder for multi-head. This causes
+         * us confusion instead, especially on the systems where both
+         * functions have the same PCI-ID!
+         */
+        if (PCI_FUNC(pdev->devfn))
+                return -ENODEV;
+
         return drm_get_pci_dev(pdev, ent, &driver);
 }
 
@@ -749,6 +762,9 @@ static int __init i915_init(void)
                 driver.driver_features &= ~DRIVER_MODESET;
 #endif
 
+        if (!(driver.driver_features & DRIVER_MODESET))
+                driver.get_vblank_timestamp = NULL;
+
         return drm_init(&driver);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 385fc7ec39d3..a0149c619cdd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -543,8 +543,11 @@ typedef struct drm_i915_private {
                 /** List of all objects in gtt_space. Used to restore gtt
                  * mappings on resume */
                 struct list_head gtt_list;
-                /** End of mappable part of GTT */
+
+                /** Usable portion of the GTT for GEM */
+                unsigned long gtt_start;
                 unsigned long gtt_mappable_end;
+                unsigned long gtt_end;
 
                 struct io_mapping *gtt_mapping;
                 int gtt_mtrr;
@@ -954,6 +957,7 @@ extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc;
 extern unsigned int i915_powersave;
 extern unsigned int i915_lvds_downclock;
+extern unsigned int i915_panel_use_ssc;
 
 extern int i915_suspend(struct drm_device *dev, pm_message_t state);
 extern int i915_resume(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3dfc848ff755..cf4f74c7c6fb 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -140,12 +140,16 @@ void i915_gem_do_init(struct drm_device *dev,
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
 
-        drm_mm_init(&dev_priv->mm.gtt_space, start,
-                    end - start);
+        drm_mm_init(&dev_priv->mm.gtt_space, start, end - start);
 
+        dev_priv->mm.gtt_start = start;
+        dev_priv->mm.gtt_mappable_end = mappable_end;
+        dev_priv->mm.gtt_end = end;
         dev_priv->mm.gtt_total = end - start;
         dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start;
-        dev_priv->mm.gtt_mappable_end = mappable_end;
+
+        /* Take over this portion of the GTT */
+        intel_gtt_clear_range(start / PAGE_SIZE, (end-start) / PAGE_SIZE);
 }
 
 int
@@ -1857,7 +1861,7 @@ i915_gem_retire_requests_ring(struct drm_device *dev,
 
         seqno = ring->get_seqno(ring);
 
-        for (i = 0; i < I915_NUM_RINGS; i++)
+        for (i = 0; i < ARRAY_SIZE(ring->sync_seqno); i++)
                 if (seqno >= ring->sync_seqno[i])
                         ring->sync_seqno[i] = 0;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index e69834341ef0..d2f445e825f2 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -464,8 +464,6 @@ i915_gem_execbuffer_relocate(struct drm_device *dev,
         int ret;
 
         list_for_each_entry(obj, objects, exec_list) {
-                obj->base.pending_read_domains = 0;
-                obj->base.pending_write_domain = 0;
                 ret = i915_gem_execbuffer_relocate_object(obj, eb);
                 if (ret)
                         return ret;
@@ -505,6 +503,9 @@ i915_gem_execbuffer_reserve(struct intel_ring_buffer *ring,
                         list_move(&obj->exec_list, &ordered_objects);
                 else
                         list_move_tail(&obj->exec_list, &ordered_objects);
+
+                obj->base.pending_read_domains = 0;
+                obj->base.pending_write_domain = 0;
         }
         list_splice(&ordered_objects, objects);
 
@@ -636,6 +637,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
 {
         struct drm_i915_gem_relocation_entry *reloc;
         struct drm_i915_gem_object *obj;
+        int *reloc_offset;
         int i, total, ret;
 
         /* We may process another execbuffer during the unlock... */
@@ -653,8 +655,11 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
         for (i = 0; i < count; i++)
                 total += exec[i].relocation_count;
 
+        reloc_offset = drm_malloc_ab(count, sizeof(*reloc_offset));
         reloc = drm_malloc_ab(total, sizeof(*reloc));
-        if (reloc == NULL) {
+        if (reloc == NULL || reloc_offset == NULL) {
+                drm_free_large(reloc);
+                drm_free_large(reloc_offset);
                 mutex_lock(&dev->struct_mutex);
                 return -ENOMEM;
         }
@@ -672,6 +677,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
                         goto err;
                 }
 
+                reloc_offset[i] = total;
                 total += exec[i].relocation_count;
         }
 
@@ -705,17 +711,12 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
         if (ret)
                 goto err;
 
-        total = 0;
         list_for_each_entry(obj, objects, exec_list) {
-                obj->base.pending_read_domains = 0;
-                obj->base.pending_write_domain = 0;
+                int offset = obj->exec_entry - exec;
                 ret = i915_gem_execbuffer_relocate_object_slow(obj, eb,
-                                                               reloc + total);
+                                                               reloc + reloc_offset[offset]);
                 if (ret)
                         goto err;
-
-                total += exec->relocation_count;
-                exec++;
         }
 
         /* Leave the user relocations as are, this is the painfully slow path,
@@ -726,6 +727,7 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
 
 err:
         drm_free_large(reloc);
+        drm_free_large(reloc_offset);
         return ret;
 }
 
@@ -770,7 +772,8 @@ i915_gem_execbuffer_sync_rings(struct drm_i915_gem_object *obj,
         if (from == NULL || to == from)
                 return 0;
 
-        if (INTEL_INFO(obj->base.dev)->gen < 6)
+        /* XXX gpu semaphores are currently causing hard hangs on SNB mobile */
+        if (INTEL_INFO(obj->base.dev)->gen < 6 || IS_MOBILE(obj->base.dev))
                 return i915_gem_object_wait_rendering(obj, true);
 
         idx = intel_ring_sync_index(from, to);
@@ -1172,7 +1175,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                 goto err;
 
         seqno = i915_gem_next_request_seqno(dev, ring);
-        for (i = 0; i < I915_NUM_RINGS-1; i++) {
+        for (i = 0; i < ARRAY_SIZE(ring->sync_seqno); i++) {
                 if (seqno < ring->sync_seqno[i]) {
                         /* The GPU can not handle its semaphore value wrapping,
                          * so every billion or so execbuffers, we need to stall
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 70433ae50ac8..b0abdc64aa9f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -34,6 +34,10 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
 
+        /* First fill our portion of the GTT with scratch pages */
+        intel_gtt_clear_range(dev_priv->mm.gtt_start / PAGE_SIZE,
+                              (dev_priv->mm.gtt_end - dev_priv->mm.gtt_start) / PAGE_SIZE);
+
         list_for_each_entry(obj, &dev_priv->mm.gtt_list, gtt_list) {
                 i915_gem_clflush_object(obj);
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index e418e8bb61e6..97f946dcc1aa 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -274,24 +274,35 @@ int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,
         return ret;
 }
 
-int i915_get_vblank_timestamp(struct drm_device *dev, int crtc,
+int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,
                               int *max_error,
                               struct timeval *vblank_time,
                               unsigned flags)
 {
-        struct drm_crtc *drmcrtc;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_crtc *crtc;
 
-        if (crtc < 0 || crtc >= dev->num_crtcs) {
-                DRM_ERROR("Invalid crtc %d\n", crtc);
+        if (pipe < 0 || pipe >= dev_priv->num_pipe) {
+                DRM_ERROR("Invalid crtc %d\n", pipe);
                 return -EINVAL;
         }
 
         /* Get drm_crtc to timestamp: */
-        drmcrtc = intel_get_crtc_for_pipe(dev, crtc);
+        crtc = intel_get_crtc_for_pipe(dev, pipe);
+        if (crtc == NULL) {
+                DRM_ERROR("Invalid crtc %d\n", pipe);
+                return -EINVAL;
+        }
+
+        if (!crtc->enabled) {
+                DRM_DEBUG_KMS("crtc %d is disabled\n", pipe);
+                return -EBUSY;
+        }
 
         /* Helper routine in DRM core does all the work: */
-        return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error,
-                                                     vblank_time, flags, drmcrtc);
+        return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,
+                                                     vblank_time, flags,
+                                                     crtc);
 }
 
 /*
@@ -348,8 +359,12 @@ static void notify_ring(struct drm_device *dev,
                         struct intel_ring_buffer *ring)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        u32 seqno = ring->get_seqno(ring);
+        u32 seqno;
 
+        if (ring->obj == NULL)
+                return;
+
+        seqno = ring->get_seqno(ring);
         trace_i915_gem_request_complete(dev, seqno);
 
         ring->irq_seqno = seqno;
@@ -720,7 +735,7 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv,
                 if (obj->ring != ring)
                         continue;
 
-                if (!i915_seqno_passed(obj->last_rendering_seqno, seqno))
+                if (i915_seqno_passed(seqno, obj->last_rendering_seqno))
                         continue;
 
                 if ((obj->base.read_domains & I915_GEM_DOMAIN_COMMAND) == 0)
@@ -831,6 +846,8 @@ static void i915_capture_error_state(struct drm_device *dev)
                 i++;
         error->pinned_bo_count = i - error->active_bo_count;
 
+        error->active_bo = NULL;
+        error->pinned_bo = NULL;
         if (i) {
                 error->active_bo = kmalloc(sizeof(*error->active_bo)*i,
                                            GFP_ATOMIC);
@@ -1179,18 +1196,18 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                                 intel_finish_page_flip_plane(dev, 1);
                 }
 
-                if (pipea_stats & vblank_status) {
+                if (pipea_stats & vblank_status &&
+                    drm_handle_vblank(dev, 0)) {
                         vblank++;
-                        drm_handle_vblank(dev, 0);
                         if (!dev_priv->flip_pending_is_done) {
                                 i915_pageflip_stall_check(dev, 0);
                                 intel_finish_page_flip(dev, 0);
                         }
                 }
 
-                if (pipeb_stats & vblank_status) {
+                if (pipeb_stats & vblank_status &&
+                    drm_handle_vblank(dev, 1)) {
                         vblank++;
-                        drm_handle_vblank(dev, 1);
                         if (!dev_priv->flip_pending_is_done) {
                                 i915_pageflip_stall_check(dev, 1);
                                 intel_finish_page_flip(dev, 1);
@@ -1278,12 +1295,12 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
         if (master_priv->sarea_priv)
                 master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 
-        ret = -ENODEV;
         if (ring->irq_get(ring)) {
                 DRM_WAIT_ON(ret, ring->irq_queue, 3 * DRM_HZ,
                             READ_BREADCRUMB(dev_priv) >= irq_nr);
                 ring->irq_put(ring);
-        }
+        } else if (wait_for(READ_BREADCRUMB(dev_priv) >= irq_nr, 3000))
+                ret = -EBUSY;
 
         if (ret == -EBUSY) {
                 DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 40a407f41f61..5cfc68940f17 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -513,6 +513,10 @@
 #define   GEN6_BLITTER_SYNC_STATUS                      (1 << 24)
 #define   GEN6_BLITTER_USER_INTERRUPT                   (1 << 22)
 
+#define GEN6_BLITTER_ECOSKPD    0x221d0
+#define   GEN6_BLITTER_LOCK_SHIFT                       16
+#define   GEN6_BLITTER_FBC_NOTIFY                       (1<<3)
+
 #define GEN6_BSD_SLEEP_PSMI_CONTROL     0x12050
 #define   GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK       (1 << 16)
 #define   GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE           (1 << 0)
@@ -2626,6 +2630,8 @@
 #define DISPLAY_PORT_PLL_BIOS_2         0x46014
 
 #define PCH_DSPCLK_GATE_D       0x42020
+# define DPFCUNIT_CLOCK_GATE_DISABLE            (1 << 9)
+# define DPFCRUNIT_CLOCK_GATE_DISABLE           (1 << 8)
 # define DPFDUNIT_CLOCK_GATE_DISABLE            (1 << 7)
 # define DPARBUNIT_CLOCK_GATE_DISABLE           (1 << 5)
 
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b0b1200ed650..0b44956c336b 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -264,17 +264,12 @@ parse_general_features(struct drm_i915_private *dev_priv,
                 dev_priv->int_crt_support = general->int_crt_support;
                 dev_priv->lvds_use_ssc = general->enable_ssc;
 
-                if (dev_priv->lvds_use_ssc) {
-                        if (IS_I85X(dev))
-                                dev_priv->lvds_ssc_freq =
-                                        general->ssc_freq ? 66 : 48;
-                        else if (IS_GEN5(dev) || IS_GEN6(dev))
-                                dev_priv->lvds_ssc_freq =
-                                        general->ssc_freq ? 100 : 120;
-                        else
-                                dev_priv->lvds_ssc_freq =
-                                        general->ssc_freq ? 100 : 96;
-                }
+                if (IS_I85X(dev))
+                        dev_priv->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
+                else if (IS_GEN5(dev) || IS_GEN6(dev))
+                        dev_priv->lvds_ssc_freq = general->ssc_freq ? 100 : 120;
+                else
+                        dev_priv->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
         }
 }
 
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 17035b87ee46..8a77ff4a7237 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -535,6 +535,15 @@ static int intel_crt_set_property(struct drm_connector *connector,
         return 0;
 }
 
+static void intel_crt_reset(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct intel_crt *crt = intel_attached_crt(connector);
+
+        if (HAS_PCH_SPLIT(dev))
+                crt->force_hotplug_required = 1;
+}
+
 /*
  * Routines for controlling stuff on the analog port
  */
@@ -548,6 +557,7 @@ static const struct drm_encoder_helper_funcs intel_crt_helper_funcs = {
 };
 
 static const struct drm_connector_funcs intel_crt_connector_funcs = {
+        .reset = intel_crt_reset,
         .dpms = drm_helper_connector_dpms,
         .detect = intel_crt_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 25d96889d7d2..7e42aa586504 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1213,6 +1213,26 @@ static bool g4x_fbc_enabled(struct drm_device *dev)
         return I915_READ(DPFC_CONTROL) & DPFC_CTL_EN;
 }
 
+static void sandybridge_blit_fbc_update(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        u32 blt_ecoskpd;
+
+        /* Make sure blitter notifies FBC of writes */
+        __gen6_force_wake_get(dev_priv);
+        blt_ecoskpd = I915_READ(GEN6_BLITTER_ECOSKPD);
+        blt_ecoskpd |= GEN6_BLITTER_FBC_NOTIFY <<
+                GEN6_BLITTER_LOCK_SHIFT;
+        I915_WRITE(GEN6_BLITTER_ECOSKPD, blt_ecoskpd);
+        blt_ecoskpd |= GEN6_BLITTER_FBC_NOTIFY;
+        I915_WRITE(GEN6_BLITTER_ECOSKPD, blt_ecoskpd);
+        blt_ecoskpd &= ~(GEN6_BLITTER_FBC_NOTIFY <<
+                         GEN6_BLITTER_LOCK_SHIFT);
+        I915_WRITE(GEN6_BLITTER_ECOSKPD, blt_ecoskpd);
+        POSTING_READ(GEN6_BLITTER_ECOSKPD);
+        __gen6_force_wake_put(dev_priv);
+}
+
 static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
 {
         struct drm_device *dev = crtc->dev;
@@ -1266,6 +1286,7 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
                 I915_WRITE(SNB_DPFC_CTL_SA,
                            SNB_CPU_FENCE_ENABLE | dev_priv->cfb_fence);
                 I915_WRITE(DPFC_CPU_FENCE_OFFSET, crtc->y);
+                sandybridge_blit_fbc_update(dev);
         }
 
         DRM_DEBUG_KMS("enabled fbc on plane %d\n", intel_crtc->plane);
@@ -3822,6 +3843,11 @@ static void intel_update_watermarks(struct drm_device *dev)
                                     sr_hdisplay, sr_htotal, pixel_size);
 }
 
+static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
+{
+        return dev_priv->lvds_use_ssc && i915_panel_use_ssc;
+}
+
 static int intel_crtc_mode_set(struct drm_crtc *crtc,
                                struct drm_display_mode *mode,
                                struct drm_display_mode *adjusted_mode,
@@ -3884,7 +3910,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                 num_connectors++;
         }
 
-        if (is_lvds && dev_priv->lvds_use_ssc && num_connectors < 2) {
+        if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2) {
                 refclk = dev_priv->lvds_ssc_freq * 1000;
                 DRM_DEBUG_KMS("using SSC reference clock of %d MHz\n",
                               refclk / 1000);
@@ -4059,7 +4085,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                 udelay(200);
 
                 if (has_edp_encoder) {
-                        if (dev_priv->lvds_use_ssc) {
+                        if (intel_panel_use_ssc(dev_priv)) {
                                 temp |= DREF_SSC1_ENABLE;
                                 I915_WRITE(PCH_DREF_CONTROL, temp);
 
@@ -4070,13 +4096,13 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 
                         /* Enable CPU source on CPU attached eDP */
                         if (!intel_encoder_is_pch_edp(&has_edp_encoder->base)) {
-                                if (dev_priv->lvds_use_ssc)
+                                if (intel_panel_use_ssc(dev_priv))
                                         temp |= DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD;
                                 else
                                         temp |= DREF_CPU_SOURCE_OUTPUT_NONSPREAD;
                         } else {
                                 /* Enable SSC on PCH eDP if needed */
-                                if (dev_priv->lvds_use_ssc) {
+                                if (intel_panel_use_ssc(dev_priv)) {
                                         DRM_ERROR("enabling SSC on PCH\n");
                                         temp |= DREF_SUPERSPREAD_SOURCE_ENABLE;
                                 }
@@ -4104,7 +4130,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                 int factor = 21;
 
                 if (is_lvds) {
-                        if ((dev_priv->lvds_use_ssc &&
+                        if ((intel_panel_use_ssc(dev_priv) &&
                              dev_priv->lvds_ssc_freq == 100) ||
                             (I915_READ(PCH_LVDS) & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP)
                                 factor = 25;
@@ -4183,7 +4209,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
                 /* XXX: just matching BIOS for now */
                 /*      dpll |= PLL_REF_INPUT_TVCLKINBC; */
                 dpll |= 3;
-        else if (is_lvds && dev_priv->lvds_use_ssc && num_connectors < 2)
+        else if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2)
                 dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
         else
                 dpll |= PLL_REF_INPUT_DREFCLK;
@@ -5525,6 +5551,18 @@ cleanup_work:
         return ret;
 }
 
+static void intel_crtc_reset(struct drm_crtc *crtc)
+{
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+
+        /* Reset flags back to the 'unknown' status so that they
+         * will be correctly set on the initial modeset.
+         */
+        intel_crtc->cursor_addr = 0;
+        intel_crtc->dpms_mode = -1;
+        intel_crtc->active = true; /* force the pipe off on setup_init_config */
+}
+
 static struct drm_crtc_helper_funcs intel_helper_funcs = {
         .dpms = intel_crtc_dpms,
         .mode_fixup = intel_crtc_mode_fixup,
@@ -5536,6 +5574,7 @@ static struct drm_crtc_helper_funcs intel_helper_funcs = {
 };
 
 static const struct drm_crtc_funcs intel_crtc_funcs = {
+        .reset = intel_crtc_reset,
         .cursor_set = intel_crtc_cursor_set,
         .cursor_move = intel_crtc_cursor_move,
         .gamma_set = intel_crtc_gamma_set,
@@ -5626,9 +5665,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
         dev_priv->plane_to_crtc_mapping[intel_crtc->plane] = &intel_crtc->base;
         dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;
 
-        intel_crtc->cursor_addr = 0;
-        intel_crtc->dpms_mode = -1;
-        intel_crtc->active = true; /* force the pipe off on setup_init_config */
+        intel_crtc_reset(&intel_crtc->base);
 
         if (HAS_PCH_SPLIT(dev)) {
                 intel_helper_funcs.prepare = ironlake_crtc_prepare;
@@ -6281,7 +6318,9 @@ void intel_enable_clock_gating(struct drm_device *dev)
 
                 if (IS_GEN5(dev)) {
                         /* Required for FBC */
-                        dspclk_gate |= DPFDUNIT_CLOCK_GATE_DISABLE;
+                        dspclk_gate |= DPFCUNIT_CLOCK_GATE_DISABLE |
+                                DPFCRUNIT_CLOCK_GATE_DISABLE |
+                                DPFDUNIT_CLOCK_GATE_DISABLE;
                         /* Required for CxSR */
                         dspclk_gate |= DPARBUNIT_CLOCK_GATE_DISABLE;
 
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index ee145a257287..512782728e51 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -148,6 +148,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
 //      memset(info->screen_base, 0, size);
 
+        drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
         drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
 
         info->pixmap.size = 64*1024;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 8f4f6bd33ee9..ace8d5d30dd2 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -704,6 +704,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
         },
         {
                 .callback = intel_no_lvds_dmi_callback,
+                .ident = "AOpen i915GMm-HFS",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+                        DMI_MATCH(DMI_BOARD_NAME, "i915GMm-HFS"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
                 .ident = "Aopen i945GTt-VFA",
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"),
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index f295a7aaadf9..64fd64443ca6 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/acpi_io.h>
 #include <acpi/video.h>
 
 #include "drmP.h"
@@ -476,7 +477,7 @@ int intel_opregion_setup(struct drm_device *dev)
                 return -ENOTSUPP;
         }
 
-        base = ioremap(asls, OPREGION_SIZE);
+        base = acpi_os_ioremap(asls, OPREGION_SIZE);
         if (!base)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e00d200df3db..c65992df458d 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -278,6 +278,6 @@ void intel_panel_setup_backlight(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
+        dev_priv->backlight_level = intel_panel_get_backlight(dev);
         dev_priv->backlight_enabled = dev_priv->backlight_level != 0;
 }
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 03e337072517..6218fa97aa1e 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -34,6 +34,14 @@
 #include "i915_trace.h"
 #include "intel_drv.h"
 
+static inline int ring_space(struct intel_ring_buffer *ring)
+{
+        int space = (ring->head & HEAD_ADDR) - (ring->tail + 8);
+        if (space < 0)
+                space += ring->size;
+        return space;
+}
+
 static u32 i915_gem_get_seqno(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
@@ -204,11 +212,9 @@ static int init_ring_common(struct intel_ring_buffer *ring)
         if (!drm_core_check_feature(ring->dev, DRIVER_MODESET))
                 i915_kernel_lost_context(ring->dev);
         else {
-                ring->head = I915_READ_HEAD(ring) & HEAD_ADDR;
+                ring->head = I915_READ_HEAD(ring);
                 ring->tail = I915_READ_TAIL(ring) & TAIL_ADDR;
-                ring->space = ring->head - (ring->tail + 8);
-                if (ring->space < 0)
-                        ring->space += ring->size;
+                ring->space = ring_space(ring);
         }
 
         return 0;
@@ -921,7 +927,7 @@ static int intel_wrap_ring_buffer(struct intel_ring_buffer *ring)
         }
 
         ring->tail = 0;
-        ring->space = ring->head - 8;
+        ring->space = ring_space(ring);
 
         return 0;
 }
@@ -933,20 +939,22 @@ int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)
         unsigned long end;
         u32 head;
 
+        /* If the reported head position has wrapped or hasn't advanced,
+         * fallback to the slow and accurate path.
+         */
+        head = intel_read_status_page(ring, 4);
+        if (head > ring->head) {
+                ring->head = head;
+                ring->space = ring_space(ring);
+                if (ring->space >= n)
+                        return 0;
+        }
+
         trace_i915_ring_wait_begin (dev);
         end = jiffies + 3 * HZ;
         do {
-                /* If the reported head position has wrapped or hasn't advanced,
-                 * fallback to the slow and accurate path.
-                 */
-                head = intel_read_status_page(ring, 4);
-                if (head < ring->actual_head)
-                        head = I915_READ_HEAD(ring);
-                ring->actual_head = head;
-                ring->head = head & HEAD_ADDR;
-                ring->space = ring->head - (ring->tail + 8);
-                if (ring->space < 0)
-                        ring->space += ring->size;
+                ring->head = I915_READ_HEAD(ring);
+                ring->space = ring_space(ring);
                 if (ring->space >= n) {
                         trace_i915_ring_wait_end(dev);
                         return 0;
@@ -1291,6 +1299,48 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
         return intel_init_ring_buffer(dev, ring);
 }
 
+int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        struct intel_ring_buffer *ring = &dev_priv->ring[RCS];
+
+        *ring = render_ring;
+        if (INTEL_INFO(dev)->gen >= 6) {
+                ring->add_request = gen6_add_request;
+                ring->irq_get = gen6_render_ring_get_irq;
+                ring->irq_put = gen6_render_ring_put_irq;
+        } else if (IS_GEN5(dev)) {
+                ring->add_request = pc_render_add_request;
+                ring->get_seqno = pc_render_get_seqno;
+        }
+
+        ring->dev = dev;
+        INIT_LIST_HEAD(&ring->active_list);
+        INIT_LIST_HEAD(&ring->request_list);
+        INIT_LIST_HEAD(&ring->gpu_write_list);
+
+        ring->size = size;
+        ring->effective_size = ring->size;
+        if (IS_I830(ring->dev))
+                ring->effective_size -= 128;
+
+        ring->map.offset = start;
+        ring->map.size = size;
+        ring->map.type = 0;
+        ring->map.flags = 0;
+        ring->map.mtrr = 0;
+
+        drm_core_ioremap_wc(&ring->map, dev);
+        if (ring->map.handle == NULL) {
+                DRM_ERROR("can not ioremap virtual address for"
+                          " ring buffer\n");
+                return -ENOMEM;
+        }
+
+        ring->virtual_start = (void __force __iomem *)ring->map.handle;
+        return 0;
+}
+
 int intel_init_bsd_ring_buffer(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index be9087e4c9be..6d6fde85a636 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -47,7 +47,6 @@ struct  intel_ring_buffer {
         struct          drm_device *dev;
         struct          drm_i915_gem_object *obj;
 
-        u32             actual_head;
         u32             head;
         u32             tail;
         int             space;
@@ -167,4 +166,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev);
 u32 intel_ring_get_active_head(struct intel_ring_buffer *ring);
 void intel_ring_setup_status_page(struct intel_ring_buffer *ring);
 
+/* DRI warts */
+int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size);
+
 #endif /* _INTEL_RINGBUFFER_H_ */
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 45cd37652a37..6a09c1413d60 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -473,20 +473,6 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
                 return false;
         }
 
-        i = 3;
-        while (status == SDVO_CMD_STATUS_PENDING && i--) {
-                if (!intel_sdvo_read_byte(intel_sdvo,
-                                          SDVO_I2C_CMD_STATUS,
-                                          &status))
-                        return false;
-        }
-        if (status != SDVO_CMD_STATUS_SUCCESS) {
-                DRM_DEBUG_KMS("command returns response %s [%d]\n",
-                              status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP ? cmd_status_names[status] : "???",
-                              status);
-                return false;
-        }
-
         return true;
 }
 
@@ -497,6 +483,8 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
         u8 status;
         int i;
 
+        DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(intel_sdvo));
+
         /*
          * The documentation states that all commands will be
          * processed within 15µs, and that we need only poll
@@ -505,14 +493,19 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
          *
          * Check 5 times in case the hardware failed to read the docs.
          */
-        do {
+        if (!intel_sdvo_read_byte(intel_sdvo,
+                                  SDVO_I2C_CMD_STATUS,
+                                  &status))
+                goto log_fail;
+
+        while (status == SDVO_CMD_STATUS_PENDING && retry--) {
+                udelay(15);
                 if (!intel_sdvo_read_byte(intel_sdvo,
                                           SDVO_I2C_CMD_STATUS,
                                           &status))
-                        return false;
-        } while (status == SDVO_CMD_STATUS_PENDING && --retry);
+                        goto log_fail;
+        }
 
-        DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(intel_sdvo));
         if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
                 DRM_LOG_KMS("(%s)", cmd_status_names[status]);
         else
@@ -533,7 +526,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
         return true;
 
 log_fail:
-        DRM_LOG_KMS("\n");
+        DRM_LOG_KMS("... failed\n");
         return false;
 }
 
@@ -550,6 +543,7 @@ static int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode)
 static bool intel_sdvo_set_control_bus_switch(struct intel_sdvo *intel_sdvo,
                                               u8 ddc_bus)
 {
+        /* This must be the immediately preceding write before the i2c xfer */
         return intel_sdvo_write_cmd(intel_sdvo,
                                     SDVO_CMD_SET_CONTROL_BUS_SWITCH,
                                     &ddc_bus, 1);
@@ -557,7 +551,10 @@ static bool intel_sdvo_set_control_bus_switch(struct intel_sdvo *intel_sdvo,
 
 static bool intel_sdvo_set_value(struct intel_sdvo *intel_sdvo, u8 cmd, const void *data, int len)
 {
-        return intel_sdvo_write_cmd(intel_sdvo, cmd, data, len);
+        if (!intel_sdvo_write_cmd(intel_sdvo, cmd, data, len))
+                return false;
+
+        return intel_sdvo_read_response(intel_sdvo, NULL, 0);
 }
 
 static bool
@@ -859,18 +856,21 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo)
 
         intel_dip_infoframe_csum(&avi_if);
 
-        if (!intel_sdvo_write_cmd(intel_sdvo, SDVO_CMD_SET_HBUF_INDEX,
+        if (!intel_sdvo_set_value(intel_sdvo,
+                                  SDVO_CMD_SET_HBUF_INDEX,
                                   set_buf_index, 2))
                 return false;
 
         for (i = 0; i < sizeof(avi_if); i += 8) {
-                if (!intel_sdvo_write_cmd(intel_sdvo, SDVO_CMD_SET_HBUF_DATA,
+                if (!intel_sdvo_set_value(intel_sdvo,
+                                          SDVO_CMD_SET_HBUF_DATA,
                                           data, 8))
                         return false;
                 data++;
         }
 
-        return intel_sdvo_write_cmd(intel_sdvo, SDVO_CMD_SET_HBUF_TXRATE,
+        return intel_sdvo_set_value(intel_sdvo,
+                                    SDVO_CMD_SET_HBUF_TXRATE,
                                     &tx_rate, 1);
 }
 
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 21d6c29c2d21..de70959b9ed5 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -8,7 +8,7 @@ config DRM_NOUVEAU
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         select FB
-        select FRAMEBUFFER_CONSOLE if !EMBEDDED
+        select FRAMEBUFFER_CONSOLE if !EXPERT
         select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
         select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
         help
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 2aef5cd3acf5..49e5e99917e2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -6310,6 +6310,9 @@ void merge_like_dcb_entries(struct drm_device *dev, struct dcb_table *dcb)
 static bool
 apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)
 {
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct dcb_table *dcb = &dev_priv->vbios.dcb;
+
         /* Dell Precision M6300
          *   DCB entry 2: 02025312 00000010
          *   DCB entry 3: 02026312 00000020
@@ -6327,6 +6330,18 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf)
                         return false;
         }
 
+        /* GeForce3 Ti 200
+         *
+         * DCB reports an LVDS output that should be TMDS:
+         *   DCB entry 1: f2005014 ffffffff
+         */
+        if (nv_match_device(dev, 0x0201, 0x1462, 0x8851)) {
+                if (*conn == 0xf2005014 && *conf == 0xffffffff) {
+                        fabricate_dcb_output(dcb, OUTPUT_TMDS, 1, 1, 1);
+                        return false;
+                }
+        }
+
         return true;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 13bb672a16f4..f658a04eecf9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -234,9 +234,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
                 pci_set_power_state(pdev, PCI_D3hot);
         }
 
-        acquire_console_sem();
+        console_lock();
         nouveau_fbcon_set_suspend(dev, 1);
-        release_console_sem();
+        console_unlock();
         nouveau_fbcon_restore_accel(dev);
         return 0;
 
@@ -359,9 +359,9 @@ nouveau_pci_resume(struct pci_dev *pdev)
                 nv_crtc->lut.depth = 0;
         }
 
-        acquire_console_sem();
+        console_lock();
         nouveau_fbcon_set_suspend(dev, 0);
-        release_console_sem();
+        console_unlock();
 
         nouveau_fbcon_zfill_all(dev);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 46e32573b3a3..9821fcacc3d2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -160,6 +160,7 @@ enum nouveau_flags {
 #define NVOBJ_FLAG_ZERO_ALLOC           (1 << 1)
 #define NVOBJ_FLAG_ZERO_FREE            (1 << 2)
 #define NVOBJ_FLAG_VM                   (1 << 3)
+#define NVOBJ_FLAG_VM_USER              (1 << 4)
 
 #define NVOBJ_CINST_GLOBAL      0xdeadbeef
 
@@ -847,9 +848,6 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev,
                                      struct nouveau_fence *fence);
 extern const struct ttm_mem_type_manager_func nouveau_vram_manager;
 
-/* nvc0_vram.c */
-extern const struct ttm_mem_type_manager_func nvc0_vram_manager;
-
 /* nouveau_notifier.c */
 extern int  nouveau_notifier_init_channel(struct nouveau_channel *);
 extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);
@@ -1576,6 +1574,20 @@ nv_match_device(struct drm_device *dev, unsigned device,
                 dev->pdev->subsystem_device == sub_device;
 }
 
+/* returns 1 if device is one of the nv4x using the 0x4497 object class,
+ * helpful to determine a number of other hardware features
+ */
+static inline int
+nv44_graph_class(struct drm_device *dev)
+{
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+        if ((dev_priv->chipset & 0xf0) == 0x60)
+                return 1;
+
+        return !(0x0baf & (1 << (dev_priv->chipset & 0x0f)));
+}
+
 /* memory type/access flags, do not match hardware values */
 #define NV_MEM_ACCESS_RO  1
 #define NV_MEM_ACCESS_WO  2
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index a26d04740c88..60769d2f9a66 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -352,13 +352,14 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
                               FBINFO_HWACCEL_IMAGEBLIT;
         info->flags |= FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &nouveau_fbcon_sw_ops;
-        info->fix.smem_start = dev->mode_config.fb_base +
-                               (nvbo->bo.mem.start << PAGE_SHIFT);
+        info->fix.smem_start = nvbo->bo.mem.bus.base +
+                               nvbo->bo.mem.bus.offset;
         info->fix.smem_len = size;
 
         info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo);
         info->screen_size = size;
 
+        drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
         drm_fb_helper_fill_var(info, &nfbdev->helper, sizes->fb_width, sizes->fb_height);
 
         /* Set aperture base/size for vesafb takeover */
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 69044eb104bb..26347b7cd872 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -742,30 +742,24 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
 {
         struct nouveau_mm *mm = man->priv;
         struct nouveau_mm_node *r;
-        u64 total = 0, ttotal[3] = {}, tused[3] = {}, tfree[3] = {};
-        int i;
+        u32 total = 0, free = 0;
 
         mutex_lock(&mm->mutex);
         list_for_each_entry(r, &mm->nodes, nl_entry) {
-                printk(KERN_DEBUG "%s %s-%d: 0x%010llx 0x%010llx\n",
-                       prefix, r->free ? "free" : "used", r->type,
-                       ((u64)r->offset << 12),
+                printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n",
+                       prefix, r->type, ((u64)r->offset << 12),
                        (((u64)r->offset + r->length) << 12));
+
                 total += r->length;
-                ttotal[r->type] += r->length;
-                if (r->free)
-                        tfree[r->type] += r->length;
-                else
-                        tused[r->type] += r->length;
+                if (!r->type)
+                        free += r->length;
         }
         mutex_unlock(&mm->mutex);
 
-        printk(KERN_DEBUG "%s  total: 0x%010llx\n", prefix, total << 12);
-        for (i = 0; i < 3; i++) {
-                printk(KERN_DEBUG "%s type %d: 0x%010llx, "
-                                  "used 0x%010llx, free 0x%010llx\n", prefix,
-                       i, ttotal[i] << 12, tused[i] << 12, tfree[i] << 12);
-        }
+        printk(KERN_DEBUG "%s  total: 0x%010llx free: 0x%010llx\n",
+               prefix, (u64)total << 12, (u64)free << 12);
+        printk(KERN_DEBUG "%s  block: 0x%08x\n",
+               prefix, mm->block_size << 12);
 }
 
 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/nouveau_mm.c
index cdbb11eb701b..8844b50c3e54 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mm.c
@@ -48,175 +48,76 @@ region_split(struct nouveau_mm *rmm, struct nouveau_mm_node *a, u32 size)
 
         b->offset = a->offset;
         b->length = size;
-        b->free   = a->free;
         b->type   = a->type;
         a->offset += size;
         a->length -= size;
         list_add_tail(&b->nl_entry, &a->nl_entry);
-        if (b->free)
+        if (b->type == 0)
                 list_add_tail(&b->fl_entry, &a->fl_entry);
         return b;
 }
 
-static struct nouveau_mm_node *
-nouveau_mm_merge(struct nouveau_mm *rmm, struct nouveau_mm_node *this)
-{
-        struct nouveau_mm_node *prev, *next;
-
-        /* try to merge with free adjacent entries of same type */
-        prev = list_entry(this->nl_entry.prev, struct nouveau_mm_node, nl_entry);
-        if (this->nl_entry.prev != &rmm->nodes) {
-                if (prev->free && prev->type == this->type) {
-                        prev->length += this->length;
-                        region_put(rmm, this);
-                        this = prev;
-                }
-        }
-
-        next = list_entry(this->nl_entry.next, struct nouveau_mm_node, nl_entry);
-        if (this->nl_entry.next != &rmm->nodes) {
-                if (next->free && next->type == this->type) {
-                        next->offset  = this->offset;
-                        next->length += this->length;
-                        region_put(rmm, this);
-                        this = next;
-                }
-        }
-
-        return this;
-}
+#define node(root, dir) ((root)->nl_entry.dir == &rmm->nodes) ? NULL : \
+        list_entry((root)->nl_entry.dir, struct nouveau_mm_node, nl_entry)
 
 void
 nouveau_mm_put(struct nouveau_mm *rmm, struct nouveau_mm_node *this)
 {
-        u32 block_s, block_l;
+        struct nouveau_mm_node *prev = node(this, prev);
+        struct nouveau_mm_node *next = node(this, next);
 
-        this->free = true;
         list_add(&this->fl_entry, &rmm->free);
-        this = nouveau_mm_merge(rmm, this);
-
-        /* any entirely free blocks now?  we'll want to remove typing
-         * on them now so they can be use for any memory allocation
-         */
-        block_s = roundup(this->offset, rmm->block_size);
-        if (block_s + rmm->block_size > this->offset + this->length)
-                return;
+        this->type = 0;
 
-        /* split off any still-typed region at the start */
-        if (block_s != this->offset) {
-                if (!region_split(rmm, this, block_s - this->offset))
-                        return;
+        if (prev && prev->type == 0) {
+                prev->length += this->length;
+                region_put(rmm, this);
+                this = prev;
         }
 
-        /* split off the soon-to-be-untyped block(s) */
-        block_l = rounddown(this->length, rmm->block_size);
-        if (block_l != this->length) {
-                this = region_split(rmm, this, block_l);
-                if (!this)
-                        return;
+        if (next && next->type == 0) {
+                next->offset  = this->offset;
+                next->length += this->length;
+                region_put(rmm, this);
         }
-
-        /* mark as having no type, and retry merge with any adjacent
-         * untyped blocks
-         */
-        this->type = 0;
-        nouveau_mm_merge(rmm, this);
 }
 
 int
 nouveau_mm_get(struct nouveau_mm *rmm, int type, u32 size, u32 size_nc,
                u32 align, struct nouveau_mm_node **pnode)
 {
-        struct nouveau_mm_node *this, *tmp, *next;
-        u32 splitoff, avail, alloc;
-
-        list_for_each_entry_safe(this, tmp, &rmm->free, fl_entry) {
-                next = list_entry(this->nl_entry.next, struct nouveau_mm_node, nl_entry);
-                if (this->nl_entry.next == &rmm->nodes)
-                        next = NULL;
-
-                /* skip wrongly typed blocks */
-                if (this->type && this->type != type)
+        struct nouveau_mm_node *prev, *this, *next;
+        u32 min = size_nc ? size_nc : size;
+        u32 align_mask = align - 1;
+        u32 splitoff;
+        u32 s, e;
+
+        list_for_each_entry(this, &rmm->free, fl_entry) {
+                e = this->offset + this->length;
+                s = this->offset;
+
+                prev = node(this, prev);
+                if (prev && prev->type != type)
+                        s = roundup(s, rmm->block_size);
+
+                next = node(this, next);
+                if (next && next->type != type)
+                        e = rounddown(e, rmm->block_size);
+
+                s  = (s + align_mask) & ~align_mask;
+                e &= ~align_mask;
+                if (s > e || e - s < min)
                         continue;
 
-                /* account for alignment */
-                splitoff = this->offset & (align - 1);
-                if (splitoff)
-                        splitoff = align - splitoff;
-
-                if (this->length <= splitoff)
-                        continue;
-
-                /* determine total memory available from this, and
-                 * the next block (if appropriate)
-                 */
-                avail = this->length;
-                if (next && next->free && (!next->type || next->type == type))
-                        avail += next->length;
-
-                avail -= splitoff;
-
-                /* determine allocation size */
-                if (size_nc) {
-                        alloc = min(avail, size);
-                        alloc = rounddown(alloc, size_nc);
-                        if (alloc == 0)
-                                continue;
-                } else {
-                        alloc = size;
-                        if (avail < alloc)
-                                continue;
-                }
-
-                /* untyped block, split off a chunk that's a multiple
-                 * of block_size and type it
-                 */
-                if (!this->type) {
-                        u32 block = roundup(alloc + splitoff, rmm->block_size);
-                        if (this->length < block)
-                                continue;
-
-                        this = region_split(rmm, this, block);
-                        if (!this)
-                                return -ENOMEM;
-
-                        this->type = type;
-                }
-
-                /* stealing memory from adjacent block */
-                if (alloc > this->length) {
-                        u32 amount = alloc - (this->length - splitoff);
-
-                        if (!next->type) {
-                                amount = roundup(amount, rmm->block_size);
-
-                                next = region_split(rmm, next, amount);
-                                if (!next)
-                                        return -ENOMEM;
-
-                                next->type = type;
-                        }
-
-                        this->length += amount;
-                        next->offset += amount;
-                        next->length -= amount;
-                        if (!next->length) {
-                                list_del(&next->nl_entry);
-                                list_del(&next->fl_entry);
-                                kfree(next);
-                        }
-                }
-
-                if (splitoff) {
-                        if (!region_split(rmm, this, splitoff))
-                                return -ENOMEM;
-                }
+                splitoff = s - this->offset;
+                if (splitoff && !region_split(rmm, this, splitoff))
+                        return -ENOMEM;
 
-                this = region_split(rmm, this, alloc);
-                if (this == NULL)
+                this = region_split(rmm, this, min(size, e - s));
+                if (!this)
                         return -ENOMEM;
 
-                this->free = false;
+                this->type = type;
                 list_del(&this->fl_entry);
                 *pnode = this;
                 return 0;
@@ -234,7 +135,6 @@ nouveau_mm_init(struct nouveau_mm **prmm, u32 offset, u32 length, u32 block)
         heap = kzalloc(sizeof(*heap), GFP_KERNEL);
         if (!heap)
                 return -ENOMEM;
-        heap->free = true;
         heap->offset = roundup(offset, block);
         heap->length = rounddown(offset + length, block) - heap->offset;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.h b/drivers/gpu/drm/nouveau/nouveau_mm.h
index af3844933036..798eaf39691c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_mm.h
@@ -30,9 +30,7 @@ struct nouveau_mm_node {
         struct list_head fl_entry;
         struct list_head rl_entry;
 
-        bool free;
-        int  type;
-
+        u8  type;
         u32 offset;
         u32 length;
 };
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index fb846a3fef15..f05c0cddfeca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -443,7 +443,7 @@ nouveau_hwmon_fini(struct drm_device *dev)
         struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
 
         if (pm->hwmon) {
-                sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);
+                sysfs_remove_group(&dev->pdev->dev.kobj, &hwmon_attrgroup);
                 hwmon_device_unregister(pm->hwmon);
         }
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 7ecc4adc1e45..8d9968e1cba8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -265,8 +265,8 @@ nouveau_temp_probe_i2c(struct drm_device *dev)
         struct i2c_board_info info[] = {
                 { I2C_BOARD_INFO("w83l785ts", 0x2d) },
                 { I2C_BOARD_INFO("w83781d", 0x2d) },
-                { I2C_BOARD_INFO("f75375", 0x2e) },
                 { I2C_BOARD_INFO("adt7473", 0x2e) },
+                { I2C_BOARD_INFO("f75375", 0x2e) },
                 { I2C_BOARD_INFO("lm99", 0x4c) },
                 { }
         };
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index 19ef92a0375a..8870d72388c8 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -451,8 +451,7 @@ nv40_graph_register(struct drm_device *dev)
         NVOBJ_CLASS(dev, 0x309e, GR); /* swzsurf */
 
         /* curie */
-        if (dev_priv->chipset >= 0x60 ||
-            0x00005450 & (1 << (dev_priv->chipset & 0x0f)))
+        if (nv44_graph_class(dev))
                 NVOBJ_CLASS(dev, 0x4497, GR);
         else
                 NVOBJ_CLASS(dev, 0x4097, GR);
diff --git a/drivers/gpu/drm/nouveau/nv40_grctx.c b/drivers/gpu/drm/nouveau/nv40_grctx.c
index ce585093264e..f70447d131d7 100644
--- a/drivers/gpu/drm/nouveau/nv40_grctx.c
+++ b/drivers/gpu/drm/nouveau/nv40_grctx.c
@@ -118,17 +118,6 @@
  */
 
 static int
-nv40_graph_4097(struct drm_device *dev)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-
-        if ((dev_priv->chipset & 0xf0) == 0x60)
-                return 0;
-
-        return !!(0x0baf & (1 << dev_priv->chipset));
-}
-
-static int
 nv40_graph_vs_count(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
@@ -219,7 +208,7 @@ nv40_graph_construct_general(struct nouveau_grctx *ctx)
                 gr_def(ctx, 0x4009dc, 0x80000000);
         } else {
                 cp_ctx(ctx, 0x400840, 20);
-                if (!nv40_graph_4097(ctx->dev)) {
+                if (nv44_graph_class(ctx->dev)) {
                         for (i = 0; i < 8; i++)
                                 gr_def(ctx, 0x400860 + (i * 4), 0x00000001);
                 }
@@ -228,7 +217,7 @@ nv40_graph_construct_general(struct nouveau_grctx *ctx)
                 gr_def(ctx, 0x400888, 0x00000040);
                 cp_ctx(ctx, 0x400894, 11);
                 gr_def(ctx, 0x400894, 0x00000040);
-                if (nv40_graph_4097(ctx->dev)) {
+                if (!nv44_graph_class(ctx->dev)) {
                         for (i = 0; i < 8; i++)
                                 gr_def(ctx, 0x4008a0 + (i * 4), 0x80000000);
                 }
@@ -546,7 +535,7 @@ nv40_graph_construct_state3d_2(struct nouveau_grctx *ctx)
 static void
 nv40_graph_construct_state3d_3(struct nouveau_grctx *ctx)
 {
-        int len = nv40_graph_4097(ctx->dev) ? 0x0684 : 0x0084;
+        int len = nv44_graph_class(ctx->dev) ? 0x0084 : 0x0684;
 
         cp_out (ctx, 0x300000);
         cp_lsr (ctx, len - 4);
@@ -582,11 +571,11 @@ nv40_graph_construct_shader(struct nouveau_grctx *ctx)
         } else {
                 b0_offset = 0x1d40/4; /* 2200 */
                 b1_offset = 0x3f40/4; /* 0b00 : 0a40 */
-                vs_len = nv40_graph_4097(dev) ? 0x4a40/4 : 0x4980/4;
+                vs_len = nv44_graph_class(dev) ? 0x4980/4 : 0x4a40/4;
         }
 
         cp_lsr(ctx, vs_len * vs_nr + 0x300/4);
-        cp_out(ctx, nv40_graph_4097(dev) ? 0x800041 : 0x800029);
+        cp_out(ctx, nv44_graph_class(dev) ? 0x800029 : 0x800041);
 
         offset = ctx->ctxvals_pos;
         ctx->ctxvals_pos += (0x0300/4 + (vs_nr * vs_len));
diff --git a/drivers/gpu/drm/nouveau/nv40_mc.c b/drivers/gpu/drm/nouveau/nv40_mc.c
index e4e72c12ab6a..03c0d4c3f355 100644
--- a/drivers/gpu/drm/nouveau/nv40_mc.c
+++ b/drivers/gpu/drm/nouveau/nv40_mc.c
@@ -6,27 +6,17 @@
 int
 nv40_mc_init(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        uint32_t tmp;
-
         /* Power up everything, resetting each individual unit will
          * be done later if needed.
          */
         nv_wr32(dev, NV03_PMC_ENABLE, 0xFFFFFFFF);
 
-        switch (dev_priv->chipset) {
-        case 0x44:
-        case 0x46: /* G72 */
-        case 0x4e:
-        case 0x4c: /* C51_G7X */
-                tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
+        if (nv44_graph_class(dev)) {
+                u32 tmp = nv_rd32(dev, NV04_PFB_FIFO_DATA);
                 nv_wr32(dev, NV40_PMC_1700, tmp);
                 nv_wr32(dev, NV40_PMC_1704, 0);
                 nv_wr32(dev, NV40_PMC_1708, 0);
                 nv_wr32(dev, NV40_PMC_170C, tmp);
-                break;
-        default:
-                break;
         }
 
         return 0;
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index 14e24e906ee8..0ea090f4244a 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -283,8 +283,7 @@ nv50_evo_create(struct drm_device *dev)
                         nv50_evo_channel_del(&dev_priv->evo);
                         return ret;
                 }
-        } else
-        if (dev_priv->chipset != 0x50) {
+        } else {
                 ret = nv50_evo_dmaobj_new(evo, 0x3d, NvEvoFB16, 0x70, 0x19,
                                           0, 0xffffffff, 0x00010000);
                 if (ret) {
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index 2d7ea75a09d4..37e21d2be95b 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -256,6 +256,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan)
         struct drm_device *dev = chan->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
+        struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo;
         int i, hdr = (dev_priv->chipset == 0x50) ? 0x200 : 0x20;
         unsigned long flags;
 
@@ -265,6 +266,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan)
                 return;
 
         spin_lock_irqsave(&dev_priv->context_switch_lock, flags);
+        pfifo->reassign(dev, false);
         pgraph->fifo_access(dev, false);
 
         if (pgraph->channel(dev) == chan)
@@ -275,6 +277,7 @@ nv50_graph_destroy_context(struct nouveau_channel *chan)
         dev_priv->engine.instmem.flush(dev);
 
         pgraph->fifo_access(dev, true);
+        pfifo->reassign(dev, true);
         spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);
 
         nouveau_gpuobj_ref(NULL, &chan->ramin_grctx);
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 2e1b1cd19a4b..ea0041810ae3 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -332,8 +332,11 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align)
         gpuobj->vinst = node->vram->offset;
 
         if (gpuobj->flags & NVOBJ_FLAG_VM) {
-                ret = nouveau_vm_get(dev_priv->chan_vm, size, 12,
-                                     NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS,
+                u32 flags = NV_MEM_ACCESS_RW;
+                if (!(gpuobj->flags & NVOBJ_FLAG_VM_USER))
+                        flags |= NV_MEM_ACCESS_SYS;
+
+                ret = nouveau_vm_get(dev_priv->chan_vm, size, 12, flags,
                                      &node->chan_vma);
                 if (ret) {
                         vram->put(dev, &node->vram);
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 38e523e10995..459ff08241e5 100644
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -45,11 +45,6 @@ nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
         }
 
         if (phys & 1) {
-                if (dev_priv->vram_sys_base) {
-                        phys += dev_priv->vram_sys_base;
-                        phys |= 0x30;
-                }
-
                 if (coverage <= 32 * 1024 * 1024)
                         phys |= 0x60;
                 else if (coverage <= 64 * 1024 * 1024)
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index 5feacd5d5fa4..eb18a7e89f5b 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -31,6 +31,7 @@
 #include "nvc0_graph.h"
 
 static void nvc0_graph_isr(struct drm_device *);
+static void nvc0_runk140_isr(struct drm_device *);
 static int  nvc0_graph_unload_context_to(struct drm_device *dev, u64 chan);
 
 void
@@ -105,7 +106,8 @@ nvc0_graph_create_context_mmio_list(struct nouveau_channel *chan)
         if (ret)
                 return ret;
 
-        ret = nouveau_gpuobj_new(dev, NULL, 384 * 1024, 4096, NVOBJ_FLAG_VM,
+        ret = nouveau_gpuobj_new(dev, NULL, 384 * 1024, 4096,
+                                 NVOBJ_FLAG_VM | NVOBJ_FLAG_VM_USER,
                                  &grch->unk418810);
         if (ret)
                 return ret;
@@ -280,6 +282,7 @@ nvc0_graph_destroy(struct drm_device *dev)
                 return;
 
         nouveau_irq_unregister(dev, 12);
+        nouveau_irq_unregister(dev, 25);
 
         nouveau_gpuobj_ref(NULL, &priv->unk4188b8);
         nouveau_gpuobj_ref(NULL, &priv->unk4188b4);
@@ -389,6 +392,7 @@ nvc0_graph_create(struct drm_device *dev)
         }
 
         nouveau_irq_register(dev, 12, nvc0_graph_isr);
+        nouveau_irq_register(dev, 25, nvc0_runk140_isr);
         NVOBJ_CLASS(dev, 0x902d, GR); /* 2D */
         NVOBJ_CLASS(dev, 0x9039, GR); /* M2MF */
         NVOBJ_CLASS(dev, 0x9097, GR); /* 3D */
@@ -511,8 +515,8 @@ nvc0_graph_init_gpc_1(struct drm_device *dev)
                         nv_wr32(dev, TP_UNIT(gpc, tp, 0x224), 0xc0000000);
                         nv_wr32(dev, TP_UNIT(gpc, tp, 0x48c), 0xc0000000);
                         nv_wr32(dev, TP_UNIT(gpc, tp, 0x084), 0xc0000000);
-                        nv_wr32(dev, TP_UNIT(gpc, tp, 0xe44), 0x001ffffe);
-                        nv_wr32(dev, TP_UNIT(gpc, tp, 0xe4c), 0x0000000f);
+                        nv_wr32(dev, TP_UNIT(gpc, tp, 0x644), 0x001ffffe);
+                        nv_wr32(dev, TP_UNIT(gpc, tp, 0x64c), 0x0000000f);
                 }
                 nv_wr32(dev, GPC_UNIT(gpc, 0x2c90), 0xffffffff);
                 nv_wr32(dev, GPC_UNIT(gpc, 0x2c94), 0xffffffff);
@@ -776,3 +780,19 @@ nvc0_graph_isr(struct drm_device *dev)
 
         nv_wr32(dev, 0x400500, 0x00010001);
 }
+
+static void
+nvc0_runk140_isr(struct drm_device *dev)
+{
+        u32 units = nv_rd32(dev, 0x00017c) & 0x1f;
+
+        while (units) {
+                u32 unit = ffs(units) - 1;
+                u32 reg = 0x140000 + unit * 0x2000;
+                u32 st0 = nv_mask(dev, reg + 0x1020, 0, 0);
+                u32 st1 = nv_mask(dev, reg + 0x1420, 0, 0);
+
+                NV_INFO(dev, "PRUNK140: %d 0x%08x 0x%08x\n", unit, st0, st1);
+                units &= ~(1 << unit);
+        }
+}
diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c
index b9e68b2d30aa..f880ff776db8 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/drivers/gpu/drm/nouveau/nvc0_grctx.c
@@ -1830,7 +1830,7 @@ nvc0_grctx_generate(struct nouveau_channel *chan)
 
         for (tp = 0, id = 0; tp < 4; tp++) {
                 for (gpc = 0; gpc < priv->gpc_nr; gpc++) {
-                        if (tp <= priv->tp_nr[gpc]) {
+                        if (tp < priv->tp_nr[gpc]) {
                                 nv_wr32(dev, TP_UNIT(gpc, tp, 0x698), id);
                                 nv_wr32(dev, TP_UNIT(gpc, tp, 0x4e8), id);
                                 nv_wr32(dev, GPC_UNIT(gpc, 0x0c10 + tp * 4), id);
diff --git a/drivers/gpu/drm/nouveau/nvc0_vm.c b/drivers/gpu/drm/nouveau/nvc0_vm.c
index 4b9251bb0ff4..e4e83c2caf5b 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_vm.c
@@ -48,8 +48,8 @@ nvc0_vm_addr(struct nouveau_vma *vma, u64 phys, u32 memtype, u32 target)
         phys >>= 8;
 
         phys |= 0x00000001; /* present */
-//      if (vma->access & NV_MEM_ACCESS_SYS)
-//              phys |= 0x00000002;
+        if (vma->access & NV_MEM_ACCESS_SYS)
+                phys |= 0x00000002;
 
         phys |= ((u64)target  << 32);
         phys |= ((u64)memtype << 36);
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index b0ab185b86f6..b1537000a104 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -555,6 +555,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                         dp_clock = dig_connector->dp_clock;
                                 }
                         }
+/* this might work properly with the new pll algo */
 #if 0 /* doesn't work properly on some laptops */
                         /* use recommended ref_div for ss */
                         if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
@@ -572,6 +573,11 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                         adjusted_clock = mode->clock * 2;
                                 if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
                                         pll->flags |= RADEON_PLL_PREFER_CLOSEST_LOWER;
+                                /* rv515 needs more testing with this option */
+                                if (rdev->family != CHIP_RV515) {
+                                        if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
+                                                pll->flags |= RADEON_PLL_IS_LCD;
+                                }
                         } else {
                                 if (encoder->encoder_type != DRM_MODE_ENCODER_DAC)
                                         pll->flags |= RADEON_PLL_NO_ODD_POST_DIV;
@@ -606,14 +612,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                 args.v1.usPixelClock = cpu_to_le16(mode->clock / 10);
                                 args.v1.ucTransmitterID = radeon_encoder->encoder_id;
                                 args.v1.ucEncodeMode = encoder_mode;
-                                if (encoder_mode == ATOM_ENCODER_MODE_DP) {
-                                        if (ss_enabled)
-                                                args.v1.ucConfig |=
-                                                        ADJUST_DISPLAY_CONFIG_SS_ENABLE;
-                                } else if (encoder_mode == ATOM_ENCODER_MODE_LVDS) {
+                                if (ss_enabled)
                                         args.v1.ucConfig |=
                                                 ADJUST_DISPLAY_CONFIG_SS_ENABLE;
-                                }
 
                                 atom_execute_table(rdev->mode_info.atom_context,
                                                    index, (uint32_t *)&args);
@@ -624,12 +625,12 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                 args.v3.sInput.ucTransmitterID = radeon_encoder->encoder_id;
                                 args.v3.sInput.ucEncodeMode = encoder_mode;
                                 args.v3.sInput.ucDispPllConfig = 0;
+                                if (ss_enabled)
+                                        args.v3.sInput.ucDispPllConfig |=
+                                                DISPPLL_CONFIG_SS_ENABLE;
                                 if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
                                         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
                                         if (encoder_mode == ATOM_ENCODER_MODE_DP) {
-                                                if (ss_enabled)
-                                                        args.v3.sInput.ucDispPllConfig |=
-                                                                DISPPLL_CONFIG_SS_ENABLE;
                                                 args.v3.sInput.ucDispPllConfig |=
                                                         DISPPLL_CONFIG_COHERENT_MODE;
                                                 /* 16200 or 27000 */
@@ -649,18 +650,11 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                         }
                                 } else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
                                         if (encoder_mode == ATOM_ENCODER_MODE_DP) {
-                                                if (ss_enabled)
-                                                        args.v3.sInput.ucDispPllConfig |=
-                                                                DISPPLL_CONFIG_SS_ENABLE;
                                                 args.v3.sInput.ucDispPllConfig |=
                                                         DISPPLL_CONFIG_COHERENT_MODE;
                                                 /* 16200 or 27000 */
                                                 args.v3.sInput.usPixelClock = cpu_to_le16(dp_clock / 10);
-                                        } else if (encoder_mode == ATOM_ENCODER_MODE_LVDS) {
-                                                if (ss_enabled)
-                                                        args.v3.sInput.ucDispPllConfig |=
-                                                                DISPPLL_CONFIG_SS_ENABLE;
-                                        } else {
+                                        } else if (encoder_mode != ATOM_ENCODER_MODE_LVDS) {
                                                 if (mode->clock > 165000)
                                                         args.v3.sInput.ucDispPllConfig |=
                                                                 DISPPLL_CONFIG_DUAL_LINK;
@@ -963,8 +957,16 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
         /* adjust pixel clock as needed */
         adjusted_clock = atombios_adjust_pll(crtc, mode, pll, ss_enabled, &ss);
 
-        radeon_compute_pll(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
-                           &ref_div, &post_div);
+        /* rv515 seems happier with the old algo */
+        if (rdev->family == CHIP_RV515)
+                radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
+                                          &ref_div, &post_div);
+        else if (ASIC_IS_AVIVO(rdev))
+                radeon_compute_pll_avivo(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
+                                         &ref_div, &post_div);
+        else
+                radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
+                                          &ref_div, &post_div);
 
         atombios_crtc_program_ss(crtc, ATOM_DISABLE, radeon_crtc->pll_id, &ss);
 
@@ -1006,6 +1008,7 @@ static int evergreen_crtc_do_set_base(struct drm_crtc *crtc,
         struct radeon_bo *rbo;
         uint64_t fb_location;
         uint32_t fb_format, fb_pitch_pixels, tiling_flags;
+        u32 fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_NONE);
         int r;
 
         /* no fb bound */
@@ -1057,11 +1060,17 @@ static int evergreen_crtc_do_set_base(struct drm_crtc *crtc,
         case 16:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB565));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN16);
+#endif
                 break;
         case 24:
         case 32:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB8888));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN32);
+#endif
                 break;
         default:
                 DRM_ERROR("Unsupported screen depth %d\n",
@@ -1106,6 +1115,7 @@ static int evergreen_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(EVERGREEN_GRPH_SECONDARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,
                (u32) fb_location & EVERGREEN_GRPH_SURFACE_ADDRESS_MASK);
         WREG32(EVERGREEN_GRPH_CONTROL + radeon_crtc->crtc_offset, fb_format);
+        WREG32(EVERGREEN_GRPH_SWAP_CONTROL + radeon_crtc->crtc_offset, fb_swap);
 
         WREG32(EVERGREEN_GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
         WREG32(EVERGREEN_GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
@@ -1162,6 +1172,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         struct drm_framebuffer *target_fb;
         uint64_t fb_location;
         uint32_t fb_format, fb_pitch_pixels, tiling_flags;
+        u32 fb_swap = R600_D1GRPH_SWAP_ENDIAN_NONE;
         int r;
 
         /* no fb bound */
@@ -1215,12 +1226,18 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_16BPP |
                     AVIVO_D1GRPH_CONTROL_16BPP_RGB565;
+#ifdef __BIG_ENDIAN
+                fb_swap = R600_D1GRPH_SWAP_ENDIAN_16BIT;
+#endif
                 break;
         case 24:
         case 32:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_32BPP |
                     AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888;
+#ifdef __BIG_ENDIAN
+                fb_swap = R600_D1GRPH_SWAP_ENDIAN_32BIT;
+#endif
                 break;
         default:
                 DRM_ERROR("Unsupported screen depth %d\n",
@@ -1260,6 +1277,8 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS +
                radeon_crtc->crtc_offset, (u32) fb_location);
         WREG32(AVIVO_D1GRPH_CONTROL + radeon_crtc->crtc_offset, fb_format);
+        if (rdev->family >= CHIP_R600)
+                WREG32(R600_D1GRPH_SWAP_CONTROL + radeon_crtc->crtc_offset, fb_swap);
 
         WREG32(AVIVO_D1GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
         WREG32(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 4e7778d44b8d..695de9a38506 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -187,9 +187,9 @@ static int dp_link_clock_for_mode_clock(u8 dpcd[DP_DPCD_SIZE], int mode_clock)
 int dp_mode_valid(u8 dpcd[DP_DPCD_SIZE], int mode_clock)
 {
         int lanes = dp_lanes_for_mode_clock(dpcd, mode_clock);
-        int bw = dp_lanes_for_mode_clock(dpcd, mode_clock);
+        int dp_clock = dp_link_clock_for_mode_clock(dpcd, mode_clock);
 
-        if ((lanes == 0) || (bw == 0))
+        if ((lanes == 0) || (dp_clock == 0))
                 return MODE_CLOCK_HIGH;
 
         return MODE_OK;
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 7fe8ebdcdc0e..ffdc8332b76e 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -97,26 +97,29 @@ u32 evergreen_page_flip(struct radeon_device *rdev, int crtc_id, u64 crtc_base)
 }
 
 /* get temperature in millidegrees */
-u32 evergreen_get_temp(struct radeon_device *rdev)
+int evergreen_get_temp(struct radeon_device *rdev)
 {
         u32 temp = (RREG32(CG_MULT_THERMAL_STATUS) & ASIC_T_MASK) >>
                 ASIC_T_SHIFT;
         u32 actual_temp = 0;
 
-        if ((temp >> 10) & 1)
-                actual_temp = 0;
-        else if ((temp >> 9) & 1)
+        if (temp & 0x400)
+                actual_temp = -256;
+        else if (temp & 0x200)
                 actual_temp = 255;
-        else
-                actual_temp = (temp >> 1) & 0xff;
+        else if (temp & 0x100) {
+                actual_temp = temp & 0x1ff;
+                actual_temp |= ~0x1ff;
+        } else
+                actual_temp = temp & 0xff;
 
-        return actual_temp * 1000;
+        return (actual_temp * 1000) / 2;
 }
 
-u32 sumo_get_temp(struct radeon_device *rdev)
+int sumo_get_temp(struct radeon_device *rdev)
 {
         u32 temp = RREG32(CG_THERMAL_STATUS) & 0xff;
-        u32 actual_temp = (temp >> 1) & 0xff;
+        int actual_temp = temp - 49;
 
         return actual_temp * 1000;
 }
@@ -1182,6 +1185,18 @@ static void evergreen_mc_program(struct radeon_device *rdev)
 /*
  * CP.
  */
+void evergreen_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)
+{
+        /* set to DX10/11 mode */
+        radeon_ring_write(rdev, PACKET3(PACKET3_MODE_CONTROL, 0));
+        radeon_ring_write(rdev, 1);
+        /* FIXME: implement */
+        radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
+        radeon_ring_write(rdev, ib->gpu_addr & 0xFFFFFFFC);
+        radeon_ring_write(rdev, upper_32_bits(ib->gpu_addr) & 0xFF);
+        radeon_ring_write(rdev, ib->length_dw);
+}
+
 
 static int evergreen_cp_load_microcode(struct radeon_device *rdev)
 {
@@ -1233,7 +1248,7 @@ static int evergreen_cp_start(struct radeon_device *rdev)
         cp_me = 0xff;
         WREG32(CP_ME_CNTL, cp_me);
 
-        r = radeon_ring_lock(rdev, evergreen_default_size + 15);
+        r = radeon_ring_lock(rdev, evergreen_default_size + 19);
         if (r) {
                 DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r);
                 return r;
@@ -1266,6 +1281,11 @@ static int evergreen_cp_start(struct radeon_device *rdev)
         radeon_ring_write(rdev, 0xffffffff);
         radeon_ring_write(rdev, 0xffffffff);
 
+        radeon_ring_write(rdev, 0xc0026900);
+        radeon_ring_write(rdev, 0x00000316);
+        radeon_ring_write(rdev, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
+        radeon_ring_write(rdev, 0x00000010); /*  */
+
         radeon_ring_unlock_commit(rdev);
 
         return 0;
@@ -2072,6 +2092,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         WREG32(VGT_CACHE_INVALIDATION, vgt_cache_invalidation);
 
         WREG32(VGT_GS_VERTEX_REUSE, 16);
+        WREG32(PA_SU_LINE_STIPPLE_VALUE, 0);
         WREG32(PA_SC_LINE_STIPPLE_STATE, 0);
 
         WREG32(VGT_VERTEX_REUSE_BLOCK_CNTL, 14);
@@ -2201,6 +2222,9 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev)
         struct evergreen_mc_save save;
         u32 grbm_reset = 0;
 
+        if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
+                return 0;
+
         dev_info(rdev->dev, "GPU softreset \n");
         dev_info(rdev->dev, "  GRBM_STATUS=0x%08X\n",
                 RREG32(GRBM_STATUS));
@@ -3002,31 +3026,6 @@ int evergreen_copy_blit(struct radeon_device *rdev,
         return 0;
 }
 
-static bool evergreen_card_posted(struct radeon_device *rdev)
-{
-        u32 reg;
-
-        /* first check CRTCs */
-        if (rdev->flags & RADEON_IS_IGP)
-                reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET);
-        else
-                reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC1_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC2_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC3_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC4_REGISTER_OFFSET) |
-                        RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC5_REGISTER_OFFSET);
-        if (reg & EVERGREEN_CRTC_MASTER_EN)
-                return true;
-
-        /* then check MEM_SIZE, in case the crtcs are off */
-        if (RREG32(CONFIG_MEMSIZE))
-                return true;
-
-        return false;
-}
-
 /* Plan is to move initialization in that function and use
  * helper function so that radeon_device_init pretty much
  * do nothing more than calling asic specific function. This
@@ -3063,7 +3062,7 @@ int evergreen_init(struct radeon_device *rdev)
         if (radeon_asic_reset(rdev))
                 dev_warn(rdev->dev, "GPU reset failed !\n");
         /* Post card if necessary */
-        if (!evergreen_card_posted(rdev)) {
+        if (!radeon_card_posted(rdev)) {
                 if (!rdev->bios) {
                         dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
                         return -EINVAL;
@@ -3158,6 +3157,9 @@ static void evergreen_pcie_gen2_enable(struct radeon_device *rdev)
 {
         u32 link_width_cntl, speed_cntl;
 
+        if (radeon_pcie_gen2 == 0)
+                return;
+
         if (rdev->flags & RADEON_IS_IGP)
                 return;
 
diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
index b758dc7f2f2c..a1ba4b3053d0 100644
--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
@@ -232,7 +232,7 @@ draw_auto(struct radeon_device *rdev)
 
 }
 
-/* emits 30 */
+/* emits 36 */
 static void
 set_default_state(struct radeon_device *rdev)
 {
@@ -245,6 +245,8 @@ set_default_state(struct radeon_device *rdev)
         int num_hs_threads, num_ls_threads;
         int num_ps_stack_entries, num_vs_stack_entries, num_gs_stack_entries, num_es_stack_entries;
         int num_hs_stack_entries, num_ls_stack_entries;
+        u64 gpu_addr;
+        int dwords;
 
         switch (rdev->family) {
         case CHIP_CEDAR:
@@ -497,6 +499,18 @@ set_default_state(struct radeon_device *rdev)
         radeon_ring_write(rdev, 0x00000000);
         radeon_ring_write(rdev, 0x00000000);
 
+        /* set to DX10/11 mode */
+        radeon_ring_write(rdev, PACKET3(PACKET3_MODE_CONTROL, 0));
+        radeon_ring_write(rdev, 1);
+
+        /* emit an IB pointing at default state */
+        dwords = ALIGN(rdev->r600_blit.state_len, 0x10);
+        gpu_addr = rdev->r600_blit.shader_gpu_addr + rdev->r600_blit.state_offset;
+        radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
+        radeon_ring_write(rdev, gpu_addr & 0xFFFFFFFC);
+        radeon_ring_write(rdev, upper_32_bits(gpu_addr) & 0xFF);
+        radeon_ring_write(rdev, dwords);
+
 }
 
 static inline uint32_t i2f(uint32_t input)
@@ -527,8 +541,10 @@ static inline uint32_t i2f(uint32_t input)
 int evergreen_blit_init(struct radeon_device *rdev)
 {
         u32 obj_size;
-        int r;
+        int r, dwords;
         void *ptr;
+        u32 packet2s[16];
+        int num_packet2s = 0;
 
         /* pin copy shader into vram if already initialized */
         if (rdev->r600_blit.shader_obj)
@@ -536,8 +552,17 @@ int evergreen_blit_init(struct radeon_device *rdev)
 
         mutex_init(&rdev->r600_blit.mutex);
         rdev->r600_blit.state_offset = 0;
-        rdev->r600_blit.state_len = 0;
-        obj_size = 0;
+
+        rdev->r600_blit.state_len = evergreen_default_size;
+
+        dwords = rdev->r600_blit.state_len;
+        while (dwords & 0xf) {
+                packet2s[num_packet2s++] = PACKET2(0);
+                dwords++;
+        }
+
+        obj_size = dwords * 4;
+        obj_size = ALIGN(obj_size, 256);
 
         rdev->r600_blit.vs_offset = obj_size;
         obj_size += evergreen_vs_size * 4;
@@ -567,6 +592,12 @@ int evergreen_blit_init(struct radeon_device *rdev)
                 return r;
         }
 
+        memcpy_toio(ptr + rdev->r600_blit.state_offset,
+                    evergreen_default_state, rdev->r600_blit.state_len * 4);
+
+        if (num_packet2s)
+                memcpy_toio(ptr + rdev->r600_blit.state_offset + (rdev->r600_blit.state_len * 4),
+                            packet2s, num_packet2s * 4);
         memcpy(ptr + rdev->r600_blit.vs_offset, evergreen_vs, evergreen_vs_size * 4);
         memcpy(ptr + rdev->r600_blit.ps_offset, evergreen_ps, evergreen_ps_size * 4);
         radeon_bo_kunmap(rdev->r600_blit.shader_obj);
@@ -652,7 +683,7 @@ int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
         /* calculate number of loops correctly */
         ring_size = num_loops * dwords_per_loop;
         /* set default  + shaders */
-        ring_size += 46; /* shaders + def state */
+        ring_size += 52; /* shaders + def state */
         ring_size += 10; /* fence emit for VB IB */
         ring_size += 5; /* done copy */
         ring_size += 10; /* fence emit for done copy */
@@ -660,7 +691,7 @@ int evergreen_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
         if (r)
                 return r;
 
-        set_default_state(rdev); /* 30 */
+        set_default_state(rdev); /* 36 */
         set_shaders(rdev); /* 16 */
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index 36d32d83d866..afec1aca2a73 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -240,6 +240,7 @@
 #define         FORCE_EOV_MAX_CLK_CNT(x)                        ((x) << 0)
 #define         FORCE_EOV_MAX_REZ_CNT(x)                        ((x) << 16)
 #define PA_SC_LINE_STIPPLE                              0x28A0C
+#define PA_SU_LINE_STIPPLE_VALUE                        0x8A60
 #define PA_SC_LINE_STIPPLE_STATE                        0x8B10
 
 #define SCRATCH_REG0                                    0x8500
@@ -652,6 +653,7 @@
 #define PACKET3_DISPATCH_DIRECT                         0x15
 #define PACKET3_DISPATCH_INDIRECT                       0x16
 #define PACKET3_INDIRECT_BUFFER_END                     0x17
+#define PACKET3_MODE_CONTROL                            0x18
 #define PACKET3_SET_PREDICATION                         0x20
 #define PACKET3_REG_RMW                                 0x21
 #define PACKET3_COND_EXEC                               0x22
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f637595b14e1..5f15820efe12 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1031,8 +1031,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
         WREG32(RADEON_CP_CSQ_MODE,
                REG_SET(RADEON_INDIRECT2_START, indirect2_start) |
                REG_SET(RADEON_INDIRECT1_START, indirect1_start));
-        WREG32(0x718, 0);
-        WREG32(0x744, 0x00004D4D);
+        WREG32(RADEON_CP_RB_WPTR_DELAY, 0);
+        WREG32(RADEON_CP_CSQ_MODE, 0x00004D4D);
         WREG32(RADEON_CP_CSQ_CNTL, RADEON_CSQ_PRIBM_INDBM);
         radeon_ring_start(rdev);
         r = radeon_ring_test(rdev);
@@ -2086,12 +2086,13 @@ int r100_asic_reset(struct radeon_device *rdev)
 {
         struct r100_mc_save save;
         u32 status, tmp;
+        int ret = 0;
 
-        r100_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         if (!G_000E40_GUI_ACTIVE(status)) {
                 return 0;
         }
+        r100_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
         /* stop CP */
@@ -2131,11 +2132,11 @@ int r100_asic_reset(struct radeon_device *rdev)
                 G_000E40_TAM_BUSY(status) || G_000E40_PB_BUSY(status)) {
                 dev_err(rdev->dev, "failed to reset GPU\n");
                 rdev->gpu_lockup = true;
-                return -1;
-        }
+                ret = -1;
+        } else
+                dev_info(rdev->dev, "GPU reset succeed\n");
         r100_mc_resume(rdev, &save);
-        dev_info(rdev->dev, "GPU reset succeed\n");
-        return 0;
+        return ret;
 }
 
 void r100_set_common_regs(struct radeon_device *rdev)
@@ -2346,10 +2347,10 @@ void r100_vga_set_state(struct radeon_device *rdev, bool state)
 
         temp = RREG32(RADEON_CONFIG_CNTL);
         if (state == false) {
-                temp &= ~(1<<8);
-                temp |= (1<<9);
+                temp &= ~RADEON_CFG_VGA_RAM_EN;
+                temp |= RADEON_CFG_VGA_IO_DIS;
         } else {
-                temp &= ~(1<<9);
+                temp &= ~RADEON_CFG_VGA_IO_DIS;
         }
         WREG32(RADEON_CONFIG_CNTL, temp);
 }
@@ -3521,7 +3522,7 @@ int r100_ring_test(struct radeon_device *rdev)
         if (i < rdev->usec_timeout) {
                 DRM_INFO("ring test succeeded in %d usecs\n", i);
         } else {
-                DRM_ERROR("radeon: ring test failed (sracth(0x%04X)=0x%08X)\n",
+                DRM_ERROR("radeon: ring test failed (scratch(0x%04X)=0x%08X)\n",
                           scratch, tmp);
                 r = -EINVAL;
         }
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index fae5e709f270..55fe5ba7def3 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -69,6 +69,9 @@ void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev)
         mb();
 }
 
+#define R300_PTE_WRITEABLE (1 << 2)
+#define R300_PTE_READABLE  (1 << 3)
+
 int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 {
         void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
@@ -78,7 +81,7 @@ int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
         }
         addr = (lower_32_bits(addr) >> 8) |
                ((upper_32_bits(addr) & 0xff) << 24) |
-               0xc;
+               R300_PTE_WRITEABLE | R300_PTE_READABLE;
         /* on x86 we want this to be CPU endian, on powerpc
          * on powerpc without HW swappers, it'll get swapped on way
          * into VRAM - so no need for cpu_to_le32 on VRAM tables */
@@ -135,7 +138,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
         WREG32_PCIE(RADEON_PCIE_TX_DISCARD_RD_ADDR_LO, rdev->mc.vram_start);
         WREG32_PCIE(RADEON_PCIE_TX_DISCARD_RD_ADDR_HI, 0);
         /* Clear error */
-        WREG32_PCIE(0x18, 0);
+        WREG32_PCIE(RADEON_PCIE_TX_GART_ERROR, 0);
         tmp = RREG32_PCIE(RADEON_PCIE_TX_GART_CNTL);
         tmp |= RADEON_PCIE_TX_GART_EN;
         tmp |= RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;
@@ -405,12 +408,13 @@ int r300_asic_reset(struct radeon_device *rdev)
 {
         struct r100_mc_save save;
         u32 status, tmp;
+        int ret = 0;
 
-        r100_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         if (!G_000E40_GUI_ACTIVE(status)) {
                 return 0;
         }
+        r100_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
         /* stop CP */
@@ -451,11 +455,11 @@ int r300_asic_reset(struct radeon_device *rdev)
         if (G_000E40_GA_BUSY(status) || G_000E40_VAP_BUSY(status)) {
                 dev_err(rdev->dev, "failed to reset GPU\n");
                 rdev->gpu_lockup = true;
-                return -1;
-        }
+                ret = -1;
+        } else
+                dev_info(rdev->dev, "GPU reset succeed\n");
         r100_mc_resume(rdev, &save);
-        dev_info(rdev->dev, "GPU reset succeed\n");
-        return 0;
+        return ret;
 }
 
 /*
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index c387346f93a9..0b59ed7c7d2c 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -96,7 +96,7 @@ void r420_pipes_init(struct radeon_device *rdev)
                        "programming pipes. Bad things might happen.\n");
         }
         /* get max number of pipes */
-        gb_pipe_select = RREG32(0x402C);
+        gb_pipe_select = RREG32(R400_GB_PIPE_SELECT);
         num_pipes = ((gb_pipe_select >> 12) & 3) + 1;
 
         /* SE chips have 1 pipe */
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 3c8677f9e385..2ce80d976568 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -79,8 +79,8 @@ static void r520_gpu_init(struct radeon_device *rdev)
                 WREG32(0x4128, 0xFF);
         }
         r420_pipes_init(rdev);
-        gb_pipe_select = RREG32(0x402C);
-        tmp = RREG32(0x170C);
+        gb_pipe_select = RREG32(R400_GB_PIPE_SELECT);
+        tmp = RREG32(R300_DST_PIPE_CONFIG);
         pipe_select_current = (tmp >> 2) & 3;
         tmp = (1 << pipe_select_current) |
               (((gb_pipe_select >> 8) & 0xF) << 4);
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 6b50716267c0..650672a0f5ad 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -97,12 +97,16 @@ void r600_irq_disable(struct radeon_device *rdev);
 static void r600_pcie_gen2_enable(struct radeon_device *rdev);
 
 /* get temperature in millidegrees */
-u32 rv6xx_get_temp(struct radeon_device *rdev)
+int rv6xx_get_temp(struct radeon_device *rdev)
 {
         u32 temp = (RREG32(CG_THERMAL_STATUS) & ASIC_T_MASK) >>
                 ASIC_T_SHIFT;
+        int actual_temp = temp & 0xff;
 
-        return temp * 1000;
+        if (temp & 0x100)
+                actual_temp -= 256;
+
+        return actual_temp * 1000;
 }
 
 void r600_pm_get_dynpm_state(struct radeon_device *rdev)
@@ -1287,6 +1291,9 @@ int r600_gpu_soft_reset(struct radeon_device *rdev)
                         S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1);
         u32 tmp;
 
+        if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
+                return 0;
+
         dev_info(rdev->dev, "GPU softreset \n");
         dev_info(rdev->dev, "  R_008010_GRBM_STATUS=0x%08X\n",
                 RREG32(R_008010_GRBM_STATUS));
@@ -2358,24 +2365,6 @@ void r600_clear_surface_reg(struct radeon_device *rdev, int reg)
         /* FIXME: implement */
 }
 
-
-bool r600_card_posted(struct radeon_device *rdev)
-{
-        uint32_t reg;
-
-        /* first check CRTCs */
-        reg = RREG32(D1CRTC_CONTROL) |
-                RREG32(D2CRTC_CONTROL);
-        if (reg & CRTC_EN)
-                return true;
-
-        /* then check MEM_SIZE, in case the crtcs are off */
-        if (RREG32(CONFIG_MEMSIZE))
-                return true;
-
-        return false;
-}
-
 int r600_startup(struct radeon_device *rdev)
 {
         int r;
@@ -2536,7 +2525,7 @@ int r600_init(struct radeon_device *rdev)
         if (r)
                 return r;
         /* Post card if necessary */
-        if (!r600_card_posted(rdev)) {
+        if (!radeon_card_posted(rdev)) {
                 if (!rdev->bios) {
                         dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
                         return -EINVAL;
@@ -3658,6 +3647,9 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev)
         u32 link_width_cntl, lanes, speed_cntl, training_cntl, tmp;
         u16 link_cntl2;
 
+        if (radeon_pcie_gen2 == 0)
+                return;
+
         if (rdev->flags & RADEON_IS_IGP)
                 return;
 
diff --git a/drivers/gpu/drm/radeon/r600_reg.h b/drivers/gpu/drm/radeon/r600_reg.h
index 33cda016b083..f869897c7456 100644
--- a/drivers/gpu/drm/radeon/r600_reg.h
+++ b/drivers/gpu/drm/radeon/r600_reg.h
@@ -81,7 +81,11 @@
 #define R600_MEDIUM_VID_LOWER_GPIO_CNTL                            0x720
 #define R600_LOW_VID_LOWER_GPIO_CNTL                               0x724
 
-
+#define R600_D1GRPH_SWAP_CONTROL                               0x610C
+#       define R600_D1GRPH_SWAP_ENDIAN_NONE                    (0 << 0)
+#       define R600_D1GRPH_SWAP_ENDIAN_16BIT                   (1 << 0)
+#       define R600_D1GRPH_SWAP_ENDIAN_32BIT                   (2 << 0)
+#       define R600_D1GRPH_SWAP_ENDIAN_64BIT                   (3 << 0)
 
 #define R600_HDP_NONSURFACE_BASE                                0x2c04
 
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index e9486630a467..56c48b67ef3d 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -92,6 +92,7 @@ extern int radeon_tv;
 extern int radeon_audio;
 extern int radeon_disp_priority;
 extern int radeon_hw_i2c;
+extern int radeon_pcie_gen2;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -178,10 +179,10 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev);
 void radeon_atombios_get_power_modes(struct radeon_device *rdev);
 void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level);
 void rs690_pm_info(struct radeon_device *rdev);
-extern u32 rv6xx_get_temp(struct radeon_device *rdev);
-extern u32 rv770_get_temp(struct radeon_device *rdev);
-extern u32 evergreen_get_temp(struct radeon_device *rdev);
-extern u32 sumo_get_temp(struct radeon_device *rdev);
+extern int rv6xx_get_temp(struct radeon_device *rdev);
+extern int rv770_get_temp(struct radeon_device *rdev);
+extern int evergreen_get_temp(struct radeon_device *rdev);
+extern int sumo_get_temp(struct radeon_device *rdev);
 
 /*
  * Fences.
@@ -811,8 +812,7 @@ struct radeon_pm {
         fixed20_12              sclk;
         fixed20_12              mclk;
         fixed20_12              needed_bandwidth;
-        /* XXX: use a define for num power modes */
-        struct radeon_power_state power_state[8];
+        struct radeon_power_state *power_state;
         /* number of valid power states */
         int                     num_power_states;
         int                     current_power_state_index;
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 3a1b16186224..e75d63b8e21d 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -759,7 +759,7 @@ static struct radeon_asic evergreen_asic = {
         .gart_tlb_flush = &evergreen_pcie_gart_tlb_flush,
         .gart_set_page = &rs600_gart_set_page,
         .ring_test = &r600_ring_test,
-        .ring_ib_execute = &r600_ring_ib_execute,
+        .ring_ib_execute = &evergreen_ring_ib_execute,
         .irq_set = &evergreen_irq_set,
         .irq_process = &evergreen_irq_process,
         .get_vblank_counter = &evergreen_get_vblank_counter,
@@ -805,7 +805,7 @@ static struct radeon_asic sumo_asic = {
         .gart_tlb_flush = &evergreen_pcie_gart_tlb_flush,
         .gart_set_page = &rs600_gart_set_page,
         .ring_test = &r600_ring_test,
-        .ring_ib_execute = &r600_ring_ib_execute,
+        .ring_ib_execute = &evergreen_ring_ib_execute,
         .irq_set = &evergreen_irq_set,
         .irq_process = &evergreen_irq_process,
         .get_vblank_counter = &evergreen_get_vblank_counter,
@@ -848,7 +848,7 @@ static struct radeon_asic btc_asic = {
         .gart_tlb_flush = &evergreen_pcie_gart_tlb_flush,
         .gart_set_page = &rs600_gart_set_page,
         .ring_test = &r600_ring_test,
-        .ring_ib_execute = &r600_ring_ib_execute,
+        .ring_ib_execute = &evergreen_ring_ib_execute,
         .irq_set = &evergreen_irq_set,
         .irq_process = &evergreen_irq_process,
         .get_vblank_counter = &evergreen_get_vblank_counter,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index e01f07718539..c59bd98a2029 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -355,6 +355,7 @@ int evergreen_resume(struct radeon_device *rdev);
 bool evergreen_gpu_is_lockup(struct radeon_device *rdev);
 int evergreen_asic_reset(struct radeon_device *rdev);
 void evergreen_bandwidth_update(struct radeon_device *rdev);
+void evergreen_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
 int evergreen_copy_blit(struct radeon_device *rdev,
                         uint64_t src_offset, uint64_t dst_offset,
                         unsigned num_pages, struct radeon_fence *fence);
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 1573202a6418..5c1cc7ad9a15 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -387,15 +387,11 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
                         *line_mux = 0x90;
         }
 
-        /* mac rv630 */
-        if ((dev->pdev->device == 0x9588) &&
-            (dev->pdev->subsystem_vendor == 0x106b) &&
-            (dev->pdev->subsystem_device == 0x00a6)) {
-                if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
-                    (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
-                        *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
-                        *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
-                }
+        /* mac rv630, rv730, others */
+        if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
+            (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
+                *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
+                *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
         }
 
         /* ASUS HD 3600 XT board lists the DVI port as HDMI */
@@ -1167,16 +1163,6 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
                                 p1pll->pll_out_min = 64800;
                         else
                                 p1pll->pll_out_min = 20000;
-                } else if (p1pll->pll_out_min > 64800) {
-                        /* Limiting the pll output range is a good thing generally as
-                         * it limits the number of possible pll combinations for a given
-                         * frequency presumably to the ones that work best on each card.
-                         * However, certain duallink DVI monitors seem to like
-                         * pll combinations that would be limited by this at least on
-                         * pre-DCE 3.0 r6xx hardware.  This might need to be adjusted per
-                         * family.
-                         */
-                        p1pll->pll_out_min = 64800;
                 }
 
                 p1pll->pll_in_min =
@@ -1991,6 +1977,9 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)
         num_modes = power_info->info.ucNumOfPowerModeEntries;
         if (num_modes > ATOM_MAX_NUMBEROF_POWER_BLOCK)
                 num_modes = ATOM_MAX_NUMBEROF_POWER_BLOCK;
+        rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * num_modes, GFP_KERNEL);
+        if (!rdev->pm.power_state)
+                return state_index;
         /* last mode is usually default, array is low to high */
         for (i = 0; i < num_modes; i++) {
                 rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
@@ -2342,6 +2331,10 @@ static int radeon_atombios_parse_power_table_4_5(struct radeon_device *rdev)
         power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);
 
         radeon_atombios_add_pplib_thermal_controller(rdev, &power_info->pplib.sThermalController);
+        rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) *
+                                       power_info->pplib.ucNumStates, GFP_KERNEL);
+        if (!rdev->pm.power_state)
+                return state_index;
         /* first mode is usually default, followed by low to high */
         for (i = 0; i < power_info->pplib.ucNumStates; i++) {
                 mode_index = 0;
@@ -2422,6 +2415,10 @@ static int radeon_atombios_parse_power_table_6(struct radeon_device *rdev)
         non_clock_info_array = (struct NonClockInfoArray *)
                 (mode_info->atom_context->bios + data_offset +
                  power_info->pplib.usNonClockInfoArrayOffset);
+        rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) *
+                                       state_array->ucNumEntries, GFP_KERNEL);
+        if (!rdev->pm.power_state)
+                return state_index;
         for (i = 0; i < state_array->ucNumEntries; i++) {
                 mode_index = 0;
                 power_state = (union pplib_power_state *)&state_array->states[i];
@@ -2495,19 +2492,22 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev)
                         break;
                 }
         } else {
-                /* add the default mode */
-                rdev->pm.power_state[state_index].type =
-                        POWER_STATE_TYPE_DEFAULT;
-                rdev->pm.power_state[state_index].num_clock_modes = 1;
-                rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk;
-                rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk;
-                rdev->pm.power_state[state_index].default_clock_mode =
-                        &rdev->pm.power_state[state_index].clock_info[0];
-                rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
-                rdev->pm.power_state[state_index].pcie_lanes = 16;
-                rdev->pm.default_power_state_index = state_index;
-                rdev->pm.power_state[state_index].flags = 0;
-                state_index++;
+                rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state), GFP_KERNEL);
+                if (rdev->pm.power_state) {
+                        /* add the default mode */
+                        rdev->pm.power_state[state_index].type =
+                                POWER_STATE_TYPE_DEFAULT;
+                        rdev->pm.power_state[state_index].num_clock_modes = 1;
+                        rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk;
+                        rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk;
+                        rdev->pm.power_state[state_index].default_clock_mode =
+                                &rdev->pm.power_state[state_index].clock_info[0];
+                        rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE;
+                        rdev->pm.power_state[state_index].pcie_lanes = 16;
+                        rdev->pm.default_power_state_index = state_index;
+                        rdev->pm.power_state[state_index].flags = 0;
+                        state_index++;
+                }
         }
 
         rdev->pm.num_power_states = state_index;
@@ -2623,7 +2623,7 @@ void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev)
         bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE;
 
         /* tell the bios not to handle mode switching */
-        bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH | ATOM_S6_ACC_MODE);
+        bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH;
 
         if (rdev->family >= CHIP_R600) {
                 WREG32(R600_BIOS_2_SCRATCH, bios_2_scratch);
@@ -2674,10 +2674,13 @@ void radeon_atom_output_lock(struct drm_encoder *encoder, bool lock)
         else
                 bios_6_scratch = RREG32(RADEON_BIOS_6_SCRATCH);
 
-        if (lock)
+        if (lock) {
                 bios_6_scratch |= ATOM_S6_CRITICAL_STATE;
-        else
+                bios_6_scratch &= ~ATOM_S6_ACC_MODE;
+        } else {
                 bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE;
+                bios_6_scratch |= ATOM_S6_ACC_MODE;
+        }
 
         if (rdev->family >= CHIP_R600)
                 WREG32(R600_BIOS_6_SCRATCH, bios_6_scratch);
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 591fcae8f224..d27ef74590cd 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -2442,6 +2442,17 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)
 
         rdev->pm.default_power_state_index = -1;
 
+        /* allocate 2 power states */
+        rdev->pm.power_state = kzalloc(sizeof(struct radeon_power_state) * 2, GFP_KERNEL);
+        if (!rdev->pm.power_state) {
+                rdev->pm.default_power_state_index = state_index;
+                rdev->pm.num_power_states = 0;
+
+                rdev->pm.current_power_state_index = rdev->pm.default_power_state_index;
+                rdev->pm.current_clock_mode_index = 0;
+                return;
+        }
+
         if (rdev->flags & RADEON_IS_MOBILITY) {
                 offset = combios_get_table_offset(dev, COMBIOS_POWERPLAY_INFO_TABLE);
                 if (offset) {
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 26091d602b84..0d478932b1a9 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -891,9 +891,9 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
                 pci_disable_device(dev->pdev);
                 pci_set_power_state(dev->pdev, PCI_D3hot);
         }
-        acquire_console_sem();
+        console_lock();
         radeon_fbdev_set_suspend(rdev, 1);
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 
@@ -905,11 +905,11 @@ int radeon_resume_kms(struct drm_device *dev)
         if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         pci_set_power_state(dev->pdev, PCI_D0);
         pci_restore_state(dev->pdev);
         if (pci_enable_device(dev->pdev)) {
-                release_console_sem();
+                console_unlock();
                 return -1;
         }
         pci_set_master(dev->pdev);
@@ -920,7 +920,7 @@ int radeon_resume_kms(struct drm_device *dev)
         radeon_restore_bios_scratch_regs(rdev);
 
         radeon_fbdev_set_suspend(rdev, 0);
-        release_console_sem();
+        console_unlock();
 
         /* reset hpd state */
         radeon_hpd_init(rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index d26dabf878d9..2eff98cfd728 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -780,6 +780,115 @@ static int radeon_ddc_dump(struct drm_connector *connector)
         return ret;
 }
 
+/* avivo */
+static void avivo_get_fb_div(struct radeon_pll *pll,
+                             u32 target_clock,
+                             u32 post_div,
+                             u32 ref_div,
+                             u32 *fb_div,
+                             u32 *frac_fb_div)
+{
+        u32 tmp = post_div * ref_div;
+
+        tmp *= target_clock;
+        *fb_div = tmp / pll->reference_freq;
+        *frac_fb_div = tmp % pll->reference_freq;
+}
+
+static u32 avivo_get_post_div(struct radeon_pll *pll,
+                              u32 target_clock)
+{
+        u32 vco, post_div, tmp;
+
+        if (pll->flags & RADEON_PLL_USE_POST_DIV)
+                return pll->post_div;
+
+        if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
+                if (pll->flags & RADEON_PLL_IS_LCD)
+                        vco = pll->lcd_pll_out_min;
+                else
+                        vco = pll->pll_out_min;
+        } else {
+                if (pll->flags & RADEON_PLL_IS_LCD)
+                        vco = pll->lcd_pll_out_max;
+                else
+                        vco = pll->pll_out_max;
+        }
+
+        post_div = vco / target_clock;
+        tmp = vco % target_clock;
+
+        if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP) {
+                if (tmp)
+                        post_div++;
+        } else {
+                if (!tmp)
+                        post_div--;
+        }
+
+        return post_div;
+}
+
+#define MAX_TOLERANCE 10
+
+void radeon_compute_pll_avivo(struct radeon_pll *pll,
+                              u32 freq,
+                              u32 *dot_clock_p,
+                              u32 *fb_div_p,
+                              u32 *frac_fb_div_p,
+                              u32 *ref_div_p,
+                              u32 *post_div_p)
+{
+        u32 target_clock = freq / 10;
+        u32 post_div = avivo_get_post_div(pll, target_clock);
+        u32 ref_div = pll->min_ref_div;
+        u32 fb_div = 0, frac_fb_div = 0, tmp;
+
+        if (pll->flags & RADEON_PLL_USE_REF_DIV)
+                ref_div = pll->reference_div;
+
+        if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV) {
+                avivo_get_fb_div(pll, target_clock, post_div, ref_div, &fb_div, &frac_fb_div);
+                frac_fb_div = (100 * frac_fb_div) / pll->reference_freq;
+                if (frac_fb_div >= 5) {
+                        frac_fb_div -= 5;
+                        frac_fb_div = frac_fb_div / 10;
+                        frac_fb_div++;
+                }
+                if (frac_fb_div >= 10) {
+                        fb_div++;
+                        frac_fb_div = 0;
+                }
+        } else {
+                while (ref_div <= pll->max_ref_div) {
+                        avivo_get_fb_div(pll, target_clock, post_div, ref_div,
+                                         &fb_div, &frac_fb_div);
+                        if (frac_fb_div >= (pll->reference_freq / 2))
+                                fb_div++;
+                        frac_fb_div = 0;
+                        tmp = (pll->reference_freq * fb_div) / (post_div * ref_div);
+                        tmp = (tmp * 10000) / target_clock;
+
+                        if (tmp > (10000 + MAX_TOLERANCE))
+                                ref_div++;
+                        else if (tmp >= (10000 - MAX_TOLERANCE))
+                                break;
+                        else
+                                ref_div++;
+                }
+        }
+
+        *dot_clock_p = ((pll->reference_freq * fb_div * 10) + (pll->reference_freq * frac_fb_div)) /
+                (ref_div * post_div * 10);
+        *fb_div_p = fb_div;
+        *frac_fb_div_p = frac_fb_div;
+        *ref_div_p = ref_div;
+        *post_div_p = post_div;
+        DRM_DEBUG_KMS("%d, pll dividers - fb: %d.%d ref: %d, post %d\n",
+                      *dot_clock_p, fb_div, frac_fb_div, ref_div, post_div);
+}
+
+/* pre-avivo */
 static inline uint32_t radeon_div(uint64_t n, uint32_t d)
 {
         uint64_t mod;
@@ -790,13 +899,13 @@ static inline uint32_t radeon_div(uint64_t n, uint32_t d)
         return n;
 }
 
-void radeon_compute_pll(struct radeon_pll *pll,
-                        uint64_t freq,
-                        uint32_t *dot_clock_p,
-                        uint32_t *fb_div_p,
-                        uint32_t *frac_fb_div_p,
-                        uint32_t *ref_div_p,
-                        uint32_t *post_div_p)
+void radeon_compute_pll_legacy(struct radeon_pll *pll,
+                               uint64_t freq,
+                               uint32_t *dot_clock_p,
+                               uint32_t *fb_div_p,
+                               uint32_t *frac_fb_div_p,
+                               uint32_t *ref_div_p,
+                               uint32_t *post_div_p)
 {
         uint32_t min_ref_div = pll->min_ref_div;
         uint32_t max_ref_div = pll->max_ref_div;
@@ -826,6 +935,9 @@ void radeon_compute_pll(struct radeon_pll *pll,
                 pll_out_max = pll->pll_out_max;
         }
 
+        if (pll_out_min > 64800)
+                pll_out_min = 64800;
+
         if (pll->flags & RADEON_PLL_USE_REF_DIV)
                 min_ref_div = max_ref_div = pll->reference_div;
         else {
@@ -849,7 +961,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
                 max_fractional_feed_div = pll->max_frac_feedback_div;
         }
 
-        for (post_div = max_post_div; post_div >= min_post_div; --post_div) {
+        for (post_div = min_post_div; post_div <= max_post_div; ++post_div) {
                 uint32_t ref_div;
 
                 if ((pll->flags & RADEON_PLL_NO_ODD_POST_DIV) && (post_div & 1))
@@ -965,6 +1077,10 @@ void radeon_compute_pll(struct radeon_pll *pll,
         *frac_fb_div_p = best_frac_feedback_div;
         *ref_div_p = best_ref_div;
         *post_div_p = best_post_div;
+        DRM_DEBUG_KMS("%d %d, pll dividers - fb: %d.%d ref: %d, post %d\n",
+                      freq, best_freq / 1000, best_feedback_div, best_frac_feedback_div,
+                      best_ref_div, best_post_div);
+
 }
 
 static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index be5cb4f28c29..275b26a708d6 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -48,7 +48,7 @@
  * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen
  * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500)
  *   2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs
- *   2.8.0 - pageflip support, r500 US_FORMAT regs. r500 ARGB2101010 colorbuf, r300->r500 CMASK
+ *   2.8.0 - pageflip support, r500 US_FORMAT regs. r500 ARGB2101010 colorbuf, r300->r500 CMASK, clock crystal query
  */
 #define KMS_DRIVER_MAJOR        2
 #define KMS_DRIVER_MINOR        8
@@ -104,6 +104,7 @@ int radeon_tv = 1;
 int radeon_audio = 1;
 int radeon_disp_priority = 0;
 int radeon_hw_i2c = 0;
+int radeon_pcie_gen2 = 0;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -147,6 +148,9 @@ module_param_named(disp_priority, radeon_disp_priority, int, 0444);
 MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)");
 module_param_named(hw_i2c, radeon_hw_i2c, int, 0444);
 
+MODULE_PARM_DESC(pcie_gen2, "PCIE Gen2 mode (1 = enable)");
+module_param_named(pcie_gen2, radeon_pcie_gen2, int, 0444);
+
 static int radeon_suspend(struct drm_device *dev, pm_message_t state)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 8fd184286c0b..d4a542247618 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -641,7 +641,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         switch (connector->connector_type) {
         case DRM_MODE_CONNECTOR_DVII:
         case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
-                if (drm_detect_monitor_audio(radeon_connector->edid)) {
+                if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
                         /* fix me */
                         if (ASIC_IS_DCE4(rdev))
                                 return ATOM_ENCODER_MODE_DVI;
@@ -655,7 +655,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         case DRM_MODE_CONNECTOR_DVID:
         case DRM_MODE_CONNECTOR_HDMIA:
         default:
-                if (drm_detect_monitor_audio(radeon_connector->edid)) {
+                if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
                         /* fix me */
                         if (ASIC_IS_DCE4(rdev))
                                 return ATOM_ENCODER_MODE_DVI;
@@ -673,7 +673,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                 if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
                     (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
                         return ATOM_ENCODER_MODE_DP;
-                else if (drm_detect_monitor_audio(radeon_connector->edid)) {
+                else if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {
                         /* fix me */
                         if (ASIC_IS_DCE4(rdev))
                                 return ATOM_ENCODER_MODE_DVI;
@@ -1063,7 +1063,7 @@ atombios_set_edp_panel_power(struct drm_connector *connector, int action)
         if (!ASIC_IS_DCE4(rdev))
                 return;
 
-        if ((action != ATOM_TRANSMITTER_ACTION_POWER_ON) ||
+        if ((action != ATOM_TRANSMITTER_ACTION_POWER_ON) &&
             (action != ATOM_TRANSMITTER_ACTION_POWER_OFF))
                 return;
 
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index ca32e9c1e91d..66324b5bb5ba 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -225,6 +225,8 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
 
         strcpy(info->fix.id, "radeondrmfb");
 
+        drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
+
         info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
         info->fbops = &radeonfb_ops;
 
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index a289646e8aa4..9ec830c77af0 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -110,11 +110,14 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
 
 int radeon_irq_kms_init(struct radeon_device *rdev)
 {
+        int i;
         int r = 0;
 
         INIT_WORK(&rdev->hotplug_work, radeon_hotplug_work_func);
 
         spin_lock_init(&rdev->irq.sw_lock);
+        for (i = 0; i < rdev->num_crtc; i++)
+                spin_lock_init(&rdev->irq.pflip_lock[i]);
         r = drm_vblank_init(rdev->ddev, rdev->num_crtc);
         if (r) {
                 return r;
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 28a53e4a925f..8387d32caaa7 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -201,6 +201,10 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                 }
                 radeon_set_filp_rights(dev, &rdev->cmask_filp, filp, &value);
                 break;
+        case RADEON_INFO_CLOCK_CRYSTAL_FREQ:
+                /* return clock value in KHz */
+                value = rdev->clock.spll.reference_freq * 10;
+                break;
         default:
                 DRM_DEBUG_KMS("Invalid request %d\n", info->request);
                 return -EINVAL;
@@ -243,6 +247,8 @@ void radeon_driver_preclose_kms(struct drm_device *dev,
         struct radeon_device *rdev = dev->dev_private;
         if (rdev->hyperz_filp == file_priv)
                 rdev->hyperz_filp = NULL;
+        if (rdev->cmask_filp == file_priv)
+                rdev->cmask_filp = NULL;
 }
 
 /*
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index ace2e6384d40..cf0638c3b7c7 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -778,9 +778,9 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
         DRM_DEBUG_KMS("\n");
 
         if (!use_bios_divs) {
-                radeon_compute_pll(pll, mode->clock,
-                                   &freq, &feedback_div, &frac_fb_div,
-                                   &reference_div, &post_divider);
+                radeon_compute_pll_legacy(pll, mode->clock,
+                                          &freq, &feedback_div, &frac_fb_div,
+                                          &reference_div, &post_divider);
 
                 for (post_div = &post_divs[0]; post_div->divider; ++post_div) {
                         if (post_div->divider == post_divider)
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 12bdeab91c86..6794cdf91f28 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -149,6 +149,7 @@ struct radeon_tmds_pll {
 #define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 11)
 #define RADEON_PLL_USE_POST_DIV         (1 << 12)
 #define RADEON_PLL_IS_LCD               (1 << 13)
+#define RADEON_PLL_PREFER_MINM_OVER_MAXP (1 << 14)
 
 struct radeon_pll {
         /* reference frequency */
@@ -510,13 +511,21 @@ extern bool radeon_atombios_get_asic_ss_info(struct radeon_device *rdev,
                                              struct radeon_atom_ss *ss,
                                              int id, u32 clock);
 
-extern void radeon_compute_pll(struct radeon_pll *pll,
-                               uint64_t freq,
-                               uint32_t *dot_clock_p,
-                               uint32_t *fb_div_p,
-                               uint32_t *frac_fb_div_p,
-                               uint32_t *ref_div_p,
-                               uint32_t *post_div_p);
+extern void radeon_compute_pll_legacy(struct radeon_pll *pll,
+                                      uint64_t freq,
+                                      uint32_t *dot_clock_p,
+                                      uint32_t *fb_div_p,
+                                      uint32_t *frac_fb_div_p,
+                                      uint32_t *ref_div_p,
+                                      uint32_t *post_div_p);
+
+extern void radeon_compute_pll_avivo(struct radeon_pll *pll,
+                                     u32 freq,
+                                     u32 *dot_clock_p,
+                                     u32 *fb_div_p,
+                                     u32 *frac_fb_div_p,
+                                     u32 *ref_div_p,
+                                     u32 *post_div_p);
 
 extern void radeon_setup_encoder_clones(struct drm_device *dev);
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 3b1b2bf9cdd5..2aed03bde4b2 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -430,7 +430,7 @@ static ssize_t radeon_hwmon_show_temp(struct device *dev,
 {
         struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev));
         struct radeon_device *rdev = ddev->dev_private;
-        u32 temp;
+        int temp;
 
         switch (rdev->pm.int_thermal_type) {
         case THERMAL_TYPE_RV6XX:
@@ -646,6 +646,9 @@ void radeon_pm_fini(struct radeon_device *rdev)
 #endif
         }
 
+        if (rdev->pm.power_state)
+                kfree(rdev->pm.power_state);
+
         radeon_hwmon_fini(rdev);
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
index 3cd4dace57c7..ec93a75369e6 100644
--- a/drivers/gpu/drm/radeon/radeon_reg.h
+++ b/drivers/gpu/drm/radeon/radeon_reg.h
@@ -375,6 +375,8 @@
 #define RADEON_CONFIG_APER_SIZE             0x0108
 #define RADEON_CONFIG_BONDS                 0x00e8
 #define RADEON_CONFIG_CNTL                  0x00e0
+#       define RADEON_CFG_VGA_RAM_EN        (1 << 8)
+#       define RADEON_CFG_VGA_IO_DIS        (1 << 9)
 #       define RADEON_CFG_ATI_REV_A11       (0   << 16)
 #       define RADEON_CFG_ATI_REV_A12       (1   << 16)
 #       define RADEON_CFG_ATI_REV_A13       (2   << 16)
diff --git a/drivers/gpu/drm/radeon/reg_srcs/evergreen b/drivers/gpu/drm/radeon/reg_srcs/evergreen
index ac40fd39d787..9177f9191837 100644
--- a/drivers/gpu/drm/radeon/reg_srcs/evergreen
+++ b/drivers/gpu/drm/radeon/reg_srcs/evergreen
@@ -439,7 +439,7 @@ evergreen 0x9400
 0x000286EC SPI_COMPUTE_NUM_THREAD_X
 0x000286F0 SPI_COMPUTE_NUM_THREAD_Y
 0x000286F4 SPI_COMPUTE_NUM_THREAD_Z
-0x000286F8 GDS_ADDR_SIZE
+0x00028724 GDS_ADDR_SIZE
 0x00028780 CB_BLEND0_CONTROL
 0x00028784 CB_BLEND1_CONTROL
 0x00028788 CB_BLEND2_CONTROL
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 5512e4e5e636..c76283d9eb3d 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -203,6 +203,9 @@ void rs400_gart_fini(struct radeon_device *rdev)
         radeon_gart_table_ram_free(rdev);
 }
 
+#define RS400_PTE_WRITEABLE (1 << 2)
+#define RS400_PTE_READABLE  (1 << 3)
+
 int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 {
         uint32_t entry;
@@ -213,7 +216,7 @@ int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 
         entry = (lower_32_bits(addr) & PAGE_MASK) |
                 ((upper_32_bits(addr) & 0xff) << 4) |
-                0xc;
+                RS400_PTE_WRITEABLE | RS400_PTE_READABLE;
         entry = cpu_to_le32(entry);
         rdev->gart.table.ram.ptr[i] = entry;
         return 0;
@@ -226,8 +229,8 @@ int rs400_mc_wait_for_idle(struct radeon_device *rdev)
 
         for (i = 0; i < rdev->usec_timeout; i++) {
                 /* read MC_STATUS */
-                tmp = RREG32(0x0150);
-                if (tmp & (1 << 2)) {
+                tmp = RREG32(RADEON_MC_STATUS);
+                if (tmp & RADEON_MC_IDLE) {
                         return 0;
                 }
                 DRM_UDELAY(1);
@@ -241,7 +244,7 @@ void rs400_gpu_init(struct radeon_device *rdev)
         r420_pipes_init(rdev);
         if (rs400_mc_wait_for_idle(rdev)) {
                 printk(KERN_WARNING "rs400: Failed to wait MC idle while "
-                       "programming pipes. Bad things might happen. %08x\n", RREG32(0x150));
+                       "programming pipes. Bad things might happen. %08x\n", RREG32(RADEON_MC_STATUS));
         }
 }
 
@@ -300,9 +303,9 @@ static int rs400_debugfs_gart_info(struct seq_file *m, void *data)
                 seq_printf(m, "MCCFG_AGP_BASE_2 0x%08x\n", tmp);
                 tmp = RREG32_MC(RS690_MCCFG_AGP_LOCATION);
                 seq_printf(m, "MCCFG_AGP_LOCATION 0x%08x\n", tmp);
-                tmp = RREG32_MC(0x100);
+                tmp = RREG32_MC(RS690_MCCFG_FB_LOCATION);
                 seq_printf(m, "MCCFG_FB_LOCATION 0x%08x\n", tmp);
-                tmp = RREG32(0x134);
+                tmp = RREG32(RS690_HDP_FB_LOCATION);
                 seq_printf(m, "HDP_FB_LOCATION 0x%08x\n", tmp);
         } else {
                 tmp = RREG32(RADEON_AGP_BASE);
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index b4192acaab5f..5afe294ed51f 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -339,16 +339,16 @@ void rs600_bm_disable(struct radeon_device *rdev)
 
 int rs600_asic_reset(struct radeon_device *rdev)
 {
-        u32 status, tmp;
-
         struct rv515_mc_save save;
+        u32 status, tmp;
+        int ret = 0;
 
-        /* Stops all mc clients */
-        rv515_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         if (!G_000E40_GUI_ACTIVE(status)) {
                 return 0;
         }
+        /* Stops all mc clients */
+        rv515_mc_stop(rdev, &save);
         status = RREG32(R_000E40_RBBM_STATUS);
         dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
         /* stop CP */
@@ -392,11 +392,11 @@ int rs600_asic_reset(struct radeon_device *rdev)
         if (G_000E40_GA_BUSY(status) || G_000E40_VAP_BUSY(status)) {
                 dev_err(rdev->dev, "failed to reset GPU\n");
                 rdev->gpu_lockup = true;
-                return -1;
-        }
+                ret = -1;
+        } else
+                dev_info(rdev->dev, "GPU reset succeed\n");
         rv515_mc_resume(rdev, &save);
-        dev_info(rdev->dev, "GPU reset succeed\n");
-        return 0;
+        return ret;
 }
 
 /*
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 5d569f41f4ae..64b57af93714 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -69,13 +69,13 @@ void rv515_ring_start(struct radeon_device *rdev)
                           ISYNC_CPSCRATCH_IDLEGUI);
         radeon_ring_write(rdev, PACKET0(WAIT_UNTIL, 0));
         radeon_ring_write(rdev, WAIT_2D_IDLECLEAN | WAIT_3D_IDLECLEAN);
-        radeon_ring_write(rdev, PACKET0(0x170C, 0));
-        radeon_ring_write(rdev, 1 << 31);
+        radeon_ring_write(rdev, PACKET0(R300_DST_PIPE_CONFIG, 0));
+        radeon_ring_write(rdev, R300_PIPE_AUTO_CONFIG);
         radeon_ring_write(rdev, PACKET0(GB_SELECT, 0));
         radeon_ring_write(rdev, 0);
         radeon_ring_write(rdev, PACKET0(GB_ENABLE, 0));
         radeon_ring_write(rdev, 0);
-        radeon_ring_write(rdev, PACKET0(0x42C8, 0));
+        radeon_ring_write(rdev, PACKET0(R500_SU_REG_DEST, 0));
         radeon_ring_write(rdev, (1 << rdev->num_gb_pipes) - 1);
         radeon_ring_write(rdev, PACKET0(VAP_INDEX_OFFSET, 0));
         radeon_ring_write(rdev, 0);
@@ -153,8 +153,8 @@ void rv515_gpu_init(struct radeon_device *rdev)
         }
         rv515_vga_render_disable(rdev);
         r420_pipes_init(rdev);
-        gb_pipe_select = RREG32(0x402C);
-        tmp = RREG32(0x170C);
+        gb_pipe_select = RREG32(R400_GB_PIPE_SELECT);
+        tmp = RREG32(R300_DST_PIPE_CONFIG);
         pipe_select_current = (tmp >> 2) & 3;
         tmp = (1 << pipe_select_current) |
               (((gb_pipe_select >> 8) & 0xF) << 4);
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 3a264aa3a79a..2211a323db41 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -78,18 +78,23 @@ u32 rv770_page_flip(struct radeon_device *rdev, int crtc_id, u64 crtc_base)
 }
 
 /* get temperature in millidegrees */
-u32 rv770_get_temp(struct radeon_device *rdev)
+int rv770_get_temp(struct radeon_device *rdev)
 {
         u32 temp = (RREG32(CG_MULT_THERMAL_STATUS) & ASIC_T_MASK) >>
                 ASIC_T_SHIFT;
-        u32 actual_temp = 0;
-
-        if ((temp >> 9) & 1)
-                actual_temp = 0;
-        else
-                actual_temp = (temp >> 1) & 0xff;
-
-        return actual_temp * 1000;
+        int actual_temp;
+
+        if (temp & 0x400)
+                actual_temp = -256;
+        else if (temp & 0x200)
+                actual_temp = 255;
+        else if (temp & 0x100) {
+                actual_temp = temp & 0x1ff;
+                actual_temp |= ~0x1ff;
+        } else
+                actual_temp = temp & 0xff;
+
+        return (actual_temp * 1000) / 2;
 }
 
 void rv770_pm_misc(struct radeon_device *rdev)
@@ -1268,7 +1273,7 @@ int rv770_init(struct radeon_device *rdev)
         if (r)
                 return r;
         /* Post card if necessary */
-        if (!r600_card_posted(rdev)) {
+        if (!radeon_card_posted(rdev)) {
                 if (!rdev->bios) {
                         dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
                         return -EINVAL;
@@ -1372,6 +1377,9 @@ static void rv770_pcie_gen2_enable(struct radeon_device *rdev)
         u32 link_width_cntl, lanes, speed_cntl, tmp;
         u16 link_cntl2;
 
+        if (radeon_pcie_gen2 == 0)
+                return;
+
         if (rdev->flags & RADEON_IS_IGP)
                 return;
 
diff --git a/drivers/gpu/stub/Kconfig b/drivers/gpu/stub/Kconfig
index 0e1edd7311ff..70e60a4bb678 100644
--- a/drivers/gpu/stub/Kconfig
+++ b/drivers/gpu/stub/Kconfig
@@ -1,12 +1,13 @@
 config STUB_POULSBO
         tristate "Intel GMA500 Stub Driver"
         depends on PCI
+        depends on NET # for THERMAL
         # Poulsbo stub depends on ACPI_VIDEO when ACPI is enabled
         # but for select to work, need to select ACPI_VIDEO's dependencies, ick
-        select VIDEO_OUTPUT_CONTROL if ACPI
         select BACKLIGHT_CLASS_DEVICE if ACPI
         select INPUT if ACPI
         select ACPI_VIDEO if ACPI
+        select THERMAL if ACPI
         help
           Choose this option if you have a system that has Intel GMA500
           (Poulsbo) integrated graphics. If M is selected, the module will
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 8d0e31a22027..96c83a9a76bb 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -1,5 +1,5 @@
 config VGA_ARB
-        bool "VGA Arbitration" if EMBEDDED
+        bool "VGA Arbitration" if EXPERT
         default y
         depends on PCI
         help
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index c380c65da417..ace2b1623b21 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -636,7 +636,7 @@ int vga_client_register(struct pci_dev *pdev, void *cookie,
                         void (*irq_set_state)(void *cookie, bool state),
                         unsigned int (*set_vga_decode)(void *cookie, bool decode))
 {
-        int ret = -1;
+        int ret = -ENODEV;
         struct vga_device *vgadev;
         unsigned long flags;
 
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 24cca2f69dfc..2560f01c1a63 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -62,9 +62,9 @@ config HID_3M_PCT
         Support for 3M PCT touch screens.
 
 config HID_A4TECH
-        tristate "A4 tech mice" if EMBEDDED
+        tristate "A4 tech mice" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for A4 tech X5 and WOP-35 / Trust 450L mice.
 
@@ -77,9 +77,9 @@ config HID_ACRUX_FF
         game controllers.
 
 config HID_APPLE
-        tristate "Apple {i,Power,Mac}Books" if EMBEDDED
+        tristate "Apple {i,Power,Mac}Books" if EXPERT
         depends on (USB_HID || BT_HIDP)
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for some Apple devices which less or more break
         HID specification.
@@ -88,9 +88,9 @@ config HID_APPLE
         MacBooks, MacBook Pros and Apple Aluminum.
 
 config HID_BELKIN
-        tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED
+        tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Belkin Flip KVM and Wireless keyboard.
 
@@ -101,16 +101,16 @@ config HID_CANDO
         Support for Cando dual touch panel.
 
 config HID_CHERRY
-        tristate "Cherry Cymotion keyboard" if EMBEDDED
+        tristate "Cherry Cymotion keyboard" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Cherry Cymotion keyboard.
 
 config HID_CHICONY
-        tristate "Chicony Tactical pad" if EMBEDDED
+        tristate "Chicony Tactical pad" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Chicony Tactical pad.
 
@@ -130,9 +130,9 @@ config HID_PRODIKEYS
           and some additional multimedia keys.
 
 config HID_CYPRESS
-        tristate "Cypress mouse and barcode readers" if EMBEDDED
+        tristate "Cypress mouse and barcode readers" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for cypress mouse and barcode readers.
 
@@ -174,16 +174,16 @@ config HID_ELECOM
         Support for the ELECOM BM084 (bluetooth mouse).
 
 config HID_EZKEY
-        tristate "Ezkey BTC 8193 keyboard" if EMBEDDED
+        tristate "Ezkey BTC 8193 keyboard" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Ezkey BTC 8193 keyboard.
 
 config HID_KYE
-        tristate "Kye/Genius Ergo Mouse" if EMBEDDED
+        tristate "Kye/Genius Ergo Mouse" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Kye/Genius Ergo Mouse.
 
@@ -212,16 +212,16 @@ config HID_TWINHAN
         Support for Twinhan IR remote control.
 
 config HID_KENSINGTON
-        tristate "Kensington Slimblade Trackball" if EMBEDDED
+        tristate "Kensington Slimblade Trackball" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Kensington Slimblade Trackball.
 
 config HID_LOGITECH
-        tristate "Logitech devices" if EMBEDDED
+        tristate "Logitech devices" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Logitech devices that are not fully compliant with HID standard.
 
@@ -276,9 +276,9 @@ config HID_MAGICMOUSE
         Apple Wireless "Magic" Mouse.
 
 config HID_MICROSOFT
-        tristate "Microsoft non-fully HID-compliant devices" if EMBEDDED
+        tristate "Microsoft non-fully HID-compliant devices" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Microsoft devices that are not fully compliant with HID standard.
 
@@ -289,9 +289,9 @@ config HID_MOSART
         Support for MosArt dual-touch panels.
 
 config HID_MONTEREY
-        tristate "Monterey Genius KB29E keyboard" if EMBEDDED
+        tristate "Monterey Genius KB29E keyboard" if EXPERT
         depends on USB_HID
-        default !EMBEDDED
+        default !EXPERT
         ---help---
         Support for Monterey Genius KB29E.
 
@@ -365,8 +365,8 @@ config HID_PICOLCD
           - IR
 
 config HID_PICOLCD_FB
-        bool "Framebuffer support" if EMBEDDED
-        default !EMBEDDED
+        bool "Framebuffer support" if EXPERT
+        default !EXPERT
         depends on HID_PICOLCD
         depends on HID_PICOLCD=FB || FB=y
         select FB_DEFERRED_IO
@@ -379,8 +379,8 @@ config HID_PICOLCD_FB
           frambuffer device.
 
 config HID_PICOLCD_BACKLIGHT
-        bool "Backlight control" if EMBEDDED
-        default !EMBEDDED
+        bool "Backlight control" if EXPERT
+        default !EXPERT
         depends on HID_PICOLCD
         depends on HID_PICOLCD=BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=y
         ---help---
@@ -388,16 +388,16 @@ config HID_PICOLCD_BACKLIGHT
           class.
 
 config HID_PICOLCD_LCD
-        bool "Contrast control" if EMBEDDED
-        default !EMBEDDED
+        bool "Contrast control" if EXPERT
+        default !EXPERT
         depends on HID_PICOLCD
         depends on HID_PICOLCD=LCD_CLASS_DEVICE || LCD_CLASS_DEVICE=y
         ---help---
           Provide access to PicoLCD's LCD contrast via lcd class.
 
 config HID_PICOLCD_LEDS
-        bool "GPO via leds class" if EMBEDDED
-        default !EMBEDDED
+        bool "GPO via leds class" if EXPERT
+        default !EXPERT
         depends on HID_PICOLCD
         depends on HID_PICOLCD=LEDS_CLASS || LEDS_CLASS=y
         ---help---
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 4edb3bef94a6..0f20fd17cf06 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -45,7 +45,7 @@ config USB_HIDDEV
           If unsure, say Y.
 
 menu "USB HID Boot Protocol drivers"
-        depends on USB!=n && USB_HID!=y && EMBEDDED
+        depends on USB!=n && USB_HID!=y && EXPERT
 
 config USB_KBD
         tristate "USB HIDBP Keyboard (simple Boot) support"
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 35f00dae3676..773e484f1646 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -618,8 +618,8 @@ config SENSORS_LM93
         depends on I2C
         select HWMON_VID
         help
-          If you say yes here you get support for National Semiconductor LM93
-          sensor chips.
+          If you say yes here you get support for National Semiconductor LM93,
+          LM94, and compatible sensor chips.
 
           This driver can also be built as a module.  If so, the module
           will be called lm93.
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index ce0372f0615e..4c0743660e9c 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1072,6 +1072,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
                         node->sda.dev_attr.show = grp->show;
                         node->sda.dev_attr.store = grp->store;
                         attr = &node->sda.dev_attr.attr;
+                        sysfs_attr_init(attr);
                         attr->name = node->name;
                         attr->mode = S_IRUGO | (grp->store ? S_IWUSR : 0);
                         ret = sysfs_create_file(&pdev->dev.kobj, attr);
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index 2d68cf3c223b..b5e892017e0c 100644
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/dmi.h>
 
 #include <acpi/acpi.h>
 #include <acpi/acpixf.h>
@@ -22,6 +23,21 @@
 
 #define ATK_HID "ATK0110"
 
+static bool new_if;
+module_param(new_if, bool, 0);
+MODULE_PARM_DESC(new_if, "Override detection heuristic and force the use of the new ATK0110 interface");
+
+static const struct dmi_system_id __initconst atk_force_new_if[] = {
+        {
+                /* Old interface has broken MCH temp monitoring */
+                .ident = "Asus Sabertooth X58",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_NAME, "SABERTOOTH X58")
+                }
+        },
+        { }
+};
+
 /* Minimum time between readings, enforced in order to avoid
  * hogging the CPU.
  */
@@ -1302,7 +1318,9 @@ static int atk_probe_if(struct atk_data *data)
          * analysis of multiple DSDTs indicates that when both interfaces
          * are present the new one (GGRP/GITM) is not functional.
          */
-        if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle)
+        if (new_if)
+                dev_info(dev, "Overriding interface detection\n");
+        if (data->rtmp_handle && data->rvlt_handle && data->rfan_handle && !new_if)
                 data->old_interface = true;
         else if (data->enumerate_handle && data->read_handle &&
                         data->write_handle)
@@ -1420,6 +1438,9 @@ static int __init atk0110_init(void)
                 return -EBUSY;
         }
 
+        if (dmi_check_system(atk_force_new_if))
+                new_if = true;
+
         ret = acpi_bus_register_driver(&atk_driver);
         if (ret)
                 pr_info("acpi_bus_register_driver failed: %d\n", ret);
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index 5dea9faa1656..cd2a6e437aec 100644
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -344,7 +344,7 @@ static int emc1403_remove(struct i2c_client *client)
 }
 
 static const unsigned short emc1403_address_list[] = {
-        0x18, 0x2a, 0x4c, 0x4d, I2C_CLIENT_END
+        0x18, 0x29, 0x4c, 0x4d, I2C_CLIENT_END
 };
 
 static const struct i2c_device_id emc1403_idtable[] = {
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index 1b674b7d4584..d805e8e57967 100644
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -957,7 +957,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
 
         /* bail if we did not get an IRQ from the bus layer */
         if (!dev->irq) {
-                pr_err("No IRQ. Disabling /dev/freefall\n");
+                pr_debug("No IRQ. Disabling /dev/freefall\n");
                 goto out;
         }
 
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 776aeb3019d2..508cb291f71b 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -98,6 +98,9 @@ static const unsigned short normal_i2c[] = { 0x18, 0x4c, 0x4e, I2C_CLIENT_END };
  * value, it uses signed 8-bit values with LSB = 1 degree Celsius.
  * For remote temperature, low and high limits, it uses signed 11-bit values
  * with LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
+ * For LM64 the actual remote diode temperature is 16 degree Celsius higher
+ * than the register reading. Remote temperature setpoints have to be
+ * adapted accordingly.
  */
 
 #define FAN_FROM_REG(reg)       ((reg) == 0xFFFC || (reg) == 0 ? 0 : \
@@ -165,6 +168,8 @@ struct lm63_data {
         struct mutex update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
+        int kind;
+        int temp2_offset;
 
         /* registers values */
         u8 config, config_fan;
@@ -247,16 +252,34 @@ static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *dum
         return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2);
 }
 
-static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
-                          char *buf)
+/*
+ * There are 8bit registers for both local(temp1) and remote(temp2) sensor.
+ * For remote sensor registers temp2_offset has to be considered,
+ * for local sensor it must not.
+ * So we need separate 8bit accessors for local and remote sensor.
+ */
+static ssize_t show_local_temp8(struct device *dev,
+                                struct device_attribute *devattr,
+                                char *buf)
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[attr->index]));
 }
 
-static ssize_t set_temp8(struct device *dev, struct device_attribute *dummy,
-                         const char *buf, size_t count)
+static ssize_t show_remote_temp8(struct device *dev,
+                                 struct device_attribute *devattr,
+                                 char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[attr->index])
+                       + data->temp2_offset);
+}
+
+static ssize_t set_local_temp8(struct device *dev,
+                               struct device_attribute *dummy,
+                               const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -274,7 +297,8 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct lm63_data *data = lm63_update_device(dev);
-        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->temp11[attr->index]));
+        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->temp11[attr->index])
+                       + data->temp2_offset);
 }
 
 static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
@@ -294,7 +318,7 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
         int nr = attr->index;
 
         mutex_lock(&data->update_lock);
-        data->temp11[nr] = TEMP11_TO_REG(val);
+        data->temp11[nr] = TEMP11_TO_REG(val - data->temp2_offset);
         i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
                                   data->temp11[nr] >> 8);
         i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
@@ -310,6 +334,7 @@ static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[2])
+                       + data->temp2_offset
                        - TEMP8_FROM_REG(data->temp2_crit_hyst));
 }
 
@@ -324,7 +349,7 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *
         long hyst;
 
         mutex_lock(&data->update_lock);
-        hyst = TEMP8_FROM_REG(data->temp8[2]) - val;
+        hyst = TEMP8_FROM_REG(data->temp8[2]) + data->temp2_offset - val;
         i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
         mutex_unlock(&data->update_lock);
@@ -355,16 +380,21 @@ static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan,
 static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1);
 static DEVICE_ATTR(pwm1_enable, S_IRUGO, show_pwm1_enable, NULL);
 
-static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
-static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,
-        set_temp8, 1);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_local_temp8, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_local_temp8,
+        set_local_temp8, 1);
 
 static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,
         set_temp11, 1);
 static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,
         set_temp11, 2);
-static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp8, NULL, 2);
+/*
+ * On LM63, temp2_crit can be set only once, which should be job
+ * of the bootloader.
+ */
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_remote_temp8,
+        NULL, 2);
 static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp2_crit_hyst,
         set_temp2_crit_hyst);
 
@@ -479,7 +509,12 @@ static int lm63_probe(struct i2c_client *new_client,
         data->valid = 0;
         mutex_init(&data->update_lock);
 
-        /* Initialize the LM63 chip */
+        /* Set the device type */
+        data->kind = id->driver_data;
+        if (data->kind == lm64)
+                data->temp2_offset = 16000;
+
+        /* Initialize chip */
         lm63_init_client(new_client);
 
         /* Register sysfs hooks */
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index c9ed14eba5a6..3b43df418613 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -135,6 +135,11 @@
 #define LM93_MFR_ID             0x73
 #define LM93_MFR_ID_PROTOTYPE   0x72
 
+/* LM94 REGISTER VALUES */
+#define LM94_MFR_ID_2           0x7a
+#define LM94_MFR_ID             0x79
+#define LM94_MFR_ID_PROTOTYPE   0x78
+
 /* SMBus capabilities */
 #define LM93_SMBUS_FUNC_FULL (I2C_FUNC_SMBUS_BYTE_DATA | \
                 I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA)
@@ -2504,6 +2509,7 @@ static int lm93_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
         struct i2c_adapter *adapter = client->adapter;
         int mfr, ver;
+        const char *name;
 
         if (!i2c_check_functionality(adapter, LM93_SMBUS_FUNC_MIN))
                 return -ENODEV;
@@ -2517,13 +2523,23 @@ static int lm93_detect(struct i2c_client *client, struct i2c_board_info *info)
         }
 
         ver = lm93_read_byte(client, LM93_REG_VER);
-        if (ver != LM93_MFR_ID && ver != LM93_MFR_ID_PROTOTYPE) {
+        switch (ver) {
+        case LM93_MFR_ID:
+        case LM93_MFR_ID_PROTOTYPE:
+                name = "lm93";
+                break;
+        case LM94_MFR_ID_2:
+        case LM94_MFR_ID:
+        case LM94_MFR_ID_PROTOTYPE:
+                name = "lm94";
+                break;
+        default:
                 dev_dbg(&adapter->dev,
                         "detect failed, bad version id 0x%02x!\n", ver);
                 return -ENODEV;
         }
 
-        strlcpy(info->type, "lm93", I2C_NAME_SIZE);
+        strlcpy(info->type, name, I2C_NAME_SIZE);
         dev_dbg(&adapter->dev,"loading %s at %d,0x%02x\n",
                 client->name, i2c_adapter_id(client->adapter),
                 client->addr);
@@ -2602,6 +2618,7 @@ static int lm93_remove(struct i2c_client *client)
 
 static const struct i2c_device_id lm93_id[] = {
         { "lm93", 0 },
+        { "lm94", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lm93_id);
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 53fab518b3da..986e5f62debe 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -29,6 +29,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/pci.h>
+#include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
@@ -40,6 +41,7 @@
 
 MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>");
 MODULE_DESCRIPTION("NatSemi SCx200 ACCESS.bus Driver");
+MODULE_ALIAS("platform:cs5535-smb");
 MODULE_LICENSE("GPL");
 
 #define MAX_DEVICES 4
@@ -84,10 +86,6 @@ struct scx200_acb_iface {
         u8 *ptr;
         char needs_reset;
         unsigned len;
-
-        /* PCI device info */
-        struct pci_dev *pdev;
-        int bar;
 };
 
 /* Register Definitions */
@@ -391,7 +389,7 @@ static const struct i2c_algorithm scx200_acb_algorithm = {
 static struct scx200_acb_iface *scx200_acb_list;
 static DEFINE_MUTEX(scx200_acb_list_mutex);
 
-static __init int scx200_acb_probe(struct scx200_acb_iface *iface)
+static __devinit int scx200_acb_probe(struct scx200_acb_iface *iface)
 {
         u8 val;
 
@@ -427,7 +425,7 @@ static __init int scx200_acb_probe(struct scx200_acb_iface *iface)
         return 0;
 }
 
-static __init struct scx200_acb_iface *scx200_create_iface(const char *text,
+static __devinit struct scx200_acb_iface *scx200_create_iface(const char *text,
                 struct device *dev, int index)
 {
         struct scx200_acb_iface *iface;
@@ -452,7 +450,7 @@ static __init struct scx200_acb_iface *scx200_create_iface(const char *text,
         return iface;
 }
 
-static int __init scx200_acb_create(struct scx200_acb_iface *iface)
+static int __devinit scx200_acb_create(struct scx200_acb_iface *iface)
 {
         struct i2c_adapter *adapter;
         int rc;
@@ -472,183 +470,145 @@ static int __init scx200_acb_create(struct scx200_acb_iface *iface)
                 return -ENODEV;
         }
 
-        mutex_lock(&scx200_acb_list_mutex);
-        iface->next = scx200_acb_list;
-        scx200_acb_list = iface;
-        mutex_unlock(&scx200_acb_list_mutex);
+        if (!adapter->dev.parent) {
+                /* If there's no dev, we're tracking (ISA) ifaces manually */
+                mutex_lock(&scx200_acb_list_mutex);
+                iface->next = scx200_acb_list;
+                scx200_acb_list = iface;
+                mutex_unlock(&scx200_acb_list_mutex);
+        }
 
         return 0;
 }
 
-static __init int scx200_create_pci(const char *text, struct pci_dev *pdev,
-                int bar)
+static struct scx200_acb_iface * __devinit scx200_create_dev(const char *text,
+                unsigned long base, int index, struct device *dev)
 {
         struct scx200_acb_iface *iface;
         int rc;
 
-        iface = scx200_create_iface(text, &pdev->dev, 0);
+        iface = scx200_create_iface(text, dev, index);
 
         if (iface == NULL)
-                return -ENOMEM;
-
-        iface->pdev = pdev;
-        iface->bar = bar;
-
-        rc = pci_enable_device_io(iface->pdev);
-        if (rc)
-                goto errout_free;
+                return NULL;
 
-        rc = pci_request_region(iface->pdev, iface->bar, iface->adapter.name);
-        if (rc) {
-                printk(KERN_ERR NAME ": can't allocate PCI BAR %d\n",
-                                iface->bar);
+        if (!request_region(base, 8, iface->adapter.name)) {
+                printk(KERN_ERR NAME ": can't allocate io 0x%lx-0x%lx\n",
+                       base, base + 8 - 1);
                 goto errout_free;
         }
 
-        iface->base = pci_resource_start(iface->pdev, iface->bar);
+        iface->base = base;
         rc = scx200_acb_create(iface);
 
         if (rc == 0)
-                return 0;
+                return iface;
 
-        pci_release_region(iface->pdev, iface->bar);
-        pci_dev_put(iface->pdev);
+        release_region(base, 8);
  errout_free:
         kfree(iface);
-        return rc;
+        return NULL;
 }
 
-static int __init scx200_create_isa(const char *text, unsigned long base,
-                int index)
+static int __devinit scx200_probe(struct platform_device *pdev)
 {
         struct scx200_acb_iface *iface;
-        int rc;
-
-        iface = scx200_create_iface(text, NULL, index);
-
-        if (iface == NULL)
-                return -ENOMEM;
+        struct resource *res;
 
-        if (!request_region(base, 8, iface->adapter.name)) {
-                printk(KERN_ERR NAME ": can't allocate io 0x%lx-0x%lx\n",
-                       base, base + 8 - 1);
-                rc = -EBUSY;
-                goto errout_free;
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "can't fetch device resource info\n");
+                return -ENODEV;
         }
 
-        iface->base = base;
-        rc = scx200_acb_create(iface);
+        iface = scx200_create_dev("CS5535", res->start, 0, &pdev->dev);
+        if (!iface)
+                return -EIO;
 
-        if (rc == 0)
-                return 0;
+        dev_info(&pdev->dev, "SCx200 device '%s' registered\n",
+                        iface->adapter.name);
+        platform_set_drvdata(pdev, iface);
 
-        release_region(base, 8);
- errout_free:
-        kfree(iface);
-        return rc;
+        return 0;
 }
 
-/* Driver data is an index into the scx200_data array that indicates
- * the name and the BAR where the I/O address resource is located.  ISA
- * devices are flagged with a bar value of -1 */
-
-static const struct pci_device_id scx200_pci[] __initconst = {
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE),
-          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE),
-          .driver_data = 0 },
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA),
-          .driver_data = 1 },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA),
-          .driver_data = 2 },
-        { 0, }
-};
-
-static struct {
-        const char *name;
-        int bar;
-} scx200_data[] = {
-        { "SCx200", -1 },
-        { "CS5535",  0 },
-        { "CS5536",  0 }
-};
+static void __devexit scx200_cleanup_iface(struct scx200_acb_iface *iface)
+{
+        i2c_del_adapter(&iface->adapter);
+        release_region(iface->base, 8);
+        kfree(iface);
+}
 
-static __init int scx200_scan_pci(void)
+static int __devexit scx200_remove(struct platform_device *pdev)
 {
-        int data, dev;
-        int rc = -ENODEV;
-        struct pci_dev *pdev;
+        struct scx200_acb_iface *iface;
 
-        for(dev = 0; dev < ARRAY_SIZE(scx200_pci); dev++) {
-                pdev = pci_get_device(scx200_pci[dev].vendor,
-                                scx200_pci[dev].device, NULL);
+        iface = platform_get_drvdata(pdev);
+        platform_set_drvdata(pdev, NULL);
+        scx200_cleanup_iface(iface);
 
-                if (pdev == NULL)
-                        continue;
+        return 0;
+}
 
-                data = scx200_pci[dev].driver_data;
+static struct platform_driver scx200_pci_drv = {
+        .driver = {
+                .name = "cs5535-smb",
+                .owner = THIS_MODULE,
+        },
+        .probe = scx200_probe,
+        .remove = __devexit_p(scx200_remove),
+};
 
-                /* if .bar is greater or equal to zero, this is a
-                 * PCI device - otherwise, we assume
-                   that the ports are ISA based
-                */
+static const struct pci_device_id scx200_isa[] __initconst = {
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
+        { 0, }
+};
 
-                if (scx200_data[data].bar >= 0)
-                        rc = scx200_create_pci(scx200_data[data].name, pdev,
-                                        scx200_data[data].bar);
-                else {
-                        int i;
+static __init void scx200_scan_isa(void)
+{
+        int i;
 
-                        pci_dev_put(pdev);
-                        for (i = 0; i < MAX_DEVICES; ++i) {
-                                if (base[i] == 0)
-                                        continue;
+        if (!pci_dev_present(scx200_isa))
+                return;
 
-                                rc = scx200_create_isa(scx200_data[data].name,
-                                                base[i],
-                                                i);
-                        }
-                }
+        for (i = 0; i < MAX_DEVICES; ++i) {
+                if (base[i] == 0)
+                        continue;
 
-                break;
+                /* XXX: should we care about failures? */
+                scx200_create_dev("SCx200", base[i], i, NULL);
         }
-
-        return rc;
 }
 
 static int __init scx200_acb_init(void)
 {
-        int rc;
-
         pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");
 
-        rc = scx200_scan_pci();
+        /* First scan for ISA-based devices */
+        scx200_scan_isa();      /* XXX: should we care about errors? */
 
         /* If at least one bus was created, init must succeed */
         if (scx200_acb_list)
                 return 0;
-        return rc;
+
+        /* No ISA devices; register the platform driver for PCI-based devices */
+        return platform_driver_register(&scx200_pci_drv);
 }
 
 static void __exit scx200_acb_cleanup(void)
 {
         struct scx200_acb_iface *iface;
 
+        platform_driver_unregister(&scx200_pci_drv);
+
         mutex_lock(&scx200_acb_list_mutex);
         while ((iface = scx200_acb_list) != NULL) {
                 scx200_acb_list = iface->next;
                 mutex_unlock(&scx200_acb_list_mutex);
 
-                i2c_del_adapter(&iface->adapter);
-
-                if (iface->pdev) {
-                        pci_release_region(iface->pdev, iface->bar);
-                        pci_dev_put(iface->pdev);
-                }
-                else
-                        release_region(iface->base, 8);
+                scx200_cleanup_iface(iface);
 
-                kfree(iface);
                 mutex_lock(&scx200_acb_list_mutex);
         }
         mutex_unlock(&scx200_acb_list_mutex);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index c7db6980e3a3..f0bd5bcdf563 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -196,88 +196,60 @@ static int i2c_device_pm_suspend(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-        if (pm) {
-                if (pm_runtime_suspended(dev))
-                        return 0;
-                else
-                        return pm->suspend ? pm->suspend(dev) : 0;
-        }
-
-        return i2c_legacy_suspend(dev, PMSG_SUSPEND);
+        if (pm)
+                return pm_generic_suspend(dev);
+        else
+                return i2c_legacy_suspend(dev, PMSG_SUSPEND);
 }
 
 static int i2c_device_pm_resume(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        int ret;
 
         if (pm)
-                ret = pm->resume ? pm->resume(dev) : 0;
+                return pm_generic_resume(dev);
         else
-                ret = i2c_legacy_resume(dev);
-
-        return ret;
+                return i2c_legacy_resume(dev);
 }
 
 static int i2c_device_pm_freeze(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-        if (pm) {
-                if (pm_runtime_suspended(dev))
-                        return 0;
-                else
-                        return pm->freeze ? pm->freeze(dev) : 0;
-        }
-
-        return i2c_legacy_suspend(dev, PMSG_FREEZE);
+        if (pm)
+                return pm_generic_freeze(dev);
+        else
+                return i2c_legacy_suspend(dev, PMSG_FREEZE);
 }
 
 static int i2c_device_pm_thaw(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-        if (pm) {
-                if (pm_runtime_suspended(dev))
-                        return 0;
-                else
-                        return pm->thaw ? pm->thaw(dev) : 0;
-        }
-
-        return i2c_legacy_resume(dev);
+        if (pm)
+                return pm_generic_thaw(dev);
+        else
+                return i2c_legacy_resume(dev);
 }
 
 static int i2c_device_pm_poweroff(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-        if (pm) {
-                if (pm_runtime_suspended(dev))
-                        return 0;
-                else
-                        return pm->poweroff ? pm->poweroff(dev) : 0;
-        }
-
-        return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
+        if (pm)
+                return pm_generic_poweroff(dev);
+        else
+                return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
 }
 
 static int i2c_device_pm_restore(struct device *dev)
 {
         const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-        int ret;
 
         if (pm)
-                ret = pm->restore ? pm->restore(dev) : 0;
+                return pm_generic_restore(dev);
         else
-                ret = i2c_legacy_resume(dev);
-
-        if (!ret) {
-                pm_runtime_disable(dev);
-                pm_runtime_set_active(dev);
-                pm_runtime_enable(dev);
-        }
-
-        return ret;
+                return i2c_legacy_resume(dev);
 }
 #else /* !CONFIG_PM_SLEEP */
 #define i2c_device_pm_suspend   NULL
@@ -1021,6 +993,14 @@ static int i2c_do_del_adapter(struct i2c_driver *driver,
 static int __unregister_client(struct device *dev, void *dummy)
 {
         struct i2c_client *client = i2c_verify_client(dev);
+        if (client && strcmp(client->name, "dummy"))
+                i2c_unregister_device(client);
+        return 0;
+}
+
+static int __unregister_dummy(struct device *dev, void *dummy)
+{
+        struct i2c_client *client = i2c_verify_client(dev);
         if (client)
                 i2c_unregister_device(client);
         return 0;
@@ -1075,8 +1055,12 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         mutex_unlock(&adap->userspace_clients_lock);
 
         /* Detach any active clients. This can't fail, thus we do not
-           checking the returned value. */
+         * check the returned value. This is a two-pass process, because
+         * we can't remove the dummy devices during the first pass: they
+         * could have been instantiated by real devices wishing to clean
+         * them up properly, so we give them a chance to do that first. */
         res = device_for_each_child(&adap->dev, NULL, __unregister_client);
+        res = device_for_each_child(&adap->dev, NULL, __unregister_dummy);
 
 #ifdef CONFIG_I2C_COMPAT
         class_compat_remove_link(i2c_adapter_compat_class, &adap->dev,
@@ -1140,6 +1124,14 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
         if (res)
                 return res;
 
+        /* Drivers should switch to dev_pm_ops instead. */
+        if (driver->suspend)
+                pr_warn("i2c-core: driver [%s] using legacy suspend method\n",
+                        driver->driver.name);
+        if (driver->resume)
+                pr_warn("i2c-core: driver [%s] using legacy resume method\n",
+                        driver->driver.name);
+
         pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name);
 
         INIT_LIST_HEAD(&driver->clients);
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 98ccfeb3f5aa..9827c5e686cb 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -134,7 +134,7 @@ config BLK_DEV_IDECD
           module will be called ide-cd.
 
 config BLK_DEV_IDECD_VERBOSE_ERRORS
-        bool "Verbose error logging for IDE/ATAPI CDROM driver" if EMBEDDED
+        bool "Verbose error logging for IDE/ATAPI CDROM driver" if EXPERT
         depends on BLK_DEV_IDECD
         default y
         help
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 56ac09d6c930..1fa091e05690 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -59,6 +59,8 @@
 #include <linux/hrtimer.h>      /* ktime_get_real() */
 #include <trace/events/power.h>
 #include <linux/sched.h>
+#include <linux/notifier.h>
+#include <linux/cpu.h>
 #include <asm/mwait.h>
 
 #define INTEL_IDLE_VERSION "0.4"
@@ -73,6 +75,7 @@ static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1;
 
 static unsigned int mwait_substates;
 
+#define LAPIC_TIMER_ALWAYS_RELIABLE 0xFFFFFFFF
 /* Reliable LAPIC Timer States, bit 1 for C1 etc.  */
 static unsigned int lapic_timer_reliable_states = (1 << 1);      /* Default to only C1 */
 
@@ -82,6 +85,14 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
 static struct cpuidle_state *cpuidle_state_table;
 
 /*
+ * Set this flag for states where the HW flushes the TLB for us
+ * and so we don't need cross-calls to keep it consistent.
+ * If this flag is set, SW flushes the TLB, so even if the
+ * HW doesn't do the flushing, this flag is safe to use.
+ */
+#define CPUIDLE_FLAG_TLB_FLUSHED        0x10000
+
+/*
  * States are indexed by the cstate number,
  * which is also the index into the MWAIT hint array.
  * Thus C0 is a dummy.
@@ -122,7 +133,7 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
                 .driver_data = (void *) 0x00,
                 .flags = CPUIDLE_FLAG_TIME_VALID,
                 .exit_latency = 1,
-                .target_residency = 4,
+                .target_residency = 1,
                 .enter = &intel_idle },
         { /* MWAIT C2 */
                 .name = "SNB-C3",
@@ -130,7 +141,7 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
                 .driver_data = (void *) 0x10,
                 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 80,
-                .target_residency = 160,
+                .target_residency = 211,
                 .enter = &intel_idle },
         { /* MWAIT C3 */
                 .name = "SNB-C6",
@@ -138,7 +149,7 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
                 .driver_data = (void *) 0x20,
                 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 104,
-                .target_residency = 208,
+                .target_residency = 345,
                 .enter = &intel_idle },
         { /* MWAIT C4 */
                 .name = "SNB-C7",
@@ -146,7 +157,7 @@ static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {
                 .driver_data = (void *) 0x30,
                 .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
                 .exit_latency = 109,
-                .target_residency = 300,
+                .target_residency = 345,
                 .enter = &intel_idle },
 };
 
@@ -220,8 +231,6 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
         kt_before = ktime_get_real();
 
         stop_critical_timings();
-        trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
-        trace_cpu_idle((eax >> 4) + 1, cpu);
         if (!need_resched()) {
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);
@@ -243,6 +252,35 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
         return usec_delta;
 }
 
+static void __setup_broadcast_timer(void *arg)
+{
+        unsigned long reason = (unsigned long)arg;
+        int cpu = smp_processor_id();
+
+        reason = reason ?
+                CLOCK_EVT_NOTIFY_BROADCAST_ON : CLOCK_EVT_NOTIFY_BROADCAST_OFF;
+
+        clockevents_notify(reason, &cpu);
+}
+
+static int setup_broadcast_cpuhp_notify(struct notifier_block *n,
+                unsigned long action, void *hcpu)
+{
+        int hotcpu = (unsigned long)hcpu;
+
+        switch (action & 0xf) {
+        case CPU_ONLINE:
+                smp_call_function_single(hotcpu, __setup_broadcast_timer,
+                        (void *)true, 1);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block setup_broadcast_notifier = {
+        .notifier_call = setup_broadcast_cpuhp_notify,
+};
+
 /*
  * intel_idle_probe()
  */
@@ -305,7 +343,11 @@ static int intel_idle_probe(void)
         }
 
         if (boot_cpu_has(X86_FEATURE_ARAT))     /* Always Reliable APIC Timer */
-                lapic_timer_reliable_states = 0xFFFFFFFF;
+                lapic_timer_reliable_states = LAPIC_TIMER_ALWAYS_RELIABLE;
+        else {
+                smp_call_function(__setup_broadcast_timer, (void *)true, 1);
+                register_cpu_notifier(&setup_broadcast_notifier);
+        }
 
         pr_debug(PREFIX "v" INTEL_IDLE_VERSION
                 " model 0x%X\n", boot_cpu_data.x86_model);
@@ -403,6 +445,10 @@ static int __init intel_idle_init(void)
 {
         int retval;
 
+        /* Do not load intel_idle at all for now if idle= is passed */
+        if (boot_option_idle_override != IDLE_NO_OVERRIDE)
+                return -ENODEV;
+
         retval = intel_idle_probe();
         if (retval)
                 return retval;
@@ -428,6 +474,11 @@ static void __exit intel_idle_exit(void)
         intel_idle_cpuidle_devices_uninit();
         cpuidle_unregister_driver(&intel_idle_driver);
 
+        if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE) {
+                smp_call_function(__setup_broadcast_timer, (void *)false, 1);
+                unregister_cpu_notifier(&setup_broadcast_notifier);
+        }
+
         return;
 }
 
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 68883565b725..f9ba7d74dfc0 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -308,7 +308,7 @@ static void ib_cache_event(struct ib_event_handler *handler,
                         INIT_WORK(&work->work, ib_cache_task);
                         work->device   = event->device;
                         work->port_num = event->element.port_num;
-                        schedule_work(&work->work);
+                        queue_work(ib_wq, &work->work);
                 }
         }
 }
@@ -368,7 +368,7 @@ static void ib_cache_cleanup_one(struct ib_device *device)
         int p;
 
         ib_unregister_event_handler(&device->cache.event_handler);
-        flush_scheduled_work();
+        flush_workqueue(ib_wq);
 
         for (p = 0; p <= end_port(device) - start_port(device); ++p) {
                 kfree(device->cache.pkey_cache[p]);
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index a19effad0811..f793bf2f5da7 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -38,7 +38,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
-#include <linux/workqueue.h>
 
 #include "core_priv.h"
 
@@ -52,6 +51,9 @@ struct ib_client_data {
         void *            data;
 };
 
+struct workqueue_struct *ib_wq;
+EXPORT_SYMBOL_GPL(ib_wq);
+
 static LIST_HEAD(device_list);
 static LIST_HEAD(client_list);
 
@@ -718,6 +720,10 @@ static int __init ib_core_init(void)
 {
         int ret;
 
+        ib_wq = alloc_workqueue("infiniband", 0, 0);
+        if (!ib_wq)
+                return -ENOMEM;
+
         ret = ib_sysfs_setup();
         if (ret)
                 printk(KERN_WARNING "Couldn't create InfiniBand device class\n");
@@ -726,6 +732,7 @@ static int __init ib_core_init(void)
         if (ret) {
                 printk(KERN_WARNING "Couldn't set up InfiniBand P_Key/GID cache\n");
                 ib_sysfs_cleanup();
+                destroy_workqueue(ib_wq);
         }
 
         return ret;
@@ -736,7 +743,7 @@ 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();
+        destroy_workqueue(ib_wq);
 }
 
 module_init(ib_core_init);
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 91a660310b7c..fbbfa24cf572 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -425,7 +425,7 @@ static void ib_sa_event(struct ib_event_handler *handler, struct ib_event *event
                 port->sm_ah = NULL;
                 spin_unlock_irqrestore(&port->ah_lock, flags);
 
-                schedule_work(&sa_dev->port[event->element.port_num -
+                queue_work(ib_wq, &sa_dev->port[event->element.port_num -
                                             sa_dev->start_port].update_task);
         }
 }
@@ -1079,7 +1079,7 @@ static void ib_sa_remove_one(struct ib_device *device)
 
         ib_unregister_event_handler(&sa_dev->event_handler);
 
-        flush_scheduled_work();
+        flush_workqueue(ib_wq);
 
         for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {
                 if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) {
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index ca12acf38379..ec1e9da1488b 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -636,6 +636,16 @@ static void ucma_copy_iboe_route(struct rdma_ucm_query_route_resp *resp,
         }
 }
 
+static void ucma_copy_iw_route(struct rdma_ucm_query_route_resp *resp,
+                               struct rdma_route *route)
+{
+        struct rdma_dev_addr *dev_addr;
+
+        dev_addr = &route->addr.dev_addr;
+        rdma_addr_get_dgid(dev_addr, (union ib_gid *) &resp->ib_route[0].dgid);
+        rdma_addr_get_sgid(dev_addr, (union ib_gid *) &resp->ib_route[0].sgid);
+}
+
 static ssize_t ucma_query_route(struct ucma_file *file,
                                 const char __user *inbuf,
                                 int in_len, int out_len)
@@ -670,8 +680,10 @@ static ssize_t ucma_query_route(struct ucma_file *file,
 
         resp.node_guid = (__force __u64) ctx->cm_id->device->node_guid;
         resp.port_num = ctx->cm_id->port_num;
-        if (rdma_node_get_transport(ctx->cm_id->device->node_type) == RDMA_TRANSPORT_IB) {
-                switch (rdma_port_get_link_layer(ctx->cm_id->device, ctx->cm_id->port_num)) {
+        switch (rdma_node_get_transport(ctx->cm_id->device->node_type)) {
+        case RDMA_TRANSPORT_IB:
+                switch (rdma_port_get_link_layer(ctx->cm_id->device,
+                        ctx->cm_id->port_num)) {
                 case IB_LINK_LAYER_INFINIBAND:
                         ucma_copy_ib_route(&resp, &ctx->cm_id->route);
                         break;
@@ -681,6 +693,12 @@ static ssize_t ucma_query_route(struct ucma_file *file,
                 default:
                         break;
                 }
+                break;
+        case RDMA_TRANSPORT_IWARP:
+                ucma_copy_iw_route(&resp, &ctx->cm_id->route);
+                break;
+        default:
+                break;
         }
 
 out:
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 415e186eee32..b645e558876f 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -262,7 +262,7 @@ void ib_umem_release(struct ib_umem *umem)
                         umem->mm   = mm;
                         umem->diff = diff;
 
-                        schedule_work(&umem->work);
+                        queue_work(ib_wq, &umem->work);
                         return;
                 }
         } else
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index 85cfae4cad71..8c81992fa6db 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -459,13 +459,12 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
              IB_DEVICE_MEM_WINDOW);
 
         /* Allocate the qptr_array */
-        c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));
+        c2dev->qptr_array = vzalloc(C2_MAX_CQS * sizeof(void *));
         if (!c2dev->qptr_array) {
                 return -ENOMEM;
         }
 
-        /* Inialize the qptr_array */
-        memset(c2dev->qptr_array, 0, C2_MAX_CQS * sizeof(void *));
+        /* Initialize the qptr_array */
         c2dev->qptr_array[0] = (void *) &c2dev->req_vq;
         c2dev->qptr_array[1] = (void *) &c2dev->rep_vq;
         c2dev->qptr_array[2] = (void *) &c2dev->aeq;
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index 9ce7819b7b2e..2ec716fb2edb 100644
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -107,7 +107,7 @@ struct c2_vq_req *vq_req_alloc(struct c2_dev *c2dev)
         r = kmalloc(sizeof(struct c2_vq_req), GFP_KERNEL);
         if (r) {
                 init_waitqueue_head(&r->wait_object);
-                r->reply_msg = (u64) NULL;
+                r->reply_msg = 0;
                 r->event = 0;
                 r->cm_id = NULL;
                 r->qp = NULL;
@@ -123,7 +123,7 @@ struct c2_vq_req *vq_req_alloc(struct c2_dev *c2dev)
  */
 void vq_req_free(struct c2_dev *c2dev, struct c2_vq_req *r)
 {
-        r->reply_msg = (u64) NULL;
+        r->reply_msg = 0;
         if (atomic_dec_and_test(&r->refcnt)) {
                 kfree(r);
         }
@@ -151,7 +151,7 @@ void vq_req_get(struct c2_dev *c2dev, struct c2_vq_req *r)
 void vq_req_put(struct c2_dev *c2dev, struct c2_vq_req *r)
 {
         if (atomic_dec_and_test(&r->refcnt)) {
-                if (r->reply_msg != (u64) NULL)
+                if (r->reply_msg != 0)
                         vq_repbuf_free(c2dev,
                                        (void *) (unsigned long) r->reply_msg);
                 kfree(r);
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 0dc62b1438be..8b00e6c46f01 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -380,7 +380,7 @@ static void send_flowc(struct c4iw_ep *ep, struct sk_buff *skb)
                                           16)) | FW_WR_FLOWID(ep->hwtid));
 
         flowc->mnemval[0].mnemonic = FW_FLOWC_MNEM_PFNVFN;
-        flowc->mnemval[0].val = cpu_to_be32(0);
+        flowc->mnemval[0].val = cpu_to_be32(PCI_FUNC(ep->com.dev->rdev.lldi.pdev->devfn) << 8);
         flowc->mnemval[1].mnemonic = FW_FLOWC_MNEM_CH;
         flowc->mnemval[1].val = cpu_to_be32(ep->tx_chan);
         flowc->mnemval[2].mnemonic = FW_FLOWC_MNEM_PORT;
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 20800900ef3f..4f0be25cab1a 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -220,7 +220,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                 V_FW_RI_RES_WR_DCAEN(0) |
                 V_FW_RI_RES_WR_DCACPU(0) |
                 V_FW_RI_RES_WR_FBMIN(2) |
-                V_FW_RI_RES_WR_FBMAX(3) |
+                V_FW_RI_RES_WR_FBMAX(2) |
                 V_FW_RI_RES_WR_CIDXFTHRESHO(0) |
                 V_FW_RI_RES_WR_CIDXFTHRESH(0) |
                 V_FW_RI_RES_WR_EQSIZE(eqsize));
@@ -243,7 +243,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                 V_FW_RI_RES_WR_DCAEN(0) |
                 V_FW_RI_RES_WR_DCACPU(0) |
                 V_FW_RI_RES_WR_FBMIN(2) |
-                V_FW_RI_RES_WR_FBMAX(3) |
+                V_FW_RI_RES_WR_FBMAX(2) |
                 V_FW_RI_RES_WR_CIDXFTHRESHO(0) |
                 V_FW_RI_RES_WR_CIDXFTHRESH(0) |
                 V_FW_RI_RES_WR_EQSIZE(eqsize));
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index 1596e3085344..1898d6e7cce5 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -222,15 +222,14 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue,
         queue->small_page = NULL;
 
         /* allocate queue page pointers */
-        queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
+        queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
         if (!queue->queue_pages) {
-                queue->queue_pages = vmalloc(nr_of_pages * sizeof(void *));
+                queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *));
                 if (!queue->queue_pages) {
                         ehca_gen_err("Couldn't allocate queue page list");
                         return 0;
                 }
         }
-        memset(queue->queue_pages, 0, nr_of_pages * sizeof(void *));
 
         /* allocate actual queue pages */
         if (is_small) {
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index b33f0457a1ff..47db4bf34628 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -199,12 +199,11 @@ static struct ipath_devdata *ipath_alloc_devdata(struct pci_dev *pdev)
                 goto bail;
         }
 
-        dd = vmalloc(sizeof(*dd));
+        dd = vzalloc(sizeof(*dd));
         if (!dd) {
                 dd = ERR_PTR(-ENOMEM);
                 goto bail;
         }
-        memset(dd, 0, sizeof(*dd));
         dd->ipath_unit = -1;
 
         spin_lock_irqsave(&ipath_devs_lock, flags);
@@ -756,7 +755,7 @@ static void __devexit ipath_remove_one(struct pci_dev *pdev)
          */
         ipath_shutdown_device(dd);
 
-        flush_scheduled_work();
+        flush_workqueue(ib_wq);
 
         if (dd->verbs_dev)
                 ipath_unregister_ib_device(dd->verbs_dev);
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 9292a15ad7c4..6d4b29c4cd89 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1530,7 +1530,7 @@ static int init_subports(struct ipath_devdata *dd,
         }
 
         num_subports = uinfo->spu_subport_cnt;
-        pd->subport_uregbase = vmalloc(PAGE_SIZE * num_subports);
+        pd->subport_uregbase = vzalloc(PAGE_SIZE * num_subports);
         if (!pd->subport_uregbase) {
                 ret = -ENOMEM;
                 goto bail;
@@ -1538,13 +1538,13 @@ static int init_subports(struct ipath_devdata *dd,
         /* Note: pd->port_rcvhdrq_size isn't initialized yet. */
         size = ALIGN(dd->ipath_rcvhdrcnt * dd->ipath_rcvhdrentsize *
                      sizeof(u32), PAGE_SIZE) * num_subports;
-        pd->subport_rcvhdr_base = vmalloc(size);
+        pd->subport_rcvhdr_base = vzalloc(size);
         if (!pd->subport_rcvhdr_base) {
                 ret = -ENOMEM;
                 goto bail_ureg;
         }
 
-        pd->subport_rcvegrbuf = vmalloc(pd->port_rcvegrbuf_chunks *
+        pd->subport_rcvegrbuf = vzalloc(pd->port_rcvegrbuf_chunks *
                                         pd->port_rcvegrbuf_size *
                                         num_subports);
         if (!pd->subport_rcvegrbuf) {
@@ -1556,11 +1556,6 @@ static int init_subports(struct ipath_devdata *dd,
         pd->port_subport_id = uinfo->spu_subport_id;
         pd->active_slaves = 1;
         set_bit(IPATH_PORT_MASTER_UNINIT, &pd->port_flag);
-        memset(pd->subport_uregbase, 0, PAGE_SIZE * num_subports);
-        memset(pd->subport_rcvhdr_base, 0, size);
-        memset(pd->subport_rcvegrbuf, 0, pd->port_rcvegrbuf_chunks *
-                                         pd->port_rcvegrbuf_size *
-                                         num_subports);
         goto bail;
 
 bail_rhdr:
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 776938299e4c..fef0f4201257 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -442,7 +442,7 @@ static void init_shadow_tids(struct ipath_devdata *dd)
         struct page **pages;
         dma_addr_t *addrs;
 
-        pages = vmalloc(dd->ipath_cfgports * dd->ipath_rcvtidcnt *
+        pages = vzalloc(dd->ipath_cfgports * dd->ipath_rcvtidcnt *
                         sizeof(struct page *));
         if (!pages) {
                 ipath_dev_err(dd, "failed to allocate shadow page * "
@@ -461,9 +461,6 @@ static void init_shadow_tids(struct ipath_devdata *dd)
                 return;
         }
 
-        memset(pages, 0, dd->ipath_cfgports * dd->ipath_rcvtidcnt *
-               sizeof(struct page *));
-
         dd->ipath_pageshadow = pages;
         dd->ipath_physshadow = addrs;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 5e86d73eba2a..bab9f74c0665 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -220,7 +220,7 @@ void ipath_release_user_pages_on_close(struct page **p, size_t num_pages)
         work->mm = mm;
         work->num_pages = num_pages;
 
-        schedule_work(&work->work);
+        queue_work(ib_wq, &work->work);
         return;
 
 bail_mm:
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 4c85224aeaa7..c7a6213c6996 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -623,8 +623,9 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
         struct mlx4_ib_qp *mqp = to_mqp(ibqp);
 
-        err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, !!(mqp->flags &
-                                    MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK));
+        err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
+                                    !!(mqp->flags & MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
+                                    MLX4_PROTOCOL_IB);
         if (err)
                 return err;
 
@@ -635,7 +636,7 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         return 0;
 
 err_add:
-        mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw);
+        mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);
         return err;
 }
 
@@ -665,7 +666,7 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         struct mlx4_ib_gid_entry *ge;
 
         err = mlx4_multicast_detach(mdev->dev,
-                                    &mqp->mqp, gid->raw);
+                                    &mqp->mqp, gid->raw, MLX4_PROTOCOL_IB);
         if (err)
                 return err;
 
@@ -1005,7 +1006,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
         if (mlx4_uar_alloc(dev, &ibdev->priv_uar))
                 goto err_pd;
 
-        ibdev->uar_map = ioremap(ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        ibdev->uar_map = ioremap((phys_addr_t) ibdev->priv_uar.pfn << PAGE_SHIFT,
+                                 PAGE_SIZE);
         if (!ibdev->uar_map)
                 goto err_uar;
         MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);
diff --git a/drivers/infiniband/hw/mthca/Kconfig b/drivers/infiniband/hw/mthca/Kconfig
index 03efc074967e..da314c3fec23 100644
--- a/drivers/infiniband/hw/mthca/Kconfig
+++ b/drivers/infiniband/hw/mthca/Kconfig
@@ -7,7 +7,7 @@ config INFINIBAND_MTHCA
           ("Tavor") and the MT25208 PCI Express HCA ("Arbel").
 
 config INFINIBAND_MTHCA_DEBUG
-        bool "Verbose debugging output" if EMBEDDED
+        bool "Verbose debugging output" if EXPERT
         depends on INFINIBAND_MTHCA
         default y
         ---help---
diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index 0aa0110e4b6c..e4a08c2819e4 100644
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -146,7 +146,7 @@ static void poll_catas(unsigned long dev_ptr)
 
 void mthca_start_catas_poll(struct mthca_dev *dev)
 {
-        unsigned long addr;
+        phys_addr_t addr;
 
         init_timer(&dev->catas_err.timer);
         dev->catas_err.map  = NULL;
@@ -158,7 +158,8 @@ void mthca_start_catas_poll(struct mthca_dev *dev)
         dev->catas_err.map = ioremap(addr, dev->catas_err.size * 4);
         if (!dev->catas_err.map) {
                 mthca_warn(dev, "couldn't map catastrophic error region "
-                           "at 0x%lx/0x%x\n", addr, dev->catas_err.size * 4);
+                           "at 0x%llx/0x%x\n", (unsigned long long) addr,
+                           dev->catas_err.size * 4);
                 return;
         }
 
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index f4ceecd9684b..7bfa2a164955 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -713,7 +713,7 @@ int mthca_RUN_FW(struct mthca_dev *dev, u8 *status)
 
 static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
 {
-        unsigned long addr;
+        phys_addr_t addr;
         u16 max_off = 0;
         int i;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index 8e8c728aff88..76785c653c13 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -653,7 +653,7 @@ static int mthca_map_reg(struct mthca_dev *dev,
                          unsigned long offset, unsigned long size,
                          void __iomem **map)
 {
-        unsigned long base = pci_resource_start(dev->pdev, 0);
+        phys_addr_t base = pci_resource_start(dev->pdev, 0);
 
         *map = ioremap(base + offset, size);
         if (!*map)
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 5eee6665919a..8a40cd539ab1 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -790,7 +790,7 @@ static int mthca_setup_hca(struct mthca_dev *dev)
                 goto err_uar_table_free;
         }
 
-        dev->kar = ioremap(dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        dev->kar = ioremap((phys_addr_t) dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
         if (!dev->kar) {
                 mthca_err(dev, "Couldn't map kernel access region, "
                           "aborting.\n");
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index 065b20899876..44045c8846db 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -853,7 +853,7 @@ void mthca_arbel_fmr_unmap(struct mthca_dev *dev, struct mthca_fmr *fmr)
 
 int mthca_init_mr_table(struct mthca_dev *dev)
 {
-        unsigned long addr;
+        phys_addr_t addr;
         int mpts, mtts, err, i;
 
         err = mthca_alloc_init(&dev->mr_table.mpt_alloc,
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 0c9f0aa5d4ea..3b4ec3238ceb 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -144,6 +144,7 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
         struct nes_device *nesdev;
         struct net_device *netdev;
         struct nes_vnic *nesvnic;
+        unsigned int is_bonded;
 
         nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address %pI4, netmask %pI4.\n",
                   &ifa->ifa_address, &ifa->ifa_mask);
@@ -152,7 +153,8 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
                                 nesdev, nesdev->netdev[0]->name);
                 netdev = nesdev->netdev[0];
                 nesvnic = netdev_priv(netdev);
-                if (netdev == event_netdev) {
+                is_bonded = (netdev->master == event_netdev);
+                if ((netdev == event_netdev) || is_bonded) {
                         if (nesvnic->rdma_enabled == 0) {
                                 nes_debug(NES_DBG_NETDEV, "Returning without processing event for %s since"
                                                 " RDMA is not enabled.\n",
@@ -169,7 +171,10 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
                                         nes_manage_arp_cache(netdev, netdev->dev_addr,
                                                         ntohl(nesvnic->local_ipaddr), NES_ARP_DELETE);
                                         nesvnic->local_ipaddr = 0;
-                                        return NOTIFY_OK;
+                                        if (is_bonded)
+                                                continue;
+                                        else
+                                                return NOTIFY_OK;
                                         break;
                                 case NETDEV_UP:
                                         nes_debug(NES_DBG_NETDEV, "event:UP\n");
@@ -178,15 +183,24 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
                                                 nes_debug(NES_DBG_NETDEV, "Interface already has local_ipaddr\n");
                                                 return NOTIFY_OK;
                                         }
+                                        /* fall through */
+                                case NETDEV_CHANGEADDR:
                                         /* Add the address to the IP table */
-                                        nesvnic->local_ipaddr = ifa->ifa_address;
+                                        if (netdev->master)
+                                                nesvnic->local_ipaddr =
+                                                        ((struct in_device *)netdev->master->ip_ptr)->ifa_list->ifa_address;
+                                        else
+                                                nesvnic->local_ipaddr = ifa->ifa_address;
 
                                         nes_write_indexed(nesdev,
                                                         NES_IDX_DST_IP_ADDR+(0x10*PCI_FUNC(nesdev->pcidev->devfn)),
-                                                        ntohl(ifa->ifa_address));
+                                                        ntohl(nesvnic->local_ipaddr));
                                         nes_manage_arp_cache(netdev, netdev->dev_addr,
                                                         ntohl(nesvnic->local_ipaddr), NES_ARP_ADD);
-                                        return NOTIFY_OK;
+                                        if (is_bonded)
+                                                continue;
+                                        else
+                                                return NOTIFY_OK;
                                         break;
                                 default:
                                         break;
@@ -660,6 +674,8 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
         }
         nes_notifiers_registered++;
 
+        INIT_DELAYED_WORK(&nesdev->work, nes_recheck_link_status);
+
         /* Initialize network devices */
         if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL)
                 goto bail7;
@@ -742,6 +758,7 @@ static void __devexit nes_remove(struct pci_dev *pcidev)
         struct nes_device *nesdev = pci_get_drvdata(pcidev);
         struct net_device *netdev;
         int netdev_index = 0;
+        unsigned long flags;
 
                 if (nesdev->netdev_count) {
                         netdev = nesdev->netdev[netdev_index];
@@ -768,6 +785,14 @@ static void __devexit nes_remove(struct pci_dev *pcidev)
         free_irq(pcidev->irq, nesdev);
         tasklet_kill(&nesdev->dpc_tasklet);
 
+        spin_lock_irqsave(&nesdev->nesadapter->phy_lock, flags);
+        if (nesdev->link_recheck) {
+                spin_unlock_irqrestore(&nesdev->nesadapter->phy_lock, flags);
+                cancel_delayed_work_sync(&nesdev->work);
+        } else {
+                spin_unlock_irqrestore(&nesdev->nesadapter->phy_lock, flags);
+        }
+
         /* Deallocate the Adapter Structure */
         nes_destroy_adapter(nesdev->nesadapter);
 
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index b3d145e82b4c..6fe79876009e 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -268,6 +268,9 @@ struct nes_device {
         u8                     napi_isr_ran;
         u8                     disable_rx_flow_control;
         u8                     disable_tx_flow_control;
+
+        struct delayed_work    work;
+        u8                     link_recheck;
 };
 
 
@@ -507,6 +510,7 @@ void nes_nic_ce_handler(struct nes_device *, struct nes_hw_nic_cq *);
 void nes_iwarp_ce_handler(struct nes_device *, struct nes_hw_cq *);
 int nes_destroy_cqp(struct nes_device *);
 int nes_nic_cm_xmit(struct sk_buff *, struct net_device *);
+void nes_recheck_link_status(struct work_struct *work);
 
 /* nes_nic.c */
 struct net_device *nes_netdev_init(struct nes_device *, void __iomem *);
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 25ad0f9944c0..009ec814d517 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1107,6 +1107,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
         struct flowi fl;
         struct neighbour *neigh;
         int rc = arpindex;
+        struct net_device *netdev;
         struct nes_adapter *nesadapter = nesvnic->nesdev->nesadapter;
 
         memset(&fl, 0, sizeof fl);
@@ -1117,7 +1118,12 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                 return rc;
         }
 
-        neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, nesvnic->netdev);
+        if (nesvnic->netdev->master)
+                netdev = nesvnic->netdev->master;
+        else
+                netdev = nesvnic->netdev;
+
+        neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, netdev);
         if (neigh) {
                 if (neigh->nud_state & NUD_VALID) {
                         nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 1980a461c499..8b606fd64022 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2608,6 +2608,13 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
                                                 netif_start_queue(nesvnic->netdev);
                                         nesvnic->linkup = 1;
                                         netif_carrier_on(nesvnic->netdev);
+
+                                        spin_lock(&nesvnic->port_ibevent_lock);
+                                        if (nesdev->iw_status == 0) {
+                                                nesdev->iw_status = 1;
+                                                nes_port_ibevent(nesvnic);
+                                        }
+                                        spin_unlock(&nesvnic->port_ibevent_lock);
                                 }
                         }
                 } else {
@@ -2633,9 +2640,23 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
                                                 netif_stop_queue(nesvnic->netdev);
                                         nesvnic->linkup = 0;
                                         netif_carrier_off(nesvnic->netdev);
+
+                                        spin_lock(&nesvnic->port_ibevent_lock);
+                                        if (nesdev->iw_status == 1) {
+                                                nesdev->iw_status = 0;
+                                                nes_port_ibevent(nesvnic);
+                                        }
+                                        spin_unlock(&nesvnic->port_ibevent_lock);
                                 }
                         }
                 }
+                if (nesadapter->phy_type[mac_index] == NES_PHY_TYPE_SFP_D) {
+                        if (nesdev->link_recheck)
+                                cancel_delayed_work(&nesdev->work);
+                        nesdev->link_recheck = 1;
+                        schedule_delayed_work(&nesdev->work,
+                                              NES_LINK_RECHECK_DELAY);
+                }
         }
 
         spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
@@ -2643,6 +2664,80 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
         nesadapter->mac_sw_state[mac_number] = NES_MAC_SW_IDLE;
 }
 
+void nes_recheck_link_status(struct work_struct *work)
+{
+        unsigned long flags;
+        struct nes_device *nesdev = container_of(work, struct nes_device, work.work);
+        struct nes_adapter *nesadapter = nesdev->nesadapter;
+        struct nes_vnic *nesvnic;
+        u32 mac_index = nesdev->mac_index;
+        u16 phy_data;
+        u16 temp_phy_data;
+
+        spin_lock_irqsave(&nesadapter->phy_lock, flags);
+
+        /* check link status */
+        nes_read_10G_phy_reg(nesdev, nesadapter->phy_index[mac_index], 1, 0x9003);
+        temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+
+        nes_read_10G_phy_reg(nesdev, nesadapter->phy_index[mac_index], 3, 0x0021);
+        nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+        nes_read_10G_phy_reg(nesdev, nesadapter->phy_index[mac_index], 3, 0x0021);
+        phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+
+        phy_data = (!temp_phy_data && (phy_data == 0x8000)) ? 0x4 : 0x0;
+
+        nes_debug(NES_DBG_PHY, "%s: Phy data = 0x%04X, link was %s.\n",
+                __func__, phy_data,
+                nesadapter->mac_link_down[mac_index] ? "DOWN" : "UP");
+
+        if (phy_data & 0x0004) {
+                nesadapter->mac_link_down[mac_index] = 0;
+                list_for_each_entry(nesvnic, &nesadapter->nesvnic_list[mac_index], list) {
+                        if (nesvnic->linkup == 0) {
+                                printk(PFX "The Link is now up for port %s, netdev %p.\n",
+                                                nesvnic->netdev->name, nesvnic->netdev);
+                                if (netif_queue_stopped(nesvnic->netdev))
+                                        netif_start_queue(nesvnic->netdev);
+                                nesvnic->linkup = 1;
+                                netif_carrier_on(nesvnic->netdev);
+
+                                spin_lock(&nesvnic->port_ibevent_lock);
+                                if (nesdev->iw_status == 0) {
+                                        nesdev->iw_status = 1;
+                                        nes_port_ibevent(nesvnic);
+                                }
+                                spin_unlock(&nesvnic->port_ibevent_lock);
+                        }
+                }
+
+        } else {
+                nesadapter->mac_link_down[mac_index] = 1;
+                list_for_each_entry(nesvnic, &nesadapter->nesvnic_list[mac_index], list) {
+                        if (nesvnic->linkup == 1) {
+                                printk(PFX "The Link is now down for port %s, netdev %p.\n",
+                                                nesvnic->netdev->name, nesvnic->netdev);
+                                if (!(netif_queue_stopped(nesvnic->netdev)))
+                                        netif_stop_queue(nesvnic->netdev);
+                                nesvnic->linkup = 0;
+                                netif_carrier_off(nesvnic->netdev);
+
+                                spin_lock(&nesvnic->port_ibevent_lock);
+                                if (nesdev->iw_status == 1) {
+                                        nesdev->iw_status = 0;
+                                        nes_port_ibevent(nesvnic);
+                                }
+                                spin_unlock(&nesvnic->port_ibevent_lock);
+                        }
+                }
+        }
+        if (nesdev->link_recheck++ < NES_LINK_RECHECK_MAX)
+                schedule_delayed_work(&nesdev->work, NES_LINK_RECHECK_DELAY);
+        else
+                nesdev->link_recheck = 0;
+
+        spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
+}
 
 
 static void nes_nic_napi_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index 1204c3432b63..d2abe07133a5 100644
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1193,6 +1193,8 @@ struct nes_listener {
 
 struct nes_ib_device;
 
+#define NES_EVENT_DELAY msecs_to_jiffies(100)
+
 struct nes_vnic {
         struct nes_ib_device *nesibdev;
         u64 sq_full;
@@ -1247,6 +1249,10 @@ struct nes_vnic {
         u32 lro_max_aggr;
         struct net_lro_mgr lro_mgr;
         struct net_lro_desc lro_desc[NES_MAX_LRO_DESCRIPTORS];
+        struct timer_list event_timer;
+        enum ib_event_type delayed_event;
+        enum ib_event_type last_dispatched_event;
+        spinlock_t port_ibevent_lock;
 };
 
 struct nes_ib_device {
@@ -1348,6 +1354,10 @@ struct nes_terminate_hdr {
 #define BAD_FRAME_OFFSET        64
 #define CQE_MAJOR_DRV           0x8000
 
+/* Used for link status recheck after interrupt processing */
+#define NES_LINK_RECHECK_DELAY  msecs_to_jiffies(50)
+#define NES_LINK_RECHECK_MAX    60
+
 #define nes_vlan_rx vlan_hwaccel_receive_skb
 #define nes_netif_rx netif_receive_skb
 
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 5a4c36484722..2c9c1933bbe3 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -144,6 +144,7 @@ static int nes_netdev_open(struct net_device *netdev)
         u32 nic_active_bit;
         u32 nic_active;
         struct list_head *list_pos, *list_temp;
+        unsigned long flags;
 
         assert(nesdev != NULL);
 
@@ -233,18 +234,36 @@ static int nes_netdev_open(struct net_device *netdev)
                 first_nesvnic = nesvnic;
         }
 
-        if (nesvnic->of_device_registered) {
-                nesdev->iw_status = 1;
-                nesdev->nesadapter->send_term_ok = 1;
-                nes_port_ibevent(nesvnic);
-        }
-
         if (first_nesvnic->linkup) {
                 /* Enable network packets */
                 nesvnic->linkup = 1;
                 netif_start_queue(netdev);
                 netif_carrier_on(netdev);
         }
+
+        spin_lock_irqsave(&nesdev->nesadapter->phy_lock, flags);
+        if (nesdev->nesadapter->phy_type[nesdev->mac_index] == NES_PHY_TYPE_SFP_D) {
+                if (nesdev->link_recheck)
+                        cancel_delayed_work(&nesdev->work);
+                nesdev->link_recheck = 1;
+                schedule_delayed_work(&nesdev->work, NES_LINK_RECHECK_DELAY);
+        }
+        spin_unlock_irqrestore(&nesdev->nesadapter->phy_lock, flags);
+
+        spin_lock_irqsave(&nesvnic->port_ibevent_lock, flags);
+        if (nesvnic->of_device_registered) {
+                nesdev->nesadapter->send_term_ok = 1;
+                if (nesvnic->linkup == 1) {
+                        if (nesdev->iw_status == 0) {
+                                nesdev->iw_status = 1;
+                                nes_port_ibevent(nesvnic);
+                        }
+                } else {
+                        nesdev->iw_status = 0;
+                }
+        }
+        spin_unlock_irqrestore(&nesvnic->port_ibevent_lock, flags);
+
         napi_enable(&nesvnic->napi);
         nesvnic->netdev_open = 1;
 
@@ -263,6 +282,7 @@ static int nes_netdev_stop(struct net_device *netdev)
         u32 nic_active;
         struct nes_vnic *first_nesvnic = NULL;
         struct list_head *list_pos, *list_temp;
+        unsigned long flags;
 
         nes_debug(NES_DBG_SHUTDOWN, "nesvnic=%p, nesdev=%p, netdev=%p %s\n",
                         nesvnic, nesdev, netdev, netdev->name);
@@ -315,12 +335,17 @@ static int nes_netdev_stop(struct net_device *netdev)
         nic_active &= nic_active_mask;
         nes_write_indexed(nesdev, NES_IDX_NIC_BROADCAST_ON, nic_active);
 
-
+        spin_lock_irqsave(&nesvnic->port_ibevent_lock, flags);
         if (nesvnic->of_device_registered) {
                 nesdev->nesadapter->send_term_ok = 0;
                 nesdev->iw_status = 0;
-                nes_port_ibevent(nesvnic);
+                if (nesvnic->linkup == 1)
+                        nes_port_ibevent(nesvnic);
         }
+        del_timer_sync(&nesvnic->event_timer);
+        nesvnic->event_timer.function = NULL;
+        spin_unlock_irqrestore(&nesvnic->port_ibevent_lock, flags);
+
         nes_destroy_nic_qp(nesvnic);
 
         nesvnic->netdev_open = 0;
@@ -1750,7 +1775,10 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
                 nesvnic->rdma_enabled = 0;
         }
         nesvnic->nic_cq.cq_number = nesvnic->nic.qp_id;
+        init_timer(&nesvnic->event_timer);
+        nesvnic->event_timer.function = NULL;
         spin_lock_init(&nesvnic->tx_lock);
+        spin_lock_init(&nesvnic->port_ibevent_lock);
         nesdev->netdev[nesdev->netdev_count] = netdev;
 
         nes_debug(NES_DBG_INIT, "Adding nesvnic (%p) to the adapters nesvnic_list for MAC%d.\n",
@@ -1763,8 +1791,11 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
               (((PCI_FUNC(nesdev->pcidev->devfn) == 1) && (nesdev->mac_index == 2)) ||
                ((PCI_FUNC(nesdev->pcidev->devfn) == 2) && (nesdev->mac_index == 1)))))) {
                 u32 u32temp;
-                u32 link_mask;
-                u32 link_val;
+                u32 link_mask = 0;
+                u32 link_val = 0;
+                u16 temp_phy_data;
+                u16 phy_data = 0;
+                unsigned long flags;
 
                 u32temp = nes_read_indexed(nesdev, NES_IDX_PHY_PCS_CONTROL_STATUS0 +
                                 (0x200 * (nesdev->mac_index & 1)));
@@ -1786,6 +1817,23 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
                                 link_val = 0x02020000;
                         }
                         break;
+                case NES_PHY_TYPE_SFP_D:
+                        spin_lock_irqsave(&nesdev->nesadapter->phy_lock, flags);
+                        nes_read_10G_phy_reg(nesdev,
+                                             nesdev->nesadapter->phy_index[nesdev->mac_index],
+                                             1, 0x9003);
+                        temp_phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+                        nes_read_10G_phy_reg(nesdev,
+                                             nesdev->nesadapter->phy_index[nesdev->mac_index],
+                                             3, 0x0021);
+                        nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+                        nes_read_10G_phy_reg(nesdev,
+                                             nesdev->nesadapter->phy_index[nesdev->mac_index],
+                                             3, 0x0021);
+                        phy_data = (u16)nes_read_indexed(nesdev, NES_IDX_MAC_MDIO_CONTROL);
+                        spin_unlock_irqrestore(&nesdev->nesadapter->phy_lock, flags);
+                        phy_data = (!temp_phy_data && (phy_data == 0x8000)) ? 0x4 : 0x0;
+                        break;
                 default:
                         link_mask = 0x0f1f0000;
                         link_val = 0x0f0f0000;
@@ -1795,8 +1843,14 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
                 u32temp = nes_read_indexed(nesdev,
                                            NES_IDX_PHY_PCS_CONTROL_STATUS0 +
                                            (0x200 * (nesdev->mac_index & 1)));
-                if ((u32temp & link_mask) == link_val)
-                        nesvnic->linkup = 1;
+
+                if (phy_type == NES_PHY_TYPE_SFP_D) {
+                        if (phy_data & 0x0004)
+                                nesvnic->linkup = 1;
+                } else {
+                        if ((u32temp & link_mask) == link_val)
+                                nesvnic->linkup = 1;
+                }
 
                 /* clear the MAC interrupt status, assumes direct logical to physical mapping */
                 u32temp = nes_read_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index));
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 99933e4e48ff..26d8018c0a7c 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3936,6 +3936,30 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
         return nesibdev;
 }
 
+
+/**
+ * nes_handle_delayed_event
+ */
+static void nes_handle_delayed_event(unsigned long data)
+{
+        struct nes_vnic *nesvnic = (void *) data;
+
+        if (nesvnic->delayed_event != nesvnic->last_dispatched_event) {
+                struct ib_event event;
+
+                event.device = &nesvnic->nesibdev->ibdev;
+                if (!event.device)
+                        goto stop_timer;
+                event.event = nesvnic->delayed_event;
+                event.element.port_num = nesvnic->logical_port + 1;
+                ib_dispatch_event(&event);
+        }
+
+stop_timer:
+        nesvnic->event_timer.function = NULL;
+}
+
+
 void  nes_port_ibevent(struct nes_vnic *nesvnic)
 {
         struct nes_ib_device *nesibdev = nesvnic->nesibdev;
@@ -3944,7 +3968,18 @@ void  nes_port_ibevent(struct nes_vnic *nesvnic)
         event.device = &nesibdev->ibdev;
         event.element.port_num = nesvnic->logical_port + 1;
         event.event = nesdev->iw_status ? IB_EVENT_PORT_ACTIVE : IB_EVENT_PORT_ERR;
-        ib_dispatch_event(&event);
+
+        if (!nesvnic->event_timer.function) {
+                ib_dispatch_event(&event);
+                nesvnic->last_dispatched_event = event.event;
+                nesvnic->event_timer.function = nes_handle_delayed_event;
+                nesvnic->event_timer.data = (unsigned long) nesvnic;
+                nesvnic->event_timer.expires = jiffies + NES_EVENT_DELAY;
+                add_timer(&nesvnic->event_timer);
+        } else {
+                mod_timer(&nesvnic->event_timer, jiffies + NES_EVENT_DELAY);
+        }
+        nesvnic->delayed_event = event.event;
 }
 
 
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index 127a0d5069f0..de799f17cb9e 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -1692,8 +1692,7 @@ static void qib_7220_quiet_serdes(struct qib_pportdata *ppd)
         ppd->lflags &= ~QIBL_IB_AUTONEG_INPROG;
         spin_unlock_irqrestore(&ppd->lflags_lock, flags);
         wake_up(&ppd->cpspec->autoneg_wait);
-        cancel_delayed_work(&ppd->cpspec->autoneg_work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&ppd->cpspec->autoneg_work);
 
         shutdown_7220_relock_poll(ppd->dd);
         val = qib_read_kreg64(ppd->dd, kr_xgxs_cfg);
@@ -3515,8 +3514,8 @@ static void try_7220_autoneg(struct qib_pportdata *ppd)
 
         toggle_7220_rclkrls(ppd->dd);
         /* 2 msec is minimum length of a poll cycle */
-        schedule_delayed_work(&ppd->cpspec->autoneg_work,
-                              msecs_to_jiffies(2));
+        queue_delayed_work(ib_wq, &ppd->cpspec->autoneg_work,
+                           msecs_to_jiffies(2));
 }
 
 /*
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index abd409d592ef..b01809a82cb0 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -623,7 +623,6 @@ struct qib_chippport_specific {
         u8 ibmalfusesnap;
         struct qib_qsfp_data qsfp_data;
         char epmsgbuf[192]; /* for port error interrupt msg buffer */
-        u8 bounced;
 };
 
 static struct {
@@ -1881,23 +1880,7 @@ static noinline void handle_7322_p_errors(struct qib_pportdata *ppd)
                     IB_PHYSPORTSTATE_DISABLED)
                         qib_set_ib_7322_lstate(ppd, 0,
                                QLOGIC_IB_IBCC_LINKINITCMD_DISABLE);
-                else {
-                        u32 lstate;
-                        /*
-                         * We need the current logical link state before
-                         * lflags are set in handle_e_ibstatuschanged.
-                         */
-                        lstate = qib_7322_iblink_state(ibcs);
-
-                        if (IS_QMH(dd) && !ppd->cpspec->bounced &&
-                            ltstate == IB_PHYSPORTSTATE_LINKUP &&
-                            (lstate >= IB_PORT_INIT &&
-                                lstate <= IB_PORT_ACTIVE)) {
-                                ppd->cpspec->bounced = 1;
-                                qib_7322_set_ib_cfg(ppd, QIB_IB_CFG_LSTATE,
-                                        IB_LINKCMD_DOWN | IB_LINKINITCMD_POLL);
-                        }
-
+                else
                         /*
                          * Since going into a recovery state causes the link
                          * state to go down and since recovery is transitory,
@@ -1911,7 +1894,6 @@ static noinline void handle_7322_p_errors(struct qib_pportdata *ppd)
                             ltstate != IB_PHYSPORTSTATE_RECOVERY_WAITRMT &&
                             ltstate != IB_PHYSPORTSTATE_RECOVERY_IDLE)
                                 qib_handle_e_ibstatuschanged(ppd, ibcs);
-                }
         }
         if (*msg && iserr)
                 qib_dev_porterr(dd, ppd->port, "%s error\n", msg);
@@ -2381,6 +2363,11 @@ static int qib_7322_bringup_serdes(struct qib_pportdata *ppd)
         qib_write_kreg_port(ppd, krp_rcvctrl, ppd->p_rcvctrl);
         spin_unlock_irqrestore(&dd->cspec->rcvmod_lock, flags);
 
+        /* Hold the link state machine for mezz boards */
+        if (IS_QMH(dd) || IS_QME(dd))
+                qib_set_ib_7322_lstate(ppd, 0,
+                                       QLOGIC_IB_IBCC_LINKINITCMD_DISABLE);
+
         /* Also enable IBSTATUSCHG interrupt.  */
         val = qib_read_kreg_port(ppd, krp_errmask);
         qib_write_kreg_port(ppd, krp_errmask,
@@ -2406,10 +2393,9 @@ static void qib_7322_mini_quiet_serdes(struct qib_pportdata *ppd)
         ppd->lflags &= ~QIBL_IB_AUTONEG_INPROG;
         spin_unlock_irqrestore(&ppd->lflags_lock, flags);
         wake_up(&ppd->cpspec->autoneg_wait);
-        cancel_delayed_work(&ppd->cpspec->autoneg_work);
+        cancel_delayed_work_sync(&ppd->cpspec->autoneg_work);
         if (ppd->dd->cspec->r1)
-                cancel_delayed_work(&ppd->cpspec->ipg_work);
-        flush_scheduled_work();
+                cancel_delayed_work_sync(&ppd->cpspec->ipg_work);
 
         ppd->cpspec->chase_end = 0;
         if (ppd->cpspec->chase_timer.data) /* if initted */
@@ -2706,7 +2692,7 @@ static noinline void unknown_7322_gpio_intr(struct qib_devdata *dd)
                         if (!(pins & mask)) {
                                 ++handled;
                                 qd->t_insert = get_jiffies_64();
-                                schedule_work(&qd->work);
+                                queue_work(ib_wq, &qd->work);
                         }
                 }
         }
@@ -4990,8 +4976,8 @@ static void try_7322_autoneg(struct qib_pportdata *ppd)
         set_7322_ibspeed_fast(ppd, QIB_IB_DDR);
         qib_7322_mini_pcs_reset(ppd);
         /* 2 msec is minimum length of a poll cycle */
-        schedule_delayed_work(&ppd->cpspec->autoneg_work,
-                              msecs_to_jiffies(2));
+        queue_delayed_work(ib_wq, &ppd->cpspec->autoneg_work,
+                           msecs_to_jiffies(2));
 }
 
 /*
@@ -5121,7 +5107,8 @@ static void try_7322_ipg(struct qib_pportdata *ppd)
                 ib_free_send_mad(send_buf);
 retry:
         delay = 2 << ppd->cpspec->ipg_tries;
-        schedule_delayed_work(&ppd->cpspec->ipg_work, msecs_to_jiffies(delay));
+        queue_delayed_work(ib_wq, &ppd->cpspec->ipg_work,
+                           msecs_to_jiffies(delay));
 }
 
 /*
@@ -5702,6 +5689,11 @@ static void set_no_qsfp_atten(struct qib_devdata *dd, int change)
                                 ppd->cpspec->h1_val = h1;
                         /* now change the IBC and serdes, overriding generic */
                         init_txdds_table(ppd, 1);
+                        /* Re-enable the physical state machine on mezz boards
+                         * now that the correct settings have been set. */
+                        if (IS_QMH(dd) || IS_QME(dd))
+                                qib_set_ib_7322_lstate(ppd, 0,
+                                            QLOGIC_IB_IBCC_LINKINITCMD_SLEEP);
                         any++;
                 }
                 if (*nxt == '\n')
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index 7896afbb9ce8..ffefb78b8949 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -80,7 +80,6 @@ unsigned qib_wc_pat = 1; /* default (1) is to use PAT, not MTRR */
 module_param_named(wc_pat, qib_wc_pat, uint, S_IRUGO);
 MODULE_PARM_DESC(wc_pat, "enable write-combining via PAT mechanism");
 
-struct workqueue_struct *qib_wq;
 struct workqueue_struct *qib_cq_wq;
 
 static void verify_interrupt(unsigned long);
@@ -270,23 +269,20 @@ static void init_shadow_tids(struct qib_devdata *dd)
         struct page **pages;
         dma_addr_t *addrs;
 
-        pages = vmalloc(dd->cfgctxts * dd->rcvtidcnt * sizeof(struct page *));
+        pages = vzalloc(dd->cfgctxts * dd->rcvtidcnt * sizeof(struct page *));
         if (!pages) {
                 qib_dev_err(dd, "failed to allocate shadow page * "
                             "array, no expected sends!\n");
                 goto bail;
         }
 
-        addrs = vmalloc(dd->cfgctxts * dd->rcvtidcnt * sizeof(dma_addr_t));
+        addrs = vzalloc(dd->cfgctxts * dd->rcvtidcnt * sizeof(dma_addr_t));
         if (!addrs) {
                 qib_dev_err(dd, "failed to allocate shadow dma handle "
                             "array, no expected sends!\n");
                 goto bail_free;
         }
 
-        memset(pages, 0, dd->cfgctxts * dd->rcvtidcnt * sizeof(struct page *));
-        memset(addrs, 0, dd->cfgctxts * dd->rcvtidcnt * sizeof(dma_addr_t));
-
         dd->pageshadow = pages;
         dd->physshadow = addrs;
         return;
@@ -1047,24 +1043,10 @@ static int __init qlogic_ib_init(void)
         if (ret)
                 goto bail;
 
-        /*
-         * We create our own workqueue mainly because we want to be
-         * able to flush it when devices are being removed.  We can't
-         * use schedule_work()/flush_scheduled_work() because both
-         * unregister_netdev() and linkwatch_event take the rtnl lock,
-         * so flush_scheduled_work() can deadlock during device
-         * removal.
-         */
-        qib_wq = create_workqueue("qib");
-        if (!qib_wq) {
-                ret = -ENOMEM;
-                goto bail_dev;
-        }
-
         qib_cq_wq = create_singlethread_workqueue("qib_cq");
         if (!qib_cq_wq) {
                 ret = -ENOMEM;
-                goto bail_wq;
+                goto bail_dev;
         }
 
         /*
@@ -1094,8 +1076,6 @@ bail_unit:
         idr_destroy(&qib_unit_table);
 bail_cq_wq:
         destroy_workqueue(qib_cq_wq);
-bail_wq:
-        destroy_workqueue(qib_wq);
 bail_dev:
         qib_dev_cleanup();
 bail:
@@ -1119,7 +1099,6 @@ static void __exit qlogic_ib_cleanup(void)
 
         pci_unregister_driver(&qib_driver);
 
-        destroy_workqueue(qib_wq);
         destroy_workqueue(qib_cq_wq);
 
         qib_cpulist_count = 0;
@@ -1292,7 +1271,7 @@ static int __devinit qib_init_one(struct pci_dev *pdev,
 
         if (qib_mini_init || initfail || ret) {
                 qib_stop_timers(dd);
-                flush_scheduled_work();
+                flush_workqueue(ib_wq);
                 for (pidx = 0; pidx < dd->num_pports; ++pidx)
                         dd->f_quiet_serdes(dd->pport + pidx);
                 if (qib_mini_init)
@@ -1341,8 +1320,8 @@ static void __devexit qib_remove_one(struct pci_dev *pdev)
 
         qib_stop_timers(dd);
 
-        /* wait until all of our (qsfp) schedule_work() calls complete */
-        flush_scheduled_work();
+        /* wait until all of our (qsfp) queue_work() calls complete */
+        flush_workqueue(ib_wq);
 
         ret = qibfs_remove(dd);
         if (ret)
diff --git a/drivers/infiniband/hw/qib/qib_qsfp.c b/drivers/infiniband/hw/qib/qib_qsfp.c
index 35b3604b691d..3374a52232c1 100644
--- a/drivers/infiniband/hw/qib/qib_qsfp.c
+++ b/drivers/infiniband/hw/qib/qib_qsfp.c
@@ -485,7 +485,7 @@ void qib_qsfp_init(struct qib_qsfp_data *qd,
                 goto bail;
         /* We see a module, but it may be unwise to look yet. Just schedule */
         qd->t_insert = get_jiffies_64();
-        schedule_work(&qd->work);
+        queue_work(ib_wq, &qd->work);
 bail:
         return;
 }
@@ -493,10 +493,9 @@ bail:
 void qib_qsfp_deinit(struct qib_qsfp_data *qd)
 {
         /*
-         * There is nothing to do here for now.  our
-         * work is scheduled with schedule_work(), and
-         * flush_scheduled_work() from remove_one will
-         * block until all work ssetup with schedule_work()
+         * There is nothing to do here for now.  our work is scheduled
+         * with queue_work(), and flush_workqueue() from remove_one
+         * will block until all work setup with queue_work()
          * completes.
          */
 }
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h
index 63b22a9a7feb..95e5b47223b3 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.h
+++ b/drivers/infiniband/hw/qib/qib_verbs.h
@@ -805,7 +805,6 @@ static inline int qib_send_ok(struct qib_qp *qp)
                  !(qp->s_flags & QIB_S_ANY_WAIT_SEND));
 }
 
-extern struct workqueue_struct *qib_wq;
 extern struct workqueue_struct *qib_cq_wq;
 
 /*
@@ -814,7 +813,7 @@ extern struct workqueue_struct *qib_cq_wq;
 static inline void qib_schedule_send(struct qib_qp *qp)
 {
         if (qib_send_ok(qp))
-                queue_work(qib_wq, &qp->s_work);
+                queue_work(ib_wq, &qp->s_work);
 }
 
 static inline int qib_pkey_ok(u16 pkey1, u16 pkey2)
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index 55855eeabae7..cda8eac55fff 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -24,7 +24,7 @@ config INFINIBAND_IPOIB_CM
           unless you limit mtu for these destinations to 2044.
 
 config INFINIBAND_IPOIB_DEBUG
-        bool "IP-over-InfiniBand debugging" if EMBEDDED
+        bool "IP-over-InfiniBand debugging" if EXPERT
         depends on INFINIBAND_IPOIB
         default y
         ---help---
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index c1c49f2d35b5..93d55806b967 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -352,15 +352,13 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
         int ret;
         int i;
 
-        rx->rx_ring = vmalloc(ipoib_recvq_size * sizeof *rx->rx_ring);
+        rx->rx_ring = vzalloc(ipoib_recvq_size * sizeof *rx->rx_ring);
         if (!rx->rx_ring) {
                 printk(KERN_WARNING "%s: failed to allocate CM non-SRQ ring (%d entries)\n",
                        priv->ca->name, ipoib_recvq_size);
                 return -ENOMEM;
         }
 
-        memset(rx->rx_ring, 0, ipoib_recvq_size * sizeof *rx->rx_ring);
-
         t = kmalloc(sizeof *t, GFP_KERNEL);
         if (!t) {
                 ret = -ENOMEM;
@@ -1097,13 +1095,12 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
         struct ipoib_dev_priv *priv = netdev_priv(p->dev);
         int ret;
 
-        p->tx_ring = vmalloc(ipoib_sendq_size * sizeof *p->tx_ring);
+        p->tx_ring = vzalloc(ipoib_sendq_size * sizeof *p->tx_ring);
         if (!p->tx_ring) {
                 ipoib_warn(priv, "failed to allocate tx ring\n");
                 ret = -ENOMEM;
                 goto err_tx;
         }
-        memset(p->tx_ring, 0, ipoib_sendq_size * sizeof *p->tx_ring);
 
         p->qp = ipoib_cm_create_tx_qp(p->dev, p);
         if (IS_ERR(p->qp)) {
@@ -1521,7 +1518,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)
                 return;
         }
 
-        priv->cm.srq_ring = vmalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring);
+        priv->cm.srq_ring = vzalloc(ipoib_recvq_size * sizeof *priv->cm.srq_ring);
         if (!priv->cm.srq_ring) {
                 printk(KERN_WARNING "%s: failed to allocate CM SRQ ring (%d entries)\n",
                        priv->ca->name, ipoib_recvq_size);
@@ -1530,7 +1527,6 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)
                 return;
         }
 
-        memset(priv->cm.srq_ring, 0, ipoib_recvq_size * sizeof *priv->cm.srq_ring);
 }
 
 int ipoib_cm_dev_init(struct net_device *dev)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 7a07a728fe0d..aca3b44f7aed 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -916,13 +916,12 @@ int ipoib_dev_init(struct net_device *dev, struct ib_device *ca, int port)
                 goto out;
         }
 
-        priv->tx_ring = vmalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
+        priv->tx_ring = vzalloc(ipoib_sendq_size * sizeof *priv->tx_ring);
         if (!priv->tx_ring) {
                 printk(KERN_WARNING "%s: failed to allocate TX ring (%d entries)\n",
                        ca->name, ipoib_sendq_size);
                 goto out_rx_ring_cleanup;
         }
-        memset(priv->tx_ring, 0, ipoib_sendq_size * sizeof *priv->tx_ring);
 
         /* priv->tx_head, tx_tail & tx_outstanding are already 0 */
 
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 4b62105ed1e8..83664ed2804f 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -638,7 +638,7 @@ err:
         if (target->state == SRP_TARGET_CONNECTING) {
                 target->state = SRP_TARGET_DEAD;
                 INIT_WORK(&target->work, srp_remove_work);
-                schedule_work(&target->work);
+                queue_work(ib_wq, &target->work);
         }
         spin_unlock_irq(&target->lock);
 
@@ -1132,15 +1132,12 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
 
         spin_lock_irqsave(&target->lock, flags);
         iu = __srp_get_tx_iu(target, SRP_IU_CMD);
-        if (iu) {
-                req = list_first_entry(&target->free_reqs, struct srp_request,
-                                      list);
-                list_del(&req->list);
-        }
-        spin_unlock_irqrestore(&target->lock, flags);
-
         if (!iu)
-                goto err;
+                goto err_unlock;
+
+        req = list_first_entry(&target->free_reqs, struct srp_request, list);
+        list_del(&req->list);
+        spin_unlock_irqrestore(&target->lock, flags);
 
         dev = target->srp_host->srp_dev->dev;
         ib_dma_sync_single_for_cpu(dev, iu->dma, srp_max_iu_len,
@@ -1185,6 +1182,8 @@ err_iu:
 
         spin_lock_irqsave(&target->lock, flags);
         list_add(&req->list, &target->free_reqs);
+
+err_unlock:
         spin_unlock_irqrestore(&target->lock, flags);
 
 err:
@@ -2199,7 +2198,7 @@ static void srp_remove_one(struct ib_device *device)
                  * started before we marked our target ports as
                  * removed, and any target port removal tasks.
                  */
-                flush_scheduled_work();
+                flush_workqueue(ib_wq);
 
                 list_for_each_entry_safe(target, tmp_target,
                                          &host->target_list, list) {
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 07c2cd43109c..1903c0f5b925 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -6,7 +6,7 @@ menu "Input device support"
         depends on !S390
 
 config INPUT
-        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
+        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
         default y
         help
           Say Y here if you have any input device (mouse, keyboard, tablet,
@@ -67,7 +67,7 @@ config INPUT_SPARSEKMAP
 comment "Userland interfaces"
 
 config INPUT_MOUSEDEV
-        tristate "Mouse interface" if EMBEDDED
+        tristate "Mouse interface" if EXPERT
         default y
         help
           Say Y here if you want your mouse to be accessible as char devices
@@ -150,7 +150,7 @@ config INPUT_EVBUG
           module will be called evbug.
 
 config INPUT_APMPOWER
-        tristate "Input Power Event -> APM Bridge" if EMBEDDED
+        tristate "Input Power Event -> APM Bridge" if EXPERT
         depends on INPUT && APM_EMULATION
         help
           Say Y here if you want suspend key events to trigger a user
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 7b3c0b8fa432..c7a92028f450 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -2,7 +2,7 @@
 # Input core configuration
 #
 menuconfig INPUT_KEYBOARD
-        bool "Keyboards" if EMBEDDED || !X86
+        bool "Keyboards" if EXPERT || !X86
         default y
         help
           Say Y here, and a list of supported keyboards will be displayed.
@@ -57,7 +57,7 @@ config KEYBOARD_ATARI
           module will be called atakbd.
 
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if EMBEDDED || !X86
+        tristate "AT keyboard" if EXPERT || !X86
         default y
         select SERIO
         select SERIO_LIBPS2
@@ -343,6 +343,16 @@ config KEYBOARD_NOMADIK
           To compile this driver as a module, choose M here: the
           module will be called nmk-ske-keypad.
 
+config KEYBOARD_TEGRA
+        tristate "NVIDIA Tegra internal matrix keyboard controller support"
+        depends on ARCH_TEGRA
+        help
+          Say Y here if you want to use a matrix keyboard connected directly
+          to the internal keyboard controller on Tegra SoCs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tegra-kbc.
+
 config KEYBOARD_OPENCORES
         tristate "OpenCores Keyboard Controller"
         help
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 4e5571b72cda..468c627a2844 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_KEYBOARD_STMPE)		+= stmpe-keypad.o
 obj-$(CONFIG_KEYBOARD_STOWAWAY)         += stowaway.o
 obj-$(CONFIG_KEYBOARD_SUNKBD)           += sunkbd.o
 obj-$(CONFIG_KEYBOARD_TC3589X)          += tc3589x-keypad.o
+obj-$(CONFIG_KEYBOARD_TEGRA)            += tegra-kbc.o
 obj-$(CONFIG_KEYBOARD_TNETV107X)        += tnetv107x-keypad.o
 obj-$(CONFIG_KEYBOARD_TWL4030)          += twl4030_keypad.o
 obj-$(CONFIG_KEYBOARD_XTKBD)            += xtkbd.o
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 6069abe31e42..eb3006361ee4 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -322,7 +322,7 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata)
         struct gpio_keys_button *button = bdata->button;
         struct input_dev *input = bdata->input;
         unsigned int type = button->type ?: EV_KEY;
-        int state = (gpio_get_value(button->gpio) ? 1 : 0) ^ button->active_low;
+        int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low;
 
         input_event(input, type, button->code, !!state);
         input_sync(input);
@@ -410,8 +410,8 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
         if (!button->can_disable)
                 irqflags |= IRQF_SHARED;
 
-        error = request_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
-        if (error) {
+        error = request_any_context_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
+        if (error < 0) {
                 dev_err(dev, "Unable to claim irq %d; error %d\n",
                         irq, error);
                 goto fail3;
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
new file mode 100644
index 000000000000..ac471b77c18e
--- /dev/null
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -0,0 +1,727 @@
+/*
+ * Keyboard class input driver for the NVIDIA Tegra SoC internal matrix
+ * keyboard controller
+ *
+ * Copyright (c) 2009-2011, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/slab.h>
+#include <mach/clk.h>
+#include <mach/kbc.h>
+
+#define KBC_MAX_DEBOUNCE_CNT    0x3ffu
+
+/* KBC row scan time and delay for beginning the row scan. */
+#define KBC_ROW_SCAN_TIME       16
+#define KBC_ROW_SCAN_DLY        5
+
+/* KBC uses a 32KHz clock so a cycle = 1/32Khz */
+#define KBC_CYCLE_USEC  32
+
+/* KBC Registers */
+
+/* KBC Control Register */
+#define KBC_CONTROL_0   0x0
+#define KBC_FIFO_TH_CNT_SHIFT(cnt)      (cnt << 14)
+#define KBC_DEBOUNCE_CNT_SHIFT(cnt)     (cnt << 4)
+#define KBC_CONTROL_FIFO_CNT_INT_EN     (1 << 3)
+#define KBC_CONTROL_KBC_EN              (1 << 0)
+
+/* KBC Interrupt Register */
+#define KBC_INT_0       0x4
+#define KBC_INT_FIFO_CNT_INT_STATUS     (1 << 2)
+
+#define KBC_ROW_CFG0_0  0x8
+#define KBC_COL_CFG0_0  0x18
+#define KBC_INIT_DLY_0  0x28
+#define KBC_RPT_DLY_0   0x2c
+#define KBC_KP_ENT0_0   0x30
+#define KBC_KP_ENT1_0   0x34
+#define KBC_ROW0_MASK_0 0x38
+
+#define KBC_ROW_SHIFT   3
+
+struct tegra_kbc {
+        void __iomem *mmio;
+        struct input_dev *idev;
+        unsigned int irq;
+        unsigned int wake_enable_rows;
+        unsigned int wake_enable_cols;
+        spinlock_t lock;
+        unsigned int repoll_dly;
+        unsigned long cp_dly_jiffies;
+        const struct tegra_kbc_platform_data *pdata;
+        unsigned short keycode[KBC_MAX_KEY];
+        unsigned short current_keys[KBC_MAX_KPENT];
+        unsigned int num_pressed_keys;
+        struct timer_list timer;
+        struct clk *clk;
+};
+
+static const u32 tegra_kbc_default_keymap[] = {
+        KEY(0, 2, KEY_W),
+        KEY(0, 3, KEY_S),
+        KEY(0, 4, KEY_A),
+        KEY(0, 5, KEY_Z),
+        KEY(0, 7, KEY_FN),
+
+        KEY(1, 7, KEY_LEFTMETA),
+
+        KEY(2, 6, KEY_RIGHTALT),
+        KEY(2, 7, KEY_LEFTALT),
+
+        KEY(3, 0, KEY_5),
+        KEY(3, 1, KEY_4),
+        KEY(3, 2, KEY_R),
+        KEY(3, 3, KEY_E),
+        KEY(3, 4, KEY_F),
+        KEY(3, 5, KEY_D),
+        KEY(3, 6, KEY_X),
+
+        KEY(4, 0, KEY_7),
+        KEY(4, 1, KEY_6),
+        KEY(4, 2, KEY_T),
+        KEY(4, 3, KEY_H),
+        KEY(4, 4, KEY_G),
+        KEY(4, 5, KEY_V),
+        KEY(4, 6, KEY_C),
+        KEY(4, 7, KEY_SPACE),
+
+        KEY(5, 0, KEY_9),
+        KEY(5, 1, KEY_8),
+        KEY(5, 2, KEY_U),
+        KEY(5, 3, KEY_Y),
+        KEY(5, 4, KEY_J),
+        KEY(5, 5, KEY_N),
+        KEY(5, 6, KEY_B),
+        KEY(5, 7, KEY_BACKSLASH),
+
+        KEY(6, 0, KEY_MINUS),
+        KEY(6, 1, KEY_0),
+        KEY(6, 2, KEY_O),
+        KEY(6, 3, KEY_I),
+        KEY(6, 4, KEY_L),
+        KEY(6, 5, KEY_K),
+        KEY(6, 6, KEY_COMMA),
+        KEY(6, 7, KEY_M),
+
+        KEY(7, 1, KEY_EQUAL),
+        KEY(7, 2, KEY_RIGHTBRACE),
+        KEY(7, 3, KEY_ENTER),
+        KEY(7, 7, KEY_MENU),
+
+        KEY(8, 4, KEY_RIGHTSHIFT),
+        KEY(8, 5, KEY_LEFTSHIFT),
+
+        KEY(9, 5, KEY_RIGHTCTRL),
+        KEY(9, 7, KEY_LEFTCTRL),
+
+        KEY(11, 0, KEY_LEFTBRACE),
+        KEY(11, 1, KEY_P),
+        KEY(11, 2, KEY_APOSTROPHE),
+        KEY(11, 3, KEY_SEMICOLON),
+        KEY(11, 4, KEY_SLASH),
+        KEY(11, 5, KEY_DOT),
+
+        KEY(12, 0, KEY_F10),
+        KEY(12, 1, KEY_F9),
+        KEY(12, 2, KEY_BACKSPACE),
+        KEY(12, 3, KEY_3),
+        KEY(12, 4, KEY_2),
+        KEY(12, 5, KEY_UP),
+        KEY(12, 6, KEY_PRINT),
+        KEY(12, 7, KEY_PAUSE),
+
+        KEY(13, 0, KEY_INSERT),
+        KEY(13, 1, KEY_DELETE),
+        KEY(13, 3, KEY_PAGEUP),
+        KEY(13, 4, KEY_PAGEDOWN),
+        KEY(13, 5, KEY_RIGHT),
+        KEY(13, 6, KEY_DOWN),
+        KEY(13, 7, KEY_LEFT),
+
+        KEY(14, 0, KEY_F11),
+        KEY(14, 1, KEY_F12),
+        KEY(14, 2, KEY_F8),
+        KEY(14, 3, KEY_Q),
+        KEY(14, 4, KEY_F4),
+        KEY(14, 5, KEY_F3),
+        KEY(14, 6, KEY_1),
+        KEY(14, 7, KEY_F7),
+
+        KEY(15, 0, KEY_ESC),
+        KEY(15, 1, KEY_GRAVE),
+        KEY(15, 2, KEY_F5),
+        KEY(15, 3, KEY_TAB),
+        KEY(15, 4, KEY_F1),
+        KEY(15, 5, KEY_F2),
+        KEY(15, 6, KEY_CAPSLOCK),
+        KEY(15, 7, KEY_F6),
+};
+
+static const struct matrix_keymap_data tegra_kbc_default_keymap_data = {
+        .keymap         = tegra_kbc_default_keymap,
+        .keymap_size    = ARRAY_SIZE(tegra_kbc_default_keymap),
+};
+
+static void tegra_kbc_report_released_keys(struct input_dev *input,
+                                           unsigned short old_keycodes[],
+                                           unsigned int old_num_keys,
+                                           unsigned short new_keycodes[],
+                                           unsigned int new_num_keys)
+{
+        unsigned int i, j;
+
+        for (i = 0; i < old_num_keys; i++) {
+                for (j = 0; j < new_num_keys; j++)
+                        if (old_keycodes[i] == new_keycodes[j])
+                                break;
+
+                if (j == new_num_keys)
+                        input_report_key(input, old_keycodes[i], 0);
+        }
+}
+
+static void tegra_kbc_report_pressed_keys(struct input_dev *input,
+                                          unsigned char scancodes[],
+                                          unsigned short keycodes[],
+                                          unsigned int num_pressed_keys)
+{
+        unsigned int i;
+
+        for (i = 0; i < num_pressed_keys; i++) {
+                input_event(input, EV_MSC, MSC_SCAN, scancodes[i]);
+                input_report_key(input, keycodes[i], 1);
+        }
+}
+
+static void tegra_kbc_report_keys(struct tegra_kbc *kbc)
+{
+        unsigned char scancodes[KBC_MAX_KPENT];
+        unsigned short keycodes[KBC_MAX_KPENT];
+        u32 val = 0;
+        unsigned int i;
+        unsigned int num_down = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&kbc->lock, flags);
+        for (i = 0; i < KBC_MAX_KPENT; i++) {
+                if ((i % 4) == 0)
+                        val = readl(kbc->mmio + KBC_KP_ENT0_0 + i);
+
+                if (val & 0x80) {
+                        unsigned int col = val & 0x07;
+                        unsigned int row = (val >> 3) & 0x0f;
+                        unsigned char scancode =
+                                MATRIX_SCAN_CODE(row, col, KBC_ROW_SHIFT);
+
+                        scancodes[num_down] = scancode;
+                        keycodes[num_down++] = kbc->keycode[scancode];
+                }
+
+                val >>= 8;
+        }
+        spin_unlock_irqrestore(&kbc->lock, flags);
+
+        tegra_kbc_report_released_keys(kbc->idev,
+                                       kbc->current_keys, kbc->num_pressed_keys,
+                                       keycodes, num_down);
+        tegra_kbc_report_pressed_keys(kbc->idev, scancodes, keycodes, num_down);
+        input_sync(kbc->idev);
+
+        memcpy(kbc->current_keys, keycodes, sizeof(kbc->current_keys));
+        kbc->num_pressed_keys = num_down;
+}
+
+static void tegra_kbc_keypress_timer(unsigned long data)
+{
+        struct tegra_kbc *kbc = (struct tegra_kbc *)data;
+        unsigned long flags;
+        u32 val;
+        unsigned int i;
+
+        val = (readl(kbc->mmio + KBC_INT_0) >> 4) & 0xf;
+        if (val) {
+                unsigned long dly;
+
+                tegra_kbc_report_keys(kbc);
+
+                /*
+                 * If more than one keys are pressed we need not wait
+                 * for the repoll delay.
+                 */
+                dly = (val == 1) ? kbc->repoll_dly : 1;
+                mod_timer(&kbc->timer, jiffies + msecs_to_jiffies(dly));
+        } else {
+                /* Release any pressed keys and exit the polling loop */
+                for (i = 0; i < kbc->num_pressed_keys; i++)
+                        input_report_key(kbc->idev, kbc->current_keys[i], 0);
+                input_sync(kbc->idev);
+
+                kbc->num_pressed_keys = 0;
+
+                /* All keys are released so enable the keypress interrupt */
+                spin_lock_irqsave(&kbc->lock, flags);
+                val = readl(kbc->mmio + KBC_CONTROL_0);
+                val |= KBC_CONTROL_FIFO_CNT_INT_EN;
+                writel(val, kbc->mmio + KBC_CONTROL_0);
+                spin_unlock_irqrestore(&kbc->lock, flags);
+        }
+}
+
+static irqreturn_t tegra_kbc_isr(int irq, void *args)
+{
+        struct tegra_kbc *kbc = args;
+        u32 val, ctl;
+
+        /*
+         * Until all keys are released, defer further processing to
+         * the polling loop in tegra_kbc_keypress_timer
+         */
+        ctl = readl(kbc->mmio + KBC_CONTROL_0);
+        ctl &= ~KBC_CONTROL_FIFO_CNT_INT_EN;
+        writel(ctl, kbc->mmio + KBC_CONTROL_0);
+
+        /*
+         * Quickly bail out & reenable interrupts if the fifo threshold
+         * count interrupt wasn't the interrupt source
+         */
+        val = readl(kbc->mmio + KBC_INT_0);
+        writel(val, kbc->mmio + KBC_INT_0);
+
+        if (val & KBC_INT_FIFO_CNT_INT_STATUS) {
+                /*
+                 * Schedule timer to run when hardware is in continuous
+                 * polling mode.
+                 */
+                mod_timer(&kbc->timer, jiffies + kbc->cp_dly_jiffies);
+        } else {
+                ctl |= KBC_CONTROL_FIFO_CNT_INT_EN;
+                writel(ctl, kbc->mmio + KBC_CONTROL_0);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static void tegra_kbc_setup_wakekeys(struct tegra_kbc *kbc, bool filter)
+{
+        const struct tegra_kbc_platform_data *pdata = kbc->pdata;
+        int i;
+        unsigned int rst_val;
+
+        BUG_ON(pdata->wake_cnt > KBC_MAX_KEY);
+        rst_val = (filter && pdata->wake_cnt) ? ~0 : 0;
+
+        for (i = 0; i < KBC_MAX_ROW; i++)
+                writel(rst_val, kbc->mmio + KBC_ROW0_MASK_0 + i * 4);
+
+        if (filter) {
+                for (i = 0; i < pdata->wake_cnt; i++) {
+                        u32 val, addr;
+                        addr = pdata->wake_cfg[i].row * 4 + KBC_ROW0_MASK_0;
+                        val = readl(kbc->mmio + addr);
+                        val &= ~(1 << pdata->wake_cfg[i].col);
+                        writel(val, kbc->mmio + addr);
+                }
+        }
+}
+
+static void tegra_kbc_config_pins(struct tegra_kbc *kbc)
+{
+        const struct tegra_kbc_platform_data *pdata = kbc->pdata;
+        int i;
+
+        for (i = 0; i < KBC_MAX_GPIO; i++) {
+                u32 r_shft = 5 * (i % 6);
+                u32 c_shft = 4 * (i % 8);
+                u32 r_mask = 0x1f << r_shft;
+                u32 c_mask = 0x0f << c_shft;
+                u32 r_offs = (i / 6) * 4 + KBC_ROW_CFG0_0;
+                u32 c_offs = (i / 8) * 4 + KBC_COL_CFG0_0;
+                u32 row_cfg = readl(kbc->mmio + r_offs);
+                u32 col_cfg = readl(kbc->mmio + c_offs);
+
+                row_cfg &= ~r_mask;
+                col_cfg &= ~c_mask;
+
+                if (pdata->pin_cfg[i].is_row)
+                        row_cfg |= ((pdata->pin_cfg[i].num << 1) | 1) << r_shft;
+                else
+                        col_cfg |= ((pdata->pin_cfg[i].num << 1) | 1) << c_shft;
+
+                writel(row_cfg, kbc->mmio + r_offs);
+                writel(col_cfg, kbc->mmio + c_offs);
+        }
+}
+
+static int tegra_kbc_start(struct tegra_kbc *kbc)
+{
+        const struct tegra_kbc_platform_data *pdata = kbc->pdata;
+        unsigned long flags;
+        unsigned int debounce_cnt;
+        u32 val = 0;
+
+        clk_enable(kbc->clk);
+
+        /* Reset the KBC controller to clear all previous status.*/
+        tegra_periph_reset_assert(kbc->clk);
+        udelay(100);
+        tegra_periph_reset_deassert(kbc->clk);
+        udelay(100);
+
+        tegra_kbc_config_pins(kbc);
+        tegra_kbc_setup_wakekeys(kbc, false);
+
+        writel(pdata->repeat_cnt, kbc->mmio + KBC_RPT_DLY_0);
+
+        /* Keyboard debounce count is maximum of 12 bits. */
+        debounce_cnt = min(pdata->debounce_cnt, KBC_MAX_DEBOUNCE_CNT);
+        val = KBC_DEBOUNCE_CNT_SHIFT(debounce_cnt);
+        val |= KBC_FIFO_TH_CNT_SHIFT(1); /* set fifo interrupt threshold to 1 */
+        val |= KBC_CONTROL_FIFO_CNT_INT_EN;  /* interrupt on FIFO threshold */
+        val |= KBC_CONTROL_KBC_EN;     /* enable */
+        writel(val, kbc->mmio + KBC_CONTROL_0);
+
+        /*
+         * Compute the delay(ns) from interrupt mode to continuous polling
+         * mode so the timer routine is scheduled appropriately.
+         */
+        val = readl(kbc->mmio + KBC_INIT_DLY_0);
+        kbc->cp_dly_jiffies = usecs_to_jiffies((val & 0xfffff) * 32);
+
+        kbc->num_pressed_keys = 0;
+
+        /*
+         * Atomically clear out any remaining entries in the key FIFO
+         * and enable keyboard interrupts.
+         */
+        spin_lock_irqsave(&kbc->lock, flags);
+        while (1) {
+                val = readl(kbc->mmio + KBC_INT_0);
+                val >>= 4;
+                if (!val)
+                        break;
+
+                val = readl(kbc->mmio + KBC_KP_ENT0_0);
+                val = readl(kbc->mmio + KBC_KP_ENT1_0);
+        }
+        writel(0x7, kbc->mmio + KBC_INT_0);
+        spin_unlock_irqrestore(&kbc->lock, flags);
+
+        enable_irq(kbc->irq);
+
+        return 0;
+}
+
+static void tegra_kbc_stop(struct tegra_kbc *kbc)
+{
+        unsigned long flags;
+        u32 val;
+
+        spin_lock_irqsave(&kbc->lock, flags);
+        val = readl(kbc->mmio + KBC_CONTROL_0);
+        val &= ~1;
+        writel(val, kbc->mmio + KBC_CONTROL_0);
+        spin_unlock_irqrestore(&kbc->lock, flags);
+
+        disable_irq(kbc->irq);
+        del_timer_sync(&kbc->timer);
+
+        clk_disable(kbc->clk);
+}
+
+static int tegra_kbc_open(struct input_dev *dev)
+{
+        struct tegra_kbc *kbc = input_get_drvdata(dev);
+
+        return tegra_kbc_start(kbc);
+}
+
+static void tegra_kbc_close(struct input_dev *dev)
+{
+        struct tegra_kbc *kbc = input_get_drvdata(dev);
+
+        return tegra_kbc_stop(kbc);
+}
+
+static bool __devinit
+tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata,
+                        struct device *dev, unsigned int *num_rows)
+{
+        int i;
+
+        *num_rows = 0;
+
+        for (i = 0; i < KBC_MAX_GPIO; i++) {
+                const struct tegra_kbc_pin_cfg *pin_cfg = &pdata->pin_cfg[i];
+
+                if (pin_cfg->is_row) {
+                        if (pin_cfg->num >= KBC_MAX_ROW) {
+                                dev_err(dev,
+                                        "pin_cfg[%d]: invalid row number %d\n",
+                                        i, pin_cfg->num);
+                                return false;
+                        }
+                        (*num_rows)++;
+                } else {
+                        if (pin_cfg->num >= KBC_MAX_COL) {
+                                dev_err(dev,
+                                        "pin_cfg[%d]: invalid column number %d\n",
+                                        i, pin_cfg->num);
+                                return false;
+                        }
+                }
+        }
+
+        return true;
+}
+
+static int __devinit tegra_kbc_probe(struct platform_device *pdev)
+{
+        const struct tegra_kbc_platform_data *pdata = pdev->dev.platform_data;
+        const struct matrix_keymap_data *keymap_data;
+        struct tegra_kbc *kbc;
+        struct input_dev *input_dev;
+        struct resource *res;
+        int irq;
+        int err;
+        int i;
+        int num_rows = 0;
+        unsigned int debounce_cnt;
+        unsigned int scan_time_rows;
+
+        if (!pdata)
+                return -EINVAL;
+
+        if (!tegra_kbc_check_pin_cfg(pdata, &pdev->dev, &num_rows))
+                return -EINVAL;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get I/O memory\n");
+                return -ENXIO;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "failed to get keyboard IRQ\n");
+                return -ENXIO;
+        }
+
+        kbc = kzalloc(sizeof(*kbc), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!kbc || !input_dev) {
+                err = -ENOMEM;
+                goto err_free_mem;
+        }
+
+        kbc->pdata = pdata;
+        kbc->idev = input_dev;
+        kbc->irq = irq;
+        spin_lock_init(&kbc->lock);
+        setup_timer(&kbc->timer, tegra_kbc_keypress_timer, (unsigned long)kbc);
+
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to request I/O memory\n");
+                err = -EBUSY;
+                goto err_free_mem;
+        }
+
+        kbc->mmio = ioremap(res->start, resource_size(res));
+        if (!kbc->mmio) {
+                dev_err(&pdev->dev, "failed to remap I/O memory\n");
+                err = -ENXIO;
+                goto err_free_mem_region;
+        }
+
+        kbc->clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(kbc->clk)) {
+                dev_err(&pdev->dev, "failed to get keyboard clock\n");
+                err = PTR_ERR(kbc->clk);
+                goto err_iounmap;
+        }
+
+        kbc->wake_enable_rows = 0;
+        kbc->wake_enable_cols = 0;
+        for (i = 0; i < pdata->wake_cnt; i++) {
+                kbc->wake_enable_rows |= (1 << pdata->wake_cfg[i].row);
+                kbc->wake_enable_cols |= (1 << pdata->wake_cfg[i].col);
+        }
+
+        /*
+         * The time delay between two consecutive reads of the FIFO is
+         * the sum of the repeat time and the time taken for scanning
+         * the rows. There is an additional delay before the row scanning
+         * starts. The repoll delay is computed in milliseconds.
+         */
+        debounce_cnt = min(pdata->debounce_cnt, KBC_MAX_DEBOUNCE_CNT);
+        scan_time_rows = (KBC_ROW_SCAN_TIME + debounce_cnt) * num_rows;
+        kbc->repoll_dly = KBC_ROW_SCAN_DLY + scan_time_rows + pdata->repeat_cnt;
+        kbc->repoll_dly = ((kbc->repoll_dly * KBC_CYCLE_USEC) + 999) / 1000;
+
+        input_dev->name = pdev->name;
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->dev.parent = &pdev->dev;
+        input_dev->open = tegra_kbc_open;
+        input_dev->close = tegra_kbc_close;
+
+        input_set_drvdata(input_dev, kbc);
+
+        input_dev->evbit[0] = BIT_MASK(EV_KEY);
+        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+
+        input_dev->keycode = kbc->keycode;
+        input_dev->keycodesize = sizeof(kbc->keycode[0]);
+        input_dev->keycodemax = ARRAY_SIZE(kbc->keycode);
+
+        keymap_data = pdata->keymap_data ?: &tegra_kbc_default_keymap_data;
+        matrix_keypad_build_keymap(keymap_data, KBC_ROW_SHIFT,
+                                   input_dev->keycode, input_dev->keybit);
+
+        err = request_irq(kbc->irq, tegra_kbc_isr, IRQF_TRIGGER_HIGH,
+                          pdev->name, kbc);
+        if (err) {
+                dev_err(&pdev->dev, "failed to request keyboard IRQ\n");
+                goto err_put_clk;
+        }
+
+        disable_irq(kbc->irq);
+
+        err = input_register_device(kbc->idev);
+        if (err) {
+                dev_err(&pdev->dev, "failed to register input device\n");
+                goto err_free_irq;
+        }
+
+        platform_set_drvdata(pdev, kbc);
+        device_init_wakeup(&pdev->dev, pdata->wakeup);
+
+        return 0;
+
+err_free_irq:
+        free_irq(kbc->irq, pdev);
+err_put_clk:
+        clk_put(kbc->clk);
+err_iounmap:
+        iounmap(kbc->mmio);
+err_free_mem_region:
+        release_mem_region(res->start, resource_size(res));
+err_free_mem:
+        input_free_device(kbc->idev);
+        kfree(kbc);
+
+        return err;
+}
+
+static int __devexit tegra_kbc_remove(struct platform_device *pdev)
+{
+        struct tegra_kbc *kbc = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        free_irq(kbc->irq, pdev);
+        clk_put(kbc->clk);
+
+        input_unregister_device(kbc->idev);
+        iounmap(kbc->mmio);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, resource_size(res));
+
+        kfree(kbc);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int tegra_kbc_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct tegra_kbc *kbc = platform_get_drvdata(pdev);
+
+        if (device_may_wakeup(&pdev->dev)) {
+                tegra_kbc_setup_wakekeys(kbc, true);
+                enable_irq_wake(kbc->irq);
+                /* Forcefully clear the interrupt status */
+                writel(0x7, kbc->mmio + KBC_INT_0);
+                msleep(30);
+        } else {
+                mutex_lock(&kbc->idev->mutex);
+                if (kbc->idev->users)
+                        tegra_kbc_stop(kbc);
+                mutex_unlock(&kbc->idev->mutex);
+        }
+
+        return 0;
+}
+
+static int tegra_kbc_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct tegra_kbc *kbc = platform_get_drvdata(pdev);
+        int err = 0;
+
+        if (device_may_wakeup(&pdev->dev)) {
+                disable_irq_wake(kbc->irq);
+                tegra_kbc_setup_wakekeys(kbc, false);
+        } else {
+                mutex_lock(&kbc->idev->mutex);
+                if (kbc->idev->users)
+                        err = tegra_kbc_start(kbc);
+                mutex_unlock(&kbc->idev->mutex);
+        }
+
+        return err;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(tegra_kbc_pm_ops, tegra_kbc_suspend, tegra_kbc_resume);
+
+static struct platform_driver tegra_kbc_driver = {
+        .probe          = tegra_kbc_probe,
+        .remove         = __devexit_p(tegra_kbc_remove),
+        .driver = {
+                .name   = "tegra-kbc",
+                .owner  = THIS_MODULE,
+                .pm     = &tegra_kbc_pm_ops,
+        },
+};
+
+static void __exit tegra_kbc_exit(void)
+{
+        platform_driver_unregister(&tegra_kbc_driver);
+}
+module_exit(tegra_kbc_exit);
+
+static int __init tegra_kbc_init(void)
+{
+        return platform_driver_register(&tegra_kbc_driver);
+}
+module_init(tegra_kbc_init);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rakesh Iyer <riyer@nvidia.com>");
+MODULE_DESCRIPTION("Tegra matrix keyboard controller driver");
+MODULE_ALIAS("platform:tegra-kbc");
diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index b4a81ebfab92..c8f097a15d89 100644
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -219,9 +220,9 @@ static int __devinit keypad_probe(struct platform_device *pdev)
         }
 
         kp->clk = clk_get(dev, NULL);
-        if (!kp->clk) {
+        if (IS_ERR(kp->clk)) {
                 dev_err(dev, "cannot claim device clock\n");
-                error = -EINVAL;
+                error = PTR_ERR(kp->clk);
                 goto error_clk;
         }
 
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 9dfd6e5f786f..1f38302a5951 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -69,11 +69,7 @@ static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned
         }
 
         if (value > 20 && value < 32767)
-#ifndef FREQ
-                count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1;
-#else
-                count = (FREQ / (value * 4)) - 1;
-#endif
+                count = (IXP4XX_TIMER_FREQ / (value * 4)) - 1;
 
         ixp4xx_spkr_control(pin, count);
 
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index bf5fd7f6a313..9c1e6ee83531 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -39,7 +39,7 @@ config MOUSE_PS2
           module will be called psmouse.
 
 config MOUSE_PS2_ALPS
-        bool "ALPS PS/2 mouse protocol extension" if EMBEDDED
+        bool "ALPS PS/2 mouse protocol extension" if EXPERT
         default y
         depends on MOUSE_PS2
         help
@@ -49,7 +49,7 @@ config MOUSE_PS2_ALPS
           If unsure, say Y.
 
 config MOUSE_PS2_LOGIPS2PP
-        bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED
+        bool "Logitech PS/2++ mouse protocol extension" if EXPERT
         default y
         depends on MOUSE_PS2
         help
@@ -59,7 +59,7 @@ config MOUSE_PS2_LOGIPS2PP
           If unsure, say Y.
 
 config MOUSE_PS2_SYNAPTICS
-        bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED
+        bool "Synaptics PS/2 mouse protocol extension" if EXPERT
         default y
         depends on MOUSE_PS2
         help
@@ -69,7 +69,7 @@ config MOUSE_PS2_SYNAPTICS
           If unsure, say Y.
 
 config MOUSE_PS2_LIFEBOOK
-        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED
+        bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT
         default y
         depends on MOUSE_PS2 && X86 && DMI
         help
@@ -79,7 +79,7 @@ config MOUSE_PS2_LIFEBOOK
           If unsure, say Y.
 
 config MOUSE_PS2_TRACKPOINT
-        bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED
+        bool "IBM Trackpoint PS/2 mouse protocol extension" if EXPERT
         default y
         depends on MOUSE_PS2
         help
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index da392c22fc6c..aa186cf6c514 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -755,23 +755,26 @@ static int synaptics_reconnect(struct psmouse *psmouse)
 {
         struct synaptics_data *priv = psmouse->private;
         struct synaptics_data old_priv = *priv;
+        int retry = 0;
+        int error;
 
-        psmouse_reset(psmouse);
+        do {
+                psmouse_reset(psmouse);
+                error = synaptics_detect(psmouse, 0);
+        } while (error && ++retry < 3);
 
-        if (synaptics_detect(psmouse, 0))
+        if (error)
                 return -1;
 
+        if (retry > 1)
+                printk(KERN_DEBUG "Synaptics reconnected after %d tries\n",
+                        retry);
+
         if (synaptics_query_hardware(psmouse)) {
                 printk(KERN_ERR "Unable to query Synaptics hardware.\n");
                 return -1;
         }
 
-        if (old_priv.identity != priv->identity ||
-            old_priv.model_id != priv->model_id ||
-            old_priv.capabilities != priv->capabilities ||
-            old_priv.ext_cap != priv->ext_cap)
-                return -1;
-
         if (synaptics_set_absolute_mode(psmouse)) {
                 printk(KERN_ERR "Unable to initialize Synaptics hardware.\n");
                 return -1;
@@ -782,6 +785,19 @@ static int synaptics_reconnect(struct psmouse *psmouse)
                 return -1;
         }
 
+        if (old_priv.identity != priv->identity ||
+            old_priv.model_id != priv->model_id ||
+            old_priv.capabilities != priv->capabilities ||
+            old_priv.ext_cap != priv->ext_cap) {
+                printk(KERN_ERR "Synaptics hardware appears to be different: "
+                        "id(%ld-%ld), model(%ld-%ld), caps(%lx-%lx), ext(%lx-%lx).\n",
+                        old_priv.identity, priv->identity,
+                        old_priv.model_id, priv->model_id,
+                        old_priv.capabilities, priv->capabilities,
+                        old_priv.ext_cap, priv->ext_cap);
+                return -1;
+        }
+
         return 0;
 }
 
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 307eef77a172..55f2c2293ec6 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -2,7 +2,7 @@
 # Input core configuration
 #
 config SERIO
-        tristate "Serial I/O support" if EMBEDDED || !X86
+        tristate "Serial I/O support" if EXPERT || !X86
         default y
         help
           Say Yes here if you have any input device that uses serial I/O to
@@ -19,7 +19,7 @@ config SERIO
 if SERIO
 
 config SERIO_I8042
-        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
+        tristate "i8042 PC Keyboard controller" if EXPERT || !X86
         default y
         depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
                    (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
@@ -168,7 +168,7 @@ config SERIO_MACEPS2
           module will be called maceps2.
 
 config SERIO_LIBPS2
-        tristate "PS/2 driver library" if EMBEDDED
+        tristate "PS/2 driver library" if EXPERT
         depends on SERIO_I8042 || SERIO_I8042=n
         help
           Say Y here if you are using a driver for device connected
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 448c7724beb9..852816567241 100644
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -111,9 +111,11 @@ static void ct82c710_close(struct serio *serio)
 static int ct82c710_open(struct serio *serio)
 {
         unsigned char status;
+        int err;
 
-        if (request_irq(CT82C710_IRQ, ct82c710_interrupt, 0, "ct82c710", NULL))
-                return -1;
+        err = request_irq(CT82C710_IRQ, ct82c710_interrupt, 0, "ct82c710", NULL);
+        if (err)
+                return err;
 
         status = inb_p(CT82C710_STATUS);
 
@@ -131,7 +133,7 @@ static int ct82c710_open(struct serio *serio)
                 status &= ~(CT82C710_ENABLE | CT82C710_INTS_ON);
                 outb_p(status, CT82C710_STATUS);
                 free_irq(CT82C710_IRQ, NULL);
-                return -1;
+                return -EBUSY;
         }
 
         return 0;
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 6e362de3f412..8755f5f3ad37 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -116,14 +116,15 @@ static void serport_ldisc_close(struct tty_struct *tty)
 
 /*
  * serport_ldisc_receive() is called by the low level tty driver when characters
- * are ready for us. We forward the characters, one by one to the 'interrupt'
- * routine.
+ * are ready for us. We forward the characters and flags, one by one to the
+ * 'interrupt' routine.
  */
 
 static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
 {
         struct serport *serport = (struct serport*) tty->disc_data;
         unsigned long flags;
+        unsigned int ch_flags;
         int i;
 
         spin_lock_irqsave(&serport->lock, flags);
@@ -131,8 +132,23 @@ static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *c
         if (!test_bit(SERPORT_ACTIVE, &serport->flags))
                 goto out;
 
-        for (i = 0; i < count; i++)
-                serio_interrupt(serport->serio, cp[i], 0);
+        for (i = 0; i < count; i++) {
+                switch (fp[i]) {
+                case TTY_FRAME:
+                        ch_flags = SERIO_FRAME;
+                        break;
+
+                case TTY_PARITY:
+                        ch_flags = SERIO_PARITY;
+                        break;
+
+                default:
+                        ch_flags = 0;
+                        break;
+                }
+
+                serio_interrupt(serport->serio, cp[i], ch_flags);
+        }
 
 out:
         spin_unlock_irqrestore(&serport->lock, flags);
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c
index a29a7812bd46..7729e547ba65 100644
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -201,6 +201,7 @@ int sparse_keymap_setup(struct input_dev *dev,
                         break;
 
                 case KE_SW:
+                case KE_VSW:
                         __set_bit(EV_SW, dev->evbit);
                         __set_bit(entry->sw.code, dev->swbit);
                         break;
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 518782999fea..367fa82a607e 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1101,6 +1101,13 @@ void wacom_setup_device_quirks(struct wacom_features *features)
         }
 }
 
+static unsigned int wacom_calculate_touch_res(unsigned int logical_max,
+                                              unsigned int physical_max)
+{
+       /* Touch physical dimensions are in 100th of mm */
+       return (logical_max * 100) / physical_max;
+}
+
 void wacom_setup_input_capabilities(struct input_dev *input_dev,
                                     struct wacom_wac *wacom_wac)
 {
@@ -1228,8 +1235,12 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
         case TABLETPC:
                 if (features->device_type == BTN_TOOL_DOUBLETAP ||
                     features->device_type == BTN_TOOL_TRIPLETAP) {
-                        input_set_abs_params(input_dev, ABS_RX, 0, features->x_phy, 0, 0);
-                        input_set_abs_params(input_dev, ABS_RY, 0, features->y_phy, 0, 0);
+                        input_abs_set_res(input_dev, ABS_X,
+                                wacom_calculate_touch_res(features->x_max,
+                                                        features->x_phy));
+                        input_abs_set_res(input_dev, ABS_Y,
+                                wacom_calculate_touch_res(features->y_max,
+                                                        features->y_phy));
                         __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
                 }
 
@@ -1272,6 +1283,12 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                         input_set_abs_params(input_dev, ABS_MT_PRESSURE,
                                              0, features->pressure_max,
                                              features->pressure_fuzz, 0);
+                        input_abs_set_res(input_dev, ABS_X,
+                                wacom_calculate_touch_res(features->x_max,
+                                                        features->x_phy));
+                        input_abs_set_res(input_dev, ABS_Y,
+                                wacom_calculate_touch_res(features->y_max,
+                                                        features->y_phy));
                 } else if (features->device_type == BTN_TOOL_PEN) {
                         __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
                         __set_bit(BTN_TOOL_PEN, input_dev->keybit);
@@ -1426,6 +1443,10 @@ static struct wacom_features wacom_features_0xD3 =
         { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN,     21648, 13530, 1023, 63, BAMBOO_PT };
 static const struct wacom_features wacom_features_0xD4 =
         { "Wacom Bamboo Pen",     WACOM_PKGLEN_BBFUN,     14720,  9200,  255, 63, BAMBOO_PT };
+static struct wacom_features wacom_features_0xD6 =
+        { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN,   14720,  9200, 1023, 63, BAMBOO_PT };
+static struct wacom_features wacom_features_0xD7 =
+        { "Wacom BambooPT 2FG Small", WACOM_PKGLEN_BBFUN, 14720,  9200, 1023, 63, BAMBOO_PT };
 static struct wacom_features wacom_features_0xD8 =
         { "Wacom Bamboo Comic 2FG", WACOM_PKGLEN_BBFUN,   21648, 13530, 1023, 63, BAMBOO_PT };
 static struct wacom_features wacom_features_0xDA =
@@ -1507,6 +1528,8 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0xD2) },
         { USB_DEVICE_WACOM(0xD3) },
         { USB_DEVICE_WACOM(0xD4) },
+        { USB_DEVICE_WACOM(0xD6) },
+        { USB_DEVICE_WACOM(0xD7) },
         { USB_DEVICE_WACOM(0xD8) },
         { USB_DEVICE_WACOM(0xDA) },
         { USB_DEVICE_WACOM(0xDB) },
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 0c9f4b158ff0..61834ae282e1 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -540,62 +540,62 @@ config TOUCHSCREEN_MC13783
 
 config TOUCHSCREEN_USB_EGALAX
         default y
-        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
+        bool "eGalax, eTurboTouch CT-410/510/700 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_PANJIT
         default y
-        bool "PanJit device support" if EMBEDDED
+        bool "PanJit device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_3M
         default y
-        bool "3M/Microtouch EX II series device support" if EMBEDDED
+        bool "3M/Microtouch EX II series device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ITM
         default y
-        bool "ITM device support" if EMBEDDED
+        bool "ITM device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ETURBO
         default y
-        bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+        bool "eTurboTouch (non-eGalax compatible) device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GUNZE
         default y
-        bool "Gunze AHL61 device support" if EMBEDDED
+        bool "Gunze AHL61 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_DMC_TSC10
         default y
-        bool "DMC TSC-10/25 device support" if EMBEDDED
+        bool "DMC TSC-10/25 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_IRTOUCH
         default y
-        bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED
+        bool "IRTOUCHSYSTEMS/UNITOP device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_IDEALTEK
         default y
-        bool "IdealTEK URTC1000 device support" if EMBEDDED
+        bool "IdealTEK URTC1000 device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GENERAL_TOUCH
         default y
-        bool "GeneralTouch Touchscreen device support" if EMBEDDED
+        bool "GeneralTouch Touchscreen device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_GOTOP
         default y
-        bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED
+        bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_JASTEC
         default y
-        bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EMBEDDED
+        bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_E2I
@@ -605,17 +605,17 @@ config TOUCHSCREEN_USB_E2I
 
 config TOUCHSCREEN_USB_ZYTRONIC
         default y
-        bool "Zytronic controller" if EMBEDDED
+        bool "Zytronic controller" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_ETT_TC45USB
         default y
-        bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EMBEDDED
+        bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_USB_NEXIO
         default y
-        bool "NEXIO/iNexio device support" if EMBEDDED
+        bool "NEXIO/iNexio device support" if EXPERT
         depends on TOUCHSCREEN_USB_COMPOSITE
 
 config TOUCHSCREEN_TOUCHIT213
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index f7fa9ef4cd65..1507ce108d5b 100644
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -12,6 +12,7 @@
 #include <linux/input.h>
 #include <linux/input/bu21013.h>
 #include <linux/slab.h>
+#include <linux/regulator/consumer.h>
 
 #define PEN_DOWN_INTR   0
 #define MAX_FINGERS     2
@@ -139,6 +140,7 @@
  * @chip: pointer to the touch panel controller
  * @in_dev: pointer to the input device structure
  * @intr_pin: interrupt pin value
+ * @regulator: pointer to the Regulator used for touch screen
  *
  * Touch panel device data structure
  */
@@ -149,6 +151,7 @@ struct bu21013_ts_data {
         const struct bu21013_platform_device *chip;
         struct input_dev *in_dev;
         unsigned int intr_pin;
+        struct regulator *regulator;
 };
 
 /**
@@ -456,6 +459,20 @@ static int __devinit bu21013_probe(struct i2c_client *client,
         bu21013_data->in_dev = in_dev;
         bu21013_data->chip = pdata;
         bu21013_data->client = client;
+
+        bu21013_data->regulator = regulator_get(&client->dev, "V-TOUCH");
+        if (IS_ERR(bu21013_data->regulator)) {
+                dev_err(&client->dev, "regulator_get failed\n");
+                error = PTR_ERR(bu21013_data->regulator);
+                goto err_free_mem;
+        }
+
+        error = regulator_enable(bu21013_data->regulator);
+        if (error < 0) {
+                dev_err(&client->dev, "regulator enable failed\n");
+                goto err_put_regulator;
+        }
+
         bu21013_data->touch_stopped = false;
         init_waitqueue_head(&bu21013_data->wait);
 
@@ -464,7 +481,7 @@ static int __devinit bu21013_probe(struct i2c_client *client,
                 error = pdata->cs_en(pdata->cs_pin);
                 if (error < 0) {
                         dev_err(&client->dev, "chip init failed\n");
-                        goto err_free_mem;
+                        goto err_disable_regulator;
                 }
         }
 
@@ -485,9 +502,9 @@ static int __devinit bu21013_probe(struct i2c_client *client,
         __set_bit(EV_ABS, in_dev->evbit);
 
         input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
-                                                pdata->x_max_res, 0, 0);
+                                                pdata->touch_x_max, 0, 0);
         input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
-                                                pdata->y_max_res, 0, 0);
+                                                pdata->touch_y_max, 0, 0);
         input_set_drvdata(in_dev, bu21013_data);
 
         error = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
@@ -513,6 +530,10 @@ err_free_irq:
         bu21013_free_irq(bu21013_data);
 err_cs_disable:
         pdata->cs_dis(pdata->cs_pin);
+err_disable_regulator:
+        regulator_disable(bu21013_data->regulator);
+err_put_regulator:
+        regulator_put(bu21013_data->regulator);
 err_free_mem:
         input_free_device(in_dev);
         kfree(bu21013_data);
@@ -535,6 +556,10 @@ static int __devexit bu21013_remove(struct i2c_client *client)
         bu21013_data->chip->cs_dis(bu21013_data->chip->cs_pin);
 
         input_unregister_device(bu21013_data->in_dev);
+
+        regulator_disable(bu21013_data->regulator);
+        regulator_put(bu21013_data->regulator);
+
         kfree(bu21013_data);
 
         device_init_wakeup(&client->dev, false);
@@ -561,6 +586,8 @@ static int bu21013_suspend(struct device *dev)
         else
                 disable_irq(bu21013_data->chip->irq);
 
+        regulator_disable(bu21013_data->regulator);
+
         return 0;
 }
 
@@ -577,6 +604,12 @@ static int bu21013_resume(struct device *dev)
         struct i2c_client *client = bu21013_data->client;
         int retval;
 
+        retval = regulator_enable(bu21013_data->regulator);
+        if (retval < 0) {
+                dev_err(&client->dev, "bu21013 regulator enable failed\n");
+                return retval;
+        }
+
         retval = bu21013_init_chip(bu21013_data);
         if (retval < 0) {
                 dev_err(&client->dev, "bu21013 controller config failed\n");
diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
index cf1dba2e267c..22a3411e93c5 100644
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -289,9 +290,9 @@ static int __devinit tsc_probe(struct platform_device *pdev)
         }
 
         ts->clk = clk_get(dev, NULL);
-        if (!ts->clk) {
+        if (IS_ERR(ts->clk)) {
                 dev_err(dev, "cannot claim device clock\n");
-                error = -EINVAL;
+                error = PTR_ERR(ts->clk);
                 goto error_clk;
         }
 
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h
index 729df4089385..18b801ad97a4 100644
--- a/drivers/isdn/hysdn/hysdn_defs.h
+++ b/drivers/isdn/hysdn/hysdn_defs.h
@@ -227,7 +227,6 @@ extern hysdn_card *card_root;	/* pointer to first card */
 /*************************/
 /* im/exported functions */
 /*************************/
-extern char *hysdn_getrev(const char *);
 
 /* hysdn_procconf.c */
 extern int hysdn_procconf_init(void);   /* init proc config filesys */
@@ -259,7 +258,6 @@ extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *,
 
 /* hysdn_net.c */
 extern unsigned int hynet_enable; 
-extern char *hysdn_net_revision;
 extern int hysdn_net_create(hysdn_card *);      /* create a new net device */
 extern int hysdn_net_release(hysdn_card *);     /* delete the device */
 extern char *hysdn_net_getname(hysdn_card *);   /* get name of net interface */
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index b7cc5c2f08c6..0ab42ace1692 100644
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -36,7 +36,6 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for HYSDN cards");
 MODULE_AUTHOR("Werner Cornelius");
 MODULE_LICENSE("GPL");
 
-static char *hysdn_init_revision = "$Revision: 1.6.6.6 $";
 static int cardmax;             /* number of found cards */
 hysdn_card *card_root = NULL;   /* pointer to first card */
 static hysdn_card *card_last = NULL;    /* pointer to first card */
@@ -49,25 +48,6 @@ static hysdn_card *card_last = NULL;	/* pointer to first card */
 /* Additionally newer versions may be activated without rebooting.          */
 /****************************************************************************/
 
-/******************************************************/
-/* extract revision number from string for log output */
-/******************************************************/
-char *
-hysdn_getrev(const char *revision)
-{
-        char *rev;
-        char *p;
-
-        if ((p = strchr(revision, ':'))) {
-                rev = p + 2;
-                p = strchr(rev, '$');
-                *--p = 0;
-        } else
-                rev = "???";
-        return rev;
-}
-
-
 /****************************************************************************/
 /* init_module is called once when the module is loaded to do all necessary */
 /* things like autodetect...                                                */
@@ -175,13 +155,9 @@ static int hysdn_have_procfs;
 static int __init
 hysdn_init(void)
 {
-        char tmp[50];
         int rc;
 
-        strcpy(tmp, hysdn_init_revision);
-        printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp));
-        strcpy(tmp, hysdn_net_revision);
-        printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp));
+        printk(KERN_NOTICE "HYSDN: module loaded\n");
 
         rc = pci_register_driver(&hysdn_pci_driver);
         if (rc)
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index feec8d89d719..11f2cce26005 100644
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -26,9 +26,6 @@
 unsigned int hynet_enable = 0xffffffff; 
 module_param(hynet_enable, uint, 0);
 
-/* store the actual version for log reporting */
-char *hysdn_net_revision = "$Revision: 1.8.6.4 $";
-
 #define MAX_SKB_BUFFERS 20      /* number of buffers for keeping TX-data */
 
 /****************************************************************************/
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 96b3e39c3356..5fe83bd42061 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -23,7 +23,6 @@
 #include "hysdn_defs.h"
 
 static DEFINE_MUTEX(hysdn_conf_mutex);
-static char *hysdn_procconf_revision = "$Revision: 1.8.6.4 $";
 
 #define INFO_OUT_LEN 80         /* length of info line including lf */
 
@@ -404,7 +403,7 @@ hysdn_procconf_init(void)
                 card = card->next;      /* next entry */
         }
 
-        printk(KERN_NOTICE "HYSDN: procfs Rev. %s initialised\n", hysdn_getrev(hysdn_procconf_revision));
+        printk(KERN_NOTICE "HYSDN: procfs initialised\n");
         return (0);
 }                               /* hysdn_procconf_init */
 
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index f2b5bab5e6a1..1f355bb85e54 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1627,7 +1627,7 @@ __setup("icn=", icn_setup);
 static int __init icn_init(void)
 {
         char *p;
-        char rev[20];
+        char rev[21];
 
         memset(&dev, 0, sizeof(icn_dev));
         dev.memaddr = (membase & 0x0ffc000);
@@ -1638,6 +1638,7 @@ static int __init icn_init(void)
 
         if ((p = strchr(revision, ':'))) {
                 strncpy(rev, p + 1, 20);
+                rev[20] = '\0';
                 p = strchr(rev, '$');
                 if (p)
                         *p = 0;
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index da3fa8dcdf5b..666daf77872e 100644
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -69,6 +69,7 @@ static int led_pwm_probe(struct platform_device *pdev)
                 led_dat->pwm = pwm_request(cur_led->pwm_id,
                                 cur_led->name);
                 if (IS_ERR(led_dat->pwm)) {
+                        ret = PTR_ERR(led_dat->pwm);
                         dev_err(&pdev->dev, "unable to request PWM %d\n",
                                         cur_led->pwm_id);
                         goto err;
diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/ledtrig-gpio.c
index 991d93be0f44..ecc4bf3f37a9 100644
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/ledtrig-gpio.c
@@ -99,7 +99,7 @@ static ssize_t gpio_trig_inverted_show(struct device *dev,
         struct led_classdev *led = dev_get_drvdata(dev);
         struct gpio_trig_data *gpio_data = led->trigger_data;
 
-        return sprintf(buf, "%s\n", gpio_data->inverted ? "yes" : "no");
+        return sprintf(buf, "%u\n", gpio_data->inverted);
 }
 
 static ssize_t gpio_trig_inverted_store(struct device *dev,
@@ -107,16 +107,17 @@ static ssize_t gpio_trig_inverted_store(struct device *dev,
 {
         struct led_classdev *led = dev_get_drvdata(dev);
         struct gpio_trig_data *gpio_data = led->trigger_data;
-        unsigned inverted;
+        unsigned long inverted;
         int ret;
 
-        ret = sscanf(buf, "%u", &inverted);
-        if (ret < 1) {
-                dev_err(dev, "invalid value\n");
+        ret = strict_strtoul(buf, 10, &inverted);
+        if (ret < 0)
+                return ret;
+
+        if (inverted > 1)
                 return -EINVAL;
-        }
 
-        gpio_data->inverted = !!inverted;
+        gpio_data->inverted = inverted;
 
         /* After inverting, we need to update the LED. */
         schedule_work(&gpio_data->work);
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index 04b22128a474..d21578ee95de 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -1137,7 +1137,7 @@ void free_guest_pagetable(struct lguest *lg)
  */
 void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages)
 {
-        pte_t *switcher_pte_page = __get_cpu_var(switcher_pte_pages);
+        pte_t *switcher_pte_page = __this_cpu_read(switcher_pte_pages);
         pte_t regs_pte;
 
 #ifdef CONFIG_X86_PAE
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index b4eb675a807e..9f1659c3d1f3 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -90,8 +90,8 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
          * meanwhile).  If that's not the case, we pretend everything in the
          * Guest has changed.
          */
-        if (__get_cpu_var(lg_last_cpu) != cpu || cpu->last_pages != pages) {
-                __get_cpu_var(lg_last_cpu) = cpu;
+        if (__this_cpu_read(lg_last_cpu) != cpu || cpu->last_pages != pages) {
+                __this_cpu_write(lg_last_cpu, cpu);
                 cpu->last_pages = pages;
                 cpu->changed = CHANGED_ALL;
         }
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 2e041fd0a00c..f3a29f264db9 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -443,7 +443,7 @@ static int fan_read_reg(int reg, unsigned char *buf, int nb)
         tries = 0;
         for (;;) {
                 nr = i2c_master_recv(fcu, buf, nb);
-                if (nr > 0 || (nr < 0 && nr != ENODEV) || tries >= 100)
+                if (nr > 0 || (nr < 0 && nr != -ENODEV) || tries >= 100)
                         break;
                 msleep(10);
                 ++tries;
@@ -464,7 +464,7 @@ static int fan_write_reg(int reg, const unsigned char *ptr, int nb)
         tries = 0;
         for (;;) {
                 nw = i2c_master_send(fcu, buf, nb);
-                if (nw > 0 || (nw < 0 && nw != EIO) || tries >= 100)
+                if (nw > 0 || (nw < 0 && nw != -EIO) || tries >= 100)
                         break;
                 msleep(10);
                 ++tries;
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index bf1a95e31559..98d9ec85e0eb 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -240,6 +240,30 @@ config DM_MIRROR
          Allow volume managers to mirror logical volumes, also
          needed for live data migration tools such as 'pvmove'.
 
+config DM_RAID
+       tristate "RAID 4/5/6 target (EXPERIMENTAL)"
+       depends on BLK_DEV_DM && EXPERIMENTAL
+       select MD_RAID456
+       select BLK_DEV_MD
+       ---help---
+         A dm target that supports RAID4, RAID5 and RAID6 mappings
+
+         A RAID-5 set of N drives with a capacity of C MB per drive provides
+         the capacity of C * (N - 1) MB, and protects against a failure
+         of a single drive. For a given sector (row) number, (N - 1) drives
+         contain data sectors, and one drive contains the parity protection.
+         For a RAID-4 set, the parity blocks are present on a single drive,
+         while a RAID-5 set distributes the parity across the drives in one
+         of the available parity distribution methods.
+
+         A RAID-6 set of N drives with a capacity of C MB per drive
+         provides the capacity of C * (N - 2) MB, and protects
+         against a failure of any two drives. For a given sector
+         (row) number, (N - 2) drives contain data sectors, and two
+         drives contains two independent redundancy syndromes.  Like
+         RAID-5, RAID-6 distributes the syndromes across the drives
+         in one of the available parity distribution methods.
+
 config DM_LOG_USERSPACE
         tristate "Mirror userspace logging (EXPERIMENTAL)"
         depends on DM_MIRROR && EXPERIMENTAL && NET
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 5e3aac41919d..d0138606c2e8 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_DM_SNAPSHOT)	+= dm-snapshot.o
 obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o dm-log.o dm-region-hash.o
 obj-$(CONFIG_DM_LOG_USERSPACE)  += dm-log-userspace.o
 obj-$(CONFIG_DM_ZERO)           += dm-zero.o
+obj-$(CONFIG_DM_RAID)   += dm-raid.o
 
 ifeq ($(CONFIG_DM_UEVENT),y)
 dm-mod-objs                     += dm-uevent.o
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 5a1ffe3527aa..9a35320fb59f 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -210,11 +210,11 @@ static struct page *read_sb_page(mddev_t *mddev, loff_t offset,
                     || test_bit(Faulty, &rdev->flags))
                         continue;
 
-                target = rdev->sb_start + offset + index * (PAGE_SIZE/512);
+                target = offset + index * (PAGE_SIZE/512);
 
                 if (sync_page_io(rdev, target,
                                  roundup(size, bdev_logical_block_size(rdev->bdev)),
-                                 page, READ)) {
+                                 page, READ, true)) {
                         page->index = index;
                         attach_page_buffers(page, NULL); /* so that free_buffer will
                                                           * quietly no-op */
@@ -264,14 +264,18 @@ static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev)
 static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
 {
         mdk_rdev_t *rdev = NULL;
+        struct block_device *bdev;
         mddev_t *mddev = bitmap->mddev;
 
         while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
                 int size = PAGE_SIZE;
                 loff_t offset = mddev->bitmap_info.offset;
+
+                bdev = (rdev->meta_bdev) ? rdev->meta_bdev : rdev->bdev;
+
                 if (page->index == bitmap->file_pages-1)
                         size = roundup(bitmap->last_page_size,
-                                       bdev_logical_block_size(rdev->bdev));
+                                       bdev_logical_block_size(bdev));
                 /* Just make sure we aren't corrupting data or
                  * metadata
                  */
@@ -1542,7 +1546,7 @@ void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector)
         wait_event(bitmap->mddev->recovery_wait,
                    atomic_read(&bitmap->mddev->recovery_active) == 0);
 
-        bitmap->mddev->curr_resync_completed = bitmap->mddev->curr_resync;
+        bitmap->mddev->curr_resync_completed = sector;
         set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags);
         sector &= ~((1ULL << CHUNK_BLOCK_SHIFT(bitmap)) - 1);
         s = 0;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d5b0e4c0e702..4e054bd91664 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -18,10 +18,14 @@
 #include <linux/crypto.h>
 #include <linux/workqueue.h>
 #include <linux/backing-dev.h>
+#include <linux/percpu.h>
 #include <asm/atomic.h>
 #include <linux/scatterlist.h>
 #include <asm/page.h>
 #include <asm/unaligned.h>
+#include <crypto/hash.h>
+#include <crypto/md5.h>
+#include <crypto/algapi.h>
 
 #include <linux/device-mapper.h>
 
@@ -63,6 +67,7 @@ struct dm_crypt_request {
         struct convert_context *ctx;
         struct scatterlist sg_in;
         struct scatterlist sg_out;
+        sector_t iv_sector;
 };
 
 struct crypt_config;
@@ -73,11 +78,13 @@ struct crypt_iv_operations {
         void (*dtr)(struct crypt_config *cc);
         int (*init)(struct crypt_config *cc);
         int (*wipe)(struct crypt_config *cc);
-        int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
+        int (*generator)(struct crypt_config *cc, u8 *iv,
+                         struct dm_crypt_request *dmreq);
+        int (*post)(struct crypt_config *cc, u8 *iv,
+                    struct dm_crypt_request *dmreq);
 };
 
 struct iv_essiv_private {
-        struct crypto_cipher *tfm;
         struct crypto_hash *hash_tfm;
         u8 *salt;
 };
@@ -86,11 +93,32 @@ struct iv_benbi_private {
         int shift;
 };
 
+#define LMK_SEED_SIZE 64 /* hash + 0 */
+struct iv_lmk_private {
+        struct crypto_shash *hash_tfm;
+        u8 *seed;
+};
+
 /*
  * Crypt: maps a linear range of a block device
  * and encrypts / decrypts at the same time.
  */
 enum flags { DM_CRYPT_SUSPENDED, DM_CRYPT_KEY_VALID };
+
+/*
+ * Duplicated per-CPU state for cipher.
+ */
+struct crypt_cpu {
+        struct ablkcipher_request *req;
+        /* ESSIV: struct crypto_cipher *essiv_tfm */
+        void *iv_private;
+        struct crypto_ablkcipher *tfms[0];
+};
+
+/*
+ * The fields in here must be read only after initialization,
+ * changing state should be in crypt_cpu.
+ */
 struct crypt_config {
         struct dm_dev *dev;
         sector_t start;
@@ -108,17 +136,25 @@ struct crypt_config {
         struct workqueue_struct *crypt_queue;
 
         char *cipher;
-        char *cipher_mode;
+        char *cipher_string;
 
         struct crypt_iv_operations *iv_gen_ops;
         union {
                 struct iv_essiv_private essiv;
                 struct iv_benbi_private benbi;
+                struct iv_lmk_private lmk;
         } iv_gen_private;
         sector_t iv_offset;
         unsigned int iv_size;
 
         /*
+         * Duplicated per cpu state. Access through
+         * per_cpu_ptr() only.
+         */
+        struct crypt_cpu __percpu *cpu;
+        unsigned tfms_count;
+
+        /*
          * Layout of each crypto request:
          *
          *   struct ablkcipher_request
@@ -132,11 +168,10 @@ struct crypt_config {
          * correctly aligned.
          */
         unsigned int dmreq_start;
-        struct ablkcipher_request *req;
 
-        struct crypto_ablkcipher *tfm;
         unsigned long flags;
         unsigned int key_size;
+        unsigned int key_parts;
         u8 key[0];
 };
 
@@ -148,6 +183,20 @@ static struct kmem_cache *_crypt_io_pool;
 
 static void clone_init(struct dm_crypt_io *, struct bio *);
 static void kcryptd_queue_crypt(struct dm_crypt_io *io);
+static u8 *iv_of_dmreq(struct crypt_config *cc, struct dm_crypt_request *dmreq);
+
+static struct crypt_cpu *this_crypt_config(struct crypt_config *cc)
+{
+        return this_cpu_ptr(cc->cpu);
+}
+
+/*
+ * Use this to access cipher attributes that are the same for each CPU.
+ */
+static struct crypto_ablkcipher *any_tfm(struct crypt_config *cc)
+{
+        return __this_cpu_ptr(cc->cpu)->tfms[0];
+}
 
 /*
  * Different IV generation algorithms:
@@ -168,23 +217,38 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io);
  * null: the initial vector is always zero.  Provides compatibility with
  *       obsolete loop_fish2 devices.  Do not use for new devices.
  *
+ * lmk:  Compatible implementation of the block chaining mode used
+ *       by the Loop-AES block device encryption system
+ *       designed by Jari Ruusu. See http://loop-aes.sourceforge.net/
+ *       It operates on full 512 byte sectors and uses CBC
+ *       with an IV derived from the sector number, the data and
+ *       optionally extra IV seed.
+ *       This means that after decryption the first block
+ *       of sector must be tweaked according to decrypted data.
+ *       Loop-AES can use three encryption schemes:
+ *         version 1: is plain aes-cbc mode
+ *         version 2: uses 64 multikey scheme with lmk IV generator
+ *         version 3: the same as version 2 with additional IV seed
+ *                   (it uses 65 keys, last key is used as IV seed)
+ *
  * plumb: unimplemented, see:
  * http://article.gmane.org/gmane.linux.kernel.device-mapper.dm-crypt/454
  */
 
-static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
+static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv,
+                              struct dm_crypt_request *dmreq)
 {
         memset(iv, 0, cc->iv_size);
-        *(u32 *)iv = cpu_to_le32(sector & 0xffffffff);
+        *(u32 *)iv = cpu_to_le32(dmreq->iv_sector & 0xffffffff);
 
         return 0;
 }
 
 static int crypt_iv_plain64_gen(struct crypt_config *cc, u8 *iv,
-                                sector_t sector)
+                                struct dm_crypt_request *dmreq)
 {
         memset(iv, 0, cc->iv_size);
-        *(u64 *)iv = cpu_to_le64(sector);
+        *(u64 *)iv = cpu_to_le64(dmreq->iv_sector);
 
         return 0;
 }
@@ -195,7 +259,8 @@ static int crypt_iv_essiv_init(struct crypt_config *cc)
         struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
         struct hash_desc desc;
         struct scatterlist sg;
-        int err;
+        struct crypto_cipher *essiv_tfm;
+        int err, cpu;
 
         sg_init_one(&sg, cc->key, cc->key_size);
         desc.tfm = essiv->hash_tfm;
@@ -205,8 +270,16 @@ static int crypt_iv_essiv_init(struct crypt_config *cc)
         if (err)
                 return err;
 
-        return crypto_cipher_setkey(essiv->tfm, essiv->salt,
+        for_each_possible_cpu(cpu) {
+                essiv_tfm = per_cpu_ptr(cc->cpu, cpu)->iv_private,
+
+                err = crypto_cipher_setkey(essiv_tfm, essiv->salt,
                                     crypto_hash_digestsize(essiv->hash_tfm));
+                if (err)
+                        return err;
+        }
+
+        return 0;
 }
 
 /* Wipe salt and reset key derived from volume key */
@@ -214,24 +287,76 @@ static int crypt_iv_essiv_wipe(struct crypt_config *cc)
 {
         struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
         unsigned salt_size = crypto_hash_digestsize(essiv->hash_tfm);
+        struct crypto_cipher *essiv_tfm;
+        int cpu, r, err = 0;
 
         memset(essiv->salt, 0, salt_size);
 
-        return crypto_cipher_setkey(essiv->tfm, essiv->salt, salt_size);
+        for_each_possible_cpu(cpu) {
+                essiv_tfm = per_cpu_ptr(cc->cpu, cpu)->iv_private;
+                r = crypto_cipher_setkey(essiv_tfm, essiv->salt, salt_size);
+                if (r)
+                        err = r;
+        }
+
+        return err;
+}
+
+/* Set up per cpu cipher state */
+static struct crypto_cipher *setup_essiv_cpu(struct crypt_config *cc,
+                                             struct dm_target *ti,
+                                             u8 *salt, unsigned saltsize)
+{
+        struct crypto_cipher *essiv_tfm;
+        int err;
+
+        /* Setup the essiv_tfm with the given salt */
+        essiv_tfm = crypto_alloc_cipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);
+        if (IS_ERR(essiv_tfm)) {
+                ti->error = "Error allocating crypto tfm for ESSIV";
+                return essiv_tfm;
+        }
+
+        if (crypto_cipher_blocksize(essiv_tfm) !=
+            crypto_ablkcipher_ivsize(any_tfm(cc))) {
+                ti->error = "Block size of ESSIV cipher does "
+                            "not match IV size of block cipher";
+                crypto_free_cipher(essiv_tfm);
+                return ERR_PTR(-EINVAL);
+        }
+
+        err = crypto_cipher_setkey(essiv_tfm, salt, saltsize);
+        if (err) {
+                ti->error = "Failed to set key for ESSIV cipher";
+                crypto_free_cipher(essiv_tfm);
+                return ERR_PTR(err);
+        }
+
+        return essiv_tfm;
 }
 
 static void crypt_iv_essiv_dtr(struct crypt_config *cc)
 {
+        int cpu;
+        struct crypt_cpu *cpu_cc;
+        struct crypto_cipher *essiv_tfm;
         struct iv_essiv_private *essiv = &cc->iv_gen_private.essiv;
 
-        crypto_free_cipher(essiv->tfm);
-        essiv->tfm = NULL;
-
         crypto_free_hash(essiv->hash_tfm);
         essiv->hash_tfm = NULL;
 
         kzfree(essiv->salt);
         essiv->salt = NULL;
+
+        for_each_possible_cpu(cpu) {
+                cpu_cc = per_cpu_ptr(cc->cpu, cpu);
+                essiv_tfm = cpu_cc->iv_private;
+
+                if (essiv_tfm)
+                        crypto_free_cipher(essiv_tfm);
+
+                cpu_cc->iv_private = NULL;
+        }
 }
 
 static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
@@ -240,7 +365,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
         struct crypto_cipher *essiv_tfm = NULL;
         struct crypto_hash *hash_tfm = NULL;
         u8 *salt = NULL;
-        int err;
+        int err, cpu;
 
         if (!opts) {
                 ti->error = "Digest algorithm missing for ESSIV mode";
@@ -262,48 +387,44 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
                 goto bad;
         }
 
-        /* Allocate essiv_tfm */
-        essiv_tfm = crypto_alloc_cipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);
-        if (IS_ERR(essiv_tfm)) {
-                ti->error = "Error allocating crypto tfm for ESSIV";
-                err = PTR_ERR(essiv_tfm);
-                goto bad;
-        }
-        if (crypto_cipher_blocksize(essiv_tfm) !=
-            crypto_ablkcipher_ivsize(cc->tfm)) {
-                ti->error = "Block size of ESSIV cipher does "
-                            "not match IV size of block cipher";
-                err = -EINVAL;
-                goto bad;
-        }
-
         cc->iv_gen_private.essiv.salt = salt;
-        cc->iv_gen_private.essiv.tfm = essiv_tfm;
         cc->iv_gen_private.essiv.hash_tfm = hash_tfm;
 
+        for_each_possible_cpu(cpu) {
+                essiv_tfm = setup_essiv_cpu(cc, ti, salt,
+                                        crypto_hash_digestsize(hash_tfm));
+                if (IS_ERR(essiv_tfm)) {
+                        crypt_iv_essiv_dtr(cc);
+                        return PTR_ERR(essiv_tfm);
+                }
+                per_cpu_ptr(cc->cpu, cpu)->iv_private = essiv_tfm;
+        }
+
         return 0;
 
 bad:
-        if (essiv_tfm && !IS_ERR(essiv_tfm))
-                crypto_free_cipher(essiv_tfm);
         if (hash_tfm && !IS_ERR(hash_tfm))
                 crypto_free_hash(hash_tfm);
         kfree(salt);
         return err;
 }
 
-static int crypt_iv_essiv_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
+static int crypt_iv_essiv_gen(struct crypt_config *cc, u8 *iv,
+                              struct dm_crypt_request *dmreq)
 {
+        struct crypto_cipher *essiv_tfm = this_crypt_config(cc)->iv_private;
+
         memset(iv, 0, cc->iv_size);
-        *(u64 *)iv = cpu_to_le64(sector);
-        crypto_cipher_encrypt_one(cc->iv_gen_private.essiv.tfm, iv, iv);
+        *(u64 *)iv = cpu_to_le64(dmreq->iv_sector);
+        crypto_cipher_encrypt_one(essiv_tfm, iv, iv);
+
         return 0;
 }
 
 static int crypt_iv_benbi_ctr(struct crypt_config *cc, struct dm_target *ti,
                               const char *opts)
 {
-        unsigned bs = crypto_ablkcipher_blocksize(cc->tfm);
+        unsigned bs = crypto_ablkcipher_blocksize(any_tfm(cc));
         int log = ilog2(bs);
 
         /* we need to calculate how far we must shift the sector count
@@ -328,25 +449,177 @@ static void crypt_iv_benbi_dtr(struct crypt_config *cc)
 {
 }
 
-static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
+static int crypt_iv_benbi_gen(struct crypt_config *cc, u8 *iv,
+                              struct dm_crypt_request *dmreq)
 {
         __be64 val;
 
         memset(iv, 0, cc->iv_size - sizeof(u64)); /* rest is cleared below */
 
-        val = cpu_to_be64(((u64)sector << cc->iv_gen_private.benbi.shift) + 1);
+        val = cpu_to_be64(((u64)dmreq->iv_sector << cc->iv_gen_private.benbi.shift) + 1);
         put_unaligned(val, (__be64 *)(iv + cc->iv_size - sizeof(u64)));
 
         return 0;
 }
 
-static int crypt_iv_null_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
+static int crypt_iv_null_gen(struct crypt_config *cc, u8 *iv,
+                             struct dm_crypt_request *dmreq)
 {
         memset(iv, 0, cc->iv_size);
 
         return 0;
 }
 
+static void crypt_iv_lmk_dtr(struct crypt_config *cc)
+{
+        struct iv_lmk_private *lmk = &cc->iv_gen_private.lmk;
+
+        if (lmk->hash_tfm && !IS_ERR(lmk->hash_tfm))
+                crypto_free_shash(lmk->hash_tfm);
+        lmk->hash_tfm = NULL;
+
+        kzfree(lmk->seed);
+        lmk->seed = NULL;
+}
+
+static int crypt_iv_lmk_ctr(struct crypt_config *cc, struct dm_target *ti,
+                            const char *opts)
+{
+        struct iv_lmk_private *lmk = &cc->iv_gen_private.lmk;
+
+        lmk->hash_tfm = crypto_alloc_shash("md5", 0, 0);
+        if (IS_ERR(lmk->hash_tfm)) {
+                ti->error = "Error initializing LMK hash";
+                return PTR_ERR(lmk->hash_tfm);
+        }
+
+        /* No seed in LMK version 2 */
+        if (cc->key_parts == cc->tfms_count) {
+                lmk->seed = NULL;
+                return 0;
+        }
+
+        lmk->seed = kzalloc(LMK_SEED_SIZE, GFP_KERNEL);
+        if (!lmk->seed) {
+                crypt_iv_lmk_dtr(cc);
+                ti->error = "Error kmallocing seed storage in LMK";
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static int crypt_iv_lmk_init(struct crypt_config *cc)
+{
+        struct iv_lmk_private *lmk = &cc->iv_gen_private.lmk;
+        int subkey_size = cc->key_size / cc->key_parts;
+
+        /* LMK seed is on the position of LMK_KEYS + 1 key */
+        if (lmk->seed)
+                memcpy(lmk->seed, cc->key + (cc->tfms_count * subkey_size),
+                       crypto_shash_digestsize(lmk->hash_tfm));
+
+        return 0;
+}
+
+static int crypt_iv_lmk_wipe(struct crypt_config *cc)
+{
+        struct iv_lmk_private *lmk = &cc->iv_gen_private.lmk;
+
+        if (lmk->seed)
+                memset(lmk->seed, 0, LMK_SEED_SIZE);
+
+        return 0;
+}
+
+static int crypt_iv_lmk_one(struct crypt_config *cc, u8 *iv,
+                            struct dm_crypt_request *dmreq,
+                            u8 *data)
+{
+        struct iv_lmk_private *lmk = &cc->iv_gen_private.lmk;
+        struct {
+                struct shash_desc desc;
+                char ctx[crypto_shash_descsize(lmk->hash_tfm)];
+        } sdesc;
+        struct md5_state md5state;
+        u32 buf[4];
+        int i, r;
+
+        sdesc.desc.tfm = lmk->hash_tfm;
+        sdesc.desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        r = crypto_shash_init(&sdesc.desc);
+        if (r)
+                return r;
+
+        if (lmk->seed) {
+                r = crypto_shash_update(&sdesc.desc, lmk->seed, LMK_SEED_SIZE);
+                if (r)
+                        return r;
+        }
+
+        /* Sector is always 512B, block size 16, add data of blocks 1-31 */
+        r = crypto_shash_update(&sdesc.desc, data + 16, 16 * 31);
+        if (r)
+                return r;
+
+        /* Sector is cropped to 56 bits here */
+        buf[0] = cpu_to_le32(dmreq->iv_sector & 0xFFFFFFFF);
+        buf[1] = cpu_to_le32((((u64)dmreq->iv_sector >> 32) & 0x00FFFFFF) | 0x80000000);
+        buf[2] = cpu_to_le32(4024);
+        buf[3] = 0;
+        r = crypto_shash_update(&sdesc.desc, (u8 *)buf, sizeof(buf));
+        if (r)
+                return r;
+
+        /* No MD5 padding here */
+        r = crypto_shash_export(&sdesc.desc, &md5state);
+        if (r)
+                return r;
+
+        for (i = 0; i < MD5_HASH_WORDS; i++)
+                __cpu_to_le32s(&md5state.hash[i]);
+        memcpy(iv, &md5state.hash, cc->iv_size);
+
+        return 0;
+}
+
+static int crypt_iv_lmk_gen(struct crypt_config *cc, u8 *iv,
+                            struct dm_crypt_request *dmreq)
+{
+        u8 *src;
+        int r = 0;
+
+        if (bio_data_dir(dmreq->ctx->bio_in) == WRITE) {
+                src = kmap_atomic(sg_page(&dmreq->sg_in), KM_USER0);
+                r = crypt_iv_lmk_one(cc, iv, dmreq, src + dmreq->sg_in.offset);
+                kunmap_atomic(src, KM_USER0);
+        } else
+                memset(iv, 0, cc->iv_size);
+
+        return r;
+}
+
+static int crypt_iv_lmk_post(struct crypt_config *cc, u8 *iv,
+                             struct dm_crypt_request *dmreq)
+{
+        u8 *dst;
+        int r;
+
+        if (bio_data_dir(dmreq->ctx->bio_in) == WRITE)
+                return 0;
+
+        dst = kmap_atomic(sg_page(&dmreq->sg_out), KM_USER0);
+        r = crypt_iv_lmk_one(cc, iv, dmreq, dst + dmreq->sg_out.offset);
+
+        /* Tweak the first block of plaintext sector */
+        if (!r)
+                crypto_xor(dst + dmreq->sg_out.offset, iv, cc->iv_size);
+
+        kunmap_atomic(dst, KM_USER0);
+        return r;
+}
+
 static struct crypt_iv_operations crypt_iv_plain_ops = {
         .generator = crypt_iv_plain_gen
 };
@@ -373,6 +646,15 @@ static struct crypt_iv_operations crypt_iv_null_ops = {
         .generator = crypt_iv_null_gen
 };
 
+static struct crypt_iv_operations crypt_iv_lmk_ops = {
+        .ctr       = crypt_iv_lmk_ctr,
+        .dtr       = crypt_iv_lmk_dtr,
+        .init      = crypt_iv_lmk_init,
+        .wipe      = crypt_iv_lmk_wipe,
+        .generator = crypt_iv_lmk_gen,
+        .post      = crypt_iv_lmk_post
+};
+
 static void crypt_convert_init(struct crypt_config *cc,
                                struct convert_context *ctx,
                                struct bio *bio_out, struct bio *bio_in,
@@ -400,6 +682,13 @@ static struct ablkcipher_request *req_of_dmreq(struct crypt_config *cc,
         return (struct ablkcipher_request *)((char *)dmreq - cc->dmreq_start);
 }
 
+static u8 *iv_of_dmreq(struct crypt_config *cc,
+                       struct dm_crypt_request *dmreq)
+{
+        return (u8 *)ALIGN((unsigned long)(dmreq + 1),
+                crypto_ablkcipher_alignmask(any_tfm(cc)) + 1);
+}
+
 static int crypt_convert_block(struct crypt_config *cc,
                                struct convert_context *ctx,
                                struct ablkcipher_request *req)
@@ -411,9 +700,9 @@ static int crypt_convert_block(struct crypt_config *cc,
         int r = 0;
 
         dmreq = dmreq_of_req(cc, req);
-        iv = (u8 *)ALIGN((unsigned long)(dmreq + 1),
-                         crypto_ablkcipher_alignmask(cc->tfm) + 1);
+        iv = iv_of_dmreq(cc, dmreq);
 
+        dmreq->iv_sector = ctx->sector;
         dmreq->ctx = ctx;
         sg_init_table(&dmreq->sg_in, 1);
         sg_set_page(&dmreq->sg_in, bv_in->bv_page, 1 << SECTOR_SHIFT,
@@ -436,7 +725,7 @@ static int crypt_convert_block(struct crypt_config *cc,
         }
 
         if (cc->iv_gen_ops) {
-                r = cc->iv_gen_ops->generator(cc, iv, ctx->sector);
+                r = cc->iv_gen_ops->generator(cc, iv, dmreq);
                 if (r < 0)
                         return r;
         }
@@ -449,21 +738,28 @@ static int crypt_convert_block(struct crypt_config *cc,
         else
                 r = crypto_ablkcipher_decrypt(req);
 
+        if (!r && cc->iv_gen_ops && cc->iv_gen_ops->post)
+                r = cc->iv_gen_ops->post(cc, iv, dmreq);
+
         return r;
 }
 
 static void kcryptd_async_done(struct crypto_async_request *async_req,
                                int error);
+
 static void crypt_alloc_req(struct crypt_config *cc,
                             struct convert_context *ctx)
 {
-        if (!cc->req)
-                cc->req = mempool_alloc(cc->req_pool, GFP_NOIO);
-        ablkcipher_request_set_tfm(cc->req, cc->tfm);
-        ablkcipher_request_set_callback(cc->req, CRYPTO_TFM_REQ_MAY_BACKLOG |
-                                        CRYPTO_TFM_REQ_MAY_SLEEP,
-                                        kcryptd_async_done,
-                                        dmreq_of_req(cc, cc->req));
+        struct crypt_cpu *this_cc = this_crypt_config(cc);
+        unsigned key_index = ctx->sector & (cc->tfms_count - 1);
+
+        if (!this_cc->req)
+                this_cc->req = mempool_alloc(cc->req_pool, GFP_NOIO);
+
+        ablkcipher_request_set_tfm(this_cc->req, this_cc->tfms[key_index]);
+        ablkcipher_request_set_callback(this_cc->req,
+            CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
+            kcryptd_async_done, dmreq_of_req(cc, this_cc->req));
 }
 
 /*
@@ -472,6 +768,7 @@ static void crypt_alloc_req(struct crypt_config *cc,
 static int crypt_convert(struct crypt_config *cc,
                          struct convert_context *ctx)
 {
+        struct crypt_cpu *this_cc = this_crypt_config(cc);
         int r;
 
         atomic_set(&ctx->pending, 1);
@@ -483,7 +780,7 @@ static int crypt_convert(struct crypt_config *cc,
 
                 atomic_inc(&ctx->pending);
 
-                r = crypt_convert_block(cc, ctx, cc->req);
+                r = crypt_convert_block(cc, ctx, this_cc->req);
 
                 switch (r) {
                 /* async */
@@ -492,7 +789,7 @@ static int crypt_convert(struct crypt_config *cc,
                         INIT_COMPLETION(ctx->restart);
                         /* fall through*/
                 case -EINPROGRESS:
-                        cc->req = NULL;
+                        this_cc->req = NULL;
                         ctx->sector++;
                         continue;
 
@@ -651,6 +948,9 @@ static void crypt_dec_pending(struct dm_crypt_io *io)
  * They must be separated as otherwise the final stages could be
  * starved by new requests which can block in the first stages due
  * to memory allocation.
+ *
+ * The work is done per CPU global for all dm-crypt instances.
+ * They should not depend on each other and do not block.
  */
 static void crypt_endio(struct bio *clone, int error)
 {
@@ -691,26 +991,30 @@ static void clone_init(struct dm_crypt_io *io, struct bio *clone)
         clone->bi_destructor = dm_crypt_bio_destructor;
 }
 
-static void kcryptd_io_read(struct dm_crypt_io *io)
+static void kcryptd_unplug(struct crypt_config *cc)
+{
+        blk_unplug(bdev_get_queue(cc->dev->bdev));
+}
+
+static int kcryptd_io_read(struct dm_crypt_io *io, gfp_t gfp)
 {
         struct crypt_config *cc = io->target->private;
         struct bio *base_bio = io->base_bio;
         struct bio *clone;
 
-        crypt_inc_pending(io);
-
         /*
          * The block layer might modify the bvec array, so always
          * copy the required bvecs because we need the original
          * one in order to decrypt the whole bio data *afterwards*.
          */
-        clone = bio_alloc_bioset(GFP_NOIO, bio_segments(base_bio), cc->bs);
-        if (unlikely(!clone)) {
-                io->error = -ENOMEM;
-                crypt_dec_pending(io);
-                return;
+        clone = bio_alloc_bioset(gfp, bio_segments(base_bio), cc->bs);
+        if (!clone) {
+                kcryptd_unplug(cc);
+                return 1;
         }
 
+        crypt_inc_pending(io);
+
         clone_init(io, clone);
         clone->bi_idx = 0;
         clone->bi_vcnt = bio_segments(base_bio);
@@ -720,6 +1024,7 @@ static void kcryptd_io_read(struct dm_crypt_io *io)
                sizeof(struct bio_vec) * clone->bi_vcnt);
 
         generic_make_request(clone);
+        return 0;
 }
 
 static void kcryptd_io_write(struct dm_crypt_io *io)
@@ -732,9 +1037,12 @@ static void kcryptd_io(struct work_struct *work)
 {
         struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work);
 
-        if (bio_data_dir(io->base_bio) == READ)
-                kcryptd_io_read(io);
-        else
+        if (bio_data_dir(io->base_bio) == READ) {
+                crypt_inc_pending(io);
+                if (kcryptd_io_read(io, GFP_NOIO))
+                        io->error = -ENOMEM;
+                crypt_dec_pending(io);
+        } else
                 kcryptd_io_write(io);
 }
 
@@ -901,6 +1209,9 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
                 return;
         }
 
+        if (!error && cc->iv_gen_ops && cc->iv_gen_ops->post)
+                error = cc->iv_gen_ops->post(cc, iv_of_dmreq(cc, dmreq), dmreq);
+
         mempool_free(req_of_dmreq(cc, dmreq), cc->req_pool);
 
         if (!atomic_dec_and_test(&ctx->pending))
@@ -971,34 +1282,84 @@ static void crypt_encode_key(char *hex, u8 *key, unsigned int size)
         }
 }
 
-static int crypt_set_key(struct crypt_config *cc, char *key)
+static void crypt_free_tfms(struct crypt_config *cc, int cpu)
 {
-        unsigned key_size = strlen(key) >> 1;
+        struct crypt_cpu *cpu_cc = per_cpu_ptr(cc->cpu, cpu);
+        unsigned i;
 
-        if (cc->key_size && cc->key_size != key_size)
+        for (i = 0; i < cc->tfms_count; i++)
+                if (cpu_cc->tfms[i] && !IS_ERR(cpu_cc->tfms[i])) {
+                        crypto_free_ablkcipher(cpu_cc->tfms[i]);
+                        cpu_cc->tfms[i] = NULL;
+                }
+}
+
+static int crypt_alloc_tfms(struct crypt_config *cc, int cpu, char *ciphermode)
+{
+        struct crypt_cpu *cpu_cc = per_cpu_ptr(cc->cpu, cpu);
+        unsigned i;
+        int err;
+
+        for (i = 0; i < cc->tfms_count; i++) {
+                cpu_cc->tfms[i] = crypto_alloc_ablkcipher(ciphermode, 0, 0);
+                if (IS_ERR(cpu_cc->tfms[i])) {
+                        err = PTR_ERR(cpu_cc->tfms[i]);
+                        crypt_free_tfms(cc, cpu);
+                        return err;
+                }
+        }
+
+        return 0;
+}
+
+static int crypt_setkey_allcpus(struct crypt_config *cc)
+{
+        unsigned subkey_size = cc->key_size >> ilog2(cc->tfms_count);
+        int cpu, err = 0, i, r;
+
+        for_each_possible_cpu(cpu) {
+                for (i = 0; i < cc->tfms_count; i++) {
+                        r = crypto_ablkcipher_setkey(per_cpu_ptr(cc->cpu, cpu)->tfms[i],
+                                                     cc->key + (i * subkey_size), subkey_size);
+                        if (r)
+                                err = r;
+                }
+        }
+
+        return err;
+}
+
+static int crypt_set_key(struct crypt_config *cc, char *key)
+{
+        /* The key size may not be changed. */
+        if (cc->key_size != (strlen(key) >> 1))
                 return -EINVAL;
 
-        cc->key_size = key_size; /* initial settings */
+        /* Hyphen (which gives a key_size of zero) means there is no key. */
+        if (!cc->key_size && strcmp(key, "-"))
+                return -EINVAL;
 
-        if ((!key_size && strcmp(key, "-")) ||
-           (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
+        if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
                 return -EINVAL;
 
         set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
 
-        return crypto_ablkcipher_setkey(cc->tfm, cc->key, cc->key_size);
+        return crypt_setkey_allcpus(cc);
 }
 
 static int crypt_wipe_key(struct crypt_config *cc)
 {
         clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);
         memset(&cc->key, 0, cc->key_size * sizeof(u8));
-        return crypto_ablkcipher_setkey(cc->tfm, cc->key, cc->key_size);
+
+        return crypt_setkey_allcpus(cc);
 }
 
 static void crypt_dtr(struct dm_target *ti)
 {
         struct crypt_config *cc = ti->private;
+        struct crypt_cpu *cpu_cc;
+        int cpu;
 
         ti->private = NULL;
 
@@ -1010,6 +1371,14 @@ static void crypt_dtr(struct dm_target *ti)
         if (cc->crypt_queue)
                 destroy_workqueue(cc->crypt_queue);
 
+        if (cc->cpu)
+                for_each_possible_cpu(cpu) {
+                        cpu_cc = per_cpu_ptr(cc->cpu, cpu);
+                        if (cpu_cc->req)
+                                mempool_free(cpu_cc->req, cc->req_pool);
+                        crypt_free_tfms(cc, cpu);
+                }
+
         if (cc->bs)
                 bioset_free(cc->bs);
 
@@ -1023,14 +1392,14 @@ static void crypt_dtr(struct dm_target *ti)
         if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
                 cc->iv_gen_ops->dtr(cc);
 
-        if (cc->tfm && !IS_ERR(cc->tfm))
-                crypto_free_ablkcipher(cc->tfm);
-
         if (cc->dev)
                 dm_put_device(ti, cc->dev);
 
+        if (cc->cpu)
+                free_percpu(cc->cpu);
+
         kzfree(cc->cipher);
-        kzfree(cc->cipher_mode);
+        kzfree(cc->cipher_string);
 
         /* Must zero key material before freeing */
         kzfree(cc);
@@ -1040,9 +1409,9 @@ static int crypt_ctr_cipher(struct dm_target *ti,
                             char *cipher_in, char *key)
 {
         struct crypt_config *cc = ti->private;
-        char *tmp, *cipher, *chainmode, *ivmode, *ivopts;
+        char *tmp, *cipher, *chainmode, *ivmode, *ivopts, *keycount;
         char *cipher_api = NULL;
-        int ret = -EINVAL;
+        int cpu, ret = -EINVAL;
 
         /* Convert to crypto api definition? */
         if (strchr(cipher_in, '(')) {
@@ -1050,23 +1419,31 @@ static int crypt_ctr_cipher(struct dm_target *ti,
                 return -EINVAL;
         }
 
+        cc->cipher_string = kstrdup(cipher_in, GFP_KERNEL);
+        if (!cc->cipher_string)
+                goto bad_mem;
+
         /*
          * Legacy dm-crypt cipher specification
-         * cipher-mode-iv:ivopts
+         * cipher[:keycount]-mode-iv:ivopts
          */
         tmp = cipher_in;
-        cipher = strsep(&tmp, "-");
+        keycount = strsep(&tmp, "-");
+        cipher = strsep(&keycount, ":");
+
+        if (!keycount)
+                cc->tfms_count = 1;
+        else if (sscanf(keycount, "%u", &cc->tfms_count) != 1 ||
+                 !is_power_of_2(cc->tfms_count)) {
+                ti->error = "Bad cipher key count specification";
+                return -EINVAL;
+        }
+        cc->key_parts = cc->tfms_count;
 
         cc->cipher = kstrdup(cipher, GFP_KERNEL);
         if (!cc->cipher)
                 goto bad_mem;
 
-        if (tmp) {
-                cc->cipher_mode = kstrdup(tmp, GFP_KERNEL);
-                if (!cc->cipher_mode)
-                        goto bad_mem;
-        }
-
         chainmode = strsep(&tmp, "-");
         ivopts = strsep(&tmp, "-");
         ivmode = strsep(&ivopts, ":");
@@ -1074,10 +1451,19 @@ static int crypt_ctr_cipher(struct dm_target *ti,
         if (tmp)
                 DMWARN("Ignoring unexpected additional cipher options");
 
-        /* Compatibility mode for old dm-crypt mappings */
+        cc->cpu = __alloc_percpu(sizeof(*(cc->cpu)) +
+                                 cc->tfms_count * sizeof(*(cc->cpu->tfms)),
+                                 __alignof__(struct crypt_cpu));
+        if (!cc->cpu) {
+                ti->error = "Cannot allocate per cpu state";
+                goto bad_mem;
+        }
+
+        /*
+         * For compatibility with the original dm-crypt mapping format, if
+         * only the cipher name is supplied, use cbc-plain.
+         */
         if (!chainmode || (!strcmp(chainmode, "plain") && !ivmode)) {
-                kfree(cc->cipher_mode);
-                cc->cipher_mode = kstrdup("cbc-plain", GFP_KERNEL);
                 chainmode = "cbc";
                 ivmode = "plain";
         }
@@ -1099,11 +1485,12 @@ static int crypt_ctr_cipher(struct dm_target *ti,
         }
 
         /* Allocate cipher */
-        cc->tfm = crypto_alloc_ablkcipher(cipher_api, 0, 0);
-        if (IS_ERR(cc->tfm)) {
-                ret = PTR_ERR(cc->tfm);
-                ti->error = "Error allocating crypto tfm";
-                goto bad;
+        for_each_possible_cpu(cpu) {
+                ret = crypt_alloc_tfms(cc, cpu, cipher_api);
+                if (ret < 0) {
+                        ti->error = "Error allocating crypto tfm";
+                        goto bad;
+                }
         }
 
         /* Initialize and set key */
@@ -1114,7 +1501,7 @@ static int crypt_ctr_cipher(struct dm_target *ti,
         }
 
         /* Initialize IV */
-        cc->iv_size = crypto_ablkcipher_ivsize(cc->tfm);
+        cc->iv_size = crypto_ablkcipher_ivsize(any_tfm(cc));
         if (cc->iv_size)
                 /* at least a 64 bit sector number should fit in our buffer */
                 cc->iv_size = max(cc->iv_size,
@@ -1137,7 +1524,15 @@ static int crypt_ctr_cipher(struct dm_target *ti,
                 cc->iv_gen_ops = &crypt_iv_benbi_ops;
         else if (strcmp(ivmode, "null") == 0)
                 cc->iv_gen_ops = &crypt_iv_null_ops;
-        else {
+        else if (strcmp(ivmode, "lmk") == 0) {
+                cc->iv_gen_ops = &crypt_iv_lmk_ops;
+                /* Version 2 and 3 is recognised according
+                 * to length of provided multi-key string.
+                 * If present (version 3), last key is used as IV seed.
+                 */
+                if (cc->key_size % cc->key_parts)
+                        cc->key_parts++;
+        } else {
                 ret = -EINVAL;
                 ti->error = "Invalid IV mode";
                 goto bad;
@@ -1194,6 +1589,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 ti->error = "Cannot allocate encryption context";
                 return -ENOMEM;
         }
+        cc->key_size = key_size;
 
         ti->private = cc;
         ret = crypt_ctr_cipher(ti, argv[0], argv[1]);
@@ -1208,9 +1604,9 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
 
         cc->dmreq_start = sizeof(struct ablkcipher_request);
-        cc->dmreq_start += crypto_ablkcipher_reqsize(cc->tfm);
+        cc->dmreq_start += crypto_ablkcipher_reqsize(any_tfm(cc));
         cc->dmreq_start = ALIGN(cc->dmreq_start, crypto_tfm_ctx_alignment());
-        cc->dmreq_start += crypto_ablkcipher_alignmask(cc->tfm) &
+        cc->dmreq_start += crypto_ablkcipher_alignmask(any_tfm(cc)) &
                            ~(crypto_tfm_ctx_alignment() - 1);
 
         cc->req_pool = mempool_create_kmalloc_pool(MIN_IOS, cc->dmreq_start +
@@ -1219,7 +1615,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 ti->error = "Cannot allocate crypt request mempool";
                 goto bad;
         }
-        cc->req = NULL;
 
         cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
         if (!cc->page_pool) {
@@ -1252,13 +1647,20 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         cc->start = tmpll;
 
         ret = -ENOMEM;
-        cc->io_queue = create_singlethread_workqueue("kcryptd_io");
+        cc->io_queue = alloc_workqueue("kcryptd_io",
+                                       WQ_NON_REENTRANT|
+                                       WQ_MEM_RECLAIM,
+                                       1);
         if (!cc->io_queue) {
                 ti->error = "Couldn't create kcryptd io queue";
                 goto bad;
         }
 
-        cc->crypt_queue = create_singlethread_workqueue("kcryptd");
+        cc->crypt_queue = alloc_workqueue("kcryptd",
+                                          WQ_NON_REENTRANT|
+                                          WQ_CPU_INTENSIVE|
+                                          WQ_MEM_RECLAIM,
+                                          1);
         if (!cc->crypt_queue) {
                 ti->error = "Couldn't create kcryptd queue";
                 goto bad;
@@ -1286,9 +1688,10 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
 
         io = crypt_io_alloc(ti, bio, dm_target_offset(ti, bio->bi_sector));
 
-        if (bio_data_dir(io->base_bio) == READ)
-                kcryptd_queue_io(io);
-        else
+        if (bio_data_dir(io->base_bio) == READ) {
+                if (kcryptd_io_read(io, GFP_NOWAIT))
+                        kcryptd_queue_io(io);
+        } else
                 kcryptd_queue_crypt(io);
 
         return DM_MAPIO_SUBMITTED;
@@ -1306,10 +1709,7 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
                 break;
 
         case STATUSTYPE_TABLE:
-                if (cc->cipher_mode)
-                        DMEMIT("%s-%s ", cc->cipher, cc->cipher_mode);
-                else
-                        DMEMIT("%s ", cc->cipher);
+                DMEMIT("%s ", cc->cipher_string);
 
                 if (cc->key_size > 0) {
                         if ((maxlen - sz) < ((cc->key_size << 1) + 1))
@@ -1421,7 +1821,7 @@ static int crypt_iterate_devices(struct dm_target *ti,
 
 static struct target_type crypt_target = {
         .name   = "crypt",
-        .version = {1, 7, 0},
+        .version = {1, 10, 0},
         .module = THIS_MODULE,
         .ctr    = crypt_ctr,
         .dtr    = crypt_dtr,
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index baa11912cc94..f18375dcedd9 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -352,7 +352,7 @@ static int __init dm_delay_init(void)
 {
         int r = -ENOMEM;
 
-        kdelayd_wq = create_workqueue("kdelayd");
+        kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0);
         if (!kdelayd_wq) {
                 DMERR("Couldn't start kdelayd");
                 goto bad_queue;
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 4b54618b4159..6d12775a1061 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -295,19 +295,55 @@ retry:
                 DMWARN("remove_all left %d open device(s)", dev_skipped);
 }
 
+/*
+ * Set the uuid of a hash_cell that isn't already set.
+ */
+static void __set_cell_uuid(struct hash_cell *hc, char *new_uuid)
+{
+        mutex_lock(&dm_hash_cells_mutex);
+        hc->uuid = new_uuid;
+        mutex_unlock(&dm_hash_cells_mutex);
+
+        list_add(&hc->uuid_list, _uuid_buckets + hash_str(new_uuid));
+}
+
+/*
+ * Changes the name of a hash_cell and returns the old name for
+ * the caller to free.
+ */
+static char *__change_cell_name(struct hash_cell *hc, char *new_name)
+{
+        char *old_name;
+
+        /*
+         * Rename and move the name cell.
+         */
+        list_del(&hc->name_list);
+        old_name = hc->name;
+
+        mutex_lock(&dm_hash_cells_mutex);
+        hc->name = new_name;
+        mutex_unlock(&dm_hash_cells_mutex);
+
+        list_add(&hc->name_list, _name_buckets + hash_str(new_name));
+
+        return old_name;
+}
+
 static struct mapped_device *dm_hash_rename(struct dm_ioctl *param,
                                             const char *new)
 {
-        char *new_name, *old_name;
+        char *new_data, *old_name = NULL;
         struct hash_cell *hc;
         struct dm_table *table;
         struct mapped_device *md;
+        unsigned change_uuid = (param->flags & DM_UUID_FLAG) ? 1 : 0;
 
         /*
          * duplicate new.
          */
-        new_name = kstrdup(new, GFP_KERNEL);
-        if (!new_name)
+        new_data = kstrdup(new, GFP_KERNEL);
+        if (!new_data)
                 return ERR_PTR(-ENOMEM);
 
         down_write(&_hash_lock);
@@ -315,13 +351,19 @@ static struct mapped_device *dm_hash_rename(struct dm_ioctl *param,
         /*
          * Is new free ?
          */
-        hc = __get_name_cell(new);
+        if (change_uuid)
+                hc = __get_uuid_cell(new);
+        else
+                hc = __get_name_cell(new);
+
         if (hc) {
-                DMWARN("asked to rename to an already-existing name %s -> %s",
+                DMWARN("Unable to change %s on mapped device %s to one that "
+                       "already exists: %s",
+                       change_uuid ? "uuid" : "name",
                        param->name, new);
                 dm_put(hc->md);
                 up_write(&_hash_lock);
-                kfree(new_name);
+                kfree(new_data);
                 return ERR_PTR(-EBUSY);
         }
 
@@ -330,22 +372,30 @@ static struct mapped_device *dm_hash_rename(struct dm_ioctl *param,
          */
         hc = __get_name_cell(param->name);
         if (!hc) {
-                DMWARN("asked to rename a non-existent device %s -> %s",
-                       param->name, new);
+                DMWARN("Unable to rename non-existent device, %s to %s%s",
+                       param->name, change_uuid ? "uuid " : "", new);
                 up_write(&_hash_lock);
-                kfree(new_name);
+                kfree(new_data);
                 return ERR_PTR(-ENXIO);
         }
 
         /*
-         * rename and move the name cell.
+         * Does this device already have a uuid?
          */
-        list_del(&hc->name_list);
-        old_name = hc->name;
-        mutex_lock(&dm_hash_cells_mutex);
-        hc->name = new_name;
-        mutex_unlock(&dm_hash_cells_mutex);
-        list_add(&hc->name_list, _name_buckets + hash_str(new_name));
+        if (change_uuid && hc->uuid) {
+                DMWARN("Unable to change uuid of mapped device %s to %s "
+                       "because uuid is already set to %s",
+                       param->name, new, hc->uuid);
+                dm_put(hc->md);
+                up_write(&_hash_lock);
+                kfree(new_data);
+                return ERR_PTR(-EINVAL);
+        }
+
+        if (change_uuid)
+                __set_cell_uuid(hc, new_data);
+        else
+                old_name = __change_cell_name(hc, new_data);
 
         /*
          * Wake up any dm event waiters.
@@ -729,7 +779,7 @@ static int dev_remove(struct dm_ioctl *param, size_t param_size)
         hc = __find_device_hash_cell(param);
 
         if (!hc) {
-                DMWARN("device doesn't appear to be in the dev hash table.");
+                DMDEBUG_LIMIT("device doesn't appear to be in the dev hash table.");
                 up_write(&_hash_lock);
                 return -ENXIO;
         }
@@ -741,7 +791,7 @@ static int dev_remove(struct dm_ioctl *param, size_t param_size)
          */
         r = dm_lock_for_deletion(md);
         if (r) {
-                DMWARN("unable to remove open device %s", hc->name);
+                DMDEBUG_LIMIT("unable to remove open device %s", hc->name);
                 up_write(&_hash_lock);
                 dm_put(md);
                 return r;
@@ -774,21 +824,24 @@ static int invalid_str(char *str, void *end)
 static int dev_rename(struct dm_ioctl *param, size_t param_size)
 {
         int r;
-        char *new_name = (char *) param + param->data_start;
+        char *new_data = (char *) param + param->data_start;
         struct mapped_device *md;
+        unsigned change_uuid = (param->flags & DM_UUID_FLAG) ? 1 : 0;
 
-        if (new_name < param->data ||
-            invalid_str(new_name, (void *) param + param_size) ||
-            strlen(new_name) > DM_NAME_LEN - 1) {
-                DMWARN("Invalid new logical volume name supplied.");
+        if (new_data < param->data ||
+            invalid_str(new_data, (void *) param + param_size) ||
+            strlen(new_data) > (change_uuid ? DM_UUID_LEN - 1 : DM_NAME_LEN - 1)) {
+                DMWARN("Invalid new mapped device name or uuid string supplied.");
                 return -EINVAL;
         }
 
-        r = check_name(new_name);
-        if (r)
-                return r;
+        if (!change_uuid) {
+                r = check_name(new_data);
+                if (r)
+                        return r;
+        }
 
-        md = dm_hash_rename(param, new_name);
+        md = dm_hash_rename(param, new_data);
         if (IS_ERR(md))
                 return PTR_ERR(md);
 
@@ -885,7 +938,7 @@ static int do_resume(struct dm_ioctl *param)
 
         hc = __find_device_hash_cell(param);
         if (!hc) {
-                DMWARN("device doesn't appear to be in the dev hash table.");
+                DMDEBUG_LIMIT("device doesn't appear to be in the dev hash table.");
                 up_write(&_hash_lock);
                 return -ENXIO;
         }
@@ -1212,7 +1265,7 @@ static int table_clear(struct dm_ioctl *param, size_t param_size)
 
         hc = __find_device_hash_cell(param);
         if (!hc) {
-                DMWARN("device doesn't appear to be in the dev hash table.");
+                DMDEBUG_LIMIT("device doesn't appear to be in the dev hash table.");
                 up_write(&_hash_lock);
                 return -ENXIO;
         }
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index d8587bac5682..924f5f0084c2 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -37,6 +37,13 @@ struct dm_kcopyd_client {
         unsigned int nr_pages;
         unsigned int nr_free_pages;
 
+        /*
+         * Block devices to unplug.
+         * Non-NULL pointer means that a block device has some pending requests
+         * and needs to be unplugged.
+         */
+        struct block_device *unplug[2];
+
         struct dm_io_client *io_client;
 
         wait_queue_head_t destroyq;
@@ -308,6 +315,31 @@ static int run_complete_job(struct kcopyd_job *job)
         return 0;
 }
 
+/*
+ * Unplug the block device at the specified index.
+ */
+static void unplug(struct dm_kcopyd_client *kc, int rw)
+{
+        if (kc->unplug[rw] != NULL) {
+                blk_unplug(bdev_get_queue(kc->unplug[rw]));
+                kc->unplug[rw] = NULL;
+        }
+}
+
+/*
+ * Prepare block device unplug. If there's another device
+ * to be unplugged at the same array index, we unplug that
+ * device first.
+ */
+static void prepare_unplug(struct dm_kcopyd_client *kc, int rw,
+                           struct block_device *bdev)
+{
+        if (likely(kc->unplug[rw] == bdev))
+                return;
+        unplug(kc, rw);
+        kc->unplug[rw] = bdev;
+}
+
 static void complete_io(unsigned long error, void *context)
 {
         struct kcopyd_job *job = (struct kcopyd_job *) context;
@@ -345,7 +377,7 @@ static int run_io_job(struct kcopyd_job *job)
 {
         int r;
         struct dm_io_request io_req = {
-                .bi_rw = job->rw | REQ_SYNC | REQ_UNPLUG,
+                .bi_rw = job->rw,
                 .mem.type = DM_IO_PAGE_LIST,
                 .mem.ptr.pl = job->pages,
                 .mem.offset = job->offset,
@@ -354,10 +386,16 @@ static int run_io_job(struct kcopyd_job *job)
                 .client = job->kc->io_client,
         };
 
-        if (job->rw == READ)
+        if (job->rw == READ) {
                 r = dm_io(&io_req, 1, &job->source, NULL);
-        else
+                prepare_unplug(job->kc, READ, job->source.bdev);
+        } else {
+                if (job->num_dests > 1)
+                        io_req.bi_rw |= REQ_UNPLUG;
                 r = dm_io(&io_req, job->num_dests, job->dests, NULL);
+                if (!(io_req.bi_rw & REQ_UNPLUG))
+                        prepare_unplug(job->kc, WRITE, job->dests[0].bdev);
+        }
 
         return r;
 }
@@ -435,10 +473,18 @@ static void do_work(struct work_struct *work)
          * Pages jobs when successful will jump onto the io jobs
          * list.  io jobs call wake when they complete and it all
          * starts again.
+         *
+         * Note that io_jobs add block devices to the unplug array,
+         * this array is cleared with "unplug" calls. It is thus
+         * forbidden to run complete_jobs after io_jobs and before
+         * unplug because the block device could be destroyed in
+         * job completion callback.
          */
         process_jobs(&kc->complete_jobs, kc, run_complete_job);
         process_jobs(&kc->pages_jobs, kc, run_pages_job);
         process_jobs(&kc->io_jobs, kc, run_io_job);
+        unplug(kc, READ);
+        unplug(kc, WRITE);
 }
 
 /*
@@ -619,12 +665,15 @@ int dm_kcopyd_client_create(unsigned int nr_pages,
         INIT_LIST_HEAD(&kc->io_jobs);
         INIT_LIST_HEAD(&kc->pages_jobs);
 
+        memset(kc->unplug, 0, sizeof(kc->unplug));
+
         kc->job_pool = mempool_create_slab_pool(MIN_JOBS, _job_cache);
         if (!kc->job_pool)
                 goto bad_slab;
 
         INIT_WORK(&kc->kcopyd_work, do_work);
-        kc->kcopyd_wq = create_singlethread_workqueue("kcopyd");
+        kc->kcopyd_wq = alloc_workqueue("kcopyd",
+                                        WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
         if (!kc->kcopyd_wq)
                 goto bad_workqueue;
 
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c
index 1ed0094f064b..aa2e0c374ab3 100644
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
@@ -12,12 +12,22 @@
 
 #include "dm-log-userspace-transfer.h"
 
+#define DM_LOG_USERSPACE_VSN "1.1.0"
+
 struct flush_entry {
         int type;
         region_t region;
         struct list_head list;
 };
 
+/*
+ * This limit on the number of mark and clear request is, to a degree,
+ * arbitrary.  However, there is some basis for the choice in the limits
+ * imposed on the size of data payload by dm-log-userspace-transfer.c:
+ * dm_consult_userspace().
+ */
+#define MAX_FLUSH_GROUP_COUNT 32
+
 struct log_c {
         struct dm_target *ti;
         uint32_t region_size;
@@ -37,8 +47,15 @@ struct log_c {
          */
         uint64_t in_sync_hint;
 
+        /*
+         * Mark and clear requests are held until a flush is issued
+         * so that we can group, and thereby limit, the amount of
+         * network traffic between kernel and userspace.  The 'flush_lock'
+         * is used to protect these lists.
+         */
         spinlock_t flush_lock;
-        struct list_head flush_list;  /* only for clear and mark requests */
+        struct list_head mark_list;
+        struct list_head clear_list;
 };
 
 static mempool_t *flush_entry_pool;
@@ -169,7 +186,8 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
 
         strncpy(lc->uuid, argv[0], DM_UUID_LEN);
         spin_lock_init(&lc->flush_lock);
-        INIT_LIST_HEAD(&lc->flush_list);
+        INIT_LIST_HEAD(&lc->mark_list);
+        INIT_LIST_HEAD(&lc->clear_list);
 
         str_size = build_constructor_string(ti, argc - 1, argv + 1, &ctr_str);
         if (str_size < 0) {
@@ -181,8 +199,11 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
         r = dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_CTR,
                                  ctr_str, str_size, NULL, NULL);
 
-        if (r == -ESRCH) {
-                DMERR("Userspace log server not found");
+        if (r < 0) {
+                if (r == -ESRCH)
+                        DMERR("Userspace log server not found");
+                else
+                        DMERR("Userspace log server failed to create log");
                 goto out;
         }
 
@@ -214,10 +235,9 @@ out:
 
 static void userspace_dtr(struct dm_dirty_log *log)
 {
-        int r;
         struct log_c *lc = log->context;
 
-        r = dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_DTR,
+        (void) dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_DTR,
                                  NULL, 0,
                                  NULL, NULL);
 
@@ -338,6 +358,71 @@ static int userspace_in_sync(struct dm_dirty_log *log, region_t region,
         return (r) ? 0 : (int)in_sync;
 }
 
+static int flush_one_by_one(struct log_c *lc, struct list_head *flush_list)
+{
+        int r = 0;
+        struct flush_entry *fe;
+
+        list_for_each_entry(fe, flush_list, list) {
+                r = userspace_do_request(lc, lc->uuid, fe->type,
+                                         (char *)&fe->region,
+                                         sizeof(fe->region),
+                                         NULL, NULL);
+                if (r)
+                        break;
+        }
+
+        return r;
+}
+
+static int flush_by_group(struct log_c *lc, struct list_head *flush_list)
+{
+        int r = 0;
+        int count;
+        uint32_t type = 0;
+        struct flush_entry *fe, *tmp_fe;
+        LIST_HEAD(tmp_list);
+        uint64_t group[MAX_FLUSH_GROUP_COUNT];
+
+        /*
+         * Group process the requests
+         */
+        while (!list_empty(flush_list)) {
+                count = 0;
+
+                list_for_each_entry_safe(fe, tmp_fe, flush_list, list) {
+                        group[count] = fe->region;
+                        count++;
+
+                        list_del(&fe->list);
+                        list_add(&fe->list, &tmp_list);
+
+                        type = fe->type;
+                        if (count >= MAX_FLUSH_GROUP_COUNT)
+                                break;
+                }
+
+                r = userspace_do_request(lc, lc->uuid, type,
+                                         (char *)(group),
+                                         count * sizeof(uint64_t),
+                                         NULL, NULL);
+                if (r) {
+                        /* Group send failed.  Attempt one-by-one. */
+                        list_splice_init(&tmp_list, flush_list);
+                        r = flush_one_by_one(lc, flush_list);
+                        break;
+                }
+        }
+
+        /*
+         * Must collect flush_entrys that were successfully processed
+         * as a group so that they will be free'd by the caller.
+         */
+        list_splice_init(&tmp_list, flush_list);
+
+        return r;
+}
+
 /*
  * userspace_flush
  *
@@ -360,31 +445,25 @@ static int userspace_flush(struct dm_dirty_log *log)
         int r = 0;
         unsigned long flags;
         struct log_c *lc = log->context;
-        LIST_HEAD(flush_list);
+        LIST_HEAD(mark_list);
+        LIST_HEAD(clear_list);
         struct flush_entry *fe, *tmp_fe;
 
         spin_lock_irqsave(&lc->flush_lock, flags);
-        list_splice_init(&lc->flush_list, &flush_list);
+        list_splice_init(&lc->mark_list, &mark_list);
+        list_splice_init(&lc->clear_list, &clear_list);
         spin_unlock_irqrestore(&lc->flush_lock, flags);
 
-        if (list_empty(&flush_list))
+        if (list_empty(&mark_list) && list_empty(&clear_list))
                 return 0;
 
-        /*
-         * FIXME: Count up requests, group request types,
-         * allocate memory to stick all requests in and
-         * send to server in one go.  Failing the allocation,
-         * do it one by one.
-         */
+        r = flush_by_group(lc, &mark_list);
+        if (r)
+                goto fail;
 
-        list_for_each_entry(fe, &flush_list, list) {
-                r = userspace_do_request(lc, lc->uuid, fe->type,
-                                         (char *)&fe->region,
-                                         sizeof(fe->region),
-                                         NULL, NULL);
-                if (r)
-                        goto fail;
-        }
+        r = flush_by_group(lc, &clear_list);
+        if (r)
+                goto fail;
 
         r = userspace_do_request(lc, lc->uuid, DM_ULOG_FLUSH,
                                  NULL, 0, NULL, NULL);
@@ -395,7 +474,11 @@ fail:
          * Calling code will receive an error and will know that
          * the log facility has failed.
          */
-        list_for_each_entry_safe(fe, tmp_fe, &flush_list, list) {
+        list_for_each_entry_safe(fe, tmp_fe, &mark_list, list) {
+                list_del(&fe->list);
+                mempool_free(fe, flush_entry_pool);
+        }
+        list_for_each_entry_safe(fe, tmp_fe, &clear_list, list) {
                 list_del(&fe->list);
                 mempool_free(fe, flush_entry_pool);
         }
@@ -425,7 +508,7 @@ static void userspace_mark_region(struct dm_dirty_log *log, region_t region)
         spin_lock_irqsave(&lc->flush_lock, flags);
         fe->type = DM_ULOG_MARK_REGION;
         fe->region = region;
-        list_add(&fe->list, &lc->flush_list);
+        list_add(&fe->list, &lc->mark_list);
         spin_unlock_irqrestore(&lc->flush_lock, flags);
 
         return;
@@ -462,7 +545,7 @@ static void userspace_clear_region(struct dm_dirty_log *log, region_t region)
         spin_lock_irqsave(&lc->flush_lock, flags);
         fe->type = DM_ULOG_CLEAR_REGION;
         fe->region = region;
-        list_add(&fe->list, &lc->flush_list);
+        list_add(&fe->list, &lc->clear_list);
         spin_unlock_irqrestore(&lc->flush_lock, flags);
 
         return;
@@ -684,7 +767,7 @@ static int __init userspace_dirty_log_init(void)
                 return r;
         }
 
-        DMINFO("version 1.0.0 loaded");
+        DMINFO("version " DM_LOG_USERSPACE_VSN " loaded");
         return 0;
 }
 
@@ -694,7 +777,7 @@ static void __exit userspace_dirty_log_exit(void)
         dm_ulog_tfr_exit();
         mempool_destroy(flush_entry_pool);
 
-        DMINFO("version 1.0.0 unloaded");
+        DMINFO("version " DM_LOG_USERSPACE_VSN " unloaded");
         return;
 }
 
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c
index 075cbcf8a9f5..049eaf12aaab 100644
--- a/drivers/md/dm-log-userspace-transfer.c
+++ b/drivers/md/dm-log-userspace-transfer.c
@@ -198,6 +198,7 @@ resend:
 
         memset(tfr, 0, DM_ULOG_PREALLOCED_SIZE - sizeof(struct cn_msg));
         memcpy(tfr->uuid, uuid, DM_UUID_LEN);
+        tfr->version = DM_ULOG_REQUEST_VERSION;
         tfr->luid = luid;
         tfr->seq = dm_ulog_seq++;
 
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 33420e68d153..6951536ea29c 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -455,7 +455,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
                         r = PTR_ERR(lc->io_req.client);
                         DMWARN("couldn't allocate disk io client");
                         kfree(lc);
-                        return -ENOMEM;
+                        return r;
                 }
 
                 lc->disk_header = vmalloc(buf_size);
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 487ecda90ad4..b82d28819e2a 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -23,6 +23,8 @@
 
 #define DM_MSG_PREFIX "multipath"
 #define MESG_STR(x) x, sizeof(x)
+#define DM_PG_INIT_DELAY_MSECS 2000
+#define DM_PG_INIT_DELAY_DEFAULT ((unsigned) -1)
 
 /* Path properties */
 struct pgpath {
@@ -33,8 +35,7 @@ struct pgpath {
         unsigned fail_count;            /* Cumulative failure count */
 
         struct dm_path path;
-        struct work_struct deactivate_path;
-        struct work_struct activate_path;
+        struct delayed_work activate_path;
 };
 
 #define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, path)
@@ -65,11 +66,15 @@ struct multipath {
 
         const char *hw_handler_name;
         char *hw_handler_params;
+
         unsigned nr_priority_groups;
         struct list_head priority_groups;
+
+        wait_queue_head_t pg_init_wait; /* Wait for pg_init completion */
+
         unsigned pg_init_required;      /* pg_init needs calling? */
         unsigned pg_init_in_progress;   /* Only one pg_init allowed at once */
-        wait_queue_head_t pg_init_wait; /* Wait for pg_init completion */
+        unsigned pg_init_delay_retry;   /* Delay pg_init retry? */
 
         unsigned nr_valid_paths;        /* Total number of usable paths */
         struct pgpath *current_pgpath;
@@ -82,6 +87,7 @@ struct multipath {
         unsigned saved_queue_if_no_path;/* Saved state during suspension */
         unsigned pg_init_retries;       /* Number of times to retry pg_init */
         unsigned pg_init_count;         /* Number of times pg_init called */
+        unsigned pg_init_delay_msecs;   /* Number of msecs before pg_init retry */
 
         struct work_struct process_queued_ios;
         struct list_head queued_ios;
@@ -116,7 +122,6 @@ static struct workqueue_struct *kmultipathd, *kmpath_handlerd;
 static void process_queued_ios(struct work_struct *work);
 static void trigger_event(struct work_struct *work);
 static void activate_path(struct work_struct *work);
-static void deactivate_path(struct work_struct *work);
 
 
 /*-----------------------------------------------
@@ -129,8 +134,7 @@ static struct pgpath *alloc_pgpath(void)
 
         if (pgpath) {
                 pgpath->is_active = 1;
-                INIT_WORK(&pgpath->deactivate_path, deactivate_path);
-                INIT_WORK(&pgpath->activate_path, activate_path);
+                INIT_DELAYED_WORK(&pgpath->activate_path, activate_path);
         }
 
         return pgpath;
@@ -141,14 +145,6 @@ static void free_pgpath(struct pgpath *pgpath)
         kfree(pgpath);
 }
 
-static void deactivate_path(struct work_struct *work)
-{
-        struct pgpath *pgpath =
-                container_of(work, struct pgpath, deactivate_path);
-
-        blk_abort_queue(pgpath->path.dev->bdev->bd_disk->queue);
-}
-
 static struct priority_group *alloc_priority_group(void)
 {
         struct priority_group *pg;
@@ -199,6 +195,7 @@ static struct multipath *alloc_multipath(struct dm_target *ti)
                 INIT_LIST_HEAD(&m->queued_ios);
                 spin_lock_init(&m->lock);
                 m->queue_io = 1;
+                m->pg_init_delay_msecs = DM_PG_INIT_DELAY_DEFAULT;
                 INIT_WORK(&m->process_queued_ios, process_queued_ios);
                 INIT_WORK(&m->trigger_event, trigger_event);
                 init_waitqueue_head(&m->pg_init_wait);
@@ -238,14 +235,19 @@ static void free_multipath(struct multipath *m)
 static void __pg_init_all_paths(struct multipath *m)
 {
         struct pgpath *pgpath;
+        unsigned long pg_init_delay = 0;
 
         m->pg_init_count++;
         m->pg_init_required = 0;
+        if (m->pg_init_delay_retry)
+                pg_init_delay = msecs_to_jiffies(m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT ?
+                                                 m->pg_init_delay_msecs : DM_PG_INIT_DELAY_MSECS);
         list_for_each_entry(pgpath, &m->current_pg->pgpaths, list) {
                 /* Skip failed paths */
                 if (!pgpath->is_active)
                         continue;
-                if (queue_work(kmpath_handlerd, &pgpath->activate_path))
+                if (queue_delayed_work(kmpath_handlerd, &pgpath->activate_path,
+                                       pg_init_delay))
                         m->pg_init_in_progress++;
         }
 }
@@ -793,8 +795,9 @@ static int parse_features(struct arg_set *as, struct multipath *m)
         const char *param_name;
 
         static struct param _params[] = {
-                {0, 3, "invalid number of feature args"},
+                {0, 5, "invalid number of feature args"},
                 {1, 50, "pg_init_retries must be between 1 and 50"},
+                {0, 60000, "pg_init_delay_msecs must be between 0 and 60000"},
         };
 
         r = read_param(_params, shift(as), &argc, &ti->error);
@@ -821,6 +824,14 @@ static int parse_features(struct arg_set *as, struct multipath *m)
                         continue;
                 }
 
+                if (!strnicmp(param_name, MESG_STR("pg_init_delay_msecs")) &&
+                    (argc >= 1)) {
+                        r = read_param(_params + 2, shift(as),
+                                       &m->pg_init_delay_msecs, &ti->error);
+                        argc--;
+                        continue;
+                }
+
                 ti->error = "Unrecognised multipath feature request";
                 r = -EINVAL;
         } while (argc && !r);
@@ -931,7 +942,7 @@ static void flush_multipath_work(struct multipath *m)
         flush_workqueue(kmpath_handlerd);
         multipath_wait_for_pg_init_completion(m);
         flush_workqueue(kmultipathd);
-        flush_scheduled_work();
+        flush_work_sync(&m->trigger_event);
 }
 
 static void multipath_dtr(struct dm_target *ti)
@@ -995,7 +1006,6 @@ static int fail_path(struct pgpath *pgpath)
                       pgpath->path.dev->name, m->nr_valid_paths);
 
         schedule_work(&m->trigger_event);
-        queue_work(kmultipathd, &pgpath->deactivate_path);
 
 out:
         spin_unlock_irqrestore(&m->lock, flags);
@@ -1034,7 +1044,7 @@ static int reinstate_path(struct pgpath *pgpath)
                 m->current_pgpath = NULL;
                 queue_work(kmultipathd, &m->process_queued_ios);
         } else if (m->hw_handler_name && (m->current_pg == pgpath->pg)) {
-                if (queue_work(kmpath_handlerd, &pgpath->activate_path))
+                if (queue_work(kmpath_handlerd, &pgpath->activate_path.work))
                         m->pg_init_in_progress++;
         }
 
@@ -1169,6 +1179,7 @@ static void pg_init_done(void *data, int errors)
         struct priority_group *pg = pgpath->pg;
         struct multipath *m = pg->m;
         unsigned long flags;
+        unsigned delay_retry = 0;
 
         /* device or driver problems */
         switch (errors) {
@@ -1193,8 +1204,9 @@ static void pg_init_done(void *data, int errors)
                  */
                 bypass_pg(m, pg, 1);
                 break;
-        /* TODO: For SCSI_DH_RETRY we should wait a couple seconds */
         case SCSI_DH_RETRY:
+                /* Wait before retrying. */
+                delay_retry = 1;
         case SCSI_DH_IMM_RETRY:
         case SCSI_DH_RES_TEMP_UNAVAIL:
                 if (pg_init_limit_reached(m, pgpath))
@@ -1227,6 +1239,7 @@ static void pg_init_done(void *data, int errors)
         if (!m->pg_init_required)
                 m->queue_io = 0;
 
+        m->pg_init_delay_retry = delay_retry;
         queue_work(kmultipathd, &m->process_queued_ios);
 
         /*
@@ -1241,7 +1254,7 @@ out:
 static void activate_path(struct work_struct *work)
 {
         struct pgpath *pgpath =
-                container_of(work, struct pgpath, activate_path);
+                container_of(work, struct pgpath, activate_path.work);
 
         scsi_dh_activate(bdev_get_queue(pgpath->path.dev->bdev),
                                 pg_init_done, pgpath);
@@ -1382,11 +1395,14 @@ static int multipath_status(struct dm_target *ti, status_type_t type,
                 DMEMIT("2 %u %u ", m->queue_size, m->pg_init_count);
         else {
                 DMEMIT("%u ", m->queue_if_no_path +
-                              (m->pg_init_retries > 0) * 2);
+                              (m->pg_init_retries > 0) * 2 +
+                              (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT) * 2);
                 if (m->queue_if_no_path)
                         DMEMIT("queue_if_no_path ");
                 if (m->pg_init_retries)
                         DMEMIT("pg_init_retries %u ", m->pg_init_retries);
+                if (m->pg_init_delay_msecs != DM_PG_INIT_DELAY_DEFAULT)
+                        DMEMIT("pg_init_delay_msecs %u ", m->pg_init_delay_msecs);
         }
 
         if (!m->hw_handler_name || type == STATUSTYPE_INFO)
@@ -1655,7 +1671,7 @@ out:
  *---------------------------------------------------------------*/
 static struct target_type multipath_target = {
         .name = "multipath",
-        .version = {1, 1, 1},
+        .version = {1, 2, 0},
         .module = THIS_MODULE,
         .ctr = multipath_ctr,
         .dtr = multipath_dtr,
@@ -1687,7 +1703,7 @@ static int __init dm_multipath_init(void)
                 return -EINVAL;
         }
 
-        kmultipathd = create_workqueue("kmpathd");
+        kmultipathd = alloc_workqueue("kmpathd", WQ_MEM_RECLAIM, 0);
         if (!kmultipathd) {
                 DMERR("failed to create workqueue kmpathd");
                 dm_unregister_target(&multipath_target);
@@ -1701,7 +1717,8 @@ static int __init dm_multipath_init(void)
          * old workqueue would also create a bottleneck in the
          * path of the storage hardware device activation.
          */
-        kmpath_handlerd = create_singlethread_workqueue("kmpath_handlerd");
+        kmpath_handlerd = alloc_ordered_workqueue("kmpath_handlerd",
+                                                  WQ_MEM_RECLAIM);
         if (!kmpath_handlerd) {
                 DMERR("failed to create workqueue kmpath_handlerd");
                 destroy_workqueue(kmultipathd);
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
new file mode 100644
index 000000000000..b9e1e15ef11c
--- /dev/null
+++ b/drivers/md/dm-raid.c
@@ -0,0 +1,697 @@
+/*
+ * Copyright (C) 2010-2011 Neil Brown
+ * Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.
+ *
+ * This file is released under the GPL.
+ */
+
+#include <linux/slab.h>
+
+#include "md.h"
+#include "raid5.h"
+#include "dm.h"
+#include "bitmap.h"
+
+#define DM_MSG_PREFIX "raid"
+
+/*
+ * If the MD doesn't support MD_SYNC_STATE_FORCED yet, then
+ * make it so the flag doesn't set anything.
+ */
+#ifndef MD_SYNC_STATE_FORCED
+#define MD_SYNC_STATE_FORCED 0
+#endif
+
+struct raid_dev {
+        /*
+         * Two DM devices, one to hold metadata and one to hold the
+         * actual data/parity.  The reason for this is to not confuse
+         * ti->len and give more flexibility in altering size and
+         * characteristics.
+         *
+         * While it is possible for this device to be associated
+         * with a different physical device than the data_dev, it
+         * is intended for it to be the same.
+         *    |--------- Physical Device ---------|
+         *    |- meta_dev -|------ data_dev ------|
+         */
+        struct dm_dev *meta_dev;
+        struct dm_dev *data_dev;
+        struct mdk_rdev_s rdev;
+};
+
+/*
+ * Flags for rs->print_flags field.
+ */
+#define DMPF_DAEMON_SLEEP      0x1
+#define DMPF_MAX_WRITE_BEHIND  0x2
+#define DMPF_SYNC              0x4
+#define DMPF_NOSYNC            0x8
+#define DMPF_STRIPE_CACHE      0x10
+#define DMPF_MIN_RECOVERY_RATE 0x20
+#define DMPF_MAX_RECOVERY_RATE 0x40
+
+struct raid_set {
+        struct dm_target *ti;
+
+        uint64_t print_flags;
+
+        struct mddev_s md;
+        struct raid_type *raid_type;
+        struct dm_target_callbacks callbacks;
+
+        struct raid_dev dev[0];
+};
+
+/* Supported raid types and properties. */
+static struct raid_type {
+        const char *name;               /* RAID algorithm. */
+        const char *descr;              /* Descriptor text for logging. */
+        const unsigned parity_devs;     /* # of parity devices. */
+        const unsigned minimal_devs;    /* minimal # of devices in set. */
+        const unsigned level;           /* RAID level. */
+        const unsigned algorithm;       /* RAID algorithm. */
+} raid_types[] = {
+        {"raid4",    "RAID4 (dedicated parity disk)",   1, 2, 5, ALGORITHM_PARITY_0},
+        {"raid5_la", "RAID5 (left asymmetric)",         1, 2, 5, ALGORITHM_LEFT_ASYMMETRIC},
+        {"raid5_ra", "RAID5 (right asymmetric)",        1, 2, 5, ALGORITHM_RIGHT_ASYMMETRIC},
+        {"raid5_ls", "RAID5 (left symmetric)",          1, 2, 5, ALGORITHM_LEFT_SYMMETRIC},
+        {"raid5_rs", "RAID5 (right symmetric)",         1, 2, 5, ALGORITHM_RIGHT_SYMMETRIC},
+        {"raid6_zr", "RAID6 (zero restart)",            2, 4, 6, ALGORITHM_ROTATING_ZERO_RESTART},
+        {"raid6_nr", "RAID6 (N restart)",               2, 4, 6, ALGORITHM_ROTATING_N_RESTART},
+        {"raid6_nc", "RAID6 (N continue)",              2, 4, 6, ALGORITHM_ROTATING_N_CONTINUE}
+};
+
+static struct raid_type *get_raid_type(char *name)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(raid_types); i++)
+                if (!strcmp(raid_types[i].name, name))
+                        return &raid_types[i];
+
+        return NULL;
+}
+
+static struct raid_set *context_alloc(struct dm_target *ti, struct raid_type *raid_type, unsigned raid_devs)
+{
+        unsigned i;
+        struct raid_set *rs;
+        sector_t sectors_per_dev;
+
+        if (raid_devs <= raid_type->parity_devs) {
+                ti->error = "Insufficient number of devices";
+                return ERR_PTR(-EINVAL);
+        }
+
+        sectors_per_dev = ti->len;
+        if (sector_div(sectors_per_dev, (raid_devs - raid_type->parity_devs))) {
+                ti->error = "Target length not divisible by number of data devices";
+                return ERR_PTR(-EINVAL);
+        }
+
+        rs = kzalloc(sizeof(*rs) + raid_devs * sizeof(rs->dev[0]), GFP_KERNEL);
+        if (!rs) {
+                ti->error = "Cannot allocate raid context";
+                return ERR_PTR(-ENOMEM);
+        }
+
+        mddev_init(&rs->md);
+
+        rs->ti = ti;
+        rs->raid_type = raid_type;
+        rs->md.raid_disks = raid_devs;
+        rs->md.level = raid_type->level;
+        rs->md.new_level = rs->md.level;
+        rs->md.dev_sectors = sectors_per_dev;
+        rs->md.layout = raid_type->algorithm;
+        rs->md.new_layout = rs->md.layout;
+        rs->md.delta_disks = 0;
+        rs->md.recovery_cp = 0;
+
+        for (i = 0; i < raid_devs; i++)
+                md_rdev_init(&rs->dev[i].rdev);
+
+        /*
+         * Remaining items to be initialized by further RAID params:
+         *  rs->md.persistent
+         *  rs->md.external
+         *  rs->md.chunk_sectors
+         *  rs->md.new_chunk_sectors
+         */
+
+        return rs;
+}
+
+static void context_free(struct raid_set *rs)
+{
+        int i;
+
+        for (i = 0; i < rs->md.raid_disks; i++)
+                if (rs->dev[i].data_dev)
+                        dm_put_device(rs->ti, rs->dev[i].data_dev);
+
+        kfree(rs);
+}
+
+/*
+ * For every device we have two words
+ *  <meta_dev>: meta device name or '-' if missing
+ *  <data_dev>: data device name or '-' if missing
+ *
+ * This code parses those words.
+ */
+static int dev_parms(struct raid_set *rs, char **argv)
+{
+        int i;
+        int rebuild = 0;
+        int metadata_available = 0;
+        int ret = 0;
+
+        for (i = 0; i < rs->md.raid_disks; i++, argv += 2) {
+                rs->dev[i].rdev.raid_disk = i;
+
+                rs->dev[i].meta_dev = NULL;
+                rs->dev[i].data_dev = NULL;
+
+                /*
+                 * There are no offsets, since there is a separate device
+                 * for data and metadata.
+                 */
+                rs->dev[i].rdev.data_offset = 0;
+                rs->dev[i].rdev.mddev = &rs->md;
+
+                if (strcmp(argv[0], "-")) {
+                        rs->ti->error = "Metadata devices not supported";
+                        return -EINVAL;
+                }
+
+                if (!strcmp(argv[1], "-")) {
+                        if (!test_bit(In_sync, &rs->dev[i].rdev.flags) &&
+                            (!rs->dev[i].rdev.recovery_offset)) {
+                                rs->ti->error = "Drive designated for rebuild not specified";
+                                return -EINVAL;
+                        }
+
+                        continue;
+                }
+
+                ret = dm_get_device(rs->ti, argv[1],
+                                    dm_table_get_mode(rs->ti->table),
+                                    &rs->dev[i].data_dev);
+                if (ret) {
+                        rs->ti->error = "RAID device lookup failure";
+                        return ret;
+                }
+
+                rs->dev[i].rdev.bdev = rs->dev[i].data_dev->bdev;
+                list_add(&rs->dev[i].rdev.same_set, &rs->md.disks);
+                if (!test_bit(In_sync, &rs->dev[i].rdev.flags))
+                        rebuild++;
+        }
+
+        if (metadata_available) {
+                rs->md.external = 0;
+                rs->md.persistent = 1;
+                rs->md.major_version = 2;
+        } else if (rebuild && !rs->md.recovery_cp) {
+                /*
+                 * Without metadata, we will not be able to tell if the array
+                 * is in-sync or not - we must assume it is not.  Therefore,
+                 * it is impossible to rebuild a drive.
+                 *
+                 * Even if there is metadata, the on-disk information may
+                 * indicate that the array is not in-sync and it will then
+                 * fail at that time.
+                 *
+                 * User could specify 'nosync' option if desperate.
+                 */
+                DMERR("Unable to rebuild drive while array is not in-sync");
+                rs->ti->error = "RAID device lookup failure";
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * Possible arguments are...
+ * RAID456:
+ *      <chunk_size> [optional_args]
+ *
+ * Optional args:
+ *    [[no]sync]                        Force or prevent recovery of the entire array
+ *    [rebuild <idx>]                   Rebuild the drive indicated by the index
+ *    [daemon_sleep <ms>]               Time between bitmap daemon work to clear bits
+ *    [min_recovery_rate <kB/sec/disk>] Throttle RAID initialization
+ *    [max_recovery_rate <kB/sec/disk>] Throttle RAID initialization
+ *    [max_write_behind <sectors>]      See '-write-behind=' (man mdadm)
+ *    [stripe_cache <sectors>]          Stripe cache size for higher RAIDs
+ */
+static int parse_raid_params(struct raid_set *rs, char **argv,
+                             unsigned num_raid_params)
+{
+        unsigned i, rebuild_cnt = 0;
+        unsigned long value;
+        char *key;
+
+        /*
+         * First, parse the in-order required arguments
+         */
+        if ((strict_strtoul(argv[0], 10, &value) < 0) ||
+            !is_power_of_2(value) || (value < 8)) {
+                rs->ti->error = "Bad chunk size";
+                return -EINVAL;
+        }
+
+        rs->md.new_chunk_sectors = rs->md.chunk_sectors = value;
+        argv++;
+        num_raid_params--;
+
+        /*
+         * Second, parse the unordered optional arguments
+         */
+        for (i = 0; i < rs->md.raid_disks; i++)
+                set_bit(In_sync, &rs->dev[i].rdev.flags);
+
+        for (i = 0; i < num_raid_params; i++) {
+                if (!strcmp(argv[i], "nosync")) {
+                        rs->md.recovery_cp = MaxSector;
+                        rs->print_flags |= DMPF_NOSYNC;
+                        rs->md.flags |= MD_SYNC_STATE_FORCED;
+                        continue;
+                }
+                if (!strcmp(argv[i], "sync")) {
+                        rs->md.recovery_cp = 0;
+                        rs->print_flags |= DMPF_SYNC;
+                        rs->md.flags |= MD_SYNC_STATE_FORCED;
+                        continue;
+                }
+
+                /* The rest of the optional arguments come in key/value pairs */
+                if ((i + 1) >= num_raid_params) {
+                        rs->ti->error = "Wrong number of raid parameters given";
+                        return -EINVAL;
+                }
+
+                key = argv[i++];
+                if (strict_strtoul(argv[i], 10, &value) < 0) {
+                        rs->ti->error = "Bad numerical argument given in raid params";
+                        return -EINVAL;
+                }
+
+                if (!strcmp(key, "rebuild")) {
+                        if (++rebuild_cnt > rs->raid_type->parity_devs) {
+                                rs->ti->error = "Too many rebuild drives given";
+                                return -EINVAL;
+                        }
+                        if (value > rs->md.raid_disks) {
+                                rs->ti->error = "Invalid rebuild index given";
+                                return -EINVAL;
+                        }
+                        clear_bit(In_sync, &rs->dev[value].rdev.flags);
+                        rs->dev[value].rdev.recovery_offset = 0;
+                } else if (!strcmp(key, "max_write_behind")) {
+                        rs->print_flags |= DMPF_MAX_WRITE_BEHIND;
+
+                        /*
+                         * In device-mapper, we specify things in sectors, but
+                         * MD records this value in kB
+                         */
+                        value /= 2;
+                        if (value > COUNTER_MAX) {
+                                rs->ti->error = "Max write-behind limit out of range";
+                                return -EINVAL;
+                        }
+                        rs->md.bitmap_info.max_write_behind = value;
+                } else if (!strcmp(key, "daemon_sleep")) {
+                        rs->print_flags |= DMPF_DAEMON_SLEEP;
+                        if (!value || (value > MAX_SCHEDULE_TIMEOUT)) {
+                                rs->ti->error = "daemon sleep period out of range";
+                                return -EINVAL;
+                        }
+                        rs->md.bitmap_info.daemon_sleep = value;
+                } else if (!strcmp(key, "stripe_cache")) {
+                        rs->print_flags |= DMPF_STRIPE_CACHE;
+
+                        /*
+                         * In device-mapper, we specify things in sectors, but
+                         * MD records this value in kB
+                         */
+                        value /= 2;
+
+                        if (rs->raid_type->level < 5) {
+                                rs->ti->error = "Inappropriate argument: stripe_cache";
+                                return -EINVAL;
+                        }
+                        if (raid5_set_cache_size(&rs->md, (int)value)) {
+                                rs->ti->error = "Bad stripe_cache size";
+                                return -EINVAL;
+                        }
+                } else if (!strcmp(key, "min_recovery_rate")) {
+                        rs->print_flags |= DMPF_MIN_RECOVERY_RATE;
+                        if (value > INT_MAX) {
+                                rs->ti->error = "min_recovery_rate out of range";
+                                return -EINVAL;
+                        }
+                        rs->md.sync_speed_min = (int)value;
+                } else if (!strcmp(key, "max_recovery_rate")) {
+                        rs->print_flags |= DMPF_MAX_RECOVERY_RATE;
+                        if (value > INT_MAX) {
+                                rs->ti->error = "max_recovery_rate out of range";
+                                return -EINVAL;
+                        }
+                        rs->md.sync_speed_max = (int)value;
+                } else {
+                        DMERR("Unable to parse RAID parameter: %s", key);
+                        rs->ti->error = "Unable to parse RAID parameters";
+                        return -EINVAL;
+                }
+        }
+
+        /* Assume there are no metadata devices until the drives are parsed */
+        rs->md.persistent = 0;
+        rs->md.external = 1;
+
+        return 0;
+}
+
+static void do_table_event(struct work_struct *ws)
+{
+        struct raid_set *rs = container_of(ws, struct raid_set, md.event_work);
+
+        dm_table_event(rs->ti->table);
+}
+
+static int raid_is_congested(struct dm_target_callbacks *cb, int bits)
+{
+        struct raid_set *rs = container_of(cb, struct raid_set, callbacks);
+
+        return md_raid5_congested(&rs->md, bits);
+}
+
+static void raid_unplug(struct dm_target_callbacks *cb)
+{
+        struct raid_set *rs = container_of(cb, struct raid_set, callbacks);
+
+        md_raid5_unplug_device(rs->md.private);
+}
+
+/*
+ * Construct a RAID4/5/6 mapping:
+ * Args:
+ *      <raid_type> <#raid_params> <raid_params>                \
+ *      <#raid_devs> { <meta_dev1> <dev1> .. <meta_devN> <devN> }
+ *
+ * ** metadata devices are not supported yet, use '-' instead **
+ *
+ * <raid_params> varies by <raid_type>.  See 'parse_raid_params' for
+ * details on possible <raid_params>.
+ */
+static int raid_ctr(struct dm_target *ti, unsigned argc, char **argv)
+{
+        int ret;
+        struct raid_type *rt;
+        unsigned long num_raid_params, num_raid_devs;
+        struct raid_set *rs = NULL;
+
+        /* Must have at least <raid_type> <#raid_params> */
+        if (argc < 2) {
+                ti->error = "Too few arguments";
+                return -EINVAL;
+        }
+
+        /* raid type */
+        rt = get_raid_type(argv[0]);
+        if (!rt) {
+                ti->error = "Unrecognised raid_type";
+                return -EINVAL;
+        }
+        argc--;
+        argv++;
+
+        /* number of RAID parameters */
+        if (strict_strtoul(argv[0], 10, &num_raid_params) < 0) {
+                ti->error = "Cannot understand number of RAID parameters";
+                return -EINVAL;
+        }
+        argc--;
+        argv++;
+
+        /* Skip over RAID params for now and find out # of devices */
+        if (num_raid_params + 1 > argc) {
+                ti->error = "Arguments do not agree with counts given";
+                return -EINVAL;
+        }
+
+        if ((strict_strtoul(argv[num_raid_params], 10, &num_raid_devs) < 0) ||
+            (num_raid_devs >= INT_MAX)) {
+                ti->error = "Cannot understand number of raid devices";
+                return -EINVAL;
+        }
+
+        rs = context_alloc(ti, rt, (unsigned)num_raid_devs);
+        if (IS_ERR(rs))
+                return PTR_ERR(rs);
+
+        ret = parse_raid_params(rs, argv, (unsigned)num_raid_params);
+        if (ret)
+                goto bad;
+
+        ret = -EINVAL;
+
+        argc -= num_raid_params + 1; /* +1: we already have num_raid_devs */
+        argv += num_raid_params + 1;
+
+        if (argc != (num_raid_devs * 2)) {
+                ti->error = "Supplied RAID devices does not match the count given";
+                goto bad;
+        }
+
+        ret = dev_parms(rs, argv);
+        if (ret)
+                goto bad;
+
+        INIT_WORK(&rs->md.event_work, do_table_event);
+        ti->split_io = rs->md.chunk_sectors;
+        ti->private = rs;
+
+        mutex_lock(&rs->md.reconfig_mutex);
+        ret = md_run(&rs->md);
+        rs->md.in_sync = 0; /* Assume already marked dirty */
+        mutex_unlock(&rs->md.reconfig_mutex);
+
+        if (ret) {
+                ti->error = "Fail to run raid array";
+                goto bad;
+        }
+
+        rs->callbacks.congested_fn = raid_is_congested;
+        rs->callbacks.unplug_fn = raid_unplug;
+        dm_table_add_target_callbacks(ti->table, &rs->callbacks);
+
+        return 0;
+
+bad:
+        context_free(rs);
+
+        return ret;
+}
+
+static void raid_dtr(struct dm_target *ti)
+{
+        struct raid_set *rs = ti->private;
+
+        list_del_init(&rs->callbacks.list);
+        md_stop(&rs->md);
+        context_free(rs);
+}
+
+static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context)
+{
+        struct raid_set *rs = ti->private;
+        mddev_t *mddev = &rs->md;
+
+        mddev->pers->make_request(mddev, bio);
+
+        return DM_MAPIO_SUBMITTED;
+}
+
+static int raid_status(struct dm_target *ti, status_type_t type,
+                       char *result, unsigned maxlen)
+{
+        struct raid_set *rs = ti->private;
+        unsigned raid_param_cnt = 1; /* at least 1 for chunksize */
+        unsigned sz = 0;
+        int i;
+        sector_t sync;
+
+        switch (type) {
+        case STATUSTYPE_INFO:
+                DMEMIT("%s %d ", rs->raid_type->name, rs->md.raid_disks);
+
+                for (i = 0; i < rs->md.raid_disks; i++) {
+                        if (test_bit(Faulty, &rs->dev[i].rdev.flags))
+                                DMEMIT("D");
+                        else if (test_bit(In_sync, &rs->dev[i].rdev.flags))
+                                DMEMIT("A");
+                        else
+                                DMEMIT("a");
+                }
+
+                if (test_bit(MD_RECOVERY_RUNNING, &rs->md.recovery))
+                        sync = rs->md.curr_resync_completed;
+                else
+                        sync = rs->md.recovery_cp;
+
+                if (sync > rs->md.resync_max_sectors)
+                        sync = rs->md.resync_max_sectors;
+
+                DMEMIT(" %llu/%llu",
+                       (unsigned long long) sync,
+                       (unsigned long long) rs->md.resync_max_sectors);
+
+                break;
+        case STATUSTYPE_TABLE:
+                /* The string you would use to construct this array */
+                for (i = 0; i < rs->md.raid_disks; i++)
+                        if (rs->dev[i].data_dev &&
+                            !test_bit(In_sync, &rs->dev[i].rdev.flags))
+                                raid_param_cnt++; /* for rebuilds */
+
+                raid_param_cnt += (hweight64(rs->print_flags) * 2);
+                if (rs->print_flags & (DMPF_SYNC | DMPF_NOSYNC))
+                        raid_param_cnt--;
+
+                DMEMIT("%s %u %u", rs->raid_type->name,
+                       raid_param_cnt, rs->md.chunk_sectors);
+
+                if ((rs->print_flags & DMPF_SYNC) &&
+                    (rs->md.recovery_cp == MaxSector))
+                        DMEMIT(" sync");
+                if (rs->print_flags & DMPF_NOSYNC)
+                        DMEMIT(" nosync");
+
+                for (i = 0; i < rs->md.raid_disks; i++)
+                        if (rs->dev[i].data_dev &&
+                            !test_bit(In_sync, &rs->dev[i].rdev.flags))
+                                DMEMIT(" rebuild %u", i);
+
+                if (rs->print_flags & DMPF_DAEMON_SLEEP)
+                        DMEMIT(" daemon_sleep %lu",
+                               rs->md.bitmap_info.daemon_sleep);
+
+                if (rs->print_flags & DMPF_MIN_RECOVERY_RATE)
+                        DMEMIT(" min_recovery_rate %d", rs->md.sync_speed_min);
+
+                if (rs->print_flags & DMPF_MAX_RECOVERY_RATE)
+                        DMEMIT(" max_recovery_rate %d", rs->md.sync_speed_max);
+
+                if (rs->print_flags & DMPF_MAX_WRITE_BEHIND)
+                        DMEMIT(" max_write_behind %lu",
+                               rs->md.bitmap_info.max_write_behind);
+
+                if (rs->print_flags & DMPF_STRIPE_CACHE) {
+                        raid5_conf_t *conf = rs->md.private;
+
+                        /* convert from kiB to sectors */
+                        DMEMIT(" stripe_cache %d",
+                               conf ? conf->max_nr_stripes * 2 : 0);
+                }
+
+                DMEMIT(" %d", rs->md.raid_disks);
+                for (i = 0; i < rs->md.raid_disks; i++) {
+                        DMEMIT(" -"); /* metadata device */
+
+                        if (rs->dev[i].data_dev)
+                                DMEMIT(" %s", rs->dev[i].data_dev->name);
+                        else
+                                DMEMIT(" -");
+                }
+        }
+
+        return 0;
+}
+
+static int raid_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data)
+{
+        struct raid_set *rs = ti->private;
+        unsigned i;
+        int ret = 0;
+
+        for (i = 0; !ret && i < rs->md.raid_disks; i++)
+                if (rs->dev[i].data_dev)
+                        ret = fn(ti,
+                                 rs->dev[i].data_dev,
+                                 0, /* No offset on data devs */
+                                 rs->md.dev_sectors,
+                                 data);
+
+        return ret;
+}
+
+static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits)
+{
+        struct raid_set *rs = ti->private;
+        unsigned chunk_size = rs->md.chunk_sectors << 9;
+        raid5_conf_t *conf = rs->md.private;
+
+        blk_limits_io_min(limits, chunk_size);
+        blk_limits_io_opt(limits, chunk_size * (conf->raid_disks - conf->max_degraded));
+}
+
+static void raid_presuspend(struct dm_target *ti)
+{
+        struct raid_set *rs = ti->private;
+
+        md_stop_writes(&rs->md);
+}
+
+static void raid_postsuspend(struct dm_target *ti)
+{
+        struct raid_set *rs = ti->private;
+
+        mddev_suspend(&rs->md);
+}
+
+static void raid_resume(struct dm_target *ti)
+{
+        struct raid_set *rs = ti->private;
+
+        mddev_resume(&rs->md);
+}
+
+static struct target_type raid_target = {
+        .name = "raid",
+        .version = {1, 0, 0},
+        .module = THIS_MODULE,
+        .ctr = raid_ctr,
+        .dtr = raid_dtr,
+        .map = raid_map,
+        .status = raid_status,
+        .iterate_devices = raid_iterate_devices,
+        .io_hints = raid_io_hints,
+        .presuspend = raid_presuspend,
+        .postsuspend = raid_postsuspend,
+        .resume = raid_resume,
+};
+
+static int __init dm_raid_init(void)
+{
+        return dm_register_target(&raid_target);
+}
+
+static void __exit dm_raid_exit(void)
+{
+        dm_unregister_target(&raid_target);
+}
+
+module_init(dm_raid_init);
+module_exit(dm_raid_exit);
+
+MODULE_DESCRIPTION(DM_NAME " raid4/5/6 target");
+MODULE_ALIAS("dm-raid4");
+MODULE_ALIAS("dm-raid5");
+MODULE_ALIAS("dm-raid6");
+MODULE_AUTHOR("Neil Brown <dm-devel@redhat.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 19a59b041c27..dee326775c60 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -261,7 +261,7 @@ static int mirror_flush(struct dm_target *ti)
         struct dm_io_request io_req = {
                 .bi_rw = WRITE_FLUSH,
                 .mem.type = DM_IO_KMEM,
-                .mem.ptr.bvec = NULL,
+                .mem.ptr.addr = NULL,
                 .client = ms->io_client,
         };
 
@@ -637,6 +637,12 @@ static void do_write(struct mirror_set *ms, struct bio *bio)
                 .client = ms->io_client,
         };
 
+        if (bio->bi_rw & REQ_DISCARD) {
+                io_req.bi_rw |= REQ_DISCARD;
+                io_req.mem.type = DM_IO_KMEM;
+                io_req.mem.ptr.addr = NULL;
+        }
+
         for (i = 0, m = ms->mirror; i < ms->nr_mirrors; i++, m++)
                 map_region(dest++, m, bio);
 
@@ -670,7 +676,8 @@ static void do_writes(struct mirror_set *ms, struct bio_list *writes)
         bio_list_init(&requeue);
 
         while ((bio = bio_list_pop(writes))) {
-                if (bio->bi_rw & REQ_FLUSH) {
+                if ((bio->bi_rw & REQ_FLUSH) ||
+                    (bio->bi_rw & REQ_DISCARD)) {
                         bio_list_add(&sync, bio);
                         continue;
                 }
@@ -1076,8 +1083,10 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         ti->private = ms;
         ti->split_io = dm_rh_get_region_size(ms->rh);
         ti->num_flush_requests = 1;
+        ti->num_discard_requests = 1;
 
-        ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
+        ms->kmirrord_wq = alloc_workqueue("kmirrord",
+                                          WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
         if (!ms->kmirrord_wq) {
                 DMERR("couldn't start kmirrord");
                 r = -ENOMEM;
@@ -1130,7 +1139,7 @@ static void mirror_dtr(struct dm_target *ti)
 
         del_timer_sync(&ms->timer);
         flush_workqueue(ms->kmirrord_wq);
-        flush_scheduled_work();
+        flush_work_sync(&ms->trigger_event);
         dm_kcopyd_client_destroy(ms->kcopyd_client);
         destroy_workqueue(ms->kmirrord_wq);
         free_context(ms, ti, ms->nr_mirrors);
@@ -1406,7 +1415,7 @@ static int mirror_iterate_devices(struct dm_target *ti,
 
 static struct target_type mirror_target = {
         .name    = "mirror",
-        .version = {1, 12, 0},
+        .version = {1, 12, 1},
         .module  = THIS_MODULE,
         .ctr     = mirror_ctr,
         .dtr     = mirror_dtr,
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 2129cdb115dc..95891dfcbca0 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -256,7 +256,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int rw,
          */
         INIT_WORK_ONSTACK(&req.work, do_metadata);
         queue_work(ps->metadata_wq, &req.work);
-        flush_workqueue(ps->metadata_wq);
+        flush_work(&req.work);
 
         return req.result;
 }
@@ -818,7 +818,7 @@ static int persistent_ctr(struct dm_exception_store *store,
         atomic_set(&ps->pending_count, 0);
         ps->callbacks = NULL;
 
-        ps->metadata_wq = create_singlethread_workqueue("ksnaphd");
+        ps->metadata_wq = alloc_workqueue("ksnaphd", WQ_MEM_RECLAIM, 0);
         if (!ps->metadata_wq) {
                 kfree(ps);
                 DMERR("couldn't start header metadata update thread");
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 53cf79d8bcbc..fdde53cd12b7 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -19,7 +19,6 @@
 #include <linux/vmalloc.h>
 #include <linux/log2.h>
 #include <linux/dm-kcopyd.h>
-#include <linux/workqueue.h>
 
 #include "dm-exception-store.h"
 
@@ -80,9 +79,6 @@ struct dm_snapshot {
         /* Origin writes don't trigger exceptions until this is set */
         int active;
 
-        /* Whether or not owning mapped_device is suspended */
-        int suspended;
-
         atomic_t pending_exceptions_count;
 
         mempool_t *pending_pool;
@@ -106,10 +102,6 @@ struct dm_snapshot {
 
         struct dm_kcopyd_client *kcopyd_client;
 
-        /* Queue of snapshot writes for ksnapd to flush */
-        struct bio_list queued_bios;
-        struct work_struct queued_bios_work;
-
         /* Wait for events based on state_bits */
         unsigned long state_bits;
 
@@ -160,9 +152,6 @@ struct dm_dev *dm_snap_cow(struct dm_snapshot *s)
 }
 EXPORT_SYMBOL(dm_snap_cow);
 
-static struct workqueue_struct *ksnapd;
-static void flush_queued_bios(struct work_struct *work);
-
 static sector_t chunk_to_sector(struct dm_exception_store *store,
                                 chunk_t chunk)
 {
@@ -1110,7 +1099,6 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         s->ti = ti;
         s->valid = 1;
         s->active = 0;
-        s->suspended = 0;
         atomic_set(&s->pending_exceptions_count, 0);
         init_rwsem(&s->lock);
         INIT_LIST_HEAD(&s->list);
@@ -1153,9 +1141,6 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         spin_lock_init(&s->tracked_chunk_lock);
 
-        bio_list_init(&s->queued_bios);
-        INIT_WORK(&s->queued_bios_work, flush_queued_bios);
-
         ti->private = s;
         ti->num_flush_requests = num_flush_requests;
 
@@ -1279,8 +1264,6 @@ static void snapshot_dtr(struct dm_target *ti)
         struct dm_snapshot *s = ti->private;
         struct dm_snapshot *snap_src = NULL, *snap_dest = NULL;
 
-        flush_workqueue(ksnapd);
-
         down_read(&_origins_lock);
         /* Check whether exception handover must be cancelled */
         (void) __find_snapshots_sharing_cow(s, &snap_src, &snap_dest, NULL);
@@ -1342,20 +1325,6 @@ static void flush_bios(struct bio *bio)
         }
 }
 
-static void flush_queued_bios(struct work_struct *work)
-{
-        struct dm_snapshot *s =
-                container_of(work, struct dm_snapshot, queued_bios_work);
-        struct bio *queued_bios;
-        unsigned long flags;
-
-        spin_lock_irqsave(&s->pe_lock, flags);
-        queued_bios = bio_list_get(&s->queued_bios);
-        spin_unlock_irqrestore(&s->pe_lock, flags);
-
-        flush_bios(queued_bios);
-}
-
 static int do_origin(struct dm_dev *origin, struct bio *bio);
 
 /*
@@ -1760,15 +1729,6 @@ static void snapshot_merge_presuspend(struct dm_target *ti)
         stop_merge(s);
 }
 
-static void snapshot_postsuspend(struct dm_target *ti)
-{
-        struct dm_snapshot *s = ti->private;
-
-        down_write(&s->lock);
-        s->suspended = 1;
-        up_write(&s->lock);
-}
-
 static int snapshot_preresume(struct dm_target *ti)
 {
         int r = 0;
@@ -1783,7 +1743,7 @@ static int snapshot_preresume(struct dm_target *ti)
                         DMERR("Unable to resume snapshot source until "
                               "handover completes.");
                         r = -EINVAL;
-                } else if (!snap_src->suspended) {
+                } else if (!dm_suspended(snap_src->ti)) {
                         DMERR("Unable to perform snapshot handover until "
                               "source is suspended.");
                         r = -EINVAL;
@@ -1816,7 +1776,6 @@ static void snapshot_resume(struct dm_target *ti)
 
         down_write(&s->lock);
         s->active = 1;
-        s->suspended = 0;
         up_write(&s->lock);
 }
 
@@ -2194,7 +2153,7 @@ static int origin_iterate_devices(struct dm_target *ti,
 
 static struct target_type origin_target = {
         .name    = "snapshot-origin",
-        .version = {1, 7, 0},
+        .version = {1, 7, 1},
         .module  = THIS_MODULE,
         .ctr     = origin_ctr,
         .dtr     = origin_dtr,
@@ -2207,13 +2166,12 @@ static struct target_type origin_target = {
 
 static struct target_type snapshot_target = {
         .name    = "snapshot",
-        .version = {1, 9, 0},
+        .version = {1, 10, 0},
         .module  = THIS_MODULE,
         .ctr     = snapshot_ctr,
         .dtr     = snapshot_dtr,
         .map     = snapshot_map,
         .end_io  = snapshot_end_io,
-        .postsuspend = snapshot_postsuspend,
         .preresume  = snapshot_preresume,
         .resume  = snapshot_resume,
         .status  = snapshot_status,
@@ -2222,14 +2180,13 @@ static struct target_type snapshot_target = {
 
 static struct target_type merge_target = {
         .name    = dm_snapshot_merge_target_name,
-        .version = {1, 0, 0},
+        .version = {1, 1, 0},
         .module  = THIS_MODULE,
         .ctr     = snapshot_ctr,
         .dtr     = snapshot_dtr,
         .map     = snapshot_merge_map,
         .end_io  = snapshot_end_io,
         .presuspend = snapshot_merge_presuspend,
-        .postsuspend = snapshot_postsuspend,
         .preresume  = snapshot_preresume,
         .resume  = snapshot_merge_resume,
         .status  = snapshot_status,
@@ -2291,17 +2248,8 @@ static int __init dm_snapshot_init(void)
                 goto bad_tracked_chunk_cache;
         }
 
-        ksnapd = create_singlethread_workqueue("ksnapd");
-        if (!ksnapd) {
-                DMERR("Failed to create ksnapd workqueue.");
-                r = -ENOMEM;
-                goto bad_pending_pool;
-        }
-
         return 0;
 
-bad_pending_pool:
-        kmem_cache_destroy(tracked_chunk_cache);
 bad_tracked_chunk_cache:
         kmem_cache_destroy(pending_cache);
 bad_pending_cache:
@@ -2322,8 +2270,6 @@ bad_register_snapshot_target:
 
 static void __exit dm_snapshot_exit(void)
 {
-        destroy_workqueue(ksnapd);
-
         dm_unregister_target(&snapshot_target);
         dm_unregister_target(&origin_target);
         dm_unregister_target(&merge_target);
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index f0371b4c4fbf..dddfa14f2982 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -39,23 +39,20 @@ struct stripe_c {
         struct dm_target *ti;
 
         /* Work struct used for triggering events*/
-        struct work_struct kstriped_ws;
+        struct work_struct trigger_event;
 
         struct stripe stripe[0];
 };
 
-static struct workqueue_struct *kstriped;
-
 /*
  * An event is triggered whenever a drive
  * drops out of a stripe volume.
  */
 static void trigger_event(struct work_struct *work)
 {
-        struct stripe_c *sc = container_of(work, struct stripe_c, kstriped_ws);
-
+        struct stripe_c *sc = container_of(work, struct stripe_c,
+                                           trigger_event);
         dm_table_event(sc->ti->table);
-
 }
 
 static inline struct stripe_c *alloc_context(unsigned int stripes)
@@ -160,7 +157,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -ENOMEM;
         }
 
-        INIT_WORK(&sc->kstriped_ws, trigger_event);
+        INIT_WORK(&sc->trigger_event, trigger_event);
 
         /* Set pointer to dm target; used in trigger_event */
         sc->ti = ti;
@@ -211,7 +208,7 @@ static void stripe_dtr(struct dm_target *ti)
         for (i = 0; i < sc->stripes; i++)
                 dm_put_device(ti, sc->stripe[i].dev);
 
-        flush_workqueue(kstriped);
+        flush_work_sync(&sc->trigger_event);
         kfree(sc);
 }
 
@@ -367,7 +364,7 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
                         atomic_inc(&(sc->stripe[i].error_count));
                         if (atomic_read(&(sc->stripe[i].error_count)) <
                             DM_IO_ERROR_THRESHOLD)
-                                queue_work(kstriped, &sc->kstriped_ws);
+                                schedule_work(&sc->trigger_event);
                 }
 
         return error;
@@ -401,7 +398,7 @@ static void stripe_io_hints(struct dm_target *ti,
 
 static struct target_type stripe_target = {
         .name   = "striped",
-        .version = {1, 3, 0},
+        .version = {1, 3, 1},
         .module = THIS_MODULE,
         .ctr    = stripe_ctr,
         .dtr    = stripe_dtr,
@@ -422,20 +419,10 @@ int __init dm_stripe_init(void)
                 return r;
         }
 
-        kstriped = create_singlethread_workqueue("kstriped");
-        if (!kstriped) {
-                DMERR("failed to create workqueue kstriped");
-                dm_unregister_target(&stripe_target);
-                return -ENOMEM;
-        }
-
         return r;
 }
 
 void dm_stripe_exit(void)
 {
         dm_unregister_target(&stripe_target);
-        destroy_workqueue(kstriped);
-
-        return;
 }
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 985c20a4f30e..38e4eb1bb965 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -71,6 +71,8 @@ struct dm_table {
         void *event_context;
 
         struct dm_md_mempools *mempools;
+
+        struct list_head target_callbacks;
 };
 
 /*
@@ -204,6 +206,7 @@ int dm_table_create(struct dm_table **result, fmode_t mode,
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&t->devices);
+        INIT_LIST_HEAD(&t->target_callbacks);
         atomic_set(&t->holders, 0);
         t->discards_supported = 1;
 
@@ -347,6 +350,7 @@ static void close_dev(struct dm_dev_internal *d, struct mapped_device *md)
         if (!d->dm_dev.bdev)
                 return;
 
+        bd_unlink_disk_holder(d->dm_dev.bdev, dm_disk(md));
         blkdev_put(d->dm_dev.bdev, d->dm_dev.mode | FMODE_EXCL);
         d->dm_dev.bdev = NULL;
 }
@@ -1225,10 +1229,17 @@ int dm_table_resume_targets(struct dm_table *t)
         return 0;
 }
 
+void dm_table_add_target_callbacks(struct dm_table *t, struct dm_target_callbacks *cb)
+{
+        list_add(&cb->list, &t->target_callbacks);
+}
+EXPORT_SYMBOL_GPL(dm_table_add_target_callbacks);
+
 int dm_table_any_congested(struct dm_table *t, int bdi_bits)
 {
         struct dm_dev_internal *dd;
         struct list_head *devices = dm_table_get_devices(t);
+        struct dm_target_callbacks *cb;
         int r = 0;
 
         list_for_each_entry(dd, devices, list) {
@@ -1243,6 +1254,10 @@ int dm_table_any_congested(struct dm_table *t, int bdi_bits)
                                      bdevname(dd->dm_dev.bdev, b));
         }
 
+        list_for_each_entry(cb, &t->target_callbacks, list)
+                if (cb->congested_fn)
+                        r |= cb->congested_fn(cb, bdi_bits);
+
         return r;
 }
 
@@ -1264,6 +1279,7 @@ void dm_table_unplug_all(struct dm_table *t)
 {
         struct dm_dev_internal *dd;
         struct list_head *devices = dm_table_get_devices(t);
+        struct dm_target_callbacks *cb;
 
         list_for_each_entry(dd, devices, list) {
                 struct request_queue *q = bdev_get_queue(dd->dm_dev.bdev);
@@ -1276,6 +1292,10 @@ void dm_table_unplug_all(struct dm_table *t)
                                      dm_device_name(t->md),
                                      bdevname(dd->dm_dev.bdev, b));
         }
+
+        list_for_each_entry(cb, &t->target_callbacks, list)
+                if (cb->unplug_fn)
+                        cb->unplug_fn(cb);
 }
 
 struct mapped_device *dm_table_get_md(struct dm_table *t)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f48a2f359ac4..eaa3af0e0632 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -32,7 +32,6 @@
 #define DM_COOKIE_ENV_VAR_NAME "DM_COOKIE"
 #define DM_COOKIE_LENGTH 24
 
-static DEFINE_MUTEX(dm_mutex);
 static const char *_name = DM_NAME;
 
 static unsigned int major = 0;
@@ -328,7 +327,6 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
 {
         struct mapped_device *md;
 
-        mutex_lock(&dm_mutex);
         spin_lock(&_minor_lock);
 
         md = bdev->bd_disk->private_data;
@@ -346,7 +344,6 @@ static int dm_blk_open(struct block_device *bdev, fmode_t mode)
 
 out:
         spin_unlock(&_minor_lock);
-        mutex_unlock(&dm_mutex);
 
         return md ? 0 : -ENXIO;
 }
@@ -355,10 +352,12 @@ static int dm_blk_close(struct gendisk *disk, fmode_t mode)
 {
         struct mapped_device *md = disk->private_data;
 
-        mutex_lock(&dm_mutex);
+        spin_lock(&_minor_lock);
+
         atomic_dec(&md->open_count);
         dm_put(md);
-        mutex_unlock(&dm_mutex);
+
+        spin_unlock(&_minor_lock);
 
         return 0;
 }
@@ -1638,13 +1637,15 @@ static void dm_request_fn(struct request_queue *q)
                 if (map_request(ti, clone, md))
                         goto requeued;
 
-                spin_lock_irq(q->queue_lock);
+                BUG_ON(!irqs_disabled());
+                spin_lock(q->queue_lock);
         }
 
         goto out;
 
 requeued:
-        spin_lock_irq(q->queue_lock);
+        BUG_ON(!irqs_disabled());
+        spin_lock(q->queue_lock);
 
 plug_and_out:
         if (!elv_queue_empty(q))
@@ -1884,7 +1885,8 @@ static struct mapped_device *alloc_dev(int minor)
         add_disk(md->disk);
         format_dev_t(md->name, MKDEV(_major, minor));
 
-        md->wq = create_singlethread_workqueue("kdmflush");
+        md->wq = alloc_workqueue("kdmflush",
+                                 WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
         if (!md->wq)
                 goto bad_thread;
 
@@ -1992,13 +1994,14 @@ static void event_callback(void *context)
         wake_up(&md->eventq);
 }
 
+/*
+ * Protected by md->suspend_lock obtained by dm_swap_table().
+ */
 static void __set_size(struct mapped_device *md, sector_t size)
 {
         set_capacity(md->disk, size);
 
-        mutex_lock(&md->bdev->bd_inode->i_mutex);
         i_size_write(md->bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
-        mutex_unlock(&md->bdev->bd_inode->i_mutex);
 }
 
 /*
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7fc090ac9e28..0cc30ecda4c1 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -287,11 +287,14 @@ static int md_make_request(struct request_queue *q, struct bio *bio)
         mddev_t *mddev = q->queuedata;
         int rv;
         int cpu;
+        unsigned int sectors;
 
-        if (mddev == NULL || mddev->pers == NULL) {
+        if (mddev == NULL || mddev->pers == NULL
+            || !mddev->ready) {
                 bio_io_error(bio);
                 return 0;
         }
+        smp_rmb(); /* Ensure implications of  'active' are visible */
         rcu_read_lock();
         if (mddev->suspended) {
                 DEFINE_WAIT(__wait);
@@ -309,12 +312,16 @@ static int md_make_request(struct request_queue *q, struct bio *bio)
         atomic_inc(&mddev->active_io);
         rcu_read_unlock();
 
+        /*
+         * save the sectors now since our bio can
+         * go away inside make_request
+         */
+        sectors = bio_sectors(bio);
         rv = mddev->pers->make_request(mddev, bio);
 
         cpu = part_stat_lock();
         part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);
-        part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],
-                      bio_sectors(bio));
+        part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw], sectors);
         part_stat_unlock();
 
         if (atomic_dec_and_test(&mddev->active_io) && mddev->suspended)
@@ -703,9 +710,9 @@ static struct mdk_personality *find_pers(int level, char *clevel)
 }
 
 /* return the offset of the super block in 512byte sectors */
-static inline sector_t calc_dev_sboffset(struct block_device *bdev)
+static inline sector_t calc_dev_sboffset(mdk_rdev_t *rdev)
 {
-        sector_t num_sectors = i_size_read(bdev->bd_inode) / 512;
+        sector_t num_sectors = i_size_read(rdev->bdev->bd_inode) / 512;
         return MD_NEW_SIZE_SECTORS(num_sectors);
 }
 
@@ -763,7 +770,7 @@ void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
          */
         struct bio *bio = bio_alloc_mddev(GFP_NOIO, 1, mddev);
 
-        bio->bi_bdev = rdev->bdev;
+        bio->bi_bdev = rdev->meta_bdev ? rdev->meta_bdev : rdev->bdev;
         bio->bi_sector = sector;
         bio_add_page(bio, page, size, 0);
         bio->bi_private = rdev;
@@ -793,7 +800,7 @@ static void bi_complete(struct bio *bio, int error)
 }
 
 int sync_page_io(mdk_rdev_t *rdev, sector_t sector, int size,
-                 struct page *page, int rw)
+                 struct page *page, int rw, bool metadata_op)
 {
         struct bio *bio = bio_alloc_mddev(GFP_NOIO, 1, rdev->mddev);
         struct completion event;
@@ -801,8 +808,12 @@ int sync_page_io(mdk_rdev_t *rdev, sector_t sector, int size,
 
         rw |= REQ_SYNC | REQ_UNPLUG;
 
-        bio->bi_bdev = rdev->bdev;
-        bio->bi_sector = sector;
+        bio->bi_bdev = (metadata_op && rdev->meta_bdev) ?
+                rdev->meta_bdev : rdev->bdev;
+        if (metadata_op)
+                bio->bi_sector = sector + rdev->sb_start;
+        else
+                bio->bi_sector = sector + rdev->data_offset;
         bio_add_page(bio, page, size, 0);
         init_completion(&event);
         bio->bi_private = &event;
@@ -827,7 +838,7 @@ static int read_disk_sb(mdk_rdev_t * rdev, int size)
                 return 0;
 
 
-        if (!sync_page_io(rdev, rdev->sb_start, size, rdev->sb_page, READ))
+        if (!sync_page_io(rdev, 0, size, rdev->sb_page, READ, true))
                 goto fail;
         rdev->sb_loaded = 1;
         return 0;
@@ -989,7 +1000,7 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
          *
          * It also happens to be a multiple of 4Kb.
          */
-        rdev->sb_start = calc_dev_sboffset(rdev->bdev);
+        rdev->sb_start = calc_dev_sboffset(rdev);
 
         ret = read_disk_sb(rdev, MD_SB_BYTES);
         if (ret) return ret;
@@ -1330,7 +1341,7 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors)
                 return 0; /* component must fit device */
         if (rdev->mddev->bitmap_info.offset)
                 return 0; /* can't move bitmap */
-        rdev->sb_start = calc_dev_sboffset(rdev->bdev);
+        rdev->sb_start = calc_dev_sboffset(rdev);
         if (!num_sectors || num_sectors > rdev->sb_start)
                 num_sectors = rdev->sb_start;
         md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,
@@ -1906,6 +1917,7 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)
                 MD_BUG();
                 return;
         }
+        bd_unlink_disk_holder(rdev->bdev, rdev->mddev->gendisk);
         list_del_rcu(&rdev->same_set);
         printk(KERN_INFO "md: unbind<%s>\n", bdevname(rdev->bdev,b));
         rdev->mddev = NULL;
@@ -1940,8 +1952,6 @@ static int lock_rdev(mdk_rdev_t *rdev, dev_t dev, int shared)
                         __bdevname(dev, b));
                 return PTR_ERR(bdev);
         }
-        if (!shared)
-                set_bit(AllReserved, &rdev->flags);
         rdev->bdev = bdev;
         return err;
 }
@@ -2458,6 +2468,9 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                 if (rdev->raid_disk != -1)
                         return -EBUSY;
 
+                if (test_bit(MD_RECOVERY_RUNNING, &rdev->mddev->recovery))
+                        return -EBUSY;
+
                 if (rdev->mddev->pers->hot_add_disk == NULL)
                         return -EINVAL;
 
@@ -2465,6 +2478,10 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                         if (rdev2->raid_disk == slot)
                                 return -EEXIST;
 
+                if (slot >= rdev->mddev->raid_disks &&
+                    slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks)
+                        return -ENOSPC;
+
                 rdev->raid_disk = slot;
                 if (test_bit(In_sync, &rdev->flags))
                         rdev->saved_raid_disk = slot;
@@ -2482,7 +2499,8 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                         /* failure here is OK */;
                 /* don't wakeup anyone, leave that to userspace. */
         } else {
-                if (slot >= rdev->mddev->raid_disks)
+                if (slot >= rdev->mddev->raid_disks &&
+                    slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks)
                         return -ENOSPC;
                 rdev->raid_disk = slot;
                 /* assume it is working */
@@ -2598,12 +2616,11 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)
 
                         mddev_lock(mddev);
                         list_for_each_entry(rdev2, &mddev->disks, same_set)
-                                if (test_bit(AllReserved, &rdev2->flags) ||
-                                    (rdev->bdev == rdev2->bdev &&
-                                     rdev != rdev2 &&
-                                     overlaps(rdev->data_offset, rdev->sectors,
-                                              rdev2->data_offset,
-                                              rdev2->sectors))) {
+                                if (rdev->bdev == rdev2->bdev &&
+                                    rdev != rdev2 &&
+                                    overlaps(rdev->data_offset, rdev->sectors,
+                                             rdev2->data_offset,
+                                             rdev2->sectors)) {
                                         overlap = 1;
                                         break;
                                 }
@@ -3107,7 +3124,7 @@ level_store(mddev_t *mddev, const char *buf, size_t len)
                 char nm[20];
                 if (rdev->raid_disk < 0)
                         continue;
-                if (rdev->new_raid_disk > mddev->raid_disks)
+                if (rdev->new_raid_disk >= mddev->raid_disks)
                         rdev->new_raid_disk = -1;
                 if (rdev->new_raid_disk == rdev->raid_disk)
                         continue;
@@ -3736,6 +3753,8 @@ action_show(mddev_t *mddev, char *page)
         return sprintf(page, "%s\n", type);
 }
 
+static void reap_sync_thread(mddev_t *mddev);
+
 static ssize_t
 action_store(mddev_t *mddev, const char *page, size_t len)
 {
@@ -3750,9 +3769,7 @@ action_store(mddev_t *mddev, const char *page, size_t len)
         if (cmd_match(page, "idle") || cmd_match(page, "frozen")) {
                 if (mddev->sync_thread) {
                         set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-                        md_unregister_thread(mddev->sync_thread);
-                        mddev->sync_thread = NULL;
-                        mddev->recovery = 0;
+                        reap_sync_thread(mddev);
                 }
         } else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) ||
                    test_bit(MD_RECOVERY_NEEDED, &mddev->recovery))
@@ -3904,7 +3921,7 @@ static struct md_sysfs_entry md_sync_speed = __ATTR_RO(sync_speed);
 static ssize_t
 sync_completed_show(mddev_t *mddev, char *page)
 {
-        unsigned long max_sectors, resync;
+        unsigned long long max_sectors, resync;
 
         if (!test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
                 return sprintf(page, "none\n");
@@ -3915,7 +3932,7 @@ sync_completed_show(mddev_t *mddev, char *page)
                 max_sectors = mddev->dev_sectors;
 
         resync = mddev->curr_resync_completed;
-        return sprintf(page, "%lu / %lu\n", resync, max_sectors);
+        return sprintf(page, "%llu / %llu\n", resync, max_sectors);
 }
 
 static struct md_sysfs_entry md_sync_completed = __ATTR_RO(sync_completed);
@@ -4002,19 +4019,24 @@ suspend_lo_store(mddev_t *mddev, const char *buf, size_t len)
 {
         char *e;
         unsigned long long new = simple_strtoull(buf, &e, 10);
+        unsigned long long old = mddev->suspend_lo;
 
         if (mddev->pers == NULL || 
             mddev->pers->quiesce == NULL)
                 return -EINVAL;
         if (buf == e || (*e && *e != '\n'))
                 return -EINVAL;
-        if (new >= mddev->suspend_hi ||
-            (new > mddev->suspend_lo && new < mddev->suspend_hi)) {
-                mddev->suspend_lo = new;
+
+        mddev->suspend_lo = new;
+        if (new >= old)
+                /* Shrinking suspended region */
                 mddev->pers->quiesce(mddev, 2);
-                return len;
-        } else
-                return -EINVAL;
+        else {
+                /* Expanding suspended region - need to wait */
+                mddev->pers->quiesce(mddev, 1);
+                mddev->pers->quiesce(mddev, 0);
+        }
+        return len;
 }
 static struct md_sysfs_entry md_suspend_lo =
 __ATTR(suspend_lo, S_IRUGO|S_IWUSR, suspend_lo_show, suspend_lo_store);
@@ -4031,20 +4053,24 @@ suspend_hi_store(mddev_t *mddev, const char *buf, size_t len)
 {
         char *e;
         unsigned long long new = simple_strtoull(buf, &e, 10);
+        unsigned long long old = mddev->suspend_hi;
 
         if (mddev->pers == NULL ||
             mddev->pers->quiesce == NULL)
                 return -EINVAL;
         if (buf == e || (*e && *e != '\n'))
                 return -EINVAL;
-        if ((new <= mddev->suspend_lo && mddev->suspend_lo >= mddev->suspend_hi) ||
-            (new > mddev->suspend_lo && new > mddev->suspend_hi)) {
-                mddev->suspend_hi = new;
+
+        mddev->suspend_hi = new;
+        if (new <= old)
+                /* Shrinking suspended region */
+                mddev->pers->quiesce(mddev, 2);
+        else {
+                /* Expanding suspended region - need to wait */
                 mddev->pers->quiesce(mddev, 1);
                 mddev->pers->quiesce(mddev, 0);
-                return len;
-        } else
-                return -EINVAL;
+        }
+        return len;
 }
 static struct md_sysfs_entry md_suspend_hi =
 __ATTR(suspend_hi, S_IRUGO|S_IWUSR, suspend_hi_show, suspend_hi_store);
@@ -4422,7 +4448,9 @@ int md_run(mddev_t *mddev)
                  * We don't want the data to overlap the metadata,
                  * Internal Bitmap issues have been handled elsewhere.
                  */
-                if (rdev->data_offset < rdev->sb_start) {
+                if (rdev->meta_bdev) {
+                        /* Nothing to check */;
+                } else if (rdev->data_offset < rdev->sb_start) {
                         if (mddev->dev_sectors &&
                             rdev->data_offset + mddev->dev_sectors
                             > rdev->sb_start) {
@@ -4556,7 +4584,8 @@ int md_run(mddev_t *mddev)
         mddev->safemode_timer.data = (unsigned long) mddev;
         mddev->safemode_delay = (200 * HZ)/1000 +1; /* 200 msec delay */
         mddev->in_sync = 1;
-
+        smp_wmb();
+        mddev->ready = 1;
         list_for_each_entry(rdev, &mddev->disks, same_set)
                 if (rdev->raid_disk >= 0) {
                         char nm[20];
@@ -4693,13 +4722,12 @@ static void md_clean(mddev_t *mddev)
         mddev->plug = NULL;
 }
 
-void md_stop_writes(mddev_t *mddev)
+static void __md_stop_writes(mddev_t *mddev)
 {
         if (mddev->sync_thread) {
                 set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
                 set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-                md_unregister_thread(mddev->sync_thread);
-                mddev->sync_thread = NULL;
+                reap_sync_thread(mddev);
         }
 
         del_timer_sync(&mddev->safemode_timer);
@@ -4713,10 +4741,18 @@ void md_stop_writes(mddev_t *mddev)
                 md_update_sb(mddev, 1);
         }
 }
+
+void md_stop_writes(mddev_t *mddev)
+{
+        mddev_lock(mddev);
+        __md_stop_writes(mddev);
+        mddev_unlock(mddev);
+}
 EXPORT_SYMBOL_GPL(md_stop_writes);
 
 void md_stop(mddev_t *mddev)
 {
+        mddev->ready = 0;
         mddev->pers->stop(mddev);
         if (mddev->pers->sync_request && mddev->to_remove == NULL)
                 mddev->to_remove = &md_redundancy_group;
@@ -4736,7 +4772,7 @@ static int md_set_readonly(mddev_t *mddev, int is_open)
                 goto out;
         }
         if (mddev->pers) {
-                md_stop_writes(mddev);
+                __md_stop_writes(mddev);
 
                 err  = -ENXIO;
                 if (mddev->ro==1)
@@ -4773,7 +4809,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                 if (mddev->ro)
                         set_disk_ro(disk, 0);
 
-                md_stop_writes(mddev);
+                __md_stop_writes(mddev);
                 md_stop(mddev);
                 mddev->queue->merge_bvec_fn = NULL;
                 mddev->queue->unplug_fn = NULL;
@@ -5151,9 +5187,10 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                 /* set saved_raid_disk if appropriate */
                 if (!mddev->persistent) {
                         if (info->state & (1<<MD_DISK_SYNC)  &&
-                            info->raid_disk < mddev->raid_disks)
+                            info->raid_disk < mddev->raid_disks) {
                                 rdev->raid_disk = info->raid_disk;
-                        else
+                                set_bit(In_sync, &rdev->flags);
+                        } else
                                 rdev->raid_disk = -1;
                 } else
                         super_types[mddev->major_version].
@@ -5230,7 +5267,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                         printk(KERN_INFO "md: nonpersistent superblock ...\n");
                         rdev->sb_start = i_size_read(rdev->bdev->bd_inode) / 512;
                 } else
-                        rdev->sb_start = calc_dev_sboffset(rdev->bdev);
+                        rdev->sb_start = calc_dev_sboffset(rdev);
                 rdev->sectors = rdev->sb_start;
 
                 err = bind_rdev_to_array(rdev, mddev);
@@ -5297,7 +5334,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
         }
 
         if (mddev->persistent)
-                rdev->sb_start = calc_dev_sboffset(rdev->bdev);
+                rdev->sb_start = calc_dev_sboffset(rdev);
         else
                 rdev->sb_start = i_size_read(rdev->bdev->bd_inode) / 512;
 
@@ -5510,7 +5547,6 @@ static int update_size(mddev_t *mddev, sector_t num_sectors)
          * sb_start or, if that is <data_offset, it must fit before the size
          * of each device.  If num_sectors is zero, we find the largest size
          * that fits.
-
          */
         if (mddev->sync_thread)
                 return -EBUSY;
@@ -5547,6 +5583,8 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
         mddev->delta_disks = raid_disks - mddev->raid_disks;
 
         rv = mddev->pers->check_reshape(mddev);
+        if (rv < 0)
+                mddev->delta_disks = 0;
         return rv;
 }
 
@@ -6033,7 +6071,8 @@ static int md_thread(void * arg)
                          || kthread_should_stop(),
                          thread->timeout);
 
-                if (test_and_clear_bit(THREAD_WAKEUP, &thread->flags))
+                clear_bit(THREAD_WAKEUP, &thread->flags);
+                if (!kthread_should_stop())
                         thread->run(thread->mddev);
         }
 
@@ -6799,7 +6838,7 @@ void md_do_sync(mddev_t *mddev)
                        desc, mdname(mddev));
                 mddev->curr_resync = j;
         }
-        mddev->curr_resync_completed = mddev->curr_resync;
+        mddev->curr_resync_completed = j;
 
         while (j < max_sectors) {
                 sector_t sectors;
@@ -6817,8 +6856,7 @@ void md_do_sync(mddev_t *mddev)
                         md_unplug(mddev);
                         wait_event(mddev->recovery_wait,
                                    atomic_read(&mddev->recovery_active) == 0);
-                        mddev->curr_resync_completed =
-                                mddev->curr_resync;
+                        mddev->curr_resync_completed = j;
                         set_bit(MD_CHANGE_CLEAN, &mddev->flags);
                         sysfs_notify(&mddev->kobj, NULL, "sync_completed");
                 }
@@ -6954,9 +6992,6 @@ void md_do_sync(mddev_t *mddev)
         } else if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
                 mddev->resync_min = mddev->curr_resync_completed;
         mddev->curr_resync = 0;
-        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery))
-                mddev->curr_resync_completed = 0;
-        sysfs_notify(&mddev->kobj, NULL, "sync_completed");
         wake_up(&resync_wait);
         set_bit(MD_RECOVERY_DONE, &mddev->recovery);
         md_wakeup_thread(mddev->thread);
@@ -6997,7 +7032,7 @@ static int remove_and_add_spares(mddev_t *mddev)
                         }
                 }
 
-        if (mddev->degraded && ! mddev->ro && !mddev->recovery_disabled) {
+        if (mddev->degraded && !mddev->recovery_disabled) {
                 list_for_each_entry(rdev, &mddev->disks, same_set) {
                         if (rdev->raid_disk >= 0 &&
                             !test_bit(In_sync, &rdev->flags) &&
@@ -7023,6 +7058,45 @@ static int remove_and_add_spares(mddev_t *mddev)
         }
         return spares;
 }
+
+static void reap_sync_thread(mddev_t *mddev)
+{
+        mdk_rdev_t *rdev;
+
+        /* resync has finished, collect result */
+        md_unregister_thread(mddev->sync_thread);
+        mddev->sync_thread = NULL;
+        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&
+            !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {
+                /* success...*/
+                /* activate any spares */
+                if (mddev->pers->spare_active(mddev))
+                        sysfs_notify(&mddev->kobj, NULL,
+                                     "degraded");
+        }
+        if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) &&
+            mddev->pers->finish_reshape)
+                mddev->pers->finish_reshape(mddev);
+        md_update_sb(mddev, 1);
+
+        /* if array is no-longer degraded, then any saved_raid_disk
+         * information must be scrapped
+         */
+        if (!mddev->degraded)
+                list_for_each_entry(rdev, &mddev->disks, same_set)
+                        rdev->saved_raid_disk = -1;
+
+        clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+        clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
+        clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
+        clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
+        clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
+        /* flag recovery needed just to double check */
+        set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
+        sysfs_notify_dirent_safe(mddev->sysfs_action);
+        md_new_event(mddev);
+}
+
 /*
  * This routine is regularly called by all per-raid-array threads to
  * deal with generic issues like resync and super-block update.
@@ -7047,9 +7121,6 @@ static int remove_and_add_spares(mddev_t *mddev)
  */
 void md_check_recovery(mddev_t *mddev)
 {
-        mdk_rdev_t *rdev;
-
-
         if (mddev->bitmap)
                 bitmap_daemon_work(mddev);
 
@@ -7084,7 +7155,20 @@ void md_check_recovery(mddev_t *mddev)
                         /* Only thing we do on a ro array is remove
                          * failed devices.
                          */
-                        remove_and_add_spares(mddev);
+                        mdk_rdev_t *rdev;
+                        list_for_each_entry(rdev, &mddev->disks, same_set)
+                                if (rdev->raid_disk >= 0 &&
+                                    !test_bit(Blocked, &rdev->flags) &&
+                                    test_bit(Faulty, &rdev->flags) &&
+                                    atomic_read(&rdev->nr_pending)==0) {
+                                        if (mddev->pers->hot_remove_disk(
+                                                    mddev, rdev->raid_disk)==0) {
+                                                char nm[20];
+                                                sprintf(nm,"rd%d", rdev->raid_disk);
+                                                sysfs_remove_link(&mddev->kobj, nm);
+                                                rdev->raid_disk = -1;
+                                        }
+                                }
                         clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
                         goto unlock;
                 }
@@ -7117,34 +7201,7 @@ void md_check_recovery(mddev_t *mddev)
                         goto unlock;
                 }
                 if (mddev->sync_thread) {
-                        /* resync has finished, collect result */
-                        md_unregister_thread(mddev->sync_thread);
-                        mddev->sync_thread = NULL;
-                        if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&
-                            !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {
-                                /* success...*/
-                                /* activate any spares */
-                                if (mddev->pers->spare_active(mddev))
-                                        sysfs_notify(&mddev->kobj, NULL,
-                                                     "degraded");
-                        }
-                        if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) &&
-                            mddev->pers->finish_reshape)
-                                mddev->pers->finish_reshape(mddev);
-                        md_update_sb(mddev, 1);
-
-                        /* if array is no-longer degraded, then any saved_raid_disk
-                         * information must be scrapped
-                         */
-                        if (!mddev->degraded)
-                                list_for_each_entry(rdev, &mddev->disks, same_set)
-                                        rdev->saved_raid_disk = -1;
-
-                        mddev->recovery = 0;
-                        /* flag recovery needed just to double check */
-                        set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
-                        sysfs_notify_dirent_safe(mddev->sysfs_action);
-                        md_new_event(mddev);
+                        reap_sync_thread(mddev);
                         goto unlock;
                 }
                 /* Set RUNNING before clearing NEEDED to avoid
@@ -7202,7 +7259,11 @@ void md_check_recovery(mddev_t *mddev)
                                         " thread...\n", 
                                         mdname(mddev));
                                 /* leave the spares where they are, it shouldn't hurt */
-                                mddev->recovery = 0;
+                                clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
+                                clear_bit(MD_RECOVERY_SYNC, &mddev->recovery);
+                                clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery);
+                                clear_bit(MD_RECOVERY_REQUESTED, &mddev->recovery);
+                                clear_bit(MD_RECOVERY_CHECK, &mddev->recovery);
                         } else
                                 md_wakeup_thread(mddev->sync_thread);
                         sysfs_notify_dirent_safe(mddev->sysfs_action);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index d05bab55df4e..7e90b8593b2a 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -60,6 +60,12 @@ struct mdk_rdev_s
         mddev_t *mddev;                 /* RAID array if running */
         int last_events;                /* IO event timestamp */
 
+        /*
+         * If meta_bdev is non-NULL, it means that a separate device is
+         * being used to store the metadata (superblock/bitmap) which
+         * would otherwise be contained on the same device as the data (bdev).
+         */
+        struct block_device *meta_bdev;
         struct block_device *bdev;      /* block device handle */
 
         struct page     *sb_page;
@@ -87,8 +93,6 @@ struct mdk_rdev_s
 #define Faulty          1               /* device is known to have a fault */
 #define In_sync         2               /* device is in_sync with rest of array */
 #define WriteMostly     4               /* Avoid reading if at all possible */
-#define AllReserved     6               /* If whole device is reserved for
-                                         * one array */
 #define AutoDetected    7               /* added by auto-detect */
 #define Blocked         8               /* An error occured on an externally
                                          * managed array, don't allow writes
@@ -148,7 +152,8 @@ struct mddev_s
                                                        * are happening, so run/
                                                        * takeover/stop are not safe
                                                        */
-
+        int                             ready; /* See when safe to pass 
+                                                * IO requests down */
         struct gendisk                  *gendisk;
 
         struct kobject                  kobj;
@@ -497,8 +502,8 @@ extern void md_flush_request(mddev_t *mddev, struct bio *bio);
 extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
                            sector_t sector, int size, struct page *page);
 extern void md_super_wait(mddev_t *mddev);
-extern int sync_page_io(mdk_rdev_t *rdev, sector_t sector, int size,
-                        struct page *page, int rw);
+extern int sync_page_io(mdk_rdev_t *rdev, sector_t sector, int size, 
+                        struct page *page, int rw, bool metadata_op);
 extern void md_do_sync(mddev_t *mddev);
 extern void md_new_event(mddev_t *mddev);
 extern int md_allow_write(mddev_t *mddev);
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index a39f4c355e55..637a96855edb 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -179,6 +179,14 @@ static int create_strip_zones(mddev_t *mddev, raid0_conf_t **private_conf)
                         rdev1->new_raid_disk = j;
                 }
 
+                if (mddev->level == 1) {
+                        /* taiking over a raid1 array-
+                         * we have only one active disk
+                         */
+                        j = 0;
+                        rdev1->new_raid_disk = j;
+                }
+
                 if (j < 0 || j >= mddev->raid_disks) {
                         printk(KERN_ERR "md/raid0:%s: bad disk number %d - "
                                "aborting!\n", mdname(mddev), j);
@@ -644,12 +652,38 @@ static void *raid0_takeover_raid10(mddev_t *mddev)
         return priv_conf;
 }
 
+static void *raid0_takeover_raid1(mddev_t *mddev)
+{
+        raid0_conf_t *priv_conf;
+
+        /* Check layout:
+         *  - (N - 1) mirror drives must be already faulty
+         */
+        if ((mddev->raid_disks - 1) != mddev->degraded) {
+                printk(KERN_ERR "md/raid0:%s: (N - 1) mirrors drives must be already faulty!\n",
+                       mdname(mddev));
+                return ERR_PTR(-EINVAL);
+        }
+
+        /* Set new parameters */
+        mddev->new_level = 0;
+        mddev->new_layout = 0;
+        mddev->new_chunk_sectors = 128; /* by default set chunk size to 64k */
+        mddev->delta_disks = 1 - mddev->raid_disks;
+        /* make sure it will be not marked as dirty */
+        mddev->recovery_cp = MaxSector;
+
+        create_strip_zones(mddev, &priv_conf);
+        return priv_conf;
+}
+
 static void *raid0_takeover(mddev_t *mddev)
 {
         /* raid0 can take over:
          *  raid4 - if all data disks are active.
          *  raid5 - providing it is Raid4 layout and one disk is faulty
          *  raid10 - assuming we have all necessary active disks
+         *  raid1 - with (N -1) mirror drives faulty
          */
         if (mddev->level == 4)
                 return raid0_takeover_raid45(mddev);
@@ -665,6 +699,12 @@ static void *raid0_takeover(mddev_t *mddev)
         if (mddev->level == 10)
                 return raid0_takeover_raid10(mddev);
 
+        if (mddev->level == 1)
+                return raid0_takeover_raid1(mddev);
+
+        printk(KERN_ERR "Takeover from raid%i to raid0 not supported\n",
+                mddev->level);
+
         return ERR_PTR(-EINVAL);
 }
 
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 845cf95b612c..a23ffa397ba9 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1027,8 +1027,9 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         } else
                 set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "md/raid1:%s: Disk failure on %s, disabling device.\n"
-               KERN_ALERT "md/raid1:%s: Operation continuing on %d devices.\n",
+        printk(KERN_ALERT
+               "md/raid1:%s: Disk failure on %s, disabling device.\n"
+               "md/raid1:%s: Operation continuing on %d devices.\n",
                mdname(mddev), bdevname(rdev->bdev, b),
                mdname(mddev), conf->raid_disks - mddev->degraded);
 }
@@ -1364,10 +1365,10 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
                                          */
                                         rdev = conf->mirrors[d].rdev;
                                         if (sync_page_io(rdev,
-                                                         sect + rdev->data_offset,
+                                                         sect,
                                                          s<<9,
                                                          bio->bi_io_vec[idx].bv_page,
-                                                         READ)) {
+                                                         READ, false)) {
                                                 success = 1;
                                                 break;
                                         }
@@ -1390,10 +1391,10 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
                                         rdev = conf->mirrors[d].rdev;
                                         atomic_add(s, &rdev->corrected_errors);
                                         if (sync_page_io(rdev,
-                                                         sect + rdev->data_offset,
+                                                         sect,
                                                          s<<9,
                                                          bio->bi_io_vec[idx].bv_page,
-                                                         WRITE) == 0)
+                                                         WRITE, false) == 0)
                                                 md_error(mddev, rdev);
                                 }
                                 d = start;
@@ -1405,10 +1406,10 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
                                                 continue;
                                         rdev = conf->mirrors[d].rdev;
                                         if (sync_page_io(rdev,
-                                                         sect + rdev->data_offset,
+                                                         sect,
                                                          s<<9,
                                                          bio->bi_io_vec[idx].bv_page,
-                                                         READ) == 0)
+                                                         READ, false) == 0)
                                                 md_error(mddev, rdev);
                                 }
                         } else {
@@ -1488,10 +1489,8 @@ static void fix_read_error(conf_t *conf, int read_disk,
                         rdev = conf->mirrors[d].rdev;
                         if (rdev &&
                             test_bit(In_sync, &rdev->flags) &&
-                            sync_page_io(rdev,
-                                         sect + rdev->data_offset,
-                                         s<<9,
-                                         conf->tmppage, READ))
+                            sync_page_io(rdev, sect, s<<9,
+                                         conf->tmppage, READ, false))
                                 success = 1;
                         else {
                                 d++;
@@ -1514,9 +1513,8 @@ static void fix_read_error(conf_t *conf, int read_disk,
                         rdev = conf->mirrors[d].rdev;
                         if (rdev &&
                             test_bit(In_sync, &rdev->flags)) {
-                                if (sync_page_io(rdev,
-                                                 sect + rdev->data_offset,
-                                                 s<<9, conf->tmppage, WRITE)
+                                if (sync_page_io(rdev, sect, s<<9,
+                                                 conf->tmppage, WRITE, false)
                                     == 0)
                                         /* Well, this device is dead */
                                         md_error(mddev, rdev);
@@ -1531,9 +1529,8 @@ static void fix_read_error(conf_t *conf, int read_disk,
                         rdev = conf->mirrors[d].rdev;
                         if (rdev &&
                             test_bit(In_sync, &rdev->flags)) {
-                                if (sync_page_io(rdev,
-                                                 sect + rdev->data_offset,
-                                                 s<<9, conf->tmppage, READ)
+                                if (sync_page_io(rdev, sect, s<<9,
+                                                 conf->tmppage, READ, false)
                                     == 0)
                                         /* Well, this device is dead */
                                         md_error(mddev, rdev);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 0641674827f0..3b607b28741b 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1051,8 +1051,9 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         }
         set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "md/raid10:%s: Disk failure on %s, disabling device.\n"
-               KERN_ALERT "md/raid10:%s: Operation continuing on %d devices.\n",
+        printk(KERN_ALERT
+               "md/raid10:%s: Disk failure on %s, disabling device.\n"
+               "md/raid10:%s: Operation continuing on %d devices.\n",
                mdname(mddev), bdevname(rdev->bdev, b),
                mdname(mddev), conf->raid_disks - mddev->degraded);
 }
@@ -1559,9 +1560,9 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
                                 rcu_read_unlock();
                                 success = sync_page_io(rdev,
                                                        r10_bio->devs[sl].addr +
-                                                       sect + rdev->data_offset,
+                                                       sect,
                                                        s<<9,
-                                                       conf->tmppage, READ);
+                                                       conf->tmppage, READ, false);
                                 rdev_dec_pending(rdev, mddev);
                                 rcu_read_lock();
                                 if (success)
@@ -1598,8 +1599,8 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
                                 atomic_add(s, &rdev->corrected_errors);
                                 if (sync_page_io(rdev,
                                                  r10_bio->devs[sl].addr +
-                                                 sect + rdev->data_offset,
-                                                 s<<9, conf->tmppage, WRITE)
+                                                 sect,
+                                                 s<<9, conf->tmppage, WRITE, false)
                                     == 0) {
                                         /* Well, this device is dead */
                                         printk(KERN_NOTICE
@@ -1635,9 +1636,9 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
                                 rcu_read_unlock();
                                 if (sync_page_io(rdev,
                                                  r10_bio->devs[sl].addr +
-                                                 sect + rdev->data_offset,
+                                                 sect,
                                                  s<<9, conf->tmppage,
-                                                 READ) == 0) {
+                                                 READ, false) == 0) {
                                         /* Well, this device is dead */
                                         printk(KERN_NOTICE
                                                "md/raid10:%s: unable to read back "
@@ -2462,11 +2463,13 @@ static void *raid10_takeover_raid0(mddev_t *mddev)
         mddev->recovery_cp = MaxSector;
 
         conf = setup_conf(mddev);
-        if (!IS_ERR(conf))
+        if (!IS_ERR(conf)) {
                 list_for_each_entry(rdev, &mddev->disks, same_set)
                         if (rdev->raid_disk >= 0)
                                 rdev->new_raid_disk = rdev->raid_disk * 2;
-                
+                conf->barrier = 1;
+        }
+
         return conf;
 }
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index dc574f303f8b..702812824195 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1721,7 +1721,6 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                 set_bit(Faulty, &rdev->flags);
                 printk(KERN_ALERT
                        "md/raid:%s: Disk failure on %s, disabling device.\n"
-                       KERN_ALERT
                        "md/raid:%s: Operation continuing on %d devices.\n",
                        mdname(mddev),
                        bdevname(rdev->bdev, b),
@@ -4237,7 +4236,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
                 wait_event(conf->wait_for_overlap,
                            atomic_read(&conf->reshape_stripes)==0);
                 mddev->reshape_position = conf->reshape_progress;
-                mddev->curr_resync_completed = mddev->curr_resync;
+                mddev->curr_resync_completed = sector_nr;
                 conf->reshape_checkpoint = jiffies;
                 set_bit(MD_CHANGE_DEVS, &mddev->flags);
                 md_wakeup_thread(mddev->thread);
@@ -4338,7 +4337,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped
                 wait_event(conf->wait_for_overlap,
                            atomic_read(&conf->reshape_stripes) == 0);
                 mddev->reshape_position = conf->reshape_progress;
-                mddev->curr_resync_completed = mddev->curr_resync + reshape_sectors;
+                mddev->curr_resync_completed = sector_nr;
                 conf->reshape_checkpoint = jiffies;
                 set_bit(MD_CHANGE_DEVS, &mddev->flags);
                 md_wakeup_thread(mddev->thread);
@@ -5339,7 +5338,7 @@ static int raid5_spare_active(mddev_t *mddev)
                     && !test_bit(Faulty, &tmp->rdev->flags)
                     && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
                         count++;
-                        sysfs_notify_dirent(tmp->rdev->sysfs_state);
+                        sysfs_notify_dirent_safe(tmp->rdev->sysfs_state);
                 }
         }
         spin_lock_irqsave(&conf->device_lock, flags);
@@ -5518,7 +5517,6 @@ static int raid5_start_reshape(mddev_t *mddev)
         raid5_conf_t *conf = mddev->private;
         mdk_rdev_t *rdev;
         int spares = 0;
-        int added_devices = 0;
         unsigned long flags;
 
         if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
@@ -5528,8 +5526,8 @@ static int raid5_start_reshape(mddev_t *mddev)
                 return -ENOSPC;
 
         list_for_each_entry(rdev, &mddev->disks, same_set)
-                if (rdev->raid_disk < 0 &&
-                    !test_bit(Faulty, &rdev->flags))
+                if (!test_bit(In_sync, &rdev->flags)
+                    && !test_bit(Faulty, &rdev->flags))
                         spares++;
 
         if (spares - mddev->degraded < mddev->delta_disks - conf->max_degraded)
@@ -5572,29 +5570,35 @@ static int raid5_start_reshape(mddev_t *mddev)
          * to correctly record the "partially reconstructed" state of
          * such devices during the reshape and confusion could result.
          */
-        if (mddev->delta_disks >= 0)
-            list_for_each_entry(rdev, &mddev->disks, same_set)
-                if (rdev->raid_disk < 0 &&
-                    !test_bit(Faulty, &rdev->flags)) {
-                        if (raid5_add_disk(mddev, rdev) == 0) {
-                                char nm[20];
-                                if (rdev->raid_disk >= conf->previous_raid_disks) {
-                                        set_bit(In_sync, &rdev->flags);
-                                        added_devices++;
-                                } else
-                                        rdev->recovery_offset = 0;
-                                sprintf(nm, "rd%d", rdev->raid_disk);
-                                if (sysfs_create_link(&mddev->kobj,
-                                                      &rdev->kobj, nm))
-                                        /* Failure here is OK */;
-                        } else
-                                break;
-                }
+        if (mddev->delta_disks >= 0) {
+                int added_devices = 0;
+                list_for_each_entry(rdev, &mddev->disks, same_set)
+                        if (rdev->raid_disk < 0 &&
+                            !test_bit(Faulty, &rdev->flags)) {
+                                if (raid5_add_disk(mddev, rdev) == 0) {
+                                        char nm[20];
+                                        if (rdev->raid_disk
+                                            >= conf->previous_raid_disks) {
+                                                set_bit(In_sync, &rdev->flags);
+                                                added_devices++;
+                                        } else
+                                                rdev->recovery_offset = 0;
+                                        sprintf(nm, "rd%d", rdev->raid_disk);
+                                        if (sysfs_create_link(&mddev->kobj,
+                                                              &rdev->kobj, nm))
+                                                /* Failure here is OK */;
+                                }
+                        } else if (rdev->raid_disk >= conf->previous_raid_disks
+                                   && !test_bit(Faulty, &rdev->flags)) {
+                                /* This is a spare that was manually added */
+                                set_bit(In_sync, &rdev->flags);
+                                added_devices++;
+                        }
 
-        /* When a reshape changes the number of devices, ->degraded
-         * is measured against the larger of the pre and post number of
-         * devices.*/
-        if (mddev->delta_disks > 0) {
+                /* When a reshape changes the number of devices,
+                 * ->degraded is measured against the larger of the
+                 * pre and post number of devices.
+                 */
                 spin_lock_irqsave(&conf->device_lock, flags);
                 mddev->degraded += (conf->raid_disks - conf->previous_raid_disks)
                         - added_devices;
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 982f000a57ff..9f47e383c57a 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -452,7 +452,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
         INFO(("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x).\n", dev->mem, dev->revision, pci->irq, pci->subsystem_vendor, pci->subsystem_device));
         dev->ext = ext;
 
-        mutex_init(&dev->lock);
+        mutex_init(&dev->v4l2_lock);
         spin_lock_init(&dev->int_slock);
         spin_lock_init(&dev->slock);
 
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index e3fedc60fe77..1bd3dd762c6b 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -15,18 +15,15 @@ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit)
         }
 
         /* is it free? */
-        mutex_lock(&dev->lock);
         if (vv->resources & bit) {
                 DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit));
                 /* no, someone else uses it */
-                mutex_unlock(&dev->lock);
                 return 0;
         }
         /* it's free, grab it */
         fh->resources  |= bit;
         vv->resources |= bit;
         DEB_D(("res: get 0x%02x, cur:0x%02x\n",bit,vv->resources));
-        mutex_unlock(&dev->lock);
         return 1;
 }
 
@@ -37,11 +34,9 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
 
         BUG_ON((fh->resources & bits) != bits);
 
-        mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
         vv->resources &= ~bits;
         DEB_D(("res: put 0x%02x, cur:0x%02x\n",bits,vv->resources));
-        mutex_unlock(&dev->lock);
 }
 
 
@@ -396,7 +391,7 @@ static const struct v4l2_file_operations video_fops =
         .write          = fops_write,
         .poll           = fops_poll,
         .mmap           = fops_mmap,
-        .ioctl          = video_ioctl2,
+        .unlocked_ioctl = video_ioctl2,
 };
 
 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
@@ -505,6 +500,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
         vfd->fops = &video_fops;
         vfd->ioctl_ops = &dev->ext_vv_data->ops;
         vfd->release = video_device_release;
+        vfd->lock = &dev->v4l2_lock;
         vfd->tvnorms = 0;
         for (i = 0; i < dev->ext_vv_data->num_stds; i++)
                 vfd->tvnorms |= dev->ext_vv_data->stds[i].id;
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 2d4533ab22b7..afe85801d6ca 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -412,7 +412,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
                             V4L2_BUF_TYPE_VBI_CAPTURE,
                             V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
                             sizeof(struct saa7146_buf),
-                            file, NULL);
+                            file, &dev->v4l2_lock);
 
         init_timer(&fh->vbi_read_timeout);
         fh->vbi_read_timeout.function = vbi_read_timeout;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 0ac5c619aecf..9aafa4e969a8 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -553,8 +553,6 @@ static int vidioc_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *f
                 }
         }
 
-        mutex_lock(&dev->lock);
-
         /* ok, accept it */
         vv->ov_fb = *fb;
         vv->ov_fmt = fmt;
@@ -563,8 +561,6 @@ static int vidioc_s_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *f
                 vv->ov_fb.fmt.bytesperline = vv->ov_fb.fmt.width * fmt->depth / 8;
                 DEB_D(("setting bytesperline to %d\n", vv->ov_fb.fmt.bytesperline));
         }
-
-        mutex_unlock(&dev->lock);
         return 0;
 }
 
@@ -649,8 +645,6 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
                 return -EINVAL;
         }
 
-        mutex_lock(&dev->lock);
-
         switch (ctrl->type) {
         case V4L2_CTRL_TYPE_BOOLEAN:
         case V4L2_CTRL_TYPE_MENU:
@@ -693,7 +687,6 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
                 /* fixme: we can support changing VFLIP and HFLIP here... */
                 if (IS_CAPTURE_ACTIVE(fh) != 0) {
                         DEB_D(("V4L2_CID_HFLIP while active capture.\n"));
-                        mutex_unlock(&dev->lock);
                         return -EBUSY;
                 }
                 vv->hflip = c->value;
@@ -701,16 +694,13 @@ static int vidioc_s_ctrl(struct file *file, void *fh, struct v4l2_control *c)
         case V4L2_CID_VFLIP:
                 if (IS_CAPTURE_ACTIVE(fh) != 0) {
                         DEB_D(("V4L2_CID_VFLIP while active capture.\n"));
-                        mutex_unlock(&dev->lock);
                         return -EBUSY;
                 }
                 vv->vflip = c->value;
                 break;
         default:
-                mutex_unlock(&dev->lock);
                 return -EINVAL;
         }
-        mutex_unlock(&dev->lock);
 
         if (IS_OVERLAY_ACTIVE(fh) != 0) {
                 saa7146_stop_preview(fh);
@@ -902,22 +892,18 @@ static int vidioc_s_fmt_vid_overlay(struct file *file, void *__fh, struct v4l2_f
         err = vidioc_try_fmt_vid_overlay(file, fh, f);
         if (0 != err)
                 return err;
-        mutex_lock(&dev->lock);
         fh->ov.win    = f->fmt.win;
         fh->ov.nclips = f->fmt.win.clipcount;
         if (fh->ov.nclips > 16)
                 fh->ov.nclips = 16;
         if (copy_from_user(fh->ov.clips, f->fmt.win.clips,
                                 sizeof(struct v4l2_clip) * fh->ov.nclips)) {
-                mutex_unlock(&dev->lock);
                 return -EFAULT;
         }
 
         /* fh->ov.fh is used to indicate that we have valid overlay informations, too */
         fh->ov.fh = fh;
 
-        mutex_unlock(&dev->lock);
-
         /* check if our current overlay is active */
         if (IS_OVERLAY_ACTIVE(fh) != 0) {
                 saa7146_stop_preview(fh);
@@ -976,8 +962,6 @@ static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *id)
                 }
         }
 
-        mutex_lock(&dev->lock);
-
         for (i = 0; i < dev->ext_vv_data->num_stds; i++)
                 if (*id & dev->ext_vv_data->stds[i].id)
                         break;
@@ -988,8 +972,6 @@ static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id *id)
                 found = 1;
         }
 
-        mutex_unlock(&dev->lock);
-
         if (vv->ov_suspend != NULL) {
                 saa7146_start_preview(vv->ov_suspend);
                 vv->ov_suspend = NULL;
@@ -1354,7 +1336,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct saa7146_buf),
-                            file, NULL);
+                            file, &dev->v4l2_lock);
 
         return 0;
 }
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 78b089526e02..6fc79f15dcbc 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -34,7 +34,7 @@ config MEDIA_TUNER
 config MEDIA_TUNER_CUSTOMISE
         bool "Customize analog and hybrid tuner modules to build"
         depends on MEDIA_TUNER
-        default y if EMBEDDED
+        default y if EXPERT
         help
           This allows the user to deselect tuner drivers unnecessary
           for their hardware from the build. Use this option with care
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index c9062ceddc71..bc6a67768af1 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -95,8 +95,7 @@ static int tda8295_i2c_bridge(struct dvb_frontend *fe, int close)
                 msleep(20);
         } else {
                 msg = disable;
-                tuner_i2c_xfer_send(&priv->i2c_props, msg, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &msg[1], 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props, msg, 1, &msg[1], 1);
 
                 buf[2] = msg[1];
                 buf[2] &= ~0x04;
@@ -233,19 +232,22 @@ static void tda8290_set_params(struct dvb_frontend *fe,
                 tuner_i2c_xfer_send(&priv->i2c_props, pll_bw_nom, 2);
         }
 
+
         tda8290_i2c_bridge(fe, 1);
 
         if (fe->ops.tuner_ops.set_analog_params)
                 fe->ops.tuner_ops.set_analog_params(fe, params);
 
         for (i = 0; i < 3; i++) {
-                tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &pll_stat, 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                         &addr_pll_stat, 1, &pll_stat, 1);
                 if (pll_stat & 0x80) {
-                        tuner_i2c_xfer_send(&priv->i2c_props, &addr_adc_sat, 1);
-                        tuner_i2c_xfer_recv(&priv->i2c_props, &adc_sat, 1);
-                        tuner_i2c_xfer_send(&priv->i2c_props, &addr_agc_stat, 1);
-                        tuner_i2c_xfer_recv(&priv->i2c_props, &agc_stat, 1);
+                        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                                 &addr_adc_sat, 1,
+                                                 &adc_sat, 1);
+                        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                                 &addr_agc_stat, 1,
+                                                 &agc_stat, 1);
                         tuner_dbg("tda8290 is locked, AGC: %d\n", agc_stat);
                         break;
                 } else {
@@ -259,20 +261,22 @@ static void tda8290_set_params(struct dvb_frontend *fe,
                            agc_stat, adc_sat, pll_stat & 0x80);
                 tuner_i2c_xfer_send(&priv->i2c_props, gainset_2, 2);
                 msleep(100);
-                tuner_i2c_xfer_send(&priv->i2c_props, &addr_agc_stat, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &agc_stat, 1);
-                tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &pll_stat, 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                         &addr_agc_stat, 1, &agc_stat, 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                         &addr_pll_stat, 1, &pll_stat, 1);
                 if ((agc_stat > 115) || !(pll_stat & 0x80)) {
                         tuner_dbg("adjust gain, step 2. Agc: %d, lock: %d\n",
                                    agc_stat, pll_stat & 0x80);
                         if (priv->cfg.agcf)
                                 priv->cfg.agcf(fe);
                         msleep(100);
-                        tuner_i2c_xfer_send(&priv->i2c_props, &addr_agc_stat, 1);
-                        tuner_i2c_xfer_recv(&priv->i2c_props, &agc_stat, 1);
-                        tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
-                        tuner_i2c_xfer_recv(&priv->i2c_props, &pll_stat, 1);
+                        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                                 &addr_agc_stat, 1,
+                                                 &agc_stat, 1);
+                        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                                 &addr_pll_stat, 1,
+                                                 &pll_stat, 1);
                         if((agc_stat > 115) || !(pll_stat & 0x80)) {
                                 tuner_dbg("adjust gain, step 3. Agc: %d\n", agc_stat);
                                 tuner_i2c_xfer_send(&priv->i2c_props, adc_head_12, 2);
@@ -284,10 +288,12 @@ static void tda8290_set_params(struct dvb_frontend *fe,
 
         /* l/ l' deadlock? */
         if(priv->tda8290_easy_mode & 0x60) {
-                tuner_i2c_xfer_send(&priv->i2c_props, &addr_adc_sat, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &adc_sat, 1);
-                tuner_i2c_xfer_send(&priv->i2c_props, &addr_pll_stat, 1);
-                tuner_i2c_xfer_recv(&priv->i2c_props, &pll_stat, 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                         &addr_adc_sat, 1,
+                                         &adc_sat, 1);
+                tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                         &addr_pll_stat, 1,
+                                         &pll_stat, 1);
                 if ((adc_sat > 20) || !(pll_stat & 0x80)) {
                         tuner_dbg("trying to resolve SECAM L deadlock\n");
                         tuner_i2c_xfer_send(&priv->i2c_props, agc_rst_on, 2);
@@ -307,8 +313,7 @@ static void tda8295_power(struct dvb_frontend *fe, int enable)
         struct tda8290_priv *priv = fe->analog_demod_priv;
         unsigned char buf[] = { 0x30, 0x00 }; /* clb_stdbt */
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props, &buf[0], 1, &buf[1], 1);
 
         if (enable)
                 buf[1] = 0x01;
@@ -323,8 +328,7 @@ static void tda8295_set_easy_mode(struct dvb_frontend *fe, int enable)
         struct tda8290_priv *priv = fe->analog_demod_priv;
         unsigned char buf[] = { 0x01, 0x00 };
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props, &buf[0], 1, &buf[1], 1);
 
         if (enable)
                 buf[1] = 0x01; /* rising edge sets regs 0x02 - 0x23 */
@@ -353,8 +357,7 @@ static void tda8295_agc1_out(struct dvb_frontend *fe, int enable)
         struct tda8290_priv *priv = fe->analog_demod_priv;
         unsigned char buf[] = { 0x02, 0x00 }; /* DIV_FUNC */
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &buf[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &buf[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props, &buf[0], 1, &buf[1], 1);
 
         if (enable)
                 buf[1] &= ~0x40;
@@ -370,10 +373,10 @@ static void tda8295_agc2_out(struct dvb_frontend *fe, int enable)
         unsigned char set_gpio_cf[]    = { 0x44, 0x00 };
         unsigned char set_gpio_val[]   = { 0x46, 0x00 };
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &set_gpio_cf[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &set_gpio_cf[1], 1);
-        tuner_i2c_xfer_send(&priv->i2c_props, &set_gpio_val[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &set_gpio_val[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                 &set_gpio_cf[0], 1, &set_gpio_cf[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                 &set_gpio_val[0], 1, &set_gpio_val[1], 1);
 
         set_gpio_cf[1] &= 0xf0; /* clear GPIO_0 bits 3-0 */
 
@@ -392,8 +395,7 @@ static int tda8295_has_signal(struct dvb_frontend *fe)
         unsigned char hvpll_stat = 0x26;
         unsigned char ret;
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &hvpll_stat, 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &ret, 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props, &hvpll_stat, 1, &ret, 1);
         return (ret & 0x01) ? 65535 : 0;
 }
 
@@ -413,8 +415,8 @@ static void tda8295_set_params(struct dvb_frontend *fe,
         tda8295_power(fe, 1);
         tda8295_agc1_out(fe, 1);
 
-        tuner_i2c_xfer_send(&priv->i2c_props, &blanking_mode[0], 1);
-        tuner_i2c_xfer_recv(&priv->i2c_props, &blanking_mode[1], 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                 &blanking_mode[0], 1, &blanking_mode[1], 1);
 
         tda8295_set_video_std(fe);
 
@@ -447,8 +449,8 @@ static int tda8290_has_signal(struct dvb_frontend *fe)
         unsigned char i2c_get_afc[1] = { 0x1B };
         unsigned char afc = 0;
 
-        tuner_i2c_xfer_send(&priv->i2c_props, i2c_get_afc, ARRAY_SIZE(i2c_get_afc));
-        tuner_i2c_xfer_recv(&priv->i2c_props, &afc, 1);
+        tuner_i2c_xfer_send_recv(&priv->i2c_props,
+                                 i2c_get_afc, ARRAY_SIZE(i2c_get_afc), &afc, 1);
         return (afc & 0x80)? 65535:0;
 }
 
@@ -654,20 +656,26 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
 static int tda8290_probe(struct tuner_i2c_props *i2c_props)
 {
 #define TDA8290_ID 0x89
-        unsigned char tda8290_id[] = { 0x1f, 0x00 };
+        u8 reg = 0x1f, id;
+        struct i2c_msg msg_read[] = {
+                { .addr = 0x4b, .flags = 0, .len = 1, .buf = &reg },
+                { .addr = 0x4b, .flags = I2C_M_RD, .len = 1, .buf = &id },
+        };
 
         /* detect tda8290 */
-        tuner_i2c_xfer_send(i2c_props, &tda8290_id[0], 1);
-        tuner_i2c_xfer_recv(i2c_props, &tda8290_id[1], 1);
+        if (i2c_transfer(i2c_props->adap, msg_read, 2) != 2) {
+                printk(KERN_WARNING "%s: tda8290 couldn't read register 0x%02x\n",
+                               __func__, reg);
+                return -ENODEV;
+        }
 
-        if (tda8290_id[1] == TDA8290_ID) {
+        if (id == TDA8290_ID) {
                 if (debug)
                         printk(KERN_DEBUG "%s: tda8290 detected @ %d-%04x\n",
                                __func__, i2c_adapter_id(i2c_props->adap),
                                i2c_props->addr);
                 return 0;
         }
-
         return -ENODEV;
 }
 
@@ -675,16 +683,23 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props)
 {
 #define TDA8295_ID 0x8a
 #define TDA8295C2_ID 0x8b
-        unsigned char tda8295_id[] = { 0x2f, 0x00 };
+        u8 reg = 0x2f, id;
+        struct i2c_msg msg_read[] = {
+                { .addr = 0x4b, .flags = 0, .len = 1, .buf = &reg },
+                { .addr = 0x4b, .flags = I2C_M_RD, .len = 1, .buf = &id },
+        };
 
-        /* detect tda8295 */
-        tuner_i2c_xfer_send(i2c_props, &tda8295_id[0], 1);
-        tuner_i2c_xfer_recv(i2c_props, &tda8295_id[1], 1);
+        /* detect tda8290 */
+        if (i2c_transfer(i2c_props->adap, msg_read, 2) != 2) {
+                printk(KERN_WARNING "%s: tda8290 couldn't read register 0x%02x\n",
+                               __func__, reg);
+                return -ENODEV;
+        }
 
-        if ((tda8295_id[1] & 0xfe) == TDA8295_ID) {
+        if ((id & 0xfe) == TDA8295_ID) {
                 if (debug)
                         printk(KERN_DEBUG "%s: %s detected @ %d-%04x\n",
-                               __func__, (tda8295_id[1] == TDA8295_ID) ?
+                               __func__, (id == TDA8295_ID) ?
                                "tda8295c1" : "tda8295c2",
                                i2c_adapter_id(i2c_props->adap),
                                i2c_props->addr);
@@ -740,9 +755,11 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
                        sizeof(struct analog_demod_ops));
         }
 
-        if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) &&
-            (tda829x_find_tuner(fe) < 0))
-                goto fail;
+        if (!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) {
+                tda8295_power(fe, 1);
+                if (tda829x_find_tuner(fe) < 0)
+                        goto fail;
+        }
 
         switch (priv->ver) {
         case TDA8290:
@@ -786,6 +803,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
         return fe;
 
 fail:
+        memset(&fe->ops.analog_ops, 0, sizeof(struct analog_demod_ops));
+
         tda829x_release(fe);
         return NULL;
 }
@@ -809,8 +828,8 @@ int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr)
         int i;
 
         /* rule out tda9887, which would return the same byte repeatedly */
-        tuner_i2c_xfer_send(&i2c_props, soft_reset, 1);
-        tuner_i2c_xfer_recv(&i2c_props, buf, PROBE_BUFFER_SIZE);
+        tuner_i2c_xfer_send_recv(&i2c_props,
+                                 soft_reset, 1, buf, PROBE_BUFFER_SIZE);
         for (i = 1; i < PROBE_BUFFER_SIZE; i++) {
                 if (buf[i] != buf[0])
                         break;
@@ -827,13 +846,12 @@ int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr)
         /* fall back to old probing method */
         tuner_i2c_xfer_send(&i2c_props, easy_mode_b, 2);
         tuner_i2c_xfer_send(&i2c_props, soft_reset, 2);
-        tuner_i2c_xfer_send(&i2c_props, &addr_dto_lsb, 1);
-        tuner_i2c_xfer_recv(&i2c_props, &data, 1);
+        tuner_i2c_xfer_send_recv(&i2c_props, &addr_dto_lsb, 1, &data, 1);
         if (data == 0) {
                 tuner_i2c_xfer_send(&i2c_props, easy_mode_g, 2);
                 tuner_i2c_xfer_send(&i2c_props, soft_reset, 2);
-                tuner_i2c_xfer_send(&i2c_props, &addr_dto_lsb, 1);
-                tuner_i2c_xfer_recv(&i2c_props, &data, 1);
+                tuner_i2c_xfer_send_recv(&i2c_props,
+                                         &addr_dto_lsb, 1, &data, 1);
                 if (data == 0x7b) {
                         return 0;
                 }
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index 8ca48f76dfa9..98ffb40728e3 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -514,8 +514,8 @@ struct dib0700_rc_response {
         union {
                 u16 system16;
                 struct {
-                        u8 system;
                         u8 not_system;
+                        u8 system;
                 };
         };
         u8 data;
@@ -575,7 +575,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                 if ((poll_reply->system ^ poll_reply->not_system) != 0xff) {
                         deb_data("NEC extended protocol\n");
                         /* NEC extended code - 24 bits */
-                        keycode = poll_reply->system16 << 8 | poll_reply->data;
+                        keycode = be16_to_cpu(poll_reply->system16) << 8 | poll_reply->data;
                 } else {
                         deb_data("NEC normal protocol\n");
                         /* normal NEC code - 16 bits */
@@ -587,7 +587,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
                 deb_data("RC5 protocol\n");
                 /* RC5 Protocol */
                 toggle = poll_reply->report_id;
-                keycode = poll_reply->system16 << 8 | poll_reply->data;
+                keycode = poll_reply->system << 8 | poll_reply->data;
 
                 break;
         }
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/dvb/firewire/firedtv-rc.c
index fcf3828472b8..f82d4a93feb3 100644
--- a/drivers/media/dvb/firewire/firedtv-rc.c
+++ b/drivers/media/dvb/firewire/firedtv-rc.c
@@ -172,7 +172,8 @@ void fdtv_unregister_rc(struct firedtv *fdtv)
 
 void fdtv_handle_rc(struct firedtv *fdtv, unsigned int code)
 {
-        u16 *keycode = fdtv->remote_ctrl_dev->keycode;
+        struct input_dev *idev = fdtv->remote_ctrl_dev;
+        u16 *keycode = idev->keycode;
 
         if (code >= 0x0300 && code <= 0x031f)
                 code = keycode[code - 0x0300];
@@ -188,6 +189,8 @@ void fdtv_handle_rc(struct firedtv *fdtv, unsigned int code)
                 return;
         }
 
-        input_report_key(fdtv->remote_ctrl_dev, code, 1);
-        input_report_key(fdtv->remote_ctrl_dev, code, 0);
+        input_report_key(idev, code, 1);
+        input_sync(idev);
+        input_report_key(idev, code, 0);
+        input_sync(idev);
 }
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index ef3e43a03199..b8519ba511e5 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -1,7 +1,7 @@
 config DVB_FE_CUSTOMISE
         bool "Customise the frontend modules to build"
         depends on DVB_CORE
-        default y if EMBEDDED
+        default y if EXPERT
         help
           This allows the user to select/deselect frontend drivers for their
           hardware from the build.
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index ce222055526d..ba25fa0b0fc2 100644
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -334,11 +334,11 @@ static int af9013_set_freq_ctrl(struct af9013_state *state, fe_bandwidth_t bw)
                                 if_sample_freq = 3300000; /* 3.3 MHz */
                                 break;
                         case BANDWIDTH_7_MHZ:
-                                if_sample_freq = 3800000; /* 3.8 MHz */
+                                if_sample_freq = 3500000; /* 3.5 MHz */
                                 break;
                         case BANDWIDTH_8_MHZ:
                         default:
-                                if_sample_freq = 4300000; /* 4.3 MHz */
+                                if_sample_freq = 4000000; /* 4.0 MHz */
                                 break;
                         }
                 } else if (state->config.tuner == AF9013_TUNER_TDA18218) {
diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb/frontends/ix2505v.c
index 6360c681ded9..6c2e929bd79f 100644
--- a/drivers/media/dvb/frontends/ix2505v.c
+++ b/drivers/media/dvb/frontends/ix2505v.c
@@ -311,7 +311,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe,
         return fe;
 
 error:
-        ix2505v_release(fe);
+        kfree(state);
         return NULL;
 }
 EXPORT_SYMBOL(ix2505v_attach);
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index d3ad3e75a35a..cc4acd2f920d 100644
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -43,6 +43,8 @@ struct mb86a20s_state {
         const struct mb86a20s_config *config;
 
         struct dvb_frontend frontend;
+
+        bool need_init;
 };
 
 struct regdata {
@@ -318,7 +320,7 @@ static int mb86a20s_i2c_writereg(struct mb86a20s_state *state,
 
         rc = i2c_transfer(state->i2c, &msg, 1);
         if (rc != 1) {
-                printk("%s: writereg rcor(rc == %i, reg == 0x%02x,"
+                printk("%s: writereg error (rc == %i, reg == 0x%02x,"
                          " data == 0x%02x)\n", __func__, rc, reg, data);
                 return rc;
         }
@@ -353,7 +355,7 @@ static int mb86a20s_i2c_readreg(struct mb86a20s_state *state,
         rc = i2c_transfer(state->i2c, msg, 2);
 
         if (rc != 2) {
-                rc("%s: reg=0x%x (rcor=%d)\n", __func__, reg, rc);
+                rc("%s: reg=0x%x (error=%d)\n", __func__, reg, rc);
                 return rc;
         }
 
@@ -382,23 +384,31 @@ static int mb86a20s_initfe(struct dvb_frontend *fe)
         /* Initialize the frontend */
         rc = mb86a20s_writeregdata(state, mb86a20s_init);
         if (rc < 0)
-                return rc;
+                goto err;
 
         if (!state->config->is_serial) {
                 regD5 &= ~1;
 
                 rc = mb86a20s_writereg(state, 0x50, 0xd5);
                 if (rc < 0)
-                        return rc;
+                        goto err;
                 rc = mb86a20s_writereg(state, 0x51, regD5);
                 if (rc < 0)
-                        return rc;
+                        goto err;
         }
 
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
 
-        return 0;
+err:
+        if (rc < 0) {
+                state->need_init = true;
+                printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n");
+        } else {
+                state->need_init = false;
+                dprintk("Initialization succeded.\n");
+        }
+        return rc;
 }
 
 static int mb86a20s_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
@@ -485,8 +495,22 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe,
 
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
+        dprintk("Calling tuner set parameters\n");
         fe->ops.tuner_ops.set_params(fe, p);
 
+        /*
+         * Make it more reliable: if, for some reason, the initial
+         * device initialization doesn't happen, initialize it when
+         * a SBTVD parameters are adjusted.
+         *
+         * Unfortunately, due to a hard to track bug at tda829x/tda18271,
+         * the agc callback logic is not called during DVB attach time,
+         * causing mb86a20s to not be initialized with Kworld SBTVD.
+         * So, this hack is needed, in order to make Kworld SBTVD to work.
+         */
+        if (state->need_init)
+                mb86a20s_initfe(fe);
+
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 0);
         rc = mb86a20s_writeregdata(state, mb86a20s_reset_reception);
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index 122c72806916..9fc1dd0ba4c3 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -277,7 +277,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg)
         {
                 ca_slot_info_t *info=(ca_slot_info_t *)parg;
 
-                if (info->num > 1)
+                if (info->num < 0 || info->num > 1)
                         return -EINVAL;
                 av7110->ci_slot[info->num].num = info->num;
                 av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ?
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 3c5a4739ed70..ecdffa6aac66 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -151,20 +151,6 @@ config RADIO_GEMTEK_PROBE
           following ports will be probed: 0x20c, 0x30c, 0x24c, 0x34c, 0x248 and
           0x28c.
 
-config RADIO_GEMTEK_PCI
-        tristate "GemTek PCI Radio Card support"
-        depends on VIDEO_V4L2 && PCI
-        ---help---
-          Choose Y here if you have this PCI FM radio card.
-
-          In order to control your radio card, you will need to use programs
-          that are compatible with the Video for Linux API.  Information on
-          this API and pointers to "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called radio-gemtek-pci.
-
 config RADIO_MAXIRADIO
         tristate "Guillemot MAXI Radio FM 2000 radio"
         depends on VIDEO_V4L2 && PCI
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile
index d2970748a69f..717656d2f749 100644
--- a/drivers/media/radio/Makefile
+++ b/drivers/media/radio/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_RADIO_MAXIRADIO) += radio-maxiradio.o
 obj-$(CONFIG_RADIO_RTRACK) += radio-aimslab.o
 obj-$(CONFIG_RADIO_ZOLTRIX) += radio-zoltrix.o
 obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o
-obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o
 obj-$(CONFIG_RADIO_TRUST) += radio-trust.o
 obj-$(CONFIG_I2C_SI4713) += si4713-i2c.o
 obj-$(CONFIG_RADIO_SI4713) += radio-si4713.o
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 6cc5d130fbc8..4ce10dbeadd8 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -31,6 +31,7 @@
 #include <linux/module.h>       /* Modules                      */
 #include <linux/init.h>         /* Initdata                     */
 #include <linux/ioport.h>       /* request_region               */
+#include <linux/delay.h>        /* msleep                       */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #include <linux/io.h>           /* outb, outb_p                 */
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
deleted file mode 100644
index 28fa85ba2087..000000000000
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- ***************************************************************************
- *
- *     radio-gemtek-pci.c - Gemtek PCI Radio driver
- *     (C) 2001 Vladimir Shebordaev <vshebordaev@mail.ru>
- *
- ***************************************************************************
- *
- *     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.
- *
- ***************************************************************************
- *
- *     Gemtek Corp still silently refuses to release any specifications
- *     of their multimedia devices, so the protocol still has to be
- *     reverse engineered.
- *
- *     The v4l code was inspired by Jonas Munsin's  Gemtek serial line
- *     radio device driver.
- *
- *     Please, let me know if this piece of code was useful :)
- *
- *     TODO: multiple device support and portability were not tested
- *
- *     Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
- *
- ***************************************************************************
- */
-
-#include <linux/types.h>
-#include <linux/list.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/videodev2.h>
-#include <linux/errno.h>
-#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-ioctl.h>
-
-MODULE_AUTHOR("Vladimir Shebordaev <vshebordaev@mail.ru>");
-MODULE_DESCRIPTION("The video4linux driver for the Gemtek PCI Radio Card");
-MODULE_LICENSE("GPL");
-
-static int nr_radio = -1;
-static int mx = 1;
-
-module_param(mx, bool, 0);
-MODULE_PARM_DESC(mx, "single digit: 1 - turn off the turner upon module exit (default), 0 - do not");
-module_param(nr_radio, int, 0);
-MODULE_PARM_DESC(nr_radio, "video4linux device number to use");
-
-#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
-
-#ifndef PCI_VENDOR_ID_GEMTEK
-#define PCI_VENDOR_ID_GEMTEK 0x5046
-#endif
-
-#ifndef PCI_DEVICE_ID_GEMTEK_PR103
-#define PCI_DEVICE_ID_GEMTEK_PR103 0x1001
-#endif
-
-#ifndef GEMTEK_PCI_RANGE_LOW
-#define GEMTEK_PCI_RANGE_LOW (87*16000)
-#endif
-
-#ifndef GEMTEK_PCI_RANGE_HIGH
-#define GEMTEK_PCI_RANGE_HIGH (108*16000)
-#endif
-
-struct gemtek_pci {
-        struct v4l2_device v4l2_dev;
-        struct video_device vdev;
-        struct mutex lock;
-        struct pci_dev *pdev;
-
-        u32 iobase;
-        u32 length;
-
-        u32 current_frequency;
-        u8  mute;
-};
-
-static inline struct gemtek_pci *to_gemtek_pci(struct v4l2_device *v4l2_dev)
-{
-        return container_of(v4l2_dev, struct gemtek_pci, v4l2_dev);
-}
-
-static inline u8 gemtek_pci_out(u16 value, u32 port)
-{
-        outw(value, port);
-
-        return (u8)value;
-}
-
-#define _b0(v) (*((u8 *)&v))
-
-static void __gemtek_pci_cmd(u16 value, u32 port, u8 *last_byte, int keep)
-{
-        u8 byte = *last_byte;
-
-        if (!value) {
-                if (!keep)
-                        value = (u16)port;
-                byte &= 0xfd;
-        } else
-                byte |= 2;
-
-        _b0(value) = byte;
-        outw(value, port);
-        byte |= 1;
-        _b0(value) = byte;
-        outw(value, port);
-        byte &= 0xfe;
-        _b0(value) = byte;
-        outw(value, port);
-
-        *last_byte = byte;
-}
-
-static inline void gemtek_pci_nil(u32 port, u8 *last_byte)
-{
-        __gemtek_pci_cmd(0x00, port, last_byte, false);
-}
-
-static inline void gemtek_pci_cmd(u16 cmd, u32 port, u8 *last_byte)
-{
-        __gemtek_pci_cmd(cmd, port, last_byte, true);
-}
-
-static void gemtek_pci_setfrequency(struct gemtek_pci *card, unsigned long frequency)
-{
-        int i;
-        u32 value = frequency / 200 + 856;
-        u16 mask = 0x8000;
-        u8 last_byte;
-        u32 port = card->iobase;
-
-        mutex_lock(&card->lock);
-        card->current_frequency = frequency;
-        last_byte = gemtek_pci_out(0x06, port);
-
-        i = 0;
-        do {
-                gemtek_pci_nil(port, &last_byte);
-                i++;
-        } while (i < 9);
-
-        i = 0;
-        do {
-                gemtek_pci_cmd(value & mask, port, &last_byte);
-                mask >>= 1;
-                i++;
-        } while (i < 16);
-
-        outw(0x10, port);
-        mutex_unlock(&card->lock);
-}
-
-
-static void gemtek_pci_mute(struct gemtek_pci *card)
-{
-        mutex_lock(&card->lock);
-        outb(0x1f, card->iobase);
-        card->mute = true;
-        mutex_unlock(&card->lock);
-}
-
-static void gemtek_pci_unmute(struct gemtek_pci *card)
-{
-        if (card->mute) {
-                gemtek_pci_setfrequency(card, card->current_frequency);
-                card->mute = false;
-        }
-}
-
-static int gemtek_pci_getsignal(struct gemtek_pci *card)
-{
-        int sig;
-
-        mutex_lock(&card->lock);
-        sig = (inb(card->iobase) & 0x08) ? 0 : 1;
-        mutex_unlock(&card->lock);
-        return sig;
-}
-
-static int vidioc_querycap(struct file *file, void *priv,
-                                        struct v4l2_capability *v)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        strlcpy(v->driver, "radio-gemtek-pci", sizeof(v->driver));
-        strlcpy(v->card, "GemTek PCI Radio", sizeof(v->card));
-        snprintf(v->bus_info, sizeof(v->bus_info), "PCI:%s", pci_name(card->pdev));
-        v->version = RADIO_VERSION;
-        v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
-        return 0;
-}
-
-static int vidioc_g_tuner(struct file *file, void *priv,
-                                        struct v4l2_tuner *v)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        if (v->index > 0)
-                return -EINVAL;
-
-        strlcpy(v->name, "FM", sizeof(v->name));
-        v->type = V4L2_TUNER_RADIO;
-        v->rangelow = GEMTEK_PCI_RANGE_LOW;
-        v->rangehigh = GEMTEK_PCI_RANGE_HIGH;
-        v->rxsubchans = V4L2_TUNER_SUB_MONO;
-        v->capability = V4L2_TUNER_CAP_LOW;
-        v->audmode = V4L2_TUNER_MODE_MONO;
-        v->signal = 0xffff * gemtek_pci_getsignal(card);
-        return 0;
-}
-
-static int vidioc_s_tuner(struct file *file, void *priv,
-                                        struct v4l2_tuner *v)
-{
-        return v->index ? -EINVAL : 0;
-}
-
-static int vidioc_s_frequency(struct file *file, void *priv,
-                                        struct v4l2_frequency *f)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
-                return -EINVAL;
-        if (f->frequency < GEMTEK_PCI_RANGE_LOW ||
-            f->frequency > GEMTEK_PCI_RANGE_HIGH)
-                return -EINVAL;
-        gemtek_pci_setfrequency(card, f->frequency);
-        card->mute = false;
-        return 0;
-}
-
-static int vidioc_g_frequency(struct file *file, void *priv,
-                                        struct v4l2_frequency *f)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        if (f->tuner != 0)
-                return -EINVAL;
-        f->type = V4L2_TUNER_RADIO;
-        f->frequency = card->current_frequency;
-        return 0;
-}
-
-static int vidioc_queryctrl(struct file *file, void *priv,
-                                        struct v4l2_queryctrl *qc)
-{
-        switch (qc->id) {
-        case V4L2_CID_AUDIO_MUTE:
-                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
-        case V4L2_CID_AUDIO_VOLUME:
-                return v4l2_ctrl_query_fill(qc, 0, 65535, 65535, 65535);
-        }
-        return -EINVAL;
-}
-
-static int vidioc_g_ctrl(struct file *file, void *priv,
-                                        struct v4l2_control *ctrl)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        switch (ctrl->id) {
-        case V4L2_CID_AUDIO_MUTE:
-                ctrl->value = card->mute;
-                return 0;
-        case V4L2_CID_AUDIO_VOLUME:
-                if (card->mute)
-                        ctrl->value = 0;
-                else
-                        ctrl->value = 65535;
-                return 0;
-        }
-        return -EINVAL;
-}
-
-static int vidioc_s_ctrl(struct file *file, void *priv,
-                                        struct v4l2_control *ctrl)
-{
-        struct gemtek_pci *card = video_drvdata(file);
-
-        switch (ctrl->id) {
-        case V4L2_CID_AUDIO_MUTE:
-                if (ctrl->value)
-                        gemtek_pci_mute(card);
-                else
-                        gemtek_pci_unmute(card);
-                return 0;
-        case V4L2_CID_AUDIO_VOLUME:
-                if (ctrl->value)
-                        gemtek_pci_unmute(card);
-                else
-                        gemtek_pci_mute(card);
-                return 0;
-        }
-        return -EINVAL;
-}
-
-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)
-{
-        return i ? -EINVAL : 0;
-}
-
-static int vidioc_g_audio(struct file *file, void *priv,
-                                        struct v4l2_audio *a)
-{
-        a->index = 0;
-        strlcpy(a->name, "Radio", sizeof(a->name));
-        a->capability = V4L2_AUDCAP_STEREO;
-        return 0;
-}
-
-static int vidioc_s_audio(struct file *file, void *priv,
-                                        struct v4l2_audio *a)
-{
-        return a->index ? -EINVAL : 0;
-}
-
-enum {
-        GEMTEK_PR103
-};
-
-static char *card_names[] __devinitdata = {
-        "GEMTEK_PR103"
-};
-
-static struct pci_device_id gemtek_pci_id[] =
-{
-        { PCI_VENDOR_ID_GEMTEK, PCI_DEVICE_ID_GEMTEK_PR103,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, GEMTEK_PR103 },
-        { 0 }
-};
-
-MODULE_DEVICE_TABLE(pci, gemtek_pci_id);
-
-static const struct v4l2_file_operations gemtek_pci_fops = {
-        .owner          = THIS_MODULE,
-        .unlocked_ioctl = video_ioctl2,
-};
-
-static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
-        .vidioc_querycap    = vidioc_querycap,
-        .vidioc_g_tuner     = vidioc_g_tuner,
-        .vidioc_s_tuner     = vidioc_s_tuner,
-        .vidioc_g_audio     = vidioc_g_audio,
-        .vidioc_s_audio     = vidioc_s_audio,
-        .vidioc_g_input     = vidioc_g_input,
-        .vidioc_s_input     = vidioc_s_input,
-        .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,
-};
-
-static int __devinit gemtek_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
-{
-        struct gemtek_pci *card;
-        struct v4l2_device *v4l2_dev;
-        int res;
-
-        card = kzalloc(sizeof(struct gemtek_pci), GFP_KERNEL);
-        if (card == NULL) {
-                dev_err(&pdev->dev, "out of memory\n");
-                return -ENOMEM;
-        }
-
-        v4l2_dev = &card->v4l2_dev;
-        mutex_init(&card->lock);
-        card->pdev = pdev;
-
-        strlcpy(v4l2_dev->name, "gemtek_pci", sizeof(v4l2_dev->name));
-
-        res = v4l2_device_register(&pdev->dev, v4l2_dev);
-        if (res < 0) {
-                v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
-                kfree(card);
-                return res;
-        }
-
-        if (pci_enable_device(pdev))
-                goto err_pci;
-
-        card->iobase = pci_resource_start(pdev, 0);
-        card->length = pci_resource_len(pdev, 0);
-
-        if (request_region(card->iobase, card->length, card_names[pci_id->driver_data]) == NULL) {
-                v4l2_err(v4l2_dev, "i/o port already in use\n");
-                goto err_pci;
-        }
-
-        strlcpy(card->vdev.name, v4l2_dev->name, sizeof(card->vdev.name));
-        card->vdev.v4l2_dev = v4l2_dev;
-        card->vdev.fops = &gemtek_pci_fops;
-        card->vdev.ioctl_ops = &gemtek_pci_ioctl_ops;
-        card->vdev.release = video_device_release_empty;
-        video_set_drvdata(&card->vdev, card);
-
-        gemtek_pci_mute(card);
-
-        if (video_register_device(&card->vdev, VFL_TYPE_RADIO, nr_radio) < 0)
-                goto err_video;
-
-        v4l2_info(v4l2_dev, "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n",
-                pdev->revision, card->iobase, card->iobase + card->length - 1);
-
-        return 0;
-
-err_video:
-        release_region(card->iobase, card->length);
-
-err_pci:
-        v4l2_device_unregister(v4l2_dev);
-        kfree(card);
-        return -ENODEV;
-}
-
-static void __devexit gemtek_pci_remove(struct pci_dev *pdev)
-{
-        struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev);
-        struct gemtek_pci *card = to_gemtek_pci(v4l2_dev);
-
-        video_unregister_device(&card->vdev);
-        v4l2_device_unregister(v4l2_dev);
-
-        release_region(card->iobase, card->length);
-
-        if (mx)
-                gemtek_pci_mute(card);
-
-        kfree(card);
-}
-
-static struct pci_driver gemtek_pci_driver = {
-        .name           = "gemtek_pci",
-        .id_table       = gemtek_pci_id,
-        .probe          = gemtek_pci_probe,
-        .remove         = __devexit_p(gemtek_pci_remove),
-};
-
-static int __init gemtek_pci_init(void)
-{
-        return pci_register_driver(&gemtek_pci_driver);
-}
-
-static void __exit gemtek_pci_exit(void)
-{
-        pci_unregister_driver(&gemtek_pci_driver);
-}
-
-module_init(gemtek_pci_init);
-module_exit(gemtek_pci_exit);
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 6459a220b0dd..5c2a9058c09f 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -77,8 +77,8 @@ MODULE_PARM_DESC(debug, "activates debug info");
 /* TEA5757 pin mappings */
 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
 
-#define FREQ_LO         (50 * 16000)
-#define FREQ_HI         (150 * 16000)
+#define FREQ_LO         (87 * 16000)
+#define FREQ_HI         (108 * 16000)
 
 #define FREQ_IF         171200 /* 10.7*16000   */
 #define FREQ_STEP       200    /* 12.5*16      */
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index dd6bd364efa0..7ecc8e657663 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1407,7 +1407,7 @@ static const struct v4l2_file_operations wl1273_fops = {
         .read           = wl1273_fm_fops_read,
         .write          = wl1273_fm_fops_write,
         .poll           = wl1273_fm_fops_poll,
-        .ioctl          = video_ioctl2,
+        .unlocked_ioctl = video_ioctl2,
         .open           = wl1273_fm_fops_open,
         .release        = wl1273_fm_fops_release,
 };
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index ac76dfe5b3fa..60c176fe328e 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -357,7 +357,8 @@ int si470x_start(struct si470x_device *radio)
                 goto done;
 
         /* sysconfig 1 */
-        radio->registers[SYSCONFIG1] = SYSCONFIG1_DE;
+        radio->registers[SYSCONFIG1] =
+                (de << 11) & SYSCONFIG1_DE;             /* DE*/
         retval = si470x_set_register(radio, SYSCONFIG1);
         if (retval < 0)
                 goto done;
@@ -687,12 +688,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
         /* driver constants */
         strcpy(tuner->name, "FM");
         tuner->type = V4L2_TUNER_RADIO;
-#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
         tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
                             V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;
-#else
-        tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
-#endif
 
         /* range limits */
         switch ((radio->registers[SYSCONFIG2] & SYSCONFIG2_BAND) >> 6) {
@@ -718,12 +715,10 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
                 tuner->rxsubchans = V4L2_TUNER_SUB_MONO;
         else
                 tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
         /* If there is a reliable method of detecting an RDS channel,
            then this code should check for that before setting this
            RDS subchannel. */
         tuner->rxsubchans |= V4L2_TUNER_SUB_RDS;
-#endif
 
         /* mono/stereo selector */
         if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 80b3c319f698..1ac49139158d 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -446,27 +446,27 @@ static void ene_rx_setup(struct ene_device *dev)
 
 select_timeout:
         if (dev->rx_fan_input_inuse) {
-                dev->rdev->rx_resolution = MS_TO_NS(ENE_FW_SAMPLE_PERIOD_FAN);
+                dev->rdev->rx_resolution = US_TO_NS(ENE_FW_SAMPLE_PERIOD_FAN);
 
                 /* Fan input doesn't support timeouts, it just ends the
                         input with a maximum sample */
                 dev->rdev->min_timeout = dev->rdev->max_timeout =
-                        MS_TO_NS(ENE_FW_SMPL_BUF_FAN_MSK *
+                        US_TO_NS(ENE_FW_SMPL_BUF_FAN_MSK *
                                 ENE_FW_SAMPLE_PERIOD_FAN);
         } else {
-                dev->rdev->rx_resolution = MS_TO_NS(sample_period);
+                dev->rdev->rx_resolution = US_TO_NS(sample_period);
 
                 /* Theoreticly timeout is unlimited, but we cap it
                  * because it was seen that on one device, it
                  * would stop sending spaces after around 250 msec.
                  * Besides, this is close to 2^32 anyway and timeout is u32.
                  */
-                dev->rdev->min_timeout = MS_TO_NS(127 * sample_period);
-                dev->rdev->max_timeout = MS_TO_NS(200000);
+                dev->rdev->min_timeout = US_TO_NS(127 * sample_period);
+                dev->rdev->max_timeout = US_TO_NS(200000);
         }
 
         if (dev->hw_learning_and_tx_capable)
-                dev->rdev->tx_resolution = MS_TO_NS(sample_period);
+                dev->rdev->tx_resolution = US_TO_NS(sample_period);
 
         if (dev->rdev->timeout > dev->rdev->max_timeout)
                 dev->rdev->timeout = dev->rdev->max_timeout;
@@ -801,7 +801,7 @@ static irqreturn_t ene_isr(int irq, void *data)
 
                 dbg("RX: %d (%s)", hw_sample, pulse ? "pulse" : "space");
 
-                ev.duration = MS_TO_NS(hw_sample);
+                ev.duration = US_TO_NS(hw_sample);
                 ev.pulse = pulse;
                 ir_raw_event_store_with_filter(dev->rdev, &ev);
         }
@@ -821,7 +821,7 @@ static void ene_setup_default_settings(struct ene_device *dev)
         dev->learning_mode_enabled = learning_mode_force;
 
         /* Set reasonable default timeout */
-        dev->rdev->timeout = MS_TO_NS(150000);
+        dev->rdev->timeout = US_TO_NS(150000);
 }
 
 /* Upload all hardware settings at once. Used at load and resume time */
@@ -1004,6 +1004,10 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         /* validate resources */
         error = -ENODEV;
 
+        /* init these to -1, as 0 is valid for both */
+        dev->hw_io = -1;
+        dev->irq = -1;
+
         if (!pnp_port_valid(pnp_dev, 0) ||
             pnp_port_len(pnp_dev, 0) < ENE_IO_SIZE)
                 goto error;
@@ -1072,6 +1076,8 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
                 rdev->input_name = "ENE eHome Infrared Remote Transceiver";
         }
 
+        dev->rdev = rdev;
+
         ene_rx_setup_hw_buffer(dev);
         ene_setup_default_settings(dev);
         ene_setup_hw_settings(dev);
@@ -1083,7 +1089,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
         if (error < 0)
                 goto error;
 
-        dev->rdev = rdev;
         ene_notice("driver has been succesfully loaded");
         return 0;
 error:
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h
index c179baf34cb4..337a41d4450b 100644
--- a/drivers/media/rc/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -201,8 +201,6 @@
 #define dbg_verbose(format, ...)        __dbg(2, format, ## __VA_ARGS__)
 #define dbg_regs(format, ...)           __dbg(3, format, ## __VA_ARGS__)
 
-#define MS_TO_NS(msec) ((msec) * 1000)
-
 struct ene_device {
         struct pnp_dev *pnp_dev;
         struct rc_dev *rdev;
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 6811512b4e83..e7dc6b46fdfa 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -988,7 +988,6 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
         int retval;
         struct imon_context *ictx = rc->priv;
         struct device *dev = ictx->dev;
-        bool pad_mouse;
         unsigned char ir_proto_packet[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
 
@@ -1000,29 +999,20 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
         case RC_TYPE_RC6:
                 dev_dbg(dev, "Configuring IR receiver for MCE protocol\n");
                 ir_proto_packet[0] = 0x01;
-                pad_mouse = false;
                 break;
         case RC_TYPE_UNKNOWN:
         case RC_TYPE_OTHER:
                 dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
-                if (pad_stabilize && !nomouse)
-                        pad_mouse = true;
-                else {
+                if (!pad_stabilize)
                         dev_dbg(dev, "PAD stabilize functionality disabled\n");
-                        pad_mouse = false;
-                }
                 /* ir_proto_packet[0] = 0x00; // already the default */
                 rc_type = RC_TYPE_OTHER;
                 break;
         default:
                 dev_warn(dev, "Unsupported IR protocol specified, overriding "
                          "to iMON IR protocol\n");
-                if (pad_stabilize && !nomouse)
-                        pad_mouse = true;
-                else {
+                if (!pad_stabilize)
                         dev_dbg(dev, "PAD stabilize functionality disabled\n");
-                        pad_mouse = false;
-                }
                 /* ir_proto_packet[0] = 0x00; // already the default */
                 rc_type = RC_TYPE_OTHER;
                 break;
@@ -1035,7 +1025,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 rc_type)
                 goto out;
 
         ictx->rc_type = rc_type;
-        ictx->pad_mouse = pad_mouse;
+        ictx->pad_mouse = false;
 
 out:
         return retval;
@@ -1517,7 +1507,7 @@ static void imon_incoming_packet(struct imon_context *ictx,
                         spin_unlock_irqrestore(&ictx->kc_lock, flags);
                         return;
                 } else {
-                        ictx->pad_mouse = 0;
+                        ictx->pad_mouse = false;
                         dev_dbg(dev, "mouse mode disabled, passing key value\n");
                 }
         }
@@ -1756,7 +1746,6 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
         printk(KERN_CONT " (id 0x%02x)\n", ffdc_cfg_byte);
 
         ictx->display_type = detected_display_type;
-        ictx->rdev->allowed_protos = allowed_protos;
         ictx->rc_type = allowed_protos;
 }
 
@@ -1839,10 +1828,6 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
         rdev->allowed_protos = RC_TYPE_OTHER | RC_TYPE_RC6; /* iMON PAD or MCE */
         rdev->change_protocol = imon_ir_change_protocol;
         rdev->driver_name = MOD_NAME;
-        if (ictx->rc_type == RC_TYPE_RC6)
-                rdev->map_name = RC_MAP_IMON_MCE;
-        else
-                rdev->map_name = RC_MAP_IMON_PAD;
 
         /* Enable front-panel buttons and/or knobs */
         memcpy(ictx->usb_tx_buf, &fp_packet, sizeof(fp_packet));
@@ -1851,11 +1836,18 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
         if (ret)
                 dev_info(ictx->dev, "panel buttons/knobs setup failed\n");
 
-        if (ictx->product == 0xffdc)
+        if (ictx->product == 0xffdc) {
                 imon_get_ffdc_type(ictx);
+                rdev->allowed_protos = ictx->rc_type;
+        }
 
         imon_set_display_type(ictx);
 
+        if (ictx->rc_type == RC_TYPE_RC6)
+                rdev->map_name = RC_MAP_IMON_MCE;
+        else
+                rdev->map_name = RC_MAP_IMON_PAD;
+
         ret = rc_register_device(rdev);
         if (ret < 0) {
                 dev_err(ictx->dev, "remote input dev register failed\n");
@@ -2108,18 +2100,6 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
                 goto find_endpoint_failed;
         }
 
-        ictx->idev = imon_init_idev(ictx);
-        if (!ictx->idev) {
-                dev_err(dev, "%s: input device setup failed\n", __func__);
-                goto idev_setup_failed;
-        }
-
-        ictx->rdev = imon_init_rdev(ictx);
-        if (!ictx->rdev) {
-                dev_err(dev, "%s: rc device setup failed\n", __func__);
-                goto rdev_setup_failed;
-        }
-
         usb_fill_int_urb(ictx->rx_urb_intf0, ictx->usbdev_intf0,
                 usb_rcvintpipe(ictx->usbdev_intf0,
                         ictx->rx_endpoint_intf0->bEndpointAddress),
@@ -2133,13 +2113,25 @@ static struct imon_context *imon_init_intf0(struct usb_interface *intf)
                 goto urb_submit_failed;
         }
 
+        ictx->idev = imon_init_idev(ictx);
+        if (!ictx->idev) {
+                dev_err(dev, "%s: input device setup failed\n", __func__);
+                goto idev_setup_failed;
+        }
+
+        ictx->rdev = imon_init_rdev(ictx);
+        if (!ictx->rdev) {
+                dev_err(dev, "%s: rc device setup failed\n", __func__);
+                goto rdev_setup_failed;
+        }
+
         return ictx;
 
-urb_submit_failed:
-        rc_unregister_device(ictx->rdev);
 rdev_setup_failed:
         input_unregister_device(ictx->idev);
 idev_setup_failed:
+        usb_kill_urb(ictx->rx_urb_intf0);
+urb_submit_failed:
 find_endpoint_failed:
         mutex_unlock(&ictx->lock);
         usb_free_urb(tx_urb);
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index f011c5d9dea1..1c5cc65ea1e1 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -1,4 +1,4 @@
-/* ir-lirc-codec.c - ir-core to classic lirc interface bridge
+/* ir-lirc-codec.c - rc-core to classic lirc interface bridge
  *
  * Copyright (C) 2010 by Jarod Wilson <jarod@redhat.com>
  *
@@ -47,6 +47,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
         /* Carrier reports */
         if (ev.carrier_report) {
                 sample = LIRC_FREQUENCY(ev.carrier);
+                IR_dprintk(2, "carrier report (freq: %d)\n", sample);
 
         /* Packet end */
         } else if (ev.timeout) {
@@ -62,6 +63,7 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
                         return 0;
 
                 sample = LIRC_TIMEOUT(ev.duration / 1000);
+                IR_dprintk(2, "timeout report (duration: %d)\n", sample);
 
         /* Normal sample */
         } else {
@@ -85,6 +87,8 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
 
                 sample = ev.pulse ? LIRC_PULSE(ev.duration / 1000) :
                                         LIRC_SPACE(ev.duration / 1000);
+                IR_dprintk(2, "delivering %uus %s to lirc_dev\n",
+                           TO_US(ev.duration), TO_STR(ev.pulse));
         }
 
         lirc_buffer_write(dev->raw->lirc.drv->rbuf,
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 185baddcbf14..73230ff93b8a 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -233,7 +233,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_handle);
 
 /* used internally by the sysfs interface */
 u64
-ir_raw_get_allowed_protocols()
+ir_raw_get_allowed_protocols(void)
 {
         u64 protocols;
         mutex_lock(&ir_raw_handler_lock);
diff --git a/drivers/media/rc/keymaps/rc-dib0700-nec.c b/drivers/media/rc/keymaps/rc-dib0700-nec.c
index c59851b203da..7a5f5300caf9 100644
--- a/drivers/media/rc/keymaps/rc-dib0700-nec.c
+++ b/drivers/media/rc/keymaps/rc-dib0700-nec.c
@@ -19,35 +19,35 @@
 
 static struct rc_map_table dib0700_nec_table[] = {
         /* Key codes for the Pixelview SBTVD remote */
-        { 0x8613, KEY_MUTE },
-        { 0x8612, KEY_POWER },
-        { 0x8601, KEY_1 },
-        { 0x8602, KEY_2 },
-        { 0x8603, KEY_3 },
-        { 0x8604, KEY_4 },
-        { 0x8605, KEY_5 },
-        { 0x8606, KEY_6 },
-        { 0x8607, KEY_7 },
-        { 0x8608, KEY_8 },
-        { 0x8609, KEY_9 },
-        { 0x8600, KEY_0 },
-        { 0x860d, KEY_CHANNELUP },
-        { 0x8619, KEY_CHANNELDOWN },
-        { 0x8610, KEY_VOLUMEUP },
-        { 0x860c, KEY_VOLUMEDOWN },
+        { 0x866b13, KEY_MUTE },
+        { 0x866b12, KEY_POWER },
+        { 0x866b01, KEY_1 },
+        { 0x866b02, KEY_2 },
+        { 0x866b03, KEY_3 },
+        { 0x866b04, KEY_4 },
+        { 0x866b05, KEY_5 },
+        { 0x866b06, KEY_6 },
+        { 0x866b07, KEY_7 },
+        { 0x866b08, KEY_8 },
+        { 0x866b09, KEY_9 },
+        { 0x866b00, KEY_0 },
+        { 0x866b0d, KEY_CHANNELUP },
+        { 0x866b19, KEY_CHANNELDOWN },
+        { 0x866b10, KEY_VOLUMEUP },
+        { 0x866b0c, KEY_VOLUMEDOWN },
 
-        { 0x860a, KEY_CAMERA },
-        { 0x860b, KEY_ZOOM },
-        { 0x861b, KEY_BACKSPACE },
-        { 0x8615, KEY_ENTER },
+        { 0x866b0a, KEY_CAMERA },
+        { 0x866b0b, KEY_ZOOM },
+        { 0x866b1b, KEY_BACKSPACE },
+        { 0x866b15, KEY_ENTER },
 
-        { 0x861d, KEY_UP },
-        { 0x861e, KEY_DOWN },
-        { 0x860e, KEY_LEFT },
-        { 0x860f, KEY_RIGHT },
+        { 0x866b1d, KEY_UP },
+        { 0x866b1e, KEY_DOWN },
+        { 0x866b0e, KEY_LEFT },
+        { 0x866b0f, KEY_RIGHT },
 
-        { 0x8618, KEY_RECORD },
-        { 0x861a, KEY_STOP },
+        { 0x866b18, KEY_RECORD },
+        { 0x866b1a, KEY_STOP },
 
         /* Key codes for the EvolutePC TVWay+ remote */
         { 0x7a00, KEY_MENU },
diff --git a/drivers/media/rc/keymaps/rc-rc6-mce.c b/drivers/media/rc/keymaps/rc-rc6-mce.c
index 3bf3337875d1..2f5dc0622b94 100644
--- a/drivers/media/rc/keymaps/rc-rc6-mce.c
+++ b/drivers/media/rc/keymaps/rc-rc6-mce.c
@@ -3,6 +3,9 @@
  *
  * Copyright (c) 2010 by Jarod Wilson <jarod@redhat.com>
  *
+ * See http://mediacenterguides.com/book/export/html/31 for details on
+ * key mappings.
+ *
  * 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
@@ -60,6 +63,9 @@ static struct rc_map_table rc6_mce[] = {
         { 0x800f0426, KEY_EPG },                /* Guide */
         { 0x800f0427, KEY_ZOOM },               /* Aspect */
 
+        { 0x800f0432, KEY_MODE },               /* Visualization */
+        { 0x800f0433, KEY_PRESENTATION },       /* Slide Show */
+        { 0x800f0434, KEY_EJECTCD },
         { 0x800f043a, KEY_BRIGHTNESSUP },
 
         { 0x800f0446, KEY_TV },
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 0fef6efad537..6df0a4980645 100644
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -48,7 +48,6 @@
 #define USB_BUFLEN              32 /* USB reception buffer length */
 #define USB_CTRL_MSG_SZ         2  /* Size of usb ctrl msg on gen1 hw */
 #define MCE_G1_INIT_MSGS        40 /* Init messages on gen1 hw to throw out */
-#define MS_TO_NS(msec)          ((msec) * 1000)
 
 /* MCE constants */
 #define MCE_CMDBUF_SIZE         384  /* MCE Command buffer length */
@@ -817,7 +816,7 @@ static void mceusb_handle_command(struct mceusb_dev *ir, int index)
         switch (ir->buf_in[index]) {
         /* 2-byte return value commands */
         case MCE_CMD_S_TIMEOUT:
-                ir->rc->timeout = MS_TO_NS((hi << 8 | lo) / 2);
+                ir->rc->timeout = US_TO_NS((hi << 8 | lo) / 2);
                 break;
 
         /* 1-byte return value commands */
@@ -856,9 +855,10 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
                         break;
                 case PARSE_IRDATA:
                         ir->rem--;
+                        init_ir_raw_event(&rawir);
                         rawir.pulse = ((ir->buf_in[i] & MCE_PULSE_BIT) != 0);
                         rawir.duration = (ir->buf_in[i] & MCE_PULSE_MASK)
-                                         * MS_TO_NS(MCE_TIME_UNIT);
+                                         * US_TO_NS(MCE_TIME_UNIT);
 
                         dev_dbg(ir->dev, "Storing %s with duration %d\n",
                                 rawir.pulse ? "pulse" : "space",
@@ -884,6 +884,8 @@ static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
                                              i, ir->rem + 1, false);
                         if (ir->rem)
                                 ir->parser_state = PARSE_IRDATA;
+                        else
+                                ir_raw_event_reset(ir->rc);
                         break;
                 }
 
@@ -1061,7 +1063,7 @@ static struct rc_dev *mceusb_init_rc_dev(struct mceusb_dev *ir)
         rc->priv = ir;
         rc->driver_type = RC_DRIVER_IR_RAW;
         rc->allowed_protos = RC_TYPE_ALL;
-        rc->timeout = MS_TO_NS(1000);
+        rc->timeout = US_TO_NS(1000);
         if (!ir->flags.no_tx) {
                 rc->s_tx_mask = mceusb_set_tx_mask;
                 rc->s_tx_carrier = mceusb_set_tx_carrier;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index dd4caf8ef80b..273d9d674792 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -460,7 +460,7 @@ static u32 nvt_rx_carrier_detect(struct nvt_dev *nvt)
                 return 0;
         }
 
-        carrier = (count * 1000000) / duration;
+        carrier = MS_TO_NS(count) / duration;
 
         if ((carrier > MAX_CARRIER) || (carrier < MIN_CARRIER))
                 nvt_dbg("WTF? Carrier frequency out of range!");
@@ -612,8 +612,8 @@ static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
                 sample = nvt->buf[i];
 
                 rawir.pulse = ((sample & BUF_PULSE_BIT) != 0);
-                rawir.duration = (sample & BUF_LEN_MASK)
-                                        * SAMPLE_PERIOD * 1000;
+                rawir.duration = US_TO_NS((sample & BUF_LEN_MASK)
+                                          * SAMPLE_PERIOD);
 
                 if ((sample & BUF_LEN_MASK) == BUF_LEN_MASK) {
                         if (nvt->rawir.pulse == rawir.pulse)
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 72be8a02118c..512a2f4ada0e 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -458,21 +458,27 @@ static int ir_getkeycode(struct input_dev *idev,
                 index = ir_lookup_by_scancode(rc_map, scancode);
         }
 
-        if (index >= rc_map->len) {
-                if (!(ke->flags & INPUT_KEYMAP_BY_INDEX))
-                        IR_dprintk(1, "unknown key for scancode 0x%04x\n",
-                                   scancode);
+        if (index < rc_map->len) {
+                entry = &rc_map->scan[index];
+
+                ke->index = index;
+                ke->keycode = entry->keycode;
+                ke->len = sizeof(entry->scancode);
+                memcpy(ke->scancode, &entry->scancode, sizeof(entry->scancode));
+
+        } else if (!(ke->flags & INPUT_KEYMAP_BY_INDEX)) {
+                /*
+                 * We do not really know the valid range of scancodes
+                 * so let's respond with KEY_RESERVED to anything we
+                 * do not have mapping for [yet].
+                 */
+                ke->index = index;
+                ke->keycode = KEY_RESERVED;
+        } else {
                 retval = -EINVAL;
                 goto out;
         }
 
-        entry = &rc_map->scan[index];
-
-        ke->index = index;
-        ke->keycode = entry->keycode;
-        ke->len = sizeof(entry->scancode);
-        memcpy(ke->scancode, &entry->scancode, sizeof(entry->scancode));
-
         retval = 0;
 
 out:
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index 6e2911c2abfb..e435d94c0776 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -164,7 +164,7 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
                                 sz->signal_start.tv_usec -
                                 sz->signal_last.tv_usec);
                         rawir.duration -= sz->sum;
-                        rawir.duration *= 1000;
+                        rawir.duration = US_TO_NS(rawir.duration);
                         rawir.duration &= IR_MAX_DURATION;
                 }
                 sz_push(sz, rawir);
@@ -177,7 +177,7 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
         rawir.duration = ((int) value) * SZ_RESOLUTION;
         rawir.duration += SZ_RESOLUTION / 2;
         sz->sum += rawir.duration;
-        rawir.duration *= 1000;
+        rawir.duration = US_TO_NS(rawir.duration);
         rawir.duration &= IR_MAX_DURATION;
         sz_push(sz, rawir);
 }
@@ -197,7 +197,7 @@ static void sz_push_full_space(struct streamzap_ir *sz,
         rawir.duration = ((int) value) * SZ_RESOLUTION;
         rawir.duration += SZ_RESOLUTION / 2;
         sz->sum += rawir.duration;
-        rawir.duration *= 1000;
+        rawir.duration = US_TO_NS(rawir.duration);
         sz_push(sz, rawir);
 }
 
@@ -273,6 +273,7 @@ static void streamzap_callback(struct urb *urb)
                                 if (sz->timeout_enabled)
                                         sz_push(sz, rawir);
                                 ir_raw_event_handle(sz->rdev);
+                                ir_raw_event_reset(sz->rdev);
                         } else {
                                 sz_push_full_space(sz, sz->buf_in[i]);
                         }
@@ -290,6 +291,7 @@ static void streamzap_callback(struct urb *urb)
                 }
         }
 
+        ir_raw_event_handle(sz->rdev);
         usb_submit_urb(urb, GFP_ATOMIC);
 
         return;
@@ -430,13 +432,13 @@ static int __devinit streamzap_probe(struct usb_interface *intf,
         sz->decoder_state = PulseSpace;
         /* FIXME: don't yet have a way to set this */
         sz->timeout_enabled = true;
-        sz->rdev->timeout = (((SZ_TIMEOUT * SZ_RESOLUTION * 1000) &
+        sz->rdev->timeout = ((US_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION) &
                                 IR_MAX_DURATION) | 0x03000000);
         #if 0
         /* not yet supported, depends on patches from maxim */
         /* see also: LIRC_GET_REC_RESOLUTION and LIRC_SET_REC_TIMEOUT */
-        sz->min_timeout = SZ_TIMEOUT * SZ_RESOLUTION * 1000;
-        sz->max_timeout = SZ_TIMEOUT * SZ_RESOLUTION * 1000;
+        sz->min_timeout = US_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION);
+        sz->max_timeout = US_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION);
         #endif
 
         do_gettimeofday(&sz->signal_start);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index eb875af05e79..aa021600e9df 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -78,7 +78,7 @@ config VIDEO_FIXED_MINOR_RANGES
 
 config VIDEO_HELPER_CHIPS_AUTO
         bool "Autoselect pertinent encoders/decoders and other helper chips"
-        default y if !EMBEDDED
+        default y if !EXPERT
         ---help---
           Most video cards may require additional modules to encode or
           decode audio/video standards. This option will autoselect
@@ -141,15 +141,6 @@ config VIDEO_TDA9840
           To compile this driver as a module, choose M here: the
           module will be called tda9840.
 
-config VIDEO_TDA9875
-        tristate "Philips TDA9875 audio processor"
-        depends on VIDEO_V4L2 && I2C
-        ---help---
-          Support for tda9875 audio decoder chip found on some bt8xx boards.
-
-          To compile this driver as a module, choose M here: the
-          module will be called tda9875.
-
 config VIDEO_TEA6415C
         tristate "Philips TEA6415C audio processor"
         depends on I2C
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 81e38cb0b846..a509d317e258 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -27,7 +27,6 @@ obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
 obj-$(CONFIG_VIDEO_TUNER) += tuner.o
 obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
 obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o
-obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o
 obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o
 obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o
 obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f318b51448b3..d2327dbb473f 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -303,11 +303,22 @@ static int adv7175_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide
         return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0);
 }
 
+static int adv7175_s_power(struct v4l2_subdev *sd, int on)
+{
+        if (on)
+                adv7175_write(sd, 0x01, 0x00);
+        else
+                adv7175_write(sd, 0x01, 0x78);
+
+        return 0;
+}
+
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops adv7175_core_ops = {
         .g_chip_ident = adv7175_g_chip_ident,
         .init = adv7175_init,
+        .s_power = adv7175_s_power,
 };
 
 static const struct v4l2_subdev_video_ops adv7175_video_ops = {
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 49efcf660ba6..7f58756d72c8 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -1373,7 +1373,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x1800,
                 .audio_mode_gpio= fv2000s_audio,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1511,7 +1510,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomute       = 0x09,
                 .needs_tvaudio  = 1,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_PHILIPS_PAL,
                 .tuner_addr     = ADDR_UNSET,
@@ -1550,7 +1548,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask2      = 0x07ff,
                 .muxsel         = MUXSEL(3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3),
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .muxsel_hook    = rv605_muxsel,
@@ -1686,7 +1683,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY1x0_848] = {
@@ -1699,7 +1695,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
 
@@ -1714,7 +1709,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY1x1] = {
@@ -1727,7 +1721,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY1x1_SVID] = {
@@ -1740,7 +1733,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY2xx] = {
@@ -1753,7 +1745,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
 
@@ -1768,7 +1759,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY2x0] = {
@@ -1781,7 +1771,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY500] = {
@@ -1794,7 +1783,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         [BTTV_BOARD_OSPREY540] = {
@@ -1805,7 +1793,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
 
@@ -1820,7 +1807,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,      /* must avoid, conflicts with the bt860 */
         },
         [BTTV_BOARD_IDS_EAGLE] = {
@@ -1835,7 +1821,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2, 2, 2),
                 .muxsel_hook    = eagle_muxsel,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .pll            = PLL_28,
         },
         [BTTV_BOARD_PINNACLESAT] = {
@@ -1846,7 +1831,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .muxsel         = MUXSEL(3, 1),
                 .pll            = PLL_28,
@@ -1897,7 +1881,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .muxsel         = MUXSEL(2, 0, 1),
                 .pll            = PLL_28,
@@ -1970,7 +1953,6 @@ struct tvcard bttv_tvcards[] = {
                 /* Tuner, CVid, SVid, CVid over SVid connector */
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomask       = 0,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .tuner_type     = TUNER_PHILIPS_PAL_I,
                 .tuner_addr     = ADDR_UNSET,
@@ -2017,7 +1999,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2,2,2,2, 3,3,3,3, 1,1,1,1, 0,0,0,0),
                 .muxsel_hook    = xguard_muxsel,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
         },
@@ -2029,7 +2010,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = NO_SVHS,
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -2134,7 +2114,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = NO_SVHS,   /* card has no svhs */
                 .needs_tvaudio  = 0,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .gpiomask       = 0x00,
                 .muxsel         = MUXSEL(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
@@ -2156,7 +2135,6 @@ struct tvcard bttv_tvcards[] = {
         [BTTV_BOARD_TWINHAN_DST] = {
                 .name           = "Twinhan DST + clones",
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2171,7 +2149,6 @@ struct tvcard bttv_tvcards[] = {
                 /* Vid In, SVid In, Vid over SVid in connector */
                 .muxsel         = MUXSEL(3, 1, 1, 3),
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2226,7 +2203,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = NO_SVHS,
                 .muxsel         = MUXSEL(2, 3, 1, 0),
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .needs_tvaudio  = 0,
                 .tuner_type     = TUNER_ABSENT,
@@ -2278,7 +2254,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0,
                 .gpiomask2      = 0x3C<<16,/*Set the GPIO[18]->GPIO[21] as output pin.==> drive the video inputs through analog multiplexers*/
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 /*878A input is always MUX0, see above.*/
                 .muxsel         = MUXSEL(2, 2, 2, 2),
@@ -2302,7 +2277,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_TEMIC_PAL,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
         },
         [BTTV_BOARD_AVDVBT_771] = {
                 /* Wolfram Joost <wojo@frokaschwei.de> */
@@ -2313,7 +2287,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .muxsel         = MUXSEL(3, 3),
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .has_dvb        = 1,
@@ -2329,7 +2302,6 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 1,
                 .muxsel         = MUXSEL(3, 1, 2, 0), /* Comp0, S-Video, ?, ? */
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_ABSENT,
@@ -2393,7 +2365,6 @@ struct tvcard bttv_tvcards[] = {
                 /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
                 .name           = "DViCO FusionHDTV DVB-T Lite",
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .no_video       = 1,
@@ -2440,7 +2411,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2),
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2478,7 +2448,6 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
-                .no_tda9875     = 1,
                 .muxsel_hook    = kodicom4400r_muxsel,
         },
         [BTTV_BOARD_KODICOM_4400R_SL] = {
@@ -2500,7 +2469,6 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
-                .no_tda9875     = 1,
                 .muxsel_hook    = kodicom4400r_muxsel,
         },
                 /* ---- card 0x86---------------------------------- */
@@ -2530,7 +2498,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
                 .gpiomute       = 0x00c00007,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .has_dvb        = 1,
         },
@@ -2630,7 +2597,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
                 /* ---- card 0x8d ---------------------------------- */
@@ -2658,7 +2624,6 @@ struct tvcard bttv_tvcards[] = {
                 .muxsel         = MUXSEL(2, 3, 1, 1),
                 .gpiomux        = { 100000, 100002, 100002, 100000 },
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .pll            = PLL_28,
                 .tuner_type     = TUNER_TNF_5335MF,
@@ -2674,7 +2639,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x0f, /* old: 7 */
                 .muxsel         = MUXSEL(0, 1, 3, 2), /* Composite 0-3 */
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
@@ -2732,7 +2696,6 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
                 .gpiomute       = 0x00c00007,
                 .no_msp34xx     = 1,
-                .no_tda9875     = 1,
                 .no_tda7432     = 1,
         },
         /* ---- card 0x95---------------------------------- */
@@ -2874,7 +2837,6 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
-                .no_tda9875     = 1,
                 .muxsel_hook    = gv800s_muxsel,
         },
                 [BTTV_BOARD_GEOVISION_GV800S_SL] = {
@@ -2899,7 +2861,6 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .no_msp34xx     = 1,
                 .no_tda7432     = 1,
-                .no_tda9875     = 1,
                 .muxsel_hook    = gv800s_muxsel,
         },
         [BTTV_BOARD_PV183] = {
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index fd62bf15d779..c6333595c6b9 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -234,7 +234,6 @@ struct tvcard {
 
         /* i2c audio flags */
         unsigned int no_msp34xx:1;
-        unsigned int no_tda9875:1;
         unsigned int no_tda7432:1;
         unsigned int needs_tvaudio:1;
         unsigned int msp34xx_alt:1;
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 789087cd6a9c..55ffd60ffa7f 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2001,6 +2001,11 @@ static int cafe_pci_probe(struct pci_dev *pdev,
                 .min_width = 320,
                 .min_height = 240,
         };
+        struct i2c_board_info ov7670_info = {
+                .type = "ov7670",
+                .addr = 0x42,
+                .platform_data = &sensor_cfg,
+        };
 
         /*
          * Start putting together one of our big camera structures.
@@ -2062,9 +2067,9 @@ static int cafe_pci_probe(struct pci_dev *pdev,
         if (dmi_check_system(olpc_xo1_dmi))
                 sensor_cfg.clock_speed = 45;
 
-        cam->sensor_addr = 0x42;
-        cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter,
-                        "ov7670", 0, &sensor_cfg, cam->sensor_addr, NULL);
+        cam->sensor_addr = ov7670_info.addr;
+        cam->sensor = v4l2_i2c_new_subdev_board(&cam->v4l2_dev, &cam->i2c_adapter,
+                        &ov7670_info, NULL);
         if (cam->sensor == NULL) {
                 ret = -ENODEV;
                 goto out_smbus;
@@ -2184,9 +2189,7 @@ static int cafe_pci_resume(struct pci_dev *pdev)
         struct cafe_camera *cam = to_cam(v4l2_dev);
         int ret = 0;
 
-        ret = pci_restore_state(pdev);
-        if (ret)
-                return ret;
+        pci_restore_state(pdev);
         ret = pci_enable_device(pdev);
 
         if (ret) {
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h
index 916c13d5cf7d..6d6d1843791c 100644
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -378,7 +378,7 @@ struct cpia2_fh {
 
 struct camera_data {
         /* locks */
-        struct mutex busy_lock; /* guard against SMP multithreading */
+        struct mutex v4l2_lock; /* serialize file operations */
         struct v4l2_prio_state prio;
 
         /* camera status */
diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index 9606bc01b803..aaffca8e13fd 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -2247,7 +2247,7 @@ struct camera_data *cpia2_init_camera_struct(void)
 
 
         cam->present = 1;
-        mutex_init(&cam->busy_lock);
+        mutex_init(&cam->v4l2_lock);
         init_waitqueue_head(&cam->wq_stream);
 
         return cam;
@@ -2365,9 +2365,9 @@ long cpia2_read(struct camera_data *cam,
                 char __user *buf, unsigned long count, int noblock)
 {
         struct framebuf *frame;
-        if (!count) {
+
+        if (!count)
                 return 0;
-        }
 
         if (!buf) {
                 ERR("%s: buffer NULL\n",__func__);
@@ -2379,17 +2379,12 @@ long cpia2_read(struct camera_data *cam,
                 return -EINVAL;
         }
 
-        /* make this _really_ smp and multithread-safe */
-        if (mutex_lock_interruptible(&cam->busy_lock))
-                return -ERESTARTSYS;
-
         if (!cam->present) {
                 LOG("%s: camera removed\n",__func__);
-                mutex_unlock(&cam->busy_lock);
                 return 0;       /* EOF */
         }
 
-        if(!cam->streaming) {
+        if (!cam->streaming) {
                 /* Start streaming */
                 cpia2_usb_stream_start(cam,
                                        cam->params.camera_state.stream_mode);
@@ -2398,42 +2393,31 @@ long cpia2_read(struct camera_data *cam,
         /* Copy cam->curbuff in case it changes while we're processing */
         frame = cam->curbuff;
         if (noblock && frame->status != FRAME_READY) {
-                mutex_unlock(&cam->busy_lock);
                 return -EAGAIN;
         }
 
-        if(frame->status != FRAME_READY) {
-                mutex_unlock(&cam->busy_lock);
+        if (frame->status != FRAME_READY) {
+                mutex_unlock(&cam->v4l2_lock);
                 wait_event_interruptible(cam->wq_stream,
                                !cam->present ||
                                (frame = cam->curbuff)->status == FRAME_READY);
+                mutex_lock(&cam->v4l2_lock);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
-                /* make this _really_ smp and multithread-safe */
-                if (mutex_lock_interruptible(&cam->busy_lock)) {
-                        return -ERESTARTSYS;
-                }
-                if(!cam->present) {
-                        mutex_unlock(&cam->busy_lock);
+                if (!cam->present)
                         return 0;
-                }
         }
 
         /* copy data to user space */
-        if (frame->length > count) {
-                mutex_unlock(&cam->busy_lock);
+        if (frame->length > count)
                 return -EFAULT;
-        }
-        if (copy_to_user(buf, frame->data, frame->length)) {
-                mutex_unlock(&cam->busy_lock);
+        if (copy_to_user(buf, frame->data, frame->length))
                 return -EFAULT;
-        }
 
         count = frame->length;
 
         frame->status = FRAME_EMPTY;
 
-        mutex_unlock(&cam->busy_lock);
         return count;
 }
 
@@ -2447,17 +2431,13 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp,
 {
         unsigned int status=0;
 
-        if(!cam) {
+        if (!cam) {
                 ERR("%s: Internal error, camera_data not found!\n",__func__);
                 return POLLERR;
         }
 
-        mutex_lock(&cam->busy_lock);
-
-        if(!cam->present) {
-                mutex_unlock(&cam->busy_lock);
+        if (!cam->present)
                 return POLLHUP;
-        }
 
         if(!cam->streaming) {
                 /* Start streaming */
@@ -2465,16 +2445,13 @@ unsigned int cpia2_poll(struct camera_data *cam, struct file *filp,
                                        cam->params.camera_state.stream_mode);
         }
 
-        mutex_unlock(&cam->busy_lock);
         poll_wait(filp, &cam->wq_stream, wait);
-        mutex_lock(&cam->busy_lock);
 
         if(!cam->present)
                 status = POLLHUP;
         else if(cam->curbuff->status == FRAME_READY)
                 status = POLLIN | POLLRDNORM;
 
-        mutex_unlock(&cam->busy_lock);
         return status;
 }
 
@@ -2496,29 +2473,19 @@ int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma)
 
         DBG("mmap offset:%ld size:%ld\n", start_offset, size);
 
-        /* make this _really_ smp-safe */
-        if (mutex_lock_interruptible(&cam->busy_lock))
-                return -ERESTARTSYS;
-
-        if (!cam->present) {
-                mutex_unlock(&cam->busy_lock);
+        if (!cam->present)
                 return -ENODEV;
-        }
 
         if (size > cam->frame_size*cam->num_frames  ||
             (start_offset % cam->frame_size) != 0 ||
-            (start_offset+size > cam->frame_size*cam->num_frames)) {
-                mutex_unlock(&cam->busy_lock);
+            (start_offset+size > cam->frame_size*cam->num_frames))
                 return -EINVAL;
-        }
 
         pos = ((unsigned long) (cam->frame_buffer)) + start_offset;
         while (size > 0) {
                 page = kvirt_to_pa(pos);
-                if (remap_pfn_range(vma, start, page >> PAGE_SHIFT, PAGE_SIZE, PAGE_SHARED)) {
-                        mutex_unlock(&cam->busy_lock);
+                if (remap_pfn_range(vma, start, page >> PAGE_SHIFT, PAGE_SIZE, PAGE_SHARED))
                         return -EAGAIN;
-                }
                 start += PAGE_SIZE;
                 pos += PAGE_SIZE;
                 if (size > PAGE_SIZE)
@@ -2528,7 +2495,5 @@ int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma)
         }
 
         cam->mmapped = true;
-        mutex_unlock(&cam->busy_lock);
         return 0;
 }
-
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 7edf80b0d01a..9bad39842936 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -238,59 +238,40 @@ static struct v4l2_queryctrl controls[] = {
 static int cpia2_open(struct file *file)
 {
         struct camera_data *cam = video_drvdata(file);
-        int retval = 0;
+        struct cpia2_fh *fh;
 
         if (!cam) {
                 ERR("Internal error, camera_data not found!\n");
                 return -ENODEV;
         }
 
-        if(mutex_lock_interruptible(&cam->busy_lock))
-                return -ERESTARTSYS;
-
-        if(!cam->present) {
-                retval = -ENODEV;
-                goto err_return;
-        }
+        if (!cam->present)
+                return -ENODEV;
 
-        if (cam->open_count > 0) {
-                goto skip_init;
-        }
+        if (cam->open_count == 0) {
+                if (cpia2_allocate_buffers(cam))
+                        return -ENOMEM;
 
-        if (cpia2_allocate_buffers(cam)) {
-                retval = -ENOMEM;
-                goto err_return;
-        }
+                /* reset the camera */
+                if (cpia2_reset_camera(cam) < 0)
+                        return -EIO;
 
-        /* reset the camera */
-        if (cpia2_reset_camera(cam) < 0) {
-                retval = -EIO;
-                goto err_return;
+                cam->APP_len = 0;
+                cam->COM_len = 0;
         }
 
-        cam->APP_len = 0;
-        cam->COM_len = 0;
-
-skip_init:
-        {
-                struct cpia2_fh *fh = kmalloc(sizeof(*fh),GFP_KERNEL);
-                if(!fh) {
-                        retval = -ENOMEM;
-                        goto err_return;
-                }
-                file->private_data = fh;
-                fh->prio = V4L2_PRIORITY_UNSET;
-                v4l2_prio_open(&cam->prio, &fh->prio);
-                fh->mmapped = 0;
-        }
+        fh = kmalloc(sizeof(*fh), GFP_KERNEL);
+        if (!fh)
+                return -ENOMEM;
+        file->private_data = fh;
+        fh->prio = V4L2_PRIORITY_UNSET;
+        v4l2_prio_open(&cam->prio, &fh->prio);
+        fh->mmapped = 0;
 
         ++cam->open_count;
 
         cpia2_dbg_dump_registers(cam);
-
-err_return:
-        mutex_unlock(&cam->busy_lock);
-        return retval;
+        return 0;
 }
 
 /******************************************************************************
@@ -304,15 +285,11 @@ static int cpia2_close(struct file *file)
         struct camera_data *cam = video_get_drvdata(dev);
         struct cpia2_fh *fh = file->private_data;
 
-        mutex_lock(&cam->busy_lock);
-
         if (cam->present &&
-            (cam->open_count == 1
-             || fh->prio == V4L2_PRIORITY_RECORD
-            )) {
+            (cam->open_count == 1 || fh->prio == V4L2_PRIORITY_RECORD)) {
                 cpia2_usb_stream_stop(cam);
 
-                if(cam->open_count == 1) {
+                if (cam->open_count == 1) {
                         /* save camera state for later open */
                         cpia2_save_camera_state(cam);
 
@@ -321,26 +298,21 @@ static int cpia2_close(struct file *file)
                 }
         }
 
-        {
-                if(fh->mmapped)
-                        cam->mmapped = 0;
-                v4l2_prio_close(&cam->prio, fh->prio);
-                file->private_data = NULL;
-                kfree(fh);
-        }
+        if (fh->mmapped)
+                cam->mmapped = 0;
+        v4l2_prio_close(&cam->prio, fh->prio);
+        file->private_data = NULL;
+        kfree(fh);
 
         if (--cam->open_count == 0) {
                 cpia2_free_buffers(cam);
                 if (!cam->present) {
                         video_unregister_device(dev);
-                        mutex_unlock(&cam->busy_lock);
                         kfree(cam);
                         return 0;
                 }
         }
 
-        mutex_unlock(&cam->busy_lock);
-
         return 0;
 }
 
@@ -405,11 +377,11 @@ static int sync(struct camera_data *cam, int frame_nr)
                         return 0;
                 }
 
-                mutex_unlock(&cam->busy_lock);
+                mutex_unlock(&cam->v4l2_lock);
                 wait_event_interruptible(cam->wq_stream,
                                          !cam->streaming ||
                                          frame->status == FRAME_READY);
-                mutex_lock(&cam->busy_lock);
+                mutex_lock(&cam->v4l2_lock);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
                 if(!cam->present)
@@ -1293,11 +1265,11 @@ static int ioctl_dqbuf(void *arg,struct camera_data *cam, struct file *file)
         if(frame < 0) {
                 /* Wait for a frame to become available */
                 struct framebuf *cb=cam->curbuff;
-                mutex_unlock(&cam->busy_lock);
+                mutex_unlock(&cam->v4l2_lock);
                 wait_event_interruptible(cam->wq_stream,
                                          !cam->present ||
                                          (cb=cam->curbuff)->status == FRAME_READY);
-                mutex_lock(&cam->busy_lock);
+                mutex_lock(&cam->v4l2_lock);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
                 if(!cam->present)
@@ -1337,14 +1309,8 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         if (!cam)
                 return -ENOTTY;
 
-        /* make this _really_ smp-safe */
-        if (mutex_lock_interruptible(&cam->busy_lock))
-                return -ERESTARTSYS;
-
-        if (!cam->present) {
-                mutex_unlock(&cam->busy_lock);
+        if (!cam->present)
                 return -ENODEV;
-        }
 
         /* Priority check */
         switch (cmd) {
@@ -1352,10 +1318,8 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         {
                 struct cpia2_fh *fh = file->private_data;
                 retval = v4l2_prio_check(&cam->prio, fh->prio);
-                if(retval) {
-                        mutex_unlock(&cam->busy_lock);
+                if (retval)
                         return retval;
-                }
                 break;
         }
         default:
@@ -1529,7 +1493,6 @@ static long cpia2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 break;
         }
 
-        mutex_unlock(&cam->busy_lock);
         return retval;
 }
 
@@ -1596,7 +1559,7 @@ static const struct v4l2_file_operations cpia2_fops = {
         .release        = cpia2_close,
         .read           = cpia2_v4l_read,
         .poll           = cpia2_v4l_poll,
-        .ioctl          = cpia2_ioctl,
+        .unlocked_ioctl = cpia2_ioctl,
         .mmap           = cpia2_mmap,
 };
 
@@ -1620,6 +1583,7 @@ int cpia2_register_camera(struct camera_data *cam)
 
         memcpy(cam->vdev, &cpia2_template, sizeof(cpia2_template));
         video_set_drvdata(cam->vdev, cam);
+        cam->vdev->lock = &cam->v4l2_lock;
 
         reset_camera_struct_v4l(cam);
 
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 133ec2bac180..944af8adbe0c 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -664,7 +664,7 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
 {
         snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in",
                  cx->v4l2_dev.name);
-        cx->in_work_queue = create_singlethread_workqueue(cx->in_workq_name);
+        cx->in_work_queue = alloc_ordered_workqueue(cx->in_workq_name, 0);
         if (cx->in_work_queue == NULL) {
                 CX18_ERR("Unable to create incoming mailbox handler thread\n");
                 return -ENOMEM;
@@ -672,18 +672,6 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
         return 0;
 }
 
-static int __devinit cx18_create_out_workq(struct cx18 *cx)
-{
-        snprintf(cx->out_workq_name, sizeof(cx->out_workq_name), "%s-out",
-                 cx->v4l2_dev.name);
-        cx->out_work_queue = create_workqueue(cx->out_workq_name);
-        if (cx->out_work_queue == NULL) {
-                CX18_ERR("Unable to create outgoing mailbox handler threads\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-
 static void __devinit cx18_init_in_work_orders(struct cx18 *cx)
 {
         int i;
@@ -710,15 +698,9 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
         mutex_init(&cx->epu2apu_mb_lock);
         mutex_init(&cx->epu2cpu_mb_lock);
 
-        ret = cx18_create_out_workq(cx);
-        if (ret)
-                return ret;
-
         ret = cx18_create_in_workq(cx);
-        if (ret) {
-                destroy_workqueue(cx->out_work_queue);
+        if (ret)
                 return ret;
-        }
 
         cx18_init_in_work_orders(cx);
 
@@ -1107,7 +1089,6 @@ free_mem:
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 free_workqueues:
         destroy_workqueue(cx->in_work_queue);
-        destroy_workqueue(cx->out_work_queue);
 err:
         if (retval == 0)
                 retval = -ENODEV;
@@ -1259,7 +1240,6 @@ static void cx18_remove(struct pci_dev *pci_dev)
         cx18_halt_firmware(cx);
 
         destroy_workqueue(cx->in_work_queue);
-        destroy_workqueue(cx->out_work_queue);
 
         cx18_streams_cleanup(cx, 1);
 
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index f6f3e50d4bdf..306caac6d3fc 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -617,9 +617,6 @@ struct cx18 {
         struct cx18_in_work_order in_work_order[CX18_MAX_IN_WORK_ORDERS];
         char epu_debug_str[256]; /* CX18_EPU_DEBUG is rare: use shared space */
 
-        struct workqueue_struct *out_work_queue;
-        char out_workq_name[12]; /* "cx18-NN-out" */
-
         /* i2c */
         struct i2c_adapter i2c_adap[2];
         struct i2c_algo_bit_data i2c_algo[2];
diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h
index 51765eb12d39..713b0e61536d 100644
--- a/drivers/media/video/cx18/cx18-streams.h
+++ b/drivers/media/video/cx18/cx18-streams.h
@@ -42,8 +42,7 @@ static inline bool cx18_stream_enabled(struct cx18_stream *s)
 /* Related to submission of mdls to firmware */
 static inline void cx18_stream_load_fw_queue(struct cx18_stream *s)
 {
-        struct cx18 *cx = s->cx;
-        queue_work(cx->out_work_queue, &s->out_work_order);
+        schedule_work(&s->out_work_order);
 }
 
 static inline void cx18_stream_put_mdl_fw(struct cx18_stream *s,
diff --git a/drivers/media/video/cx231xx/cx231xx-dvb.c b/drivers/media/video/cx231xx/cx231xx-dvb.c
index fe59a1c3f064..363aa6004221 100644
--- a/drivers/media/video/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/video/cx231xx/cx231xx-dvb.c
@@ -28,7 +28,6 @@
 #include <media/videobuf-vmalloc.h>
 
 #include "xc5000.h"
-#include "dvb_dummy_fe.h"
 #include "s5h1432.h"
 #include "tda18271.h"
 #include "s5h1411.h"
@@ -619,7 +618,7 @@ static int dvb_init(struct cx231xx *dev)
 
                 if (dev->dvb->frontend == NULL) {
                         printk(DRIVER_NAME
-                               ": Failed to attach dummy front end\n");
+                               ": Failed to attach s5h1411 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -665,7 +664,7 @@ static int dvb_init(struct cx231xx *dev)
 
                 if (dev->dvb->frontend == NULL) {
                         printk(DRIVER_NAME
-                               ": Failed to attach dummy front end\n");
+                               ": Failed to attach s5h1411 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index f16461844c5c..6fc09dd41b9d 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1682,20 +1682,6 @@ static int cx25840_log_status(struct v4l2_subdev *sd)
         return 0;
 }
 
-static int cx25840_s_config(struct v4l2_subdev *sd, int irq, void *platform_data)
-{
-        struct cx25840_state *state = to_state(sd);
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-
-        if (platform_data) {
-                struct cx25840_platform_data *pdata = platform_data;
-
-                state->pvr150_workaround = pdata->pvr150_workaround;
-                set_input(client, state->vid_input, state->aud_input);
-        }
-        return 0;
-}
-
 static int cx23885_irq_handler(struct v4l2_subdev *sd, u32 status,
                                bool *handled)
 {
@@ -1787,7 +1773,6 @@ static const struct v4l2_ctrl_ops cx25840_ctrl_ops = {
 
 static const struct v4l2_subdev_core_ops cx25840_core_ops = {
         .log_status = cx25840_log_status,
-        .s_config = cx25840_s_config,
         .g_chip_ident = cx25840_g_chip_ident,
         .g_ctrl = v4l2_subdev_g_ctrl,
         .s_ctrl = v4l2_subdev_s_ctrl,
@@ -1974,7 +1959,6 @@ static int cx25840_probe(struct i2c_client *client,
         state->vid_input = CX25840_COMPOSITE7;
         state->aud_input = CX25840_AUDIO8;
         state->audclk_freq = 48000;
-        state->pvr150_workaround = 0;
         state->audmode = V4L2_TUNER_MODE_LANG1;
         state->vbi_line_offset = 8;
         state->id = id;
@@ -2034,6 +2018,12 @@ static int cx25840_probe(struct i2c_client *client,
         v4l2_ctrl_cluster(2, &state->volume);
         v4l2_ctrl_handler_setup(&state->hdl);
 
+        if (client->dev.platform_data) {
+                struct cx25840_platform_data *pdata = client->dev.platform_data;
+
+                state->pvr150_workaround = pdata->pvr150_workaround;
+        }
+
         cx25840_ir_probe(sd);
         return 0;
 }
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index 1f532e31cd49..9f3bfc1eb240 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -41,6 +41,183 @@ spinlock_t vpif_lock;
 
 void __iomem *vpif_base;
 
+/**
+ * ch_params: video standard configuration parameters for vpif
+ * The table must include all presets from supported subdevices.
+ */
+const struct vpif_channel_config_params ch_params[] = {
+        /* HDTV formats */
+        {
+                .name = "480p59_94",
+                .width = 720,
+                .height = 480,
+                .frm_fmt = 1,
+                .ycmux_mode = 0,
+                .eav2sav = 138-8,
+                .sav2eav = 720,
+                .l1 = 1,
+                .l3 = 43,
+                .l5 = 523,
+                .vsize = 525,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_480P59_94,
+        },
+        {
+                .name = "576p50",
+                .width = 720,
+                .height = 576,
+                .frm_fmt = 1,
+                .ycmux_mode = 0,
+                .eav2sav = 144-8,
+                .sav2eav = 720,
+                .l1 = 1,
+                .l3 = 45,
+                .l5 = 621,
+                .vsize = 625,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_576P50,
+        },
+        {
+                .name = "720p50",
+                .width = 1280,
+                .height = 720,
+                .frm_fmt = 1,
+                .ycmux_mode = 0,
+                .eav2sav = 700-8,
+                .sav2eav = 1280,
+                .l1 = 1,
+                .l3 = 26,
+                .l5 = 746,
+                .vsize = 750,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_720P50,
+        },
+        {
+                .name = "720p60",
+                .width = 1280,
+                .height = 720,
+                .frm_fmt = 1,
+                .ycmux_mode = 0,
+                .eav2sav = 370 - 8,
+                .sav2eav = 1280,
+                .l1 = 1,
+                .l3 = 26,
+                .l5 = 746,
+                .vsize = 750,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_720P60,
+        },
+        {
+                .name = "1080I50",
+                .width = 1920,
+                .height = 1080,
+                .frm_fmt = 0,
+                .ycmux_mode = 0,
+                .eav2sav = 720 - 8,
+                .sav2eav = 1920,
+                .l1 = 1,
+                .l3 = 21,
+                .l5 = 561,
+                .l7 = 563,
+                .l9 = 584,
+                .l11 = 1124,
+                .vsize = 1125,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_1080I50,
+        },
+        {
+                .name = "1080I60",
+                .width = 1920,
+                .height = 1080,
+                .frm_fmt = 0,
+                .ycmux_mode = 0,
+                .eav2sav = 280 - 8,
+                .sav2eav = 1920,
+                .l1 = 1,
+                .l3 = 21,
+                .l5 = 561,
+                .l7 = 563,
+                .l9 = 584,
+                .l11 = 1124,
+                .vsize = 1125,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_1080I60,
+        },
+        {
+                .name = "1080p60",
+                .width = 1920,
+                .height = 1080,
+                .frm_fmt = 1,
+                .ycmux_mode = 0,
+                .eav2sav = 280 - 8,
+                .sav2eav = 1920,
+                .l1 = 1,
+                .l3 = 42,
+                .l5 = 1122,
+                .vsize = 1125,
+                .capture_format = 0,
+                .vbi_supported = 0,
+                .hd_sd = 1,
+                .dv_preset = V4L2_DV_1080P60,
+        },
+
+        /* SDTV formats */
+        {
+                .name = "NTSC_M",
+                .width = 720,
+                .height = 480,
+                .frm_fmt = 0,
+                .ycmux_mode = 1,
+                .eav2sav = 268,
+                .sav2eav = 1440,
+                .l1 = 1,
+                .l3 = 23,
+                .l5 = 263,
+                .l7 = 266,
+                .l9 = 286,
+                .l11 = 525,
+                .vsize = 525,
+                .capture_format = 0,
+                .vbi_supported = 1,
+                .hd_sd = 0,
+                .stdid = V4L2_STD_525_60,
+        },
+        {
+                .name = "PAL_BDGHIK",
+                .width = 720,
+                .height = 576,
+                .frm_fmt = 0,
+                .ycmux_mode = 1,
+                .eav2sav = 280,
+                .sav2eav = 1440,
+                .l1 = 1,
+                .l3 = 23,
+                .l5 = 311,
+                .l7 = 313,
+                .l9 = 336,
+                .l11 = 624,
+                .vsize = 625,
+                .capture_format = 0,
+                .vbi_supported = 1,
+                .hd_sd = 0,
+                .stdid = V4L2_STD_625_50,
+        },
+};
+
+const unsigned int vpif_ch_params_count = ARRAY_SIZE(ch_params);
+
 static inline void vpif_wr_bit(u32 reg, u32 bit, u32 val)
 {
         if (val)
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index ebd5c4338ebb..10550bd93b06 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -577,12 +577,10 @@ struct vpif_channel_config_params {
         char name[VPIF_MAX_NAME];       /* Name of the mode */
         u16 width;                      /* Indicates width of the image */
         u16 height;                     /* Indicates height of the image */
-        u8 fps;
-        u8 frm_fmt;                     /* Indicates whether this is interlaced
-                                         * or progressive format */
-        u8 ycmux_mode;                  /* Indicates whether this mode requires
-                                         * single or two channels */
-        u16 eav2sav;                    /* length of sav 2 eav */
+        u8 frm_fmt;                     /* Interlaced (0) or progressive (1) */
+        u8 ycmux_mode;                  /* This mode requires one (0) or two (1)
+                                           channels */
+        u16 eav2sav;                    /* length of eav 2 sav */
         u16 sav2eav;                    /* length of sav 2 eav */
         u16 l1, l3, l5, l7, l9, l11;    /* Other parameter configurations */
         u16 vsize;                      /* Vertical size of the image */
@@ -590,10 +588,14 @@ struct vpif_channel_config_params {
                                          * is in BT or in CCD/CMOS */
         u8  vbi_supported;              /* Indicates whether this mode
                                          * supports capturing vbi or not */
-        u8 hd_sd;
-        v4l2_std_id stdid;
+        u8 hd_sd;                       /* HDTV (1) or SDTV (0) format */
+        v4l2_std_id stdid;              /* SDTV format */
+        u32 dv_preset;                  /* HDTV format */
 };
 
+extern const unsigned int vpif_ch_params_count;
+extern const struct vpif_channel_config_params ch_params[];
+
 struct vpif_video_params;
 struct vpif_params;
 struct vpif_vbi_params;
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 193abab6b355..d93ad74a34c5 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
 
 #include "vpif_capture.h"
 #include "vpif.h"
@@ -81,20 +82,6 @@ static struct vpif_device vpif_obj = { {NULL} };
 static struct device *vpif_dev;
 
 /**
- * ch_params: video standard configuration parameters for vpif
- */
-static const struct vpif_channel_config_params ch_params[] = {
-        {
-                "NTSC_M", 720, 480, 30, 0, 1, 268, 1440, 1, 23, 263, 266,
-                286, 525, 525, 0, 1, 0, V4L2_STD_525_60,
-        },
-        {
-                "PAL_BDGHIK", 720, 576, 25, 0, 1, 280, 1440, 1, 23, 311, 313,
-                336, 624, 625, 0, 1, 0, V4L2_STD_625_50,
-        },
-};
-
-/**
  * vpif_uservirt_to_phys : translate user/virtual address to phy address
  * @virtp: user/virtual address
  *
@@ -342,7 +329,7 @@ static void vpif_schedule_next_buffer(struct common_obj *common)
  * @dev_id: dev_id ptr
  *
  * It changes status of the captured buffer, takes next buffer from the queue
- * and sets its address in VPIF  registers
+ * and sets its address in VPIF registers
  */
 static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
 {
@@ -435,24 +422,31 @@ static int vpif_update_std_info(struct channel_obj *ch)
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         struct vpif_params *vpifparams = &ch->vpifparams;
         const struct vpif_channel_config_params *config;
-        struct vpif_channel_config_params *std_info;
+        struct vpif_channel_config_params *std_info = &vpifparams->std_info;
         struct video_obj *vid_ch = &ch->video;
         int index;
 
         vpif_dbg(2, debug, "vpif_update_std_info\n");
 
-        std_info = &vpifparams->std_info;
-
-        for (index = 0; index < ARRAY_SIZE(ch_params); index++) {
+        for (index = 0; index < vpif_ch_params_count; index++) {
                 config = &ch_params[index];
-                if (config->stdid & vid_ch->stdid) {
-                        memcpy(std_info, config, sizeof(*config));
-                        break;
+                if (config->hd_sd == 0) {
+                        vpif_dbg(2, debug, "SD format\n");
+                        if (config->stdid & vid_ch->stdid) {
+                                memcpy(std_info, config, sizeof(*config));
+                                break;
+                        }
+                } else {
+                        vpif_dbg(2, debug, "HD format\n");
+                        if (config->dv_preset == vid_ch->dv_preset) {
+                                memcpy(std_info, config, sizeof(*config));
+                                break;
+                        }
                 }
         }
 
         /* standard not found */
-        if (index == ARRAY_SIZE(ch_params))
+        if (index == vpif_ch_params_count)
                 return -EINVAL;
 
         common->fmt.fmt.pix.width = std_info->width;
@@ -462,6 +456,7 @@ static int vpif_update_std_info(struct channel_obj *ch)
         common->fmt.fmt.pix.bytesperline = std_info->width;
         vpifparams->video_params.hpitch = std_info->width;
         vpifparams->video_params.storage_mode = std_info->frm_fmt;
+
         return 0;
 }
 
@@ -757,7 +752,7 @@ static int vpif_open(struct file *filep)
         struct video_obj *vid_ch;
         struct channel_obj *ch;
         struct vpif_fh *fh;
-        int i, ret = 0;
+        int i;
 
         vpif_dbg(2, debug, "vpif_open\n");
 
@@ -766,9 +761,6 @@ static int vpif_open(struct file *filep)
         vid_ch = &ch->video;
         common = &ch->common[VPIF_VIDEO_INDEX];
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         if (NULL == ch->curr_subdev_info) {
                 /**
                  * search through the sub device to see a registered
@@ -785,8 +777,7 @@ static int vpif_open(struct file *filep)
                 }
                 if (i == config->subdev_count) {
                         vpif_err("No sub device registered\n");
-                        ret = -ENOENT;
-                        goto exit;
+                        return -ENOENT;
                 }
         }
 
@@ -794,8 +785,7 @@ static int vpif_open(struct file *filep)
         fh = kzalloc(sizeof(struct vpif_fh), GFP_KERNEL);
         if (NULL == fh) {
                 vpif_err("unable to allocate memory for file handle object\n");
-                ret = -ENOMEM;
-                goto exit;
+                return -ENOMEM;
         }
 
         /* store pointer to fh in private_data member of filep */
@@ -815,9 +805,7 @@ static int vpif_open(struct file *filep)
         /* Initialize priority of this instance to default priority */
         fh->prio = V4L2_PRIORITY_UNSET;
         v4l2_prio_open(&ch->prio, &fh->prio);
-exit:
-        mutex_unlock(&common->lock);
-        return ret;
+        return 0;
 }
 
 /**
@@ -837,9 +825,6 @@ static int vpif_release(struct file *filep)
 
         common = &ch->common[VPIF_VIDEO_INDEX];
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* if this instance is doing IO */
         if (fh->io_allowed[VPIF_VIDEO_INDEX]) {
                 /* Reset io_usrs member of channel object */
@@ -863,9 +848,6 @@ static int vpif_release(struct file *filep)
         /* Decrement channel usrs counter */
         ch->usrs--;
 
-        /* unlock mutex on channel object */
-        mutex_unlock(&common->lock);
-
         /* Close the priority */
         v4l2_prio_close(&ch->prio, fh->prio);
 
@@ -890,7 +872,6 @@ static int vpif_reqbufs(struct file *file, void *priv,
         struct channel_obj *ch = fh->channel;
         struct common_obj *common;
         u8 index = 0;
-        int ret = 0;
 
         vpif_dbg(2, debug, "vpif_reqbufs\n");
 
@@ -913,13 +894,8 @@ static int vpif_reqbufs(struct file *file, void *priv,
 
         common = &ch->common[index];
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
-        if (0 != common->io_usrs) {
-                ret = -EBUSY;
-                goto reqbuf_exit;
-        }
+        if (0 != common->io_usrs)
+                return -EBUSY;
 
         /* Initialize videobuf queue as per the buffer type */
         videobuf_queue_dma_contig_init(&common->buffer_queue,
@@ -928,7 +904,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
                                             reqbuf->type,
                                             common->fmt.fmt.pix.field,
                                             sizeof(struct videobuf_buffer), fh,
-                                            NULL);
+                                            &common->lock);
 
         /* Set io allowed member of file handle to TRUE */
         fh->io_allowed[index] = 1;
@@ -939,11 +915,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         INIT_LIST_HEAD(&common->dma_queue);
 
         /* Allocate buffers */
-        ret = videobuf_reqbufs(&common->buffer_queue, reqbuf);
-
-reqbuf_exit:
-        mutex_unlock(&common->lock);
-        return ret;
+        return videobuf_reqbufs(&common->buffer_queue, reqbuf);
 }
 
 /**
@@ -1157,11 +1129,6 @@ static int vpif_streamon(struct file *file, void *priv,
                 return ret;
         }
 
-        if (mutex_lock_interruptible(&common->lock)) {
-                ret = -ERESTARTSYS;
-                goto streamoff_exit;
-        }
-
         /* If buffer queue is empty, return error */
         if (list_empty(&common->dma_queue)) {
                 vpif_dbg(1, debug, "buffer queue is empty\n");
@@ -1240,13 +1207,10 @@ static int vpif_streamon(struct file *file, void *priv,
                 enable_channel1(1);
         }
         channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
-        mutex_unlock(&common->lock);
         return ret;
 
 exit:
-        mutex_unlock(&common->lock);
-streamoff_exit:
-        ret = videobuf_streamoff(&common->buffer_queue);
+        videobuf_streamoff(&common->buffer_queue);
         return ret;
 }
 
@@ -1284,9 +1248,6 @@ static int vpif_streamoff(struct file *file, void *priv,
                 return -EINVAL;
         }
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* disable channel */
         if (VPIF_CHANNEL0_VIDEO == ch->channel_id) {
                 enable_channel0(0);
@@ -1304,8 +1265,6 @@ static int vpif_streamoff(struct file *file, void *priv,
         if (ret && (ret != -ENOIOCTLCMD))
                 vpif_dbg(1, debug, "stream off failed in subdev\n");
 
-        mutex_unlock(&common->lock);
-
         return videobuf_streamoff(&common->buffer_queue);
 }
 
@@ -1381,21 +1340,16 @@ static int vpif_querystd(struct file *file, void *priv, v4l2_std_id *std_id)
 {
         struct vpif_fh *fh = priv;
         struct channel_obj *ch = fh->channel;
-        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         int ret = 0;
 
         vpif_dbg(2, debug, "vpif_querystd\n");
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* Call querystd function of decoder device */
         ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], video,
                                 querystd, std_id);
         if (ret < 0)
                 vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
 
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1451,16 +1405,14 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         fh->initialized = 1;
 
         /* Call encoder subdevice function to set the standard */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         ch->video.stdid = *std_id;
+        ch->video.dv_preset = V4L2_DV_INVALID;
+        memset(&ch->video.bt_timings, 0, sizeof(ch->video.bt_timings));
 
         /* Get the information about the standard */
         if (vpif_update_std_info(ch)) {
-                ret = -EINVAL;
                 vpif_err("Error getting the standard info\n");
-                goto s_std_exit;
+                return -EINVAL;
         }
 
         /* Configure the default format information */
@@ -1471,9 +1423,6 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
                                 s_std, *std_id);
         if (ret < 0)
                 vpif_dbg(1, debug, "Failed to set standard for sub devices\n");
-
-s_std_exit:
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1567,9 +1516,6 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index)
                 return -EINVAL;
         }
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* first setup input path from sub device to vpif */
         if (config->setup_input_path) {
                 ret = config->setup_input_path(ch->channel_id,
@@ -1578,7 +1524,7 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index)
                         vpif_dbg(1, debug, "couldn't setup input path for the"
                                 " sub device %s, for input index %d\n",
                                 subdev_info->name, index);
-                        goto exit;
+                        return ret;
                 }
         }
 
@@ -1589,7 +1535,7 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index)
                                         input, output, 0);
                 if (ret < 0) {
                         vpif_dbg(1, debug, "Failed to set input\n");
-                        goto exit;
+                        return ret;
                 }
         }
         vid_ch->input_idx = index;
@@ -1600,9 +1546,6 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index)
 
         /* update tvnorms from the sub device input info */
         ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;
-
-exit:
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1671,11 +1614,7 @@ static int vpif_g_fmt_vid_cap(struct file *file, void *priv,
                 return -EINVAL;
 
         /* Fill in the information about format */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         *fmt = common->fmt;
-        mutex_unlock(&common->lock);
         return 0;
 }
 
@@ -1694,7 +1633,7 @@ static int vpif_s_fmt_vid_cap(struct file *file, void *priv,
         struct v4l2_pix_format *pixfmt;
         int ret = 0;
 
-        vpif_dbg(2, debug, "VIDIOC_S_FMT\n");
+        vpif_dbg(2, debug, "%s\n", __func__);
 
         /* If streaming is started, return error */
         if (common->started) {
@@ -1723,12 +1662,7 @@ static int vpif_s_fmt_vid_cap(struct file *file, void *priv,
         if (ret)
                 return ret;
         /* store the format in the channel object */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         common->fmt = *fmt;
-        mutex_unlock(&common->lock);
-
         return 0;
 }
 
@@ -1807,6 +1741,306 @@ static int vpif_cropcap(struct file *file, void *priv,
         return 0;
 }
 
+/**
+ * vpif_enum_dv_presets() - ENUM_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_enum_dv_presets(struct file *file, void *priv,
+                struct v4l2_dv_enum_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],
+                        video, enum_dv_presets, preset);
+}
+
+/**
+ * vpif_query_dv_presets() - QUERY_DV_PRESET handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_query_dv_preset(struct file *file, void *priv,
+                struct v4l2_dv_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],
+                       video, query_dv_preset, preset);
+}
+/**
+ * vpif_s_dv_presets() - S_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_s_dv_preset(struct file *file, void *priv,
+                struct v4l2_dv_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        int ret = 0;
+
+        if (common->started) {
+                vpif_dbg(1, debug, "streaming in progress\n");
+                return -EBUSY;
+        }
+
+        if ((VPIF_CHANNEL0_VIDEO == ch->channel_id) ||
+            (VPIF_CHANNEL1_VIDEO == ch->channel_id)) {
+                if (!fh->initialized) {
+                        vpif_dbg(1, debug, "Channel Busy\n");
+                        return -EBUSY;
+                }
+        }
+
+        ret = v4l2_prio_check(&ch->prio, fh->prio);
+        if (ret)
+                return ret;
+
+        fh->initialized = 1;
+
+        /* Call encoder subdevice function to set the standard */
+        if (mutex_lock_interruptible(&common->lock))
+                return -ERESTARTSYS;
+
+        ch->video.dv_preset = preset->preset;
+        ch->video.stdid = V4L2_STD_UNKNOWN;
+        memset(&ch->video.bt_timings, 0, sizeof(ch->video.bt_timings));
+
+        /* Get the information about the standard */
+        if (vpif_update_std_info(ch)) {
+                vpif_dbg(1, debug, "Error getting the standard info\n");
+                ret = -EINVAL;
+        } else {
+                /* Configure the default format information */
+                vpif_config_format(ch);
+
+                ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],
+                                video, s_dv_preset, preset);
+        }
+
+        mutex_unlock(&common->lock);
+
+        return ret;
+}
+/**
+ * vpif_g_dv_presets() - G_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_g_dv_preset(struct file *file, void *priv,
+                struct v4l2_dv_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        preset->preset = ch->video.dv_preset;
+
+        return 0;
+}
+
+/**
+ * vpif_s_dv_timings() - S_DV_TIMINGS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @timings: digital video timings
+ */
+static int vpif_s_dv_timings(struct file *file, void *priv,
+                struct v4l2_dv_timings *timings)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct vpif_params *vpifparams = &ch->vpifparams;
+        struct vpif_channel_config_params *std_info = &vpifparams->std_info;
+        struct video_obj *vid_ch = &ch->video;
+        struct v4l2_bt_timings *bt = &vid_ch->bt_timings;
+        int ret;
+
+        if (timings->type != V4L2_DV_BT_656_1120) {
+                vpif_dbg(2, debug, "Timing type not defined\n");
+                return -EINVAL;
+        }
+
+        /* Configure subdevice timings, if any */
+        ret = v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index],
+                        video, s_dv_timings, timings);
+        if (ret == -ENOIOCTLCMD) {
+                vpif_dbg(2, debug, "Custom DV timings not supported by "
+                                "subdevice\n");
+                return -EINVAL;
+        }
+        if (ret < 0) {
+                vpif_dbg(2, debug, "Error setting custom DV timings\n");
+                return ret;
+        }
+
+        if (!(timings->bt.width && timings->bt.height &&
+                                (timings->bt.hbackporch ||
+                                 timings->bt.hfrontporch ||
+                                 timings->bt.hsync) &&
+                                timings->bt.vfrontporch &&
+                                (timings->bt.vbackporch ||
+                                 timings->bt.vsync))) {
+                vpif_dbg(2, debug, "Timings for width, height, "
+                                "horizontal back porch, horizontal sync, "
+                                "horizontal front porch, vertical back porch, "
+                                "vertical sync and vertical back porch "
+                                "must be defined\n");
+                return -EINVAL;
+        }
+
+        *bt = timings->bt;
+
+        /* Configure video port timings */
+
+        std_info->eav2sav = bt->hbackporch + bt->hfrontporch +
+                bt->hsync - 8;
+        std_info->sav2eav = bt->width;
+
+        std_info->l1 = 1;
+        std_info->l3 = bt->vsync + bt->vbackporch + 1;
+
+        if (bt->interlaced) {
+                if (bt->il_vbackporch || bt->il_vfrontporch || bt->il_vsync) {
+                        std_info->vsize = bt->height * 2 +
+                                bt->vfrontporch + bt->vsync + bt->vbackporch +
+                                bt->il_vfrontporch + bt->il_vsync +
+                                bt->il_vbackporch;
+                        std_info->l5 = std_info->vsize/2 -
+                                (bt->vfrontporch - 1);
+                        std_info->l7 = std_info->vsize/2 + 1;
+                        std_info->l9 = std_info->l7 + bt->il_vsync +
+                                bt->il_vbackporch + 1;
+                        std_info->l11 = std_info->vsize -
+                                (bt->il_vfrontporch - 1);
+                } else {
+                        vpif_dbg(2, debug, "Required timing values for "
+                                        "interlaced BT format missing\n");
+                        return -EINVAL;
+                }
+        } else {
+                std_info->vsize = bt->height + bt->vfrontporch +
+                        bt->vsync + bt->vbackporch;
+                std_info->l5 = std_info->vsize - (bt->vfrontporch - 1);
+        }
+        strncpy(std_info->name, "Custom timings BT656/1120", VPIF_MAX_NAME);
+        std_info->width = bt->width;
+        std_info->height = bt->height;
+        std_info->frm_fmt = bt->interlaced ? 0 : 1;
+        std_info->ycmux_mode = 0;
+        std_info->capture_format = 0;
+        std_info->vbi_supported = 0;
+        std_info->hd_sd = 1;
+        std_info->stdid = 0;
+        std_info->dv_preset = V4L2_DV_INVALID;
+
+        vid_ch->stdid = 0;
+        vid_ch->dv_preset = V4L2_DV_INVALID;
+        return 0;
+}
+
+/**
+ * vpif_g_dv_timings() - G_DV_TIMINGS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @timings: digital video timings
+ */
+static int vpif_g_dv_timings(struct file *file, void *priv,
+                struct v4l2_dv_timings *timings)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct video_obj *vid_ch = &ch->video;
+        struct v4l2_bt_timings *bt = &vid_ch->bt_timings;
+
+        timings->bt = *bt;
+
+        return 0;
+}
+
+/*
+ * vpif_g_chip_ident() - Identify the chip
+ * @file: file ptr
+ * @priv: file handle
+ * @chip: chip identity
+ *
+ * Returns zero or -EINVAL if read operations fails.
+ */
+static int vpif_g_chip_ident(struct file *file, void *priv,
+                struct v4l2_dbg_chip_ident *chip)
+{
+        chip->ident = V4L2_IDENT_NONE;
+        chip->revision = 0;
+        if (chip->match.type != V4L2_CHIP_MATCH_I2C_DRIVER &&
+                        chip->match.type != V4L2_CHIP_MATCH_I2C_ADDR) {
+                vpif_dbg(2, debug, "match_type is invalid.\n");
+                return -EINVAL;
+        }
+
+        return v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 0, core,
+                        g_chip_ident, chip);
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+/*
+ * vpif_dbg_g_register() - Read register
+ * @file: file ptr
+ * @priv: file handle
+ * @reg: register to be read
+ *
+ * Debugging only
+ * Returns zero or -EINVAL if read operations fails.
+ */
+static int vpif_dbg_g_register(struct file *file, void *priv,
+                struct v4l2_dbg_register *reg){
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,
+                        g_register, reg);
+}
+
+/*
+ * vpif_dbg_s_register() - Write to register
+ * @file: file ptr
+ * @priv: file handle
+ * @reg: register to be modified
+ *
+ * Debugging only
+ * Returns zero or -EINVAL if write operations fails.
+ */
+static int vpif_dbg_s_register(struct file *file, void *priv,
+                struct v4l2_dbg_register *reg){
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        return v4l2_subdev_call(vpif_obj.sd[ch->curr_sd_index], core,
+                        s_register, reg);
+}
+#endif
+
+/*
+ * vpif_log_status() - Status information
+ * @file: file ptr
+ * @priv: file handle
+ *
+ * Returns zero.
+ */
+static int vpif_log_status(struct file *filep, void *priv)
+{
+        /* status for sub devices */
+        v4l2_device_call_all(&vpif_obj.v4l2_dev, 0, core, log_status);
+
+        return 0;
+}
+
 /* vpif capture ioctl operations */
 static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
         .vidioc_querycap                = vpif_querycap,
@@ -1829,6 +2063,18 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
         .vidioc_streamon                = vpif_streamon,
         .vidioc_streamoff               = vpif_streamoff,
         .vidioc_cropcap                 = vpif_cropcap,
+        .vidioc_enum_dv_presets         = vpif_enum_dv_presets,
+        .vidioc_s_dv_preset             = vpif_s_dv_preset,
+        .vidioc_g_dv_preset             = vpif_g_dv_preset,
+        .vidioc_query_dv_preset         = vpif_query_dv_preset,
+        .vidioc_s_dv_timings            = vpif_s_dv_timings,
+        .vidioc_g_dv_timings            = vpif_g_dv_timings,
+        .vidioc_g_chip_ident            = vpif_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register              = vpif_dbg_g_register,
+        .vidioc_s_register              = vpif_dbg_s_register,
+#endif
+        .vidioc_log_status              = vpif_log_status,
 };
 
 /* vpif file operations */
@@ -1836,7 +2082,7 @@ static struct v4l2_file_operations vpif_fops = {
         .owner = THIS_MODULE,
         .open = vpif_open,
         .release = vpif_release,
-        .ioctl = video_ioctl2,
+        .unlocked_ioctl = video_ioctl2,
         .mmap = vpif_mmap,
         .poll = vpif_poll
 };
@@ -1979,6 +2225,7 @@ static __init int vpif_probe(struct platform_device *pdev)
                 common = &(ch->common[VPIF_VIDEO_INDEX]);
                 spin_lock_init(&common->irqlock);
                 mutex_init(&common->lock);
+                ch->video_dev->lock = &common->lock;
                 /* Initialize prio member of channel object */
                 v4l2_prio_init(&ch->prio);
                 err = video_register_device(ch->video_dev,
@@ -2026,9 +2273,9 @@ static __init int vpif_probe(struct platform_device *pdev)
                 if (vpif_obj.sd[i])
                         vpif_obj.sd[i]->grp_id = 1 << i;
         }
-        v4l2_info(&vpif_obj.v4l2_dev, "DM646x VPIF Capture driver"
-                  " initialized\n");
 
+        v4l2_info(&vpif_obj.v4l2_dev,
+                        "DM646x VPIF capture driver initialized\n");
         return 0;
 
 probe_subdev_out:
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index 4e12ec8cac6f..7a4196dfdce1 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -59,6 +59,8 @@ struct video_obj {
         enum v4l2_field buf_field;
         /* Currently selected or default standard */
         v4l2_std_id stdid;
+        u32 dv_preset;
+        struct v4l2_bt_timings bt_timings;
         /* This is to track the last input that is passed to application */
         u32 input_idx;
 };
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 412c65d54fe1..cdf659abdc2a 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -38,6 +38,7 @@
 #include <media/adv7343.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
 
 #include <mach/dm646x.h>
 
@@ -84,17 +85,6 @@ static struct vpif_config_params config_params = {
 static struct vpif_device vpif_obj = { {NULL} };
 static struct device *vpif_dev;
 
-static const struct vpif_channel_config_params ch_params[] = {
-        {
-                "NTSC", 720, 480, 30, 0, 1, 268, 1440, 1, 23, 263, 266,
-                286, 525, 525, 0, 1, 0, V4L2_STD_525_60,
-        },
-        {
-                "PAL", 720, 576, 25, 0, 1, 280, 1440, 1, 23, 311, 313,
-                336, 624, 625, 0, 1, 0, V4L2_STD_625_50,
-        },
-};
-
 /*
  * vpif_uservirt_to_phys: This function is used to convert user
  * space virtual address to physical address.
@@ -373,30 +363,54 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int vpif_get_std_info(struct channel_obj *ch)
+static int vpif_update_std_info(struct channel_obj *ch)
 {
-        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         struct video_obj *vid_ch = &ch->video;
         struct vpif_params *vpifparams = &ch->vpifparams;
         struct vpif_channel_config_params *std_info = &vpifparams->std_info;
         const struct vpif_channel_config_params *config;
 
-        int index;
-
-        std_info->stdid = vid_ch->stdid;
-        if (!std_info->stdid)
-                return -1;
+        int i;
 
-        for (index = 0; index < ARRAY_SIZE(ch_params); index++) {
-                config = &ch_params[index];
-                if (config->stdid & std_info->stdid) {
-                        memcpy(std_info, config, sizeof(*config));
-                        break;
+        for (i = 0; i < vpif_ch_params_count; i++) {
+                config = &ch_params[i];
+                if (config->hd_sd == 0) {
+                        vpif_dbg(2, debug, "SD format\n");
+                        if (config->stdid & vid_ch->stdid) {
+                                memcpy(std_info, config, sizeof(*config));
+                                break;
+                        }
+                } else {
+                        vpif_dbg(2, debug, "HD format\n");
+                        if (config->dv_preset == vid_ch->dv_preset) {
+                                memcpy(std_info, config, sizeof(*config));
+                                break;
+                        }
                 }
         }
 
-        if (index == ARRAY_SIZE(ch_params))
-                return -1;
+        if (i == vpif_ch_params_count) {
+                vpif_dbg(1, debug, "Format not found\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vpif_update_resolution(struct channel_obj *ch)
+{
+        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        struct video_obj *vid_ch = &ch->video;
+        struct vpif_params *vpifparams = &ch->vpifparams;
+        struct vpif_channel_config_params *std_info = &vpifparams->std_info;
+
+        if (!vid_ch->stdid && !vid_ch->dv_preset && !vid_ch->bt_timings.height)
+                return -EINVAL;
+
+        if (vid_ch->stdid || vid_ch->dv_preset) {
+                if (vpif_update_std_info(ch))
+                        return -EINVAL;
+        }
 
         common->fmt.fmt.pix.width = std_info->width;
         common->fmt.fmt.pix.height = std_info->height;
@@ -404,8 +418,8 @@ static int vpif_get_std_info(struct channel_obj *ch)
                         common->fmt.fmt.pix.width, common->fmt.fmt.pix.height);
 
         /* Set height and width paramateres */
-        ch->common[VPIF_VIDEO_INDEX].height = std_info->height;
-        ch->common[VPIF_VIDEO_INDEX].width = std_info->width;
+        common->height = std_info->height;
+        common->width = std_info->width;
 
         return 0;
 }
@@ -516,10 +530,8 @@ static int vpif_check_format(struct channel_obj *ch,
         else
                 sizeimage = config_params.channel_bufsize[ch->channel_id];
 
-        if (vpif_get_std_info(ch)) {
-                vpif_err("Error getting the standard info\n");
+        if (vpif_update_resolution(ch))
                 return -EINVAL;
-        }
 
         hpitch = pixfmt->bytesperline;
         vpitch = sizeimage / (hpitch * 2);
@@ -568,7 +580,10 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
 static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
 {
         struct vpif_fh *fh = filep->private_data;
-        struct common_obj *common = &fh->channel->common[VPIF_VIDEO_INDEX];
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common = &(ch->common[VPIF_VIDEO_INDEX]);
+
+        vpif_dbg(2, debug, "vpif_mmap\n");
 
         return videobuf_mmap_mapper(&common->buffer_queue, vma);
 }
@@ -637,9 +652,6 @@ static int vpif_release(struct file *filep)
         struct channel_obj *ch = fh->channel;
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* if this instance is doing IO */
         if (fh->io_allowed[VPIF_VIDEO_INDEX]) {
                 /* Reset io_usrs member of channel object */
@@ -662,8 +674,6 @@ static int vpif_release(struct file *filep)
                     config_params.numbuffers[ch->channel_id];
         }
 
-        mutex_unlock(&common->lock);
-
         /* Decrement channel usrs counter */
         atomic_dec(&ch->usrs);
         /* If this file handle has initialize encoder device, reset it */
@@ -680,7 +690,12 @@ static int vpif_release(struct file *filep)
 }
 
 /* functions implementing ioctls */
-
+/**
+ * vpif_querycap() - QUERYCAP handler
+ * @file: file ptr
+ * @priv: file handle
+ * @cap: ptr to v4l2_capability structure
+ */
 static int vpif_querycap(struct file *file, void  *priv,
                                 struct v4l2_capability *cap)
 {
@@ -722,17 +737,9 @@ static int vpif_g_fmt_vid_out(struct file *file, void *priv,
         if (common->fmt.type != fmt->type)
                 return -EINVAL;
 
-        /* Fill in the information about format */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
-        if (vpif_get_std_info(ch)) {
-                vpif_err("Error getting the standard info\n");
+        if (vpif_update_resolution(ch))
                 return -EINVAL;
-        }
-
         *fmt = common->fmt;
-        mutex_unlock(&common->lock);
         return 0;
 }
 
@@ -773,12 +780,7 @@ static int vpif_s_fmt_vid_out(struct file *file, void *priv,
         /* store the pix format in the channel object */
         common->fmt.fmt.pix = *pixfmt;
         /* store the format in the channel object */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         common->fmt = *fmt;
-        mutex_unlock(&common->lock);
-
         return 0;
 }
 
@@ -808,7 +810,6 @@ static int vpif_reqbufs(struct file *file, void *priv,
         struct common_obj *common;
         enum v4l2_field field;
         u8 index = 0;
-        int ret = 0;
 
         /* This file handle has not initialized the channel,
            It is not allowed to do settings */
@@ -826,18 +827,12 @@ static int vpif_reqbufs(struct file *file, void *priv,
         index = VPIF_VIDEO_INDEX;
 
         common = &ch->common[index];
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
 
-        if (common->fmt.type != reqbuf->type) {
-                ret = -EINVAL;
-                goto reqbuf_exit;
-        }
+        if (common->fmt.type != reqbuf->type)
+                return -EINVAL;
 
-        if (0 != common->io_usrs) {
-                ret = -EBUSY;
-                goto reqbuf_exit;
-        }
+        if (0 != common->io_usrs)
+                return -EBUSY;
 
         if (reqbuf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 if (common->fmt.fmt.pix.field == V4L2_FIELD_ANY)
@@ -854,7 +849,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
                                             &common->irqlock,
                                             reqbuf->type, field,
                                             sizeof(struct videobuf_buffer), fh,
-                                            NULL);
+                                            &common->lock);
 
         /* Set io allowed member of file handle to TRUE */
         fh->io_allowed[index] = 1;
@@ -865,11 +860,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
         INIT_LIST_HEAD(&common->dma_queue);
 
         /* Allocate buffers */
-        ret = videobuf_reqbufs(&common->buffer_queue, reqbuf);
-
-reqbuf_exit:
-        mutex_unlock(&common->lock);
-        return ret;
+        return videobuf_reqbufs(&common->buffer_queue, reqbuf);
 }
 
 static int vpif_querybuf(struct file *file, void *priv,
@@ -990,22 +981,19 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
         }
 
         /* Call encoder subdevice function to set the standard */
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         ch->video.stdid = *std_id;
+        ch->video.dv_preset = V4L2_DV_INVALID;
+        memset(&ch->video.bt_timings, 0, sizeof(ch->video.bt_timings));
+
         /* Get the information about the standard */
-        if (vpif_get_std_info(ch)) {
-                vpif_err("Error getting the standard info\n");
+        if (vpif_update_resolution(ch))
                 return -EINVAL;
-        }
 
         if ((ch->vpifparams.std_info.width *
                 ch->vpifparams.std_info.height * 2) >
                 config_params.channel_bufsize[ch->channel_id]) {
                 vpif_err("invalid std for this size\n");
-                ret = -EINVAL;
-                goto s_std_exit;
+                return -EINVAL;
         }
 
         common->fmt.fmt.pix.bytesperline = common->fmt.fmt.pix.width;
@@ -1016,16 +1004,13 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
                                                 s_std_output, *std_id);
         if (ret < 0) {
                 vpif_err("Failed to set output standard\n");
-                goto s_std_exit;
+                return ret;
         }
 
         ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, core,
                                                         s_std, *std_id);
         if (ret < 0)
                 vpif_err("Failed to set standard for sub devices\n");
-
-s_std_exit:
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1090,21 +1075,17 @@ static int vpif_streamon(struct file *file, void *priv,
         if (ret < 0)
                 return ret;
 
-        /* Call videobuf_streamon to start streaming  in videobuf */
+        /* Call videobuf_streamon to start streaming in videobuf */
         ret = videobuf_streamon(&common->buffer_queue);
         if (ret < 0) {
                 vpif_err("videobuf_streamon\n");
                 return ret;
         }
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         /* If buffer queue is empty, return error */
         if (list_empty(&common->dma_queue)) {
                 vpif_err("buffer queue is empty\n");
-                ret = -EIO;
-                goto streamon_exit;
+                return -EIO;
         }
 
         /* Get the next frame from the buffer queue */
@@ -1130,8 +1111,7 @@ static int vpif_streamon(struct file *file, void *priv,
                         || (!ch->vpifparams.std_info.frm_fmt
                         && (common->fmt.fmt.pix.field == V4L2_FIELD_NONE))) {
                         vpif_err("conflict in field format and std format\n");
-                        ret = -EINVAL;
-                        goto streamon_exit;
+                        return -EINVAL;
                 }
 
                 /* clock settings */
@@ -1140,13 +1120,13 @@ static int vpif_streamon(struct file *file, void *priv,
                                                 ch->vpifparams.std_info.hd_sd);
                 if (ret < 0) {
                         vpif_err("can't set clock\n");
-                        goto streamon_exit;
+                        return ret;
                 }
 
                 /* set the parameters and addresses */
                 ret = vpif_set_video_params(vpif, ch->channel_id + 2);
                 if (ret < 0)
-                        goto streamon_exit;
+                        return ret;
 
                 common->started = ret;
                 vpif_config_addr(ch, ret);
@@ -1171,9 +1151,6 @@ static int vpif_streamon(struct file *file, void *priv,
                 }
                 channel_first_int[VPIF_VIDEO_INDEX][ch->channel_id] = 1;
         }
-
-streamon_exit:
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1199,9 +1176,6 @@ static int vpif_streamoff(struct file *file, void *priv,
                 return -EINVAL;
         }
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         if (buftype == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 /* disable channel */
                 if (VPIF_CHANNEL2_VIDEO == ch->channel_id) {
@@ -1216,8 +1190,6 @@ static int vpif_streamoff(struct file *file, void *priv,
         }
 
         common->started = 0;
-        mutex_unlock(&common->lock);
-
         return videobuf_streamoff(&common->buffer_queue);
 }
 
@@ -1264,13 +1236,9 @@ static int vpif_s_output(struct file *file, void *priv, unsigned int i)
         struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
         int ret = 0;
 
-        if (mutex_lock_interruptible(&common->lock))
-                return -ERESTARTSYS;
-
         if (common->started) {
                 vpif_err("Streaming in progress\n");
-                ret = -EBUSY;
-                goto s_output_exit;
+                return -EBUSY;
         }
 
         ret = v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 1, video,
@@ -1280,9 +1248,6 @@ static int vpif_s_output(struct file *file, void *priv, unsigned int i)
                 vpif_err("Failed to set output standard\n");
 
         vid_ch->output_id = i;
-
-s_output_exit:
-        mutex_unlock(&common->lock);
         return ret;
 }
 
@@ -1315,6 +1280,287 @@ static int vpif_s_priority(struct file *file, void *priv, enum v4l2_priority p)
         return v4l2_prio_change(&ch->prio, &fh->prio, p);
 }
 
+/**
+ * vpif_enum_dv_presets() - ENUM_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_enum_dv_presets(struct file *file, void *priv,
+                struct v4l2_dv_enum_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct video_obj *vid_ch = &ch->video;
+
+        return v4l2_subdev_call(vpif_obj.sd[vid_ch->output_id],
+                        video, enum_dv_presets, preset);
+}
+
+/**
+ * vpif_s_dv_presets() - S_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_s_dv_preset(struct file *file, void *priv,
+                struct v4l2_dv_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
+        struct video_obj *vid_ch = &ch->video;
+        int ret = 0;
+
+        if (common->started) {
+                vpif_dbg(1, debug, "streaming in progress\n");
+                return -EBUSY;
+        }
+
+        ret = v4l2_prio_check(&ch->prio, fh->prio);
+        if (ret != 0)
+                return ret;
+
+        fh->initialized = 1;
+
+        /* Call encoder subdevice function to set the standard */
+        if (mutex_lock_interruptible(&common->lock))
+                return -ERESTARTSYS;
+
+        ch->video.dv_preset = preset->preset;
+        ch->video.stdid = V4L2_STD_UNKNOWN;
+        memset(&ch->video.bt_timings, 0, sizeof(ch->video.bt_timings));
+
+        /* Get the information about the standard */
+        if (vpif_update_resolution(ch)) {
+                ret = -EINVAL;
+        } else {
+                /* Configure the default format information */
+                vpif_config_format(ch);
+
+                ret = v4l2_subdev_call(vpif_obj.sd[vid_ch->output_id],
+                                video, s_dv_preset, preset);
+        }
+
+        mutex_unlock(&common->lock);
+
+        return ret;
+}
+/**
+ * vpif_g_dv_presets() - G_DV_PRESETS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @preset: input preset
+ */
+static int vpif_g_dv_preset(struct file *file, void *priv,
+                struct v4l2_dv_preset *preset)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+
+        preset->preset = ch->video.dv_preset;
+
+        return 0;
+}
+/**
+ * vpif_s_dv_timings() - S_DV_TIMINGS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @timings: digital video timings
+ */
+static int vpif_s_dv_timings(struct file *file, void *priv,
+                struct v4l2_dv_timings *timings)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct vpif_params *vpifparams = &ch->vpifparams;
+        struct vpif_channel_config_params *std_info = &vpifparams->std_info;
+        struct video_obj *vid_ch = &ch->video;
+        struct v4l2_bt_timings *bt = &vid_ch->bt_timings;
+        int ret;
+
+        if (timings->type != V4L2_DV_BT_656_1120) {
+                vpif_dbg(2, debug, "Timing type not defined\n");
+                return -EINVAL;
+        }
+
+        /* Configure subdevice timings, if any */
+        ret = v4l2_subdev_call(vpif_obj.sd[vid_ch->output_id],
+                        video, s_dv_timings, timings);
+        if (ret == -ENOIOCTLCMD) {
+                vpif_dbg(2, debug, "Custom DV timings not supported by "
+                                "subdevice\n");
+                return -EINVAL;
+        }
+        if (ret < 0) {
+                vpif_dbg(2, debug, "Error setting custom DV timings\n");
+                return ret;
+        }
+
+        if (!(timings->bt.width && timings->bt.height &&
+                                (timings->bt.hbackporch ||
+                                 timings->bt.hfrontporch ||
+                                 timings->bt.hsync) &&
+                                timings->bt.vfrontporch &&
+                                (timings->bt.vbackporch ||
+                                 timings->bt.vsync))) {
+                vpif_dbg(2, debug, "Timings for width, height, "
+                                "horizontal back porch, horizontal sync, "
+                                "horizontal front porch, vertical back porch, "
+                                "vertical sync and vertical back porch "
+                                "must be defined\n");
+                return -EINVAL;
+        }
+
+        *bt = timings->bt;
+
+        /* Configure video port timings */
+
+        std_info->eav2sav = bt->hbackporch + bt->hfrontporch +
+                bt->hsync - 8;
+        std_info->sav2eav = bt->width;
+
+        std_info->l1 = 1;
+        std_info->l3 = bt->vsync + bt->vbackporch + 1;
+
+        if (bt->interlaced) {
+                if (bt->il_vbackporch || bt->il_vfrontporch || bt->il_vsync) {
+                        std_info->vsize = bt->height * 2 +
+                                bt->vfrontporch + bt->vsync + bt->vbackporch +
+                                bt->il_vfrontporch + bt->il_vsync +
+                                bt->il_vbackporch;
+                        std_info->l5 = std_info->vsize/2 -
+                                (bt->vfrontporch - 1);
+                        std_info->l7 = std_info->vsize/2 + 1;
+                        std_info->l9 = std_info->l7 + bt->il_vsync +
+                                bt->il_vbackporch + 1;
+                        std_info->l11 = std_info->vsize -
+                                (bt->il_vfrontporch - 1);
+                } else {
+                        vpif_dbg(2, debug, "Required timing values for "
+                                        "interlaced BT format missing\n");
+                        return -EINVAL;
+                }
+        } else {
+                std_info->vsize = bt->height + bt->vfrontporch +
+                        bt->vsync + bt->vbackporch;
+                std_info->l5 = std_info->vsize - (bt->vfrontporch - 1);
+        }
+        strncpy(std_info->name, "Custom timings BT656/1120",
+                        VPIF_MAX_NAME);
+        std_info->width = bt->width;
+        std_info->height = bt->height;
+        std_info->frm_fmt = bt->interlaced ? 0 : 1;
+        std_info->ycmux_mode = 0;
+        std_info->capture_format = 0;
+        std_info->vbi_supported = 0;
+        std_info->hd_sd = 1;
+        std_info->stdid = 0;
+        std_info->dv_preset = V4L2_DV_INVALID;
+
+        vid_ch->stdid = 0;
+        vid_ch->dv_preset = V4L2_DV_INVALID;
+
+        return 0;
+}
+
+/**
+ * vpif_g_dv_timings() - G_DV_TIMINGS handler
+ * @file: file ptr
+ * @priv: file handle
+ * @timings: digital video timings
+ */
+static int vpif_g_dv_timings(struct file *file, void *priv,
+                struct v4l2_dv_timings *timings)
+{
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct video_obj *vid_ch = &ch->video;
+        struct v4l2_bt_timings *bt = &vid_ch->bt_timings;
+
+        timings->bt = *bt;
+
+        return 0;
+}
+
+/*
+ * vpif_g_chip_ident() - Identify the chip
+ * @file: file ptr
+ * @priv: file handle
+ * @chip: chip identity
+ *
+ * Returns zero or -EINVAL if read operations fails.
+ */
+static int vpif_g_chip_ident(struct file *file, void *priv,
+                struct v4l2_dbg_chip_ident *chip)
+{
+        chip->ident = V4L2_IDENT_NONE;
+        chip->revision = 0;
+        if (chip->match.type != V4L2_CHIP_MATCH_I2C_DRIVER &&
+                        chip->match.type != V4L2_CHIP_MATCH_I2C_ADDR) {
+                vpif_dbg(2, debug, "match_type is invalid.\n");
+                return -EINVAL;
+        }
+
+        return v4l2_device_call_until_err(&vpif_obj.v4l2_dev, 0, core,
+                        g_chip_ident, chip);
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+/*
+ * vpif_dbg_g_register() - Read register
+ * @file: file ptr
+ * @priv: file handle
+ * @reg: register to be read
+ *
+ * Debugging only
+ * Returns zero or -EINVAL if read operations fails.
+ */
+static int vpif_dbg_g_register(struct file *file, void *priv,
+                struct v4l2_dbg_register *reg){
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct video_obj *vid_ch = &ch->video;
+
+        return v4l2_subdev_call(vpif_obj.sd[vid_ch->output_id], core,
+                        g_register, reg);
+}
+
+/*
+ * vpif_dbg_s_register() - Write to register
+ * @file: file ptr
+ * @priv: file handle
+ * @reg: register to be modified
+ *
+ * Debugging only
+ * Returns zero or -EINVAL if write operations fails.
+ */
+static int vpif_dbg_s_register(struct file *file, void *priv,
+                struct v4l2_dbg_register *reg){
+        struct vpif_fh *fh = priv;
+        struct channel_obj *ch = fh->channel;
+        struct video_obj *vid_ch = &ch->video;
+
+        return v4l2_subdev_call(vpif_obj.sd[vid_ch->output_id], core,
+                        s_register, reg);
+}
+#endif
+
+/*
+ * vpif_log_status() - Status information
+ * @file: file ptr
+ * @priv: file handle
+ *
+ * Returns zero.
+ */
+static int vpif_log_status(struct file *filep, void *priv)
+{
+        /* status for sub devices */
+        v4l2_device_call_all(&vpif_obj.v4l2_dev, 0, core, log_status);
+
+        return 0;
+}
+
 /* vpif display ioctl operations */
 static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
         .vidioc_querycap                = vpif_querycap,
@@ -1336,13 +1582,24 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
         .vidioc_s_output                = vpif_s_output,
         .vidioc_g_output                = vpif_g_output,
         .vidioc_cropcap                 = vpif_cropcap,
+        .vidioc_enum_dv_presets         = vpif_enum_dv_presets,
+        .vidioc_s_dv_preset             = vpif_s_dv_preset,
+        .vidioc_g_dv_preset             = vpif_g_dv_preset,
+        .vidioc_s_dv_timings            = vpif_s_dv_timings,
+        .vidioc_g_dv_timings            = vpif_g_dv_timings,
+        .vidioc_g_chip_ident            = vpif_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register              = vpif_dbg_g_register,
+        .vidioc_s_register              = vpif_dbg_s_register,
+#endif
+        .vidioc_log_status              = vpif_log_status,
 };
 
 static const struct v4l2_file_operations vpif_fops = {
         .owner          = THIS_MODULE,
         .open           = vpif_open,
         .release        = vpif_release,
-        .ioctl          = video_ioctl2,
+        .unlocked_ioctl = video_ioctl2,
         .mmap           = vpif_mmap,
         .poll           = vpif_poll
 };
@@ -1526,6 +1783,7 @@ static __init int vpif_probe(struct platform_device *pdev)
                 v4l2_prio_init(&ch->prio);
                 ch->common[VPIF_VIDEO_INDEX].fmt.type =
                                                 V4L2_BUF_TYPE_VIDEO_OUTPUT;
+                ch->video_dev->lock = &common->lock;
 
                 /* register video device */
                 vpif_dbg(1, debug, "channel=%x,channel->video_dev=%x\n",
@@ -1565,6 +1823,8 @@ static __init int vpif_probe(struct platform_device *pdev)
                         vpif_obj.sd[i]->grp_id = 1 << i;
         }
 
+        v4l2_info(&vpif_obj.v4l2_dev,
+                        "DM646x VPIF display driver initialized\n");
         return 0;
 
 probe_subdev_out:
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index a2a7cd166bbf..b53aaa883075 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -67,6 +67,8 @@ struct video_obj {
                                          * most recent displayed frame only */
         v4l2_std_id stdid;              /* Currently selected or default
                                          * standard */
+        u32 dv_preset;
+        struct v4l2_bt_timings bt_timings;
         u32 output_id;                  /* Current output id */
 };
 
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 099d5df8c572..87f77a34eeab 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -33,6 +33,7 @@
 #include <media/saa7115.h>
 #include <media/tvp5150.h>
 #include <media/tvaudio.h>
+#include <media/mt9v011.h>
 #include <media/i2c-addr.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
@@ -1917,11 +1918,6 @@ static unsigned short tvp5150_addrs[] = {
         I2C_CLIENT_END
 };
 
-static unsigned short mt9v011_addrs[] = {
-        0xba >> 1,
-        I2C_CLIENT_END
-};
-
 static unsigned short msp3400_addrs[] = {
         0x80 >> 1,
         0x88 >> 1,
@@ -2437,6 +2433,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
+                break;
         case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
                 dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;
                 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
@@ -2623,11 +2620,17 @@ void em28xx_card_setup(struct em28xx *dev)
                         "tvp5150", 0, tvp5150_addrs);
 
         if (dev->em28xx_sensor == EM28XX_MT9V011) {
+                struct mt9v011_platform_data pdata;
+                struct i2c_board_info mt9v011_info = {
+                        .type = "mt9v011",
+                        .addr = 0xba >> 1,
+                        .platform_data = &pdata,
+                };
                 struct v4l2_subdev *sd;
 
-                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                         &dev->i2c_adap, "mt9v011", 0, mt9v011_addrs);
-                v4l2_subdev_call(sd, core, s_config, 0, &dev->sensor_xtal);
+                pdata.xtal = dev->sensor_xtal;
+                sd = v4l2_i2c_new_subdev_board(&dev->v4l2_dev, &dev->i2c_adap,
+                                &mt9v011_info, NULL);
         }
 
 
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index cc77d144df3c..bf66189cb26d 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -59,31 +59,7 @@
 /*****************************************************************************/
 
 static const struct usb_device_id et61x251_id_table[] = {
-        { USB_DEVICE(0x102c, 0x6151), },
         { USB_DEVICE(0x102c, 0x6251), },
-        { USB_DEVICE(0x102c, 0x6253), },
-        { USB_DEVICE(0x102c, 0x6254), },
-        { USB_DEVICE(0x102c, 0x6255), },
-        { USB_DEVICE(0x102c, 0x6256), },
-        { USB_DEVICE(0x102c, 0x6257), },
-        { USB_DEVICE(0x102c, 0x6258), },
-        { USB_DEVICE(0x102c, 0x6259), },
-        { USB_DEVICE(0x102c, 0x625a), },
-        { USB_DEVICE(0x102c, 0x625b), },
-        { USB_DEVICE(0x102c, 0x625c), },
-        { USB_DEVICE(0x102c, 0x625d), },
-        { USB_DEVICE(0x102c, 0x625e), },
-        { USB_DEVICE(0x102c, 0x625f), },
-        { USB_DEVICE(0x102c, 0x6260), },
-        { USB_DEVICE(0x102c, 0x6261), },
-        { USB_DEVICE(0x102c, 0x6262), },
-        { USB_DEVICE(0x102c, 0x6263), },
-        { USB_DEVICE(0x102c, 0x6264), },
-        { USB_DEVICE(0x102c, 0x6265), },
-        { USB_DEVICE(0x102c, 0x6266), },
-        { USB_DEVICE(0x102c, 0x6267), },
-        { USB_DEVICE(0x102c, 0x6268), },
-        { USB_DEVICE(0x102c, 0x6269), },
         { }
 };
 
diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
index 629043933501..a09c4709d613 100644
--- a/drivers/media/video/gspca/benq.c
+++ b/drivers/media/video/gspca/benq.c
@@ -276,7 +276,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x04a5, 0x3035)},
         {}
 };
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index 1eacb6c7926d..8b398493f96b 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -1040,14 +1040,14 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0572, 0x0041)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index c1ae05f4661f..4bf2cab98d64 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -2088,7 +2088,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0553, 0x0002)},
         {USB_DEVICE(0x0813, 0x0001)},
         {}
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index a594b36d6199..4b2c483fce6f 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -864,7 +864,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
 #if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE
         {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
@@ -875,7 +875,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
                     const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index d78226455d1f..987b4b69d7ab 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -229,7 +229,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 }
 
 /* Table of supported USB devices */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x04cb, 0x0104)},
         {USB_DEVICE(0x04cb, 0x0109)},
         {USB_DEVICE(0x04cb, 0x010b)},
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index b05bec7321b5..99083038cec3 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -488,7 +488,7 @@ static void sd_callback(struct gspca_dev *gspca_dev)
 
 /*=================== USB driver structure initialisation ==================*/
 
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x05e3, 0x0503)},
         {USB_DEVICE(0x05e3, 0xf191)},
         {}
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 442970073e8a..f21f2a258ae0 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -55,7 +55,7 @@ MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 11, 0)
+#define DRIVER_VERSION_NUMBER   KERNEL_VERSION(2, 12, 0)
 
 #ifdef GSPCA_DEBUG
 int gspca_debug = D_ERR | D_PROBE;
@@ -508,8 +508,8 @@ static int gspca_is_compressed(__u32 format)
         return 0;
 }
 
-static int frame_alloc(struct gspca_dev *gspca_dev,
-                        unsigned int count)
+static int frame_alloc(struct gspca_dev *gspca_dev, struct file *file,
+                        enum v4l2_memory memory, unsigned int count)
 {
         struct gspca_frame *frame;
         unsigned int frsz;
@@ -519,7 +519,6 @@ static int frame_alloc(struct gspca_dev *gspca_dev,
         frsz = gspca_dev->cam.cam_mode[i].sizeimage;
         PDEBUG(D_STREAM, "frame alloc frsz: %d", frsz);
         frsz = PAGE_ALIGN(frsz);
-        gspca_dev->frsz = frsz;
         if (count >= GSPCA_MAX_FRAMES)
                 count = GSPCA_MAX_FRAMES - 1;
         gspca_dev->frbuf = vmalloc_32(frsz * count);
@@ -527,6 +526,9 @@ static int frame_alloc(struct gspca_dev *gspca_dev,
                 err("frame alloc failed");
                 return -ENOMEM;
         }
+        gspca_dev->capt_file = file;
+        gspca_dev->memory = memory;
+        gspca_dev->frsz = frsz;
         gspca_dev->nframes = count;
         for (i = 0; i < count; i++) {
                 frame = &gspca_dev->frame[i];
@@ -535,7 +537,7 @@ static int frame_alloc(struct gspca_dev *gspca_dev,
                 frame->v4l2_buf.flags = 0;
                 frame->v4l2_buf.field = V4L2_FIELD_NONE;
                 frame->v4l2_buf.length = frsz;
-                frame->v4l2_buf.memory = gspca_dev->memory;
+                frame->v4l2_buf.memory = memory;
                 frame->v4l2_buf.sequence = 0;
                 frame->data = gspca_dev->frbuf + i * frsz;
                 frame->v4l2_buf.m.offset = i * frsz;
@@ -558,6 +560,9 @@ static void frame_free(struct gspca_dev *gspca_dev)
                         gspca_dev->frame[i].data = NULL;
         }
         gspca_dev->nframes = 0;
+        gspca_dev->frsz = 0;
+        gspca_dev->capt_file = NULL;
+        gspca_dev->memory = GSPCA_MEMORY_NO;
 }
 
 static void destroy_urbs(struct gspca_dev *gspca_dev)
@@ -1210,29 +1215,15 @@ static void gspca_release(struct video_device *vfd)
 static int dev_open(struct file *file)
 {
         struct gspca_dev *gspca_dev;
-        int ret;
 
         PDEBUG(D_STREAM, "[%s] open", current->comm);
         gspca_dev = (struct gspca_dev *) video_devdata(file);
-        if (mutex_lock_interruptible(&gspca_dev->queue_lock))
-                return -ERESTARTSYS;
-        if (!gspca_dev->present) {
-                ret = -ENODEV;
-                goto out;
-        }
-
-        if (gspca_dev->users > 4) {     /* (arbitrary value) */
-                ret = -EBUSY;
-                goto out;
-        }
+        if (!gspca_dev->present)
+                return -ENODEV;
 
         /* protect the subdriver against rmmod */
-        if (!try_module_get(gspca_dev->module)) {
-                ret = -ENODEV;
-                goto out;
-        }
-
-        gspca_dev->users++;
+        if (!try_module_get(gspca_dev->module))
+                return -ENODEV;
 
         file->private_data = gspca_dev;
 #ifdef GSPCA_DEBUG
@@ -1244,14 +1235,7 @@ static int dev_open(struct file *file)
                 gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL
                                         | V4L2_DEBUG_IOCTL_ARG);
 #endif
-        ret = 0;
-out:
-        mutex_unlock(&gspca_dev->queue_lock);
-        if (ret != 0)
-                PDEBUG(D_ERR|D_STREAM, "open failed err %d", ret);
-        else
-                PDEBUG(D_STREAM, "open done");
-        return ret;
+        return 0;
 }
 
 static int dev_close(struct file *file)
@@ -1261,7 +1245,6 @@ static int dev_close(struct file *file)
         PDEBUG(D_STREAM, "[%s] close", current->comm);
         if (mutex_lock_interruptible(&gspca_dev->queue_lock))
                 return -ERESTARTSYS;
-        gspca_dev->users--;
 
         /* if the file did the capture, free the streaming resources */
         if (gspca_dev->capt_file == file) {
@@ -1272,8 +1255,6 @@ static int dev_close(struct file *file)
                         mutex_unlock(&gspca_dev->usb_lock);
                 }
                 frame_free(gspca_dev);
-                gspca_dev->capt_file = NULL;
-                gspca_dev->memory = GSPCA_MEMORY_NO;
         }
         file->private_data = NULL;
         module_put(gspca_dev->module);
@@ -1516,6 +1497,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                 return -ERESTARTSYS;
 
         if (gspca_dev->memory != GSPCA_MEMORY_NO
+            && gspca_dev->memory != GSPCA_MEMORY_READ
             && gspca_dev->memory != rb->memory) {
                 ret = -EBUSY;
                 goto out;
@@ -1544,19 +1526,18 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                 gspca_stream_off(gspca_dev);
                 mutex_unlock(&gspca_dev->usb_lock);
         }
+        /* Don't restart the stream when switching from read to mmap mode */
+        if (gspca_dev->memory == GSPCA_MEMORY_READ)
+                streaming = 0;
 
         /* free the previous allocated buffers, if any */
-        if (gspca_dev->nframes != 0) {
+        if (gspca_dev->nframes != 0)
                 frame_free(gspca_dev);
-                gspca_dev->capt_file = NULL;
-        }
         if (rb->count == 0)                     /* unrequest */
                 goto out;
-        gspca_dev->memory = rb->memory;
-        ret = frame_alloc(gspca_dev, rb->count);
+        ret = frame_alloc(gspca_dev, file, rb->memory, rb->count);
         if (ret == 0) {
                 rb->count = gspca_dev->nframes;
-                gspca_dev->capt_file = file;
                 if (streaming)
                         ret = gspca_init_transfer(gspca_dev);
         }
@@ -1630,11 +1611,15 @@ static int vidioc_streamoff(struct file *file, void *priv,
 
         if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
-        if (!gspca_dev->streaming)
-                return 0;
+
         if (mutex_lock_interruptible(&gspca_dev->queue_lock))
                 return -ERESTARTSYS;
 
+        if (!gspca_dev->streaming) {
+                ret = 0;
+                goto out;
+        }
+
         /* check the capture file */
         if (gspca_dev->capt_file != file) {
                 ret = -EBUSY;
@@ -1649,6 +1634,8 @@ static int vidioc_streamoff(struct file *file, void *priv,
         gspca_dev->usb_err = 0;
         gspca_stream_off(gspca_dev);
         mutex_unlock(&gspca_dev->usb_lock);
+        /* In case another thread is waiting in dqbuf */
+        wake_up_interruptible(&gspca_dev->wq);
 
         /* empty the transfer queues */
         atomic_set(&gspca_dev->fr_q, 0);
@@ -1827,33 +1814,77 @@ out:
         return ret;
 }
 
+static int frame_ready_nolock(struct gspca_dev *gspca_dev, struct file *file,
+                                enum v4l2_memory memory)
+{
+        if (!gspca_dev->present)
+                return -ENODEV;
+        if (gspca_dev->capt_file != file || gspca_dev->memory != memory ||
+                        !gspca_dev->streaming)
+                return -EINVAL;
+
+        /* check if a frame is ready */
+        return gspca_dev->fr_o != atomic_read(&gspca_dev->fr_i);
+}
+
+static int frame_ready(struct gspca_dev *gspca_dev, struct file *file,
+                        enum v4l2_memory memory)
+{
+        int ret;
+
+        if (mutex_lock_interruptible(&gspca_dev->queue_lock))
+                return -ERESTARTSYS;
+        ret = frame_ready_nolock(gspca_dev, file, memory);
+        mutex_unlock(&gspca_dev->queue_lock);
+        return ret;
+}
+
 /*
- * wait for a video frame
+ * dequeue a video buffer
  *
- * If a frame is ready, its index is returned.
+ * If nonblock_ing is false, block until a buffer is available.
  */
-static int frame_wait(struct gspca_dev *gspca_dev,
-                        int nonblock_ing)
+static int vidioc_dqbuf(struct file *file, void *priv,
+                        struct v4l2_buffer *v4l2_buf)
 {
-        int i, ret;
+        struct gspca_dev *gspca_dev = priv;
+        struct gspca_frame *frame;
+        int i, j, ret;
 
-        /* check if a frame is ready */
-        i = gspca_dev->fr_o;
-        if (i == atomic_read(&gspca_dev->fr_i)) {
-                if (nonblock_ing)
+        PDEBUG(D_FRAM, "dqbuf");
+
+        if (mutex_lock_interruptible(&gspca_dev->queue_lock))
+                return -ERESTARTSYS;
+
+        for (;;) {
+                ret = frame_ready_nolock(gspca_dev, file, v4l2_buf->memory);
+                if (ret < 0)
+                        goto out;
+                if (ret > 0)
+                        break;
+
+                mutex_unlock(&gspca_dev->queue_lock);
+
+                if (file->f_flags & O_NONBLOCK)
                         return -EAGAIN;
 
                 /* wait till a frame is ready */
                 ret = wait_event_interruptible_timeout(gspca_dev->wq,
-                        i != atomic_read(&gspca_dev->fr_i) ||
-                        !gspca_dev->streaming || !gspca_dev->present,
+                        frame_ready(gspca_dev, file, v4l2_buf->memory),
                         msecs_to_jiffies(3000));
                 if (ret < 0)
                         return ret;
-                if (ret == 0 || !gspca_dev->streaming || !gspca_dev->present)
+                if (ret == 0)
                         return -EIO;
+
+                if (mutex_lock_interruptible(&gspca_dev->queue_lock))
+                        return -ERESTARTSYS;
         }
 
+        i = gspca_dev->fr_o;
+        j = gspca_dev->fr_queue[i];
+        frame = &gspca_dev->frame[j];
+
         gspca_dev->fr_o = (i + 1) % GSPCA_MAX_FRAMES;
 
         if (gspca_dev->sd_desc->dq_callback) {
@@ -1863,46 +1894,12 @@ static int frame_wait(struct gspca_dev *gspca_dev,
                         gspca_dev->sd_desc->dq_callback(gspca_dev);
                 mutex_unlock(&gspca_dev->usb_lock);
         }
-        return gspca_dev->fr_queue[i];
-}
-
-/*
- * dequeue a video buffer
- *
- * If nonblock_ing is false, block until a buffer is available.
- */
-static int vidioc_dqbuf(struct file *file, void *priv,
-                        struct v4l2_buffer *v4l2_buf)
-{
-        struct gspca_dev *gspca_dev = priv;
-        struct gspca_frame *frame;
-        int i, ret;
-
-        PDEBUG(D_FRAM, "dqbuf");
-        if (v4l2_buf->memory != gspca_dev->memory)
-                return -EINVAL;
-
-        if (!gspca_dev->present)
-                return -ENODEV;
-
-        /* if not streaming, be sure the application will not loop forever */
-        if (!(file->f_flags & O_NONBLOCK)
-            && !gspca_dev->streaming && gspca_dev->users == 1)
-                return -EINVAL;
 
-        /* only the capturing file may dequeue */
-        if (gspca_dev->capt_file != file)
-                return -EINVAL;
-
-        /* only one dequeue / read at a time */
-        if (mutex_lock_interruptible(&gspca_dev->read_lock))
-                return -ERESTARTSYS;
+        frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE;
+        memcpy(v4l2_buf, &frame->v4l2_buf, sizeof *v4l2_buf);
+        PDEBUG(D_FRAM, "dqbuf %d", j);
+        ret = 0;
 
-        ret = frame_wait(gspca_dev, file->f_flags & O_NONBLOCK);
-        if (ret < 0)
-                goto out;
-        i = ret;                                /* frame index */
-        frame = &gspca_dev->frame[i];
         if (gspca_dev->memory == V4L2_MEMORY_USERPTR) {
                 if (copy_to_user((__u8 __user *) frame->v4l2_buf.m.userptr,
                                  frame->data,
@@ -1910,15 +1907,10 @@ static int vidioc_dqbuf(struct file *file, void *priv,
                         PDEBUG(D_ERR|D_STREAM,
                                 "dqbuf cp to user failed");
                         ret = -EFAULT;
-                        goto out;
                 }
         }
-        frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE;
-        memcpy(v4l2_buf, &frame->v4l2_buf, sizeof *v4l2_buf);
-        PDEBUG(D_FRAM, "dqbuf %d", i);
-        ret = 0;
 out:
-        mutex_unlock(&gspca_dev->read_lock);
+        mutex_unlock(&gspca_dev->queue_lock);
         return ret;
 }
 
@@ -2033,9 +2025,7 @@ static unsigned int dev_poll(struct file *file, poll_table *wait)
         poll_wait(file, &gspca_dev->wq, wait);
 
         /* if reqbufs is not done, the user would use read() */
-        if (gspca_dev->nframes == 0) {
-                if (gspca_dev->memory != GSPCA_MEMORY_NO)
-                        return POLLERR;         /* not the 1st time */
+        if (gspca_dev->memory == GSPCA_MEMORY_NO) {
                 ret = read_alloc(gspca_dev, file);
                 if (ret != 0)
                         return POLLERR;
@@ -2067,18 +2057,10 @@ static ssize_t dev_read(struct file *file, char __user *data,
         PDEBUG(D_FRAM, "read (%zd)", count);
         if (!gspca_dev->present)
                 return -ENODEV;
-        switch (gspca_dev->memory) {
-        case GSPCA_MEMORY_NO:                   /* first time */
+        if (gspca_dev->memory == GSPCA_MEMORY_NO) { /* first time ? */
                 ret = read_alloc(gspca_dev, file);
                 if (ret != 0)
                         return ret;
-                break;
-        case GSPCA_MEMORY_READ:
-                if (gspca_dev->capt_file == file)
-                        break;
-                /* fall thru */
-        default:
-                return -EINVAL;
         }
 
         /* get a frame */
@@ -2266,7 +2248,6 @@ int gspca_dev_probe2(struct usb_interface *intf,
                 goto out;
 
         mutex_init(&gspca_dev->usb_lock);
-        mutex_init(&gspca_dev->read_lock);
         mutex_init(&gspca_dev->queue_lock);
         init_waitqueue_head(&gspca_dev->wq);
 
@@ -2341,12 +2322,11 @@ void gspca_disconnect(struct usb_interface *intf)
         PDEBUG(D_PROBE, "%s disconnect",
                 video_device_node_name(&gspca_dev->vdev));
         mutex_lock(&gspca_dev->usb_lock);
+
         gspca_dev->present = 0;
+        wake_up_interruptible(&gspca_dev->wq);
 
-        if (gspca_dev->streaming) {
-                destroy_urbs(gspca_dev);
-                wake_up_interruptible(&gspca_dev->wq);
-        }
+        destroy_urbs(gspca_dev);
 
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
         gspca_input_destroy_urb(gspca_dev);
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 97b77a26a2eb..41755226d389 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -205,14 +205,12 @@ struct gspca_dev {
 
         wait_queue_head_t wq;           /* wait queue */
         struct mutex usb_lock;          /* usb exchange protection */
-        struct mutex read_lock;         /* read protection */
         struct mutex queue_lock;        /* ISOC queue protection */
         int usb_err;                    /* USB error - protected by usb_lock */
         u16 pkt_size;                   /* ISOC packet size */
 #ifdef CONFIG_PM
         char frozen;                    /* suspend - resume */
 #endif
-        char users;                     /* number of opens */
         char present;                   /* device connected */
         char nbufread;                  /* number of buffers for read() */
         char memory;                    /* memory type (V4L2_MEMORY_xxx) */
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index a35e87bb0388..06b777f5379e 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -314,7 +314,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 }
 
 /* Table of supported USB devices */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0979, 0x0280)},
         {}
 };
diff --git a/drivers/media/video/gspca/jpeg.h b/drivers/media/video/gspca/jpeg.h
index de63c36806c0..ab54910418b4 100644
--- a/drivers/media/video/gspca/jpeg.h
+++ b/drivers/media/video/gspca/jpeg.h
@@ -141,9 +141,9 @@ static void jpeg_define(u8 *jpeg_hdr,
         memcpy(jpeg_hdr, jpeg_head, sizeof jpeg_head);
 #ifndef CONEX_CAM
         jpeg_hdr[JPEG_HEIGHT_OFFSET + 0] = height >> 8;
-        jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height & 0xff;
+        jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height;
         jpeg_hdr[JPEG_HEIGHT_OFFSET + 2] = width >> 8;
-        jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width & 0xff;
+        jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width;
         jpeg_hdr[JPEG_HEIGHT_OFFSET + 6] = samplesY;
 #endif
 }
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index d2ce65dcbfdc..5964691c0e95 100644
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -607,7 +607,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x04c8, 0x0720)}, /* Intel YC 76 */
         {}
 };
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index c872b93a3351..a7722b1aef9b 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -28,7 +28,7 @@ int force_sensor;
 static int dump_bridge;
 int dump_sensor;
 
-static const __devinitdata struct usb_device_id m5602_table[] = {
+static const struct usb_device_id m5602_table[] = {
         {USB_DEVICE(0x0402, 0x5602)},
         {}
 };
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index a81536e78698..cb4d0bf0d784 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -490,7 +490,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x093a, 0x050f)},
         {}
 };
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 7607a288b51c..3884c9d300c5 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -1229,7 +1229,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x08ca, 0x0110)},   /* Trust Spyc@m 100 */
         {USB_DEVICE(0x08ca, 0x0111)},   /* Aiptek Pencam VGA+ */
         {USB_DEVICE(0x093a, 0x010f)},   /* All other known MR97310A VGA cams */
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index e1c3b9328ace..8ab2c452c25e 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -488,7 +488,6 @@ static const struct v4l2_pix_format ovfx2_ov3610_mode[] = {
 #define R511_SNAP_PXDIV                 0x1c
 #define R511_SNAP_LNDIV                 0x1d
 #define R511_SNAP_UV_EN                 0x1e
-#define R511_SNAP_UV_EN                 0x1e
 #define R511_SNAP_OPTS                  0x1f
 
 #define R511_DRAM_FLOW_CTL              0x20
@@ -1847,8 +1846,7 @@ static const struct ov_i2c_regvals norm_7670[] = {
         { 0x6c, 0x0a },
         { 0x6d, 0x55 },
         { 0x6e, 0x11 },
-        { 0x6f, 0x9f },
-                                        /* "9e for advance AWB" */
+        { 0x6f, 0x9f },                 /* "9e for advance AWB" */
         { 0x6a, 0x40 },
         { OV7670_R01_BLUE, 0x40 },
         { OV7670_R02_RED, 0x60 },
@@ -3054,7 +3052,7 @@ static void ov519_configure(struct sd *sd)
 {
         static const struct ov_regvals init_519[] = {
                 { 0x5a, 0x6d }, /* EnableSystem */
-                { 0x53, 0x9b },
+                { 0x53, 0x9b }, /* don't enable the microcontroller */
                 { OV519_R54_EN_CLK1, 0xff }, /* set bit2 to enable jpeg */
                 { 0x5d, 0x03 },
                 { 0x49, 0x01 },
@@ -4747,7 +4745,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x4003), .driver_info = BRIDGE_W9968CF },
         {USB_DEVICE(0x041e, 0x4052), .driver_info = BRIDGE_OV519 },
         {USB_DEVICE(0x041e, 0x405f), .driver_info = BRIDGE_OV519 },
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 0edf93973b1c..04da22802736 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -479,15 +479,20 @@ static void ov534_reg_write(struct gspca_dev *gspca_dev, u16 reg, u8 val)
         struct usb_device *udev = gspca_dev->dev;
         int ret;
 
-        PDEBUG(D_USBO, "reg=0x%04x, val=0%02x", reg, val);
+        if (gspca_dev->usb_err < 0)
+                return;
+
+        PDEBUG(D_USBO, "SET 01 0000 %04x %02x", reg, val);
         gspca_dev->usb_buf[0] = val;
         ret = usb_control_msg(udev,
                               usb_sndctrlpipe(udev, 0),
                               0x01,
                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                               0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
-        if (ret < 0)
+        if (ret < 0) {
                 err("write failed %d", ret);
+                gspca_dev->usb_err = ret;
+        }
 }
 
 static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
@@ -495,14 +500,18 @@ static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)
         struct usb_device *udev = gspca_dev->dev;
         int ret;
 
+        if (gspca_dev->usb_err < 0)
+                return 0;
         ret = usb_control_msg(udev,
                               usb_rcvctrlpipe(udev, 0),
                               0x01,
                               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                               0x00, reg, gspca_dev->usb_buf, 1, CTRL_TIMEOUT);
-        PDEBUG(D_USBI, "reg=0x%04x, data=0x%02x", reg, gspca_dev->usb_buf[0]);
-        if (ret < 0)
+        PDEBUG(D_USBI, "GET 01 0000 %04x %02x", reg, gspca_dev->usb_buf[0]);
+        if (ret < 0) {
                 err("read failed %d", ret);
+                gspca_dev->usb_err = ret;
+        }
         return gspca_dev->usb_buf[0];
 }
 
@@ -558,13 +567,15 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)
 
 static void sccb_reg_write(struct gspca_dev *gspca_dev, u8 reg, u8 val)
 {
-        PDEBUG(D_USBO, "reg: 0x%02x, val: 0x%02x", reg, val);
+        PDEBUG(D_USBO, "sccb write: %02x %02x", reg, val);
         ov534_reg_write(gspca_dev, OV534_REG_SUBADDR, reg);
         ov534_reg_write(gspca_dev, OV534_REG_WRITE, val);
         ov534_reg_write(gspca_dev, OV534_REG_OPERATION, OV534_OP_WRITE_3);
 
-        if (!sccb_check_status(gspca_dev))
+        if (!sccb_check_status(gspca_dev)) {
                 err("sccb_reg_write failed");
+                gspca_dev->usb_err = -EIO;
+        }
 }
 
 static u8 sccb_reg_read(struct gspca_dev *gspca_dev, u16 reg)
@@ -885,7 +896,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
         ov534_set_led(gspca_dev, 0);
         set_frame_rate(gspca_dev);
 
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
@@ -920,7 +931,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         ov534_set_led(gspca_dev, 1);
         ov534_reg_write(gspca_dev, 0xe0, 0x00);
-        return 0;
+        return gspca_dev->usb_err;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1289,7 +1300,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x1415, 0x2000)},
         {}
 };
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index c5244b4b4777..aaf5428c57f5 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1429,7 +1429,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x06f8, 0x3003)},
         {}
 };
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 96f9986305b4..81739a2f205e 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -530,7 +530,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x4028)},
         {USB_DEVICE(0x093a, 0x2460)},
         {USB_DEVICE(0x093a, 0x2461)},
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index 2700975abce5..5615d7bd8304 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -1184,7 +1184,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x06f8, 0x3009)},
         {USB_DEVICE(0x093a, 0x2620)},
         {USB_DEVICE(0x093a, 0x2621)},
@@ -1201,7 +1201,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 6820f5d58b19..f8801b50e64f 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -837,7 +837,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x093a, 0x2600)},
         {USB_DEVICE(0x093a, 0x2601)},
         {USB_DEVICE(0x093a, 0x2603)},
@@ -849,7 +849,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c
index 40a06680502d..4271f86dfe01 100644
--- a/drivers/media/video/gspca/sn9c2028.c
+++ b/drivers/media/video/gspca/sn9c2028.c
@@ -703,7 +703,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0458, 0x7005)}, /* Genius Smart 300, version 2 */
         /* The Genius Smart is untested. I can't find an owner ! */
         /* {USB_DEVICE(0x0c45, 0x8000)}, DC31VC, Don't know this camera */
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index cb08d00d0a31..fcf29897b713 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -2470,7 +2470,7 @@ static const struct sd_desc sd_desc = {
                         | (SENSOR_ ## sensor << 8) \
                         | (i2c_addr)
 
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0c45, 0x6240), SN9C20X(MT9M001, 0x5d, 0)},
         {USB_DEVICE(0x0c45, 0x6242), SN9C20X(MT9M111, 0x5d, 0)},
         {USB_DEVICE(0x0c45, 0x6248), SN9C20X(OV9655, 0x30, 0)},
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 73504a3f87b7..c6cd68d66b53 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -23,8 +23,15 @@
 /* Some documentation on known sonixb registers:
 
 Reg     Use
+sn9c101 / sn9c102:
 0x10    high nibble red gain low nibble blue gain
 0x11    low nibble green gain
+sn9c103:
+0x05    red gain 0-127
+0x06    blue gain 0-127
+0x07    green gain 0-127
+all:
+0x08-0x0f i2c / 3wire registers
 0x12    hstart
 0x13    vstart
 0x15    hsize (hsize = register-value * 16)
@@ -88,12 +95,9 @@ struct sd {
 typedef const __u8 sensor_init_t[8];
 
 struct sensor_data {
-        const __u8 *bridge_init[2];
-        int bridge_init_size[2];
+        const __u8 *bridge_init;
         sensor_init_t *sensor_init;
         int sensor_init_size;
-        sensor_init_t *sensor_bridge_init[2];
-        int sensor_bridge_init_size[2];
         int flags;
         unsigned ctrl_dis;
         __u8 sensor_addr;
@@ -114,7 +118,6 @@ struct sensor_data {
 #define NO_FREQ (1 << FREQ_IDX)
 #define NO_BRIGHTNESS (1 << BRIGHTNESS_IDX)
 
-#define COMP2 0x8f
 #define COMP 0xc7               /* 0x87 //0x07 */
 #define COMP1 0xc9              /* 0x89 //0x09 */
 
@@ -123,15 +126,11 @@ struct sensor_data {
 
 #define SYS_CLK 0x04
 
-#define SENS(bridge_1, bridge_3, sensor, sensor_1, \
-        sensor_3, _flags, _ctrl_dis, _sensor_addr) \
+#define SENS(bridge, sensor, _flags, _ctrl_dis, _sensor_addr) \
 { \
-        .bridge_init = { bridge_1, bridge_3 }, \
-        .bridge_init_size = { sizeof(bridge_1), sizeof(bridge_3) }, \
+        .bridge_init = bridge, \
         .sensor_init = sensor, \
         .sensor_init_size = sizeof(sensor), \
-        .sensor_bridge_init = { sensor_1, sensor_3,}, \
-        .sensor_bridge_init_size = { sizeof(sensor_1), sizeof(sensor_3)}, \
         .flags = _flags, .ctrl_dis = _ctrl_dis, .sensor_addr = _sensor_addr \
 }
 
@@ -311,7 +310,6 @@ static const __u8 initHv7131d[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x02, 0x02, 0x00,
         0x28, 0x1e, 0x60, 0x8e, 0x42,
-        0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c
 };
 static const __u8 hv7131d_sensor_init[][8] = {
         {0xa0, 0x11, 0x01, 0x04, 0x00, 0x00, 0x00, 0x17},
@@ -326,7 +324,6 @@ static const __u8 initHv7131r[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x02, 0x01, 0x00,
         0x28, 0x1e, 0x60, 0x8a, 0x20,
-        0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c
 };
 static const __u8 hv7131r_sensor_init[][8] = {
         {0xc0, 0x11, 0x31, 0x38, 0x2a, 0x2e, 0x00, 0x10},
@@ -339,7 +336,7 @@ static const __u8 initOv6650[] = {
         0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
         0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b,
-        0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07
+        0x10,
 };
 static const __u8 ov6650_sensor_init[][8] = {
         /* Bright, contrast, etc are set through SCBB interface.
@@ -378,24 +375,13 @@ static const __u8 initOv7630[] = {
         0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* r09 .. r10 */
         0x00, 0x01, 0x01, 0x0a,                         /* r11 .. r14 */
         0x28, 0x1e,                     /* H & V sizes     r15 .. r16 */
-        0x68, COMP2, MCK_INIT1,                         /* r17 .. r19 */
-        0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c              /* r1a .. r1f */
-};
-static const __u8 initOv7630_3[] = {
-        0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */
-        0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* r09 .. r10 */
-        0x00, 0x02, 0x01, 0x0a,                         /* r11 .. r14 */
-        0x28, 0x1e,                     /* H & V sizes     r15 .. r16 */
         0x68, 0x8f, MCK_INIT1,                          /* r17 .. r19 */
-        0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00,       /* r1a .. r20 */
-        0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, /* r21 .. r28 */
-        0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, 0xff  /* r29 .. r30 */
 };
 static const __u8 ov7630_sensor_init[][8] = {
         {0xa0, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10},
         {0xb0, 0x21, 0x01, 0x77, 0x3a, 0x00, 0x00, 0x10},
 /*      {0xd0, 0x21, 0x12, 0x7c, 0x01, 0x80, 0x34, 0x10},          jfm */
-        {0xd0, 0x21, 0x12, 0x1c, 0x00, 0x80, 0x34, 0x10},       /* jfm */
+        {0xd0, 0x21, 0x12, 0x5c, 0x00, 0x80, 0x34, 0x10},       /* jfm */
         {0xa0, 0x21, 0x1b, 0x04, 0x00, 0x80, 0x34, 0x10},
         {0xa0, 0x21, 0x20, 0x44, 0x00, 0x80, 0x34, 0x10},
         {0xa0, 0x21, 0x23, 0xee, 0x00, 0x80, 0x34, 0x10},
@@ -413,16 +399,11 @@ static const __u8 ov7630_sensor_init[][8] = {
         {0xd0, 0x21, 0x17, 0x1c, 0xbd, 0x06, 0xf6, 0x10},
 };
 
-static const __u8 ov7630_sensor_init_3[][8] = {
-        {0xa0, 0x21, 0x13, 0x80, 0x00,  0x00, 0x00, 0x10},
-};
-
 static const __u8 initPas106[] = {
         0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x40, 0x00, 0x00, 0x00,
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x04, 0x01, 0x00,
         0x16, 0x12, 0x24, COMP1, MCK_INIT1,
-        0x18, 0x10, 0x02, 0x02, 0x09, 0x07
 };
 /* compression 0x86 mckinit1 0x2b */
 
@@ -496,7 +477,6 @@ static const __u8 initPas202[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x06, 0x03, 0x0a,
         0x28, 0x1e, 0x20, 0x89, 0x20,
-        0x00, 0x00, 0x02, 0x03, 0x0f, 0x0c
 };
 
 /* "Known" PAS202BCB registers:
@@ -537,7 +517,6 @@ static const __u8 initTas5110c[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x45, 0x09, 0x0a,
         0x16, 0x12, 0x60, 0x86, 0x2b,
-        0x14, 0x0a, 0x02, 0x02, 0x09, 0x07
 };
 /* Same as above, except a different hstart */
 static const __u8 initTas5110d[] = {
@@ -545,12 +524,19 @@ static const __u8 initTas5110d[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x41, 0x09, 0x0a,
         0x16, 0x12, 0x60, 0x86, 0x2b,
-        0x14, 0x0a, 0x02, 0x02, 0x09, 0x07
 };
-static const __u8 tas5110_sensor_init[][8] = {
+/* tas5110c is 3 wire, tas5110d is 2 wire (regular i2c) */
+static const __u8 tas5110c_sensor_init[][8] = {
         {0x30, 0x11, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x10},
         {0x30, 0x11, 0x02, 0x20, 0xa9, 0x00, 0x00, 0x10},
-        {0xa0, 0x61, 0x9a, 0xca, 0x00, 0x00, 0x00, 0x17},
+};
+/* Known TAS5110D registers
+ * reg02: gain, bit order reversed!! 0 == max gain, 255 == min gain
+ * reg03: bit3: vflip, bit4: ~hflip, bit7: ~gainboost (~ == inverted)
+ *        Note: writing reg03 seems to only work when written together with 02
+ */
+static const __u8 tas5110d_sensor_init[][8] = {
+        {0xa0, 0x61, 0x9a, 0xca, 0x00, 0x00, 0x00, 0x17}, /* reset */
 };
 
 static const __u8 initTas5130[] = {
@@ -558,7 +544,6 @@ static const __u8 initTas5130[] = {
         0x00, 0x00,
         0x00, 0x00, 0x00, 0x68, 0x0c, 0x0a,
         0x28, 0x1e, 0x60, COMP, MCK_INIT,
-        0x18, 0x10, 0x04, 0x03, 0x11, 0x0c
 };
 static const __u8 tas5130_sensor_init[][8] = {
 /*      {0x30, 0x11, 0x00, 0x40, 0x47, 0x00, 0x00, 0x10},
@@ -569,21 +554,18 @@ static const __u8 tas5130_sensor_init[][8] = {
 };
 
 static struct sensor_data sensor_data[] = {
-SENS(initHv7131d, NULL, hv7131d_sensor_init, NULL, NULL, F_GAIN, NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initHv7131r, NULL, hv7131r_sensor_init, NULL, NULL, 0, NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),
-SENS(initOv6650, NULL, ov6650_sensor_init, NULL, NULL, F_GAIN|F_SIF, 0, 0x60),
-SENS(initOv7630, initOv7630_3, ov7630_sensor_init, NULL, ov7630_sensor_init_3,
-        F_GAIN, 0, 0x21),
-SENS(initPas106, NULL, pas106_sensor_init, NULL, NULL, F_GAIN|F_SIF, NO_FREQ,
-        0),
-SENS(initPas202, initPas202, pas202_sensor_init, NULL, NULL, F_GAIN,
-        NO_FREQ, 0),
-SENS(initTas5110c, NULL, tas5110_sensor_init, NULL, NULL,
-        F_GAIN|F_SIF|F_COARSE_EXPO, NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initTas5110d, NULL, tas5110_sensor_init, NULL, NULL,
-        F_GAIN|F_SIF|F_COARSE_EXPO, NO_BRIGHTNESS|NO_FREQ, 0),
-SENS(initTas5130, NULL, tas5130_sensor_init, NULL, NULL, 0, NO_EXPO|NO_FREQ,
-        0),
+SENS(initHv7131d, hv7131d_sensor_init, F_GAIN, NO_BRIGHTNESS|NO_FREQ, 0),
+SENS(initHv7131r, hv7131r_sensor_init, 0, NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),
+SENS(initOv6650, ov6650_sensor_init, F_GAIN|F_SIF, 0, 0x60),
+SENS(initOv7630, ov7630_sensor_init, F_GAIN, 0, 0x21),
+SENS(initPas106, pas106_sensor_init, F_GAIN|F_SIF, NO_FREQ, 0),
+SENS(initPas202, pas202_sensor_init, F_GAIN, NO_FREQ, 0),
+SENS(initTas5110c, tas5110c_sensor_init, F_GAIN|F_SIF|F_COARSE_EXPO,
+        NO_BRIGHTNESS|NO_FREQ, 0),
+SENS(initTas5110d, tas5110d_sensor_init, F_GAIN|F_SIF|F_COARSE_EXPO,
+        NO_BRIGHTNESS|NO_FREQ, 0),
+SENS(initTas5130, tas5130_sensor_init, F_GAIN,
+        NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),
 };
 
 /* get one byte in gspca_dev->usb_buf */
@@ -655,7 +637,6 @@ static void i2c_w_vector(struct gspca_dev *gspca_dev,
 static void setbrightness(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        __u8 value;
 
         switch (sd->sensor) {
         case  SENSOR_OV6650:
@@ -697,17 +678,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
                         goto err;
                 break;
             }
-        case SENSOR_TAS5130CXX: {
-                __u8 i2c[] =
-                        {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10};
-
-                value = 0xff - sd->brightness;
-                i2c[4] = value;
-                PDEBUG(D_CONF, "brightness %d : %d", value, i2c[4]);
-                if (i2c_w(gspca_dev, i2c) < 0)
-                        goto err;
-                break;
-            }
         }
         return;
 err:
@@ -733,7 +703,7 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
                 break;
             }
         case SENSOR_TAS5110C:
-        case SENSOR_TAS5110D: {
+        case SENSOR_TAS5130CXX: {
                 __u8 i2c[] =
                         {0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10};
 
@@ -742,6 +712,23 @@ static void setsensorgain(struct gspca_dev *gspca_dev)
                         goto err;
                 break;
             }
+        case SENSOR_TAS5110D: {
+                __u8 i2c[] = {
+                        0xb0, 0x61, 0x02, 0x00, 0x10, 0x00, 0x00, 0x17 };
+                gain = 255 - gain;
+                /* The bits in the register are the wrong way around!! */
+                i2c[3] |= (gain & 0x80) >> 7;
+                i2c[3] |= (gain & 0x40) >> 5;
+                i2c[3] |= (gain & 0x20) >> 3;
+                i2c[3] |= (gain & 0x10) >> 1;
+                i2c[3] |= (gain & 0x08) << 1;
+                i2c[3] |= (gain & 0x04) << 3;
+                i2c[3] |= (gain & 0x02) << 5;
+                i2c[3] |= (gain & 0x01) << 7;
+                if (i2c_w(gspca_dev, i2c) < 0)
+                        goto err;
+                break;
+            }
 
         case SENSOR_OV6650:
                 gain >>= 1;
@@ -796,7 +783,7 @@ static void setgain(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         __u8 gain;
-        __u8 buf[2] = { 0, 0 };
+        __u8 buf[3] = { 0, 0, 0 };
 
         if (sensor_data[sd->sensor].flags & F_GAIN) {
                 /* Use the sensor gain to do the actual gain */
@@ -804,13 +791,18 @@ static void setgain(struct gspca_dev *gspca_dev)
                 return;
         }
 
-        gain = sd->gain >> 4;
-
-        /* red and blue gain */
-        buf[0] = gain << 4 | gain;
-        /* green gain */
-        buf[1] = gain;
-        reg_w(gspca_dev, 0x10, buf, 2);
+        if (sd->bridge == BRIDGE_103) {
+                gain = sd->gain >> 1;
+                buf[0] = gain; /* Red */
+                buf[1] = gain; /* Green */
+                buf[2] = gain; /* Blue */
+                reg_w(gspca_dev, 0x05, buf, 3);
+        } else {
+                gain = sd->gain >> 4;
+                buf[0] = gain << 4 | gain; /* Red and blue */
+                buf[1] = gain; /* Green */
+                reg_w(gspca_dev, 0x10, buf, 2);
+        }
 }
 
 static void setexposure(struct gspca_dev *gspca_dev)
@@ -1049,7 +1041,7 @@ static void do_autogain(struct gspca_dev *gspca_dev)
                 desired_avg_lum = 5000;
         } else {
                 deadzone = 1500;
-                desired_avg_lum = 18000;
+                desired_avg_lum = 13000;
         }
 
         if (sensor_data[sd->sensor].flags & F_COARSE_EXPO)
@@ -1127,53 +1119,91 @@ static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         struct cam *cam = &gspca_dev->cam;
-        int mode, l;
-        const __u8 *sn9c10x;
-        __u8 reg12_19[8];
+        int i, mode;
+        __u8 regs[0x31];
 
         mode = cam->cam_mode[gspca_dev->curr_mode].priv & 0x07;
-        sn9c10x = sensor_data[sd->sensor].bridge_init[sd->bridge];
-        l = sensor_data[sd->sensor].bridge_init_size[sd->bridge];
-        memcpy(reg12_19, &sn9c10x[0x12 - 1], 8);
-        reg12_19[6] = sn9c10x[0x18 - 1] | (mode << 4);
-        /* Special cases where reg 17 and or 19 value depends on mode */
+        /* Copy registers 0x01 - 0x19 from the template */
+        memcpy(&regs[0x01], sensor_data[sd->sensor].bridge_init, 0x19);
+        /* Set the mode */
+        regs[0x18] |= mode << 4;
+
+        /* Set bridge gain to 1.0 */
+        if (sd->bridge == BRIDGE_103) {
+                regs[0x05] = 0x20; /* Red */
+                regs[0x06] = 0x20; /* Green */
+                regs[0x07] = 0x20; /* Blue */
+        } else {
+                regs[0x10] = 0x00; /* Red and blue */
+                regs[0x11] = 0x00; /* Green */
+        }
+
+        /* Setup pixel numbers and auto exposure window */
+        if (sensor_data[sd->sensor].flags & F_SIF) {
+                regs[0x1a] = 0x14; /* HO_SIZE 640, makes no sense */
+                regs[0x1b] = 0x0a; /* VO_SIZE 320, makes no sense */
+                regs[0x1c] = 0x02; /* AE H-start 64 */
+                regs[0x1d] = 0x02; /* AE V-start 64 */
+                regs[0x1e] = 0x09; /* AE H-end 288 */
+                regs[0x1f] = 0x07; /* AE V-end 224 */
+        } else {
+                regs[0x1a] = 0x1d; /* HO_SIZE 960, makes no sense */
+                regs[0x1b] = 0x10; /* VO_SIZE 512, makes no sense */
+                regs[0x1c] = 0x05; /* AE H-start 160 */
+                regs[0x1d] = 0x03; /* AE V-start 96 */
+                regs[0x1e] = 0x0f; /* AE H-end 480 */
+                regs[0x1f] = 0x0c; /* AE V-end 384 */
+        }
+
+        /* Setup the gamma table (only used with the sn9c103 bridge) */
+        for (i = 0; i < 16; i++)
+                regs[0x20 + i] = i * 16;
+        regs[0x20 + i] = 255;
+
+        /* Special cases where some regs depend on mode or bridge */
         switch (sd->sensor) {
         case SENSOR_TAS5130CXX:
-                /* probably not mode specific at all most likely the upper
+                /* FIXME / TESTME
+                   probably not mode specific at all most likely the upper
                    nibble of 0x19 is exposure (clock divider) just as with
                    the tas5110, we need someone to test this. */
-                reg12_19[7] = mode ? 0x23 : 0x43;
+                regs[0x19] = mode ? 0x23 : 0x43;
                 break;
+        case SENSOR_OV7630:
+                /* FIXME / TESTME for some reason with the 101/102 bridge the
+                   clock is set to 12 Mhz (reg1 == 0x04), rather then 24.
+                   Also the hstart needs to go from 1 to 2 when using a 103,
+                   which is likely related. This does not seem right. */
+                if (sd->bridge == BRIDGE_103) {
+                        regs[0x01] = 0x44; /* Select 24 Mhz clock */
+                        regs[0x12] = 0x02; /* Set hstart to 2 */
+                }
         }
         /* Disable compression when the raw bayer format has been selected */
         if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_RAW)
-                reg12_19[6] &= ~0x80;
+                regs[0x18] &= ~0x80;
 
         /* Vga mode emulation on SIF sensor? */
         if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_REDUCED_SIF) {
-                reg12_19[0] += 16; /* 0x12: hstart adjust */
-                reg12_19[1] += 24; /* 0x13: vstart adjust */
-                reg12_19[3] = 320 / 16; /* 0x15: hsize */
-                reg12_19[4] = 240 / 16; /* 0x16: vsize */
+                regs[0x12] += 16;       /* hstart adjust */
+                regs[0x13] += 24;       /* vstart adjust */
+                regs[0x15]  = 320 / 16; /* hsize */
+                regs[0x16]  = 240 / 16; /* vsize */
         }
 
         /* reg 0x01 bit 2 video transfert on */
-        reg_w(gspca_dev, 0x01, &sn9c10x[0x01 - 1], 1);
+        reg_w(gspca_dev, 0x01, &regs[0x01], 1);
         /* reg 0x17 SensorClk enable inv Clk 0x60 */
-        reg_w(gspca_dev, 0x17, &sn9c10x[0x17 - 1], 1);
+        reg_w(gspca_dev, 0x17, &regs[0x17], 1);
         /* Set the registers from the template */
-        reg_w(gspca_dev, 0x01, sn9c10x, l);
+        reg_w(gspca_dev, 0x01, &regs[0x01],
+              (sd->bridge == BRIDGE_103) ? 0x30 : 0x1f);
 
         /* Init the sensor */
         i2c_w_vector(gspca_dev, sensor_data[sd->sensor].sensor_init,
                         sensor_data[sd->sensor].sensor_init_size);
-        if (sensor_data[sd->sensor].sensor_bridge_init[sd->bridge])
-                i2c_w_vector(gspca_dev,
-                        sensor_data[sd->sensor].sensor_bridge_init[sd->bridge],
-                        sensor_data[sd->sensor].sensor_bridge_init_size[
-                                sd->bridge]);
 
-        /* Mode specific sensor setup */
+        /* Mode / bridge specific sensor setup */
         switch (sd->sensor) {
         case SENSOR_PAS202: {
                 const __u8 i2cpclockdiv[] =
@@ -1181,27 +1211,37 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 /* clockdiv from 4 to 3 (7.5 -> 10 fps) when in low res mode */
                 if (mode)
                         i2c_w(gspca_dev, i2cpclockdiv);
+                break;
             }
+        case SENSOR_OV7630:
+                /* FIXME / TESTME We should be able to handle this identical
+                   for the 101/102 and the 103 case */
+                if (sd->bridge == BRIDGE_103) {
+                        const __u8 i2c[] = { 0xa0, 0x21, 0x13,
+                                             0x80, 0x00, 0x00, 0x00, 0x10 };
+                        i2c_w(gspca_dev, i2c);
+                }
+                break;
         }
         /* H_size V_size 0x28, 0x1e -> 640x480. 0x16, 0x12 -> 352x288 */
-        reg_w(gspca_dev, 0x15, &reg12_19[3], 2);
+        reg_w(gspca_dev, 0x15, &regs[0x15], 2);
         /* compression register */
-        reg_w(gspca_dev, 0x18, &reg12_19[6], 1);
+        reg_w(gspca_dev, 0x18, &regs[0x18], 1);
         /* H_start */
-        reg_w(gspca_dev, 0x12, &reg12_19[0], 1);
+        reg_w(gspca_dev, 0x12, &regs[0x12], 1);
         /* V_START */
-        reg_w(gspca_dev, 0x13, &reg12_19[1], 1);
+        reg_w(gspca_dev, 0x13, &regs[0x13], 1);
         /* reset 0x17 SensorClk enable inv Clk 0x60 */
                                 /*fixme: ov7630 [17]=68 8f (+20 if 102)*/
-        reg_w(gspca_dev, 0x17, &reg12_19[5], 1);
+        reg_w(gspca_dev, 0x17, &regs[0x17], 1);
         /*MCKSIZE ->3 */        /*fixme: not ov7630*/
-        reg_w(gspca_dev, 0x19, &reg12_19[7], 1);
+        reg_w(gspca_dev, 0x19, &regs[0x19], 1);
         /* AE_STRX AE_STRY AE_ENDX AE_ENDY */
-        reg_w(gspca_dev, 0x1c, &sn9c10x[0x1c - 1], 4);
+        reg_w(gspca_dev, 0x1c, &regs[0x1c], 4);
         /* Enable video transfert */
-        reg_w(gspca_dev, 0x01, &sn9c10x[0], 1);
+        reg_w(gspca_dev, 0x01, &regs[0x01], 1);
         /* Compression */
-        reg_w(gspca_dev, 0x18, &reg12_19[6], 2);
+        reg_w(gspca_dev, 0x18, &regs[0x18], 2);
         msleep(20);
 
         sd->reg11 = -1;
@@ -1525,15 +1565,15 @@ static const struct sd_desc sd_desc = {
         .driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
 
 
-static const struct usb_device_id device_table[] __devinitconst = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0c45, 0x6001), SB(TAS5110C, 102)}, /* TAS5110C1B */
         {USB_DEVICE(0x0c45, 0x6005), SB(TAS5110C, 101)}, /* TAS5110C1B */
         {USB_DEVICE(0x0c45, 0x6007), SB(TAS5110D, 101)}, /* TAS5110D */
         {USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},
         {USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
         {USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
+#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
         {USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
 #endif
@@ -1544,18 +1584,22 @@ static const struct usb_device_id device_table[] __devinitconst = {
         {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
         {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
         {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},
-        /* {USB_DEVICE(0x0c45, 0x602b), SB(MI03XX, 102)}, */ /* MI0343 MI0360 MI0330 */
+        /* {USB_DEVICE(0x0c45, 0x6030), SB(MI03XX, 102)}, */ /* MI0343 MI0360 MI0330 */
+        /* {USB_DEVICE(0x0c45, 0x6082), SB(MI03XX, 103)}, */ /* MI0343 MI0360 */
+        {USB_DEVICE(0x0c45, 0x6083), SB(HV7131D, 103)},
+        {USB_DEVICE(0x0c45, 0x608c), SB(HV7131R, 103)},
+        /* {USB_DEVICE(0x0c45, 0x608e), SB(CISVF10, 103)}, */
         {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+        {USB_DEVICE(0x0c45, 0x60a8), SB(PAS106, 103)},
+        {USB_DEVICE(0x0c45, 0x60aa), SB(TAS5130CXX, 103)},
         {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},
-#endif
         {USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)},
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
 
 /* -- device connect -- */
-static int __devinit sd_probe(struct usb_interface *intf,
+static int sd_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
         return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 2d0bb17a30a2..d6f39ce1b7e1 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -25,12 +25,12 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-#define V4L2_CID_INFRARED (V4L2_CID_PRIVATE_BASE + 0)
-
 MODULE_AUTHOR("Jean-François Moine <http://moinejf.free.fr>");
 MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver");
 MODULE_LICENSE("GPL");
 
+static int starcam;
+
 /* controls */
 enum e_ctrl {
         BRIGHTNESS,
@@ -43,7 +43,7 @@ enum e_ctrl {
         HFLIP,
         VFLIP,
         SHARPNESS,
-        INFRARED,
+        ILLUM,
         FREQ,
         NCTRLS          /* number of controls */
 };
@@ -100,7 +100,8 @@ enum sensors {
 };
 
 /* device flags */
-#define PDN_INV 1               /* inverse pin S_PWR_DN / sn_xxx tables */
+#define F_PDN_INV       0x01    /* inverse pin S_PWR_DN / sn_xxx tables */
+#define F_ILLUM         0x02    /* presence of illuminator */
 
 /* sn9c1xx definitions */
 /* register 0x01 */
@@ -124,7 +125,7 @@ static void setgamma(struct gspca_dev *gspca_dev);
 static void setautogain(struct gspca_dev *gspca_dev);
 static void sethvflip(struct gspca_dev *gspca_dev);
 static void setsharpness(struct gspca_dev *gspca_dev);
-static void setinfrared(struct gspca_dev *gspca_dev);
+static void setillum(struct gspca_dev *gspca_dev);
 static void setfreq(struct gspca_dev *gspca_dev);
 
 static const struct ctrl sd_ctrls[NCTRLS] = {
@@ -251,18 +252,17 @@ static const struct ctrl sd_ctrls[NCTRLS] = {
             },
             .set_control = setsharpness
         },
-/* mt9v111 only */
-[INFRARED] = {
+[ILLUM] = {
             {
-                .id      = V4L2_CID_INFRARED,
+                .id      = V4L2_CID_ILLUMINATORS_1,
                 .type    = V4L2_CTRL_TYPE_BOOLEAN,
-                .name    = "Infrared",
+                .name    = "Illuminator / infrared",
                 .minimum = 0,
                 .maximum = 1,
                 .step    = 1,
                 .default_value = 0,
             },
-            .set_control = setinfrared
+            .set_control = setillum
         },
 /* ov7630/ov7648/ov7660 only */
 [FREQ] = {
@@ -282,32 +282,26 @@ static const struct ctrl sd_ctrls[NCTRLS] = {
 /* table of the disabled controls */
 static const __u32 ctrl_dis[] = {
 [SENSOR_ADCM1700] =     (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_GC0307] =       (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_GC0307] =       (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_HV7131R] =      (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_HV7131R] =      (1 << HFLIP) |
                         (1 << FREQ),
 
-[SENSOR_MI0360] =       (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_MI0360] =       (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_MI0360B] =      (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_MI0360B] =      (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_MO4000] =       (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_MO4000] =       (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
@@ -315,40 +309,32 @@ static const __u32 ctrl_dis[] = {
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_OM6802] =       (1 << INFRARED) |
-                        (1 << HFLIP) |
+[SENSOR_OM6802] =       (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
-[SENSOR_OV7630] =       (1 << INFRARED) |
-                        (1 << HFLIP),
+[SENSOR_OV7630] =       (1 << HFLIP),
 
-[SENSOR_OV7648] =       (1 << INFRARED) |
-                        (1 << HFLIP),
+[SENSOR_OV7648] =       (1 << HFLIP),
 
 [SENSOR_OV7660] =       (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << HFLIP) |
                         (1 << VFLIP),
 
 [SENSOR_PO1030] =       (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
 [SENSOR_PO2030N] =      (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << FREQ),
 
 [SENSOR_SOI768] =       (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
 
 [SENSOR_SP80708] =      (1 << AUTOGAIN) |
-                        (1 << INFRARED) |
                         (1 << HFLIP) |
                         (1 << VFLIP) |
                         (1 << FREQ),
@@ -1822,44 +1808,46 @@ static int sd_init(struct gspca_dev *gspca_dev)
         PDEBUG(D_PROBE, "Sonix chip id: %02x", regF1);
         switch (sd->bridge) {
         case BRIDGE_SN9C102P:
+        case BRIDGE_SN9C105:
                 if (regF1 != 0x11)
                         return -ENODEV;
+                break;
+        default:
+/*      case BRIDGE_SN9C110: */
+/*      case BRIDGE_SN9C120: */
+                if (regF1 != 0x12)
+                        return -ENODEV;
+        }
+
+        switch (sd->sensor) {
+        case SENSOR_MI0360:
+                mi0360_probe(gspca_dev);
+                break;
+        case SENSOR_OV7630:
+                ov7630_probe(gspca_dev);
+                break;
+        case SENSOR_OV7648:
+                ov7648_probe(gspca_dev);
+                break;
+        case SENSOR_PO2030N:
+                po2030n_probe(gspca_dev);
+                break;
+        }
+
+        switch (sd->bridge) {
+        case BRIDGE_SN9C102P:
                 reg_w1(gspca_dev, 0x02, regGpio[1]);
                 break;
         case BRIDGE_SN9C105:
-                if (regF1 != 0x11)
-                        return -ENODEV;
-                if (sd->sensor == SENSOR_MI0360)
-                        mi0360_probe(gspca_dev);
                 reg_w(gspca_dev, 0x01, regGpio, 2);
                 break;
+        case BRIDGE_SN9C110:
+                reg_w1(gspca_dev, 0x02, 0x62);
+                break;
         case BRIDGE_SN9C120:
-                if (regF1 != 0x12)
-                        return -ENODEV;
-                switch (sd->sensor) {
-                case SENSOR_MI0360:
-                        mi0360_probe(gspca_dev);
-                        break;
-                case SENSOR_OV7630:
-                        ov7630_probe(gspca_dev);
-                        break;
-                case SENSOR_OV7648:
-                        ov7648_probe(gspca_dev);
-                        break;
-                case SENSOR_PO2030N:
-                        po2030n_probe(gspca_dev);
-                        break;
-                }
                 regGpio[1] = 0x70;              /* no audio */
                 reg_w(gspca_dev, 0x01, regGpio, 2);
                 break;
-        default:
-/*      case BRIDGE_SN9C110: */
-/*      case BRIDGE_SN9C325: */
-                if (regF1 != 0x12)
-                        return -ENODEV;
-                reg_w1(gspca_dev, 0x02, 0x62);
-                break;
         }
 
         if (sd->sensor == SENSOR_OM6802)
@@ -1874,6 +1862,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
         sd->i2c_addr = sn9c1xx[9];
 
         gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
+        if (!(sd->flags & F_ILLUM))
+                gspca_dev->ctrl_dis |= (1 << ILLUM);
 
         return gspca_dev->usb_err;
 }
@@ -2197,16 +2187,28 @@ static void setsharpness(struct gspca_dev *gspca_dev)
         reg_w1(gspca_dev, 0x99, sd->ctrls[SHARPNESS].val);
 }
 
-static void setinfrared(struct gspca_dev *gspca_dev)
+static void setillum(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (gspca_dev->ctrl_dis & (1 << INFRARED))
+        if (gspca_dev->ctrl_dis & (1 << ILLUM))
                 return;
-/*fixme: different sequence for StarCam Clip and StarCam 370i */
-/* Clip */
-        i2c_w1(gspca_dev, 0x02,                         /* gpio */
-                sd->ctrls[INFRARED].val ? 0x66 : 0x64);
+        switch (sd->sensor) {
+        case SENSOR_ADCM1700:
+                reg_w1(gspca_dev, 0x02,                         /* gpio */
+                        sd->ctrls[ILLUM].val ? 0x64 : 0x60);
+                break;
+        case SENSOR_MT9V111:
+                if (starcam)
+                        reg_w1(gspca_dev, 0x02,
+                                sd->ctrls[ILLUM].val ?
+                                                0x55 : 0x54);   /* 370i */
+                else
+                        reg_w1(gspca_dev, 0x02,
+                                sd->ctrls[ILLUM].val ?
+                                                0x66 : 0x64);   /* Clip */
+                break;
+        }
 }
 
 static void setfreq(struct gspca_dev *gspca_dev)
@@ -2344,7 +2346,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         /* sensor clock already enabled in sd_init */
         /* reg_w1(gspca_dev, 0xf1, 0x00); */
         reg01 = sn9c1xx[1];
-        if (sd->flags & PDN_INV)
+        if (sd->flags & F_PDN_INV)
                 reg01 ^= S_PDN_INV;             /* power down inverted */
         reg_w1(gspca_dev, 0x01, reg01);
 
@@ -2907,13 +2909,11 @@ static const struct sd_desc sd_desc = {
         .driver_info = (BRIDGE_ ## bridge << 16) \
                         | (SENSOR_ ## sensor << 8) \
                         | (flags)
-static const __devinitdata struct usb_device_id device_table[] = {
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
         {USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
-#endif
-        {USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, PDN_INV)},
-        {USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, PDN_INV)},
+        {USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, F_PDN_INV)},
+        {USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, F_PDN_INV)},
         {USB_DEVICE(0x0471, 0x0327), BS(SN9C105, MI0360)},
         {USB_DEVICE(0x0471, 0x0328), BS(SN9C105, MI0360)},
         {USB_DEVICE(0x0471, 0x0330), BS(SN9C105, MI0360)},
@@ -2925,7 +2925,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x607b), BS(SN9C102P, OV7660)}, */
         {USB_DEVICE(0x0c45, 0x607c), BS(SN9C102P, HV7131R)},
 /*      {USB_DEVICE(0x0c45, 0x607e), BS(SN9C102P, OV7630)}, */
-        {USB_DEVICE(0x0c45, 0x60c0), BS(SN9C105, MI0360)},
+        {USB_DEVICE(0x0c45, 0x60c0), BSF(SN9C105, MI0360, F_ILLUM)},
                                                 /* or MT9V111 */
 /*      {USB_DEVICE(0x0c45, 0x60c2), BS(SN9C105, P1030xC)}, */
 /*      {USB_DEVICE(0x0c45, 0x60c8), BS(SN9C105, OM6802)}, */
@@ -2936,10 +2936,8 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x60fa), BS(SN9C105, OV7648)}, */
 /*      {USB_DEVICE(0x0c45, 0x60f2), BS(SN9C105, OV7660)}, */
         {USB_DEVICE(0x0c45, 0x60fb), BS(SN9C105, OV7660)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0c45, 0x60fc), BS(SN9C105, HV7131R)},
         {USB_DEVICE(0x0c45, 0x60fe), BS(SN9C105, OV7630)},
-#endif
         {USB_DEVICE(0x0c45, 0x6100), BS(SN9C120, MI0360)},      /*sn9c128*/
         {USB_DEVICE(0x0c45, 0x6102), BS(SN9C120, PO2030N)},     /* /GC0305*/
 /*      {USB_DEVICE(0x0c45, 0x6108), BS(SN9C120, OM6802)}, */
@@ -2962,16 +2960,15 @@ static const __devinitdata struct usb_device_id device_table[] = {
 /*      {USB_DEVICE(0x0c45, 0x6132), BS(SN9C120, OV7670)}, */
         {USB_DEVICE(0x0c45, 0x6138), BS(SN9C120, MO4000)},
         {USB_DEVICE(0x0c45, 0x613a), BS(SN9C120, OV7648)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
         {USB_DEVICE(0x0c45, 0x613b), BS(SN9C120, OV7660)},
-#endif
         {USB_DEVICE(0x0c45, 0x613c), BS(SN9C120, HV7131R)},
         {USB_DEVICE(0x0c45, 0x613e), BS(SN9C120, OV7630)},
         {USB_DEVICE(0x0c45, 0x6142), BS(SN9C120, PO2030N)},     /*sn9c120b*/
                                                 /* or GC0305 / GC0307 */
         {USB_DEVICE(0x0c45, 0x6143), BS(SN9C120, SP80708)},     /*sn9c120b*/
         {USB_DEVICE(0x0c45, 0x6148), BS(SN9C120, OM6802)},      /*sn9c120b*/
-        {USB_DEVICE(0x0c45, 0x614a), BS(SN9C120, ADCM1700)},    /*sn9c120b*/
+        {USB_DEVICE(0x0c45, 0x614a), BSF(SN9C120, ADCM1700, F_ILLUM)},
+/*      {USB_DEVICE(0x0c45, 0x614c), BS(SN9C120, GC0306)}, */   /*sn9c120b*/
         {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -3007,3 +3004,7 @@ static void __exit sd_mod_exit(void)
 
 module_init(sd_mod_init);
 module_exit(sd_mod_exit);
+
+module_param(starcam, int, 0644);
+MODULE_PARM_DESC(starcam,
+        "StarCam model. 0: Clip, 1: 370i");
diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c
index e64338664410..76c006b2bc83 100644
--- a/drivers/media/video/gspca/spca1528.c
+++ b/drivers/media/video/gspca/spca1528.c
@@ -555,7 +555,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x04fc, 0x1528)},
         {}
 };
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 8e202b9039f1..45552c3ff8d9 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -1051,7 +1051,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x040a, 0x0300), .driver_info = KodakEZ200},
         {USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},
         {USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index 642839a11e8d..f7ef282cc600 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -2155,7 +2155,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x040a, 0x0002), .driver_info = KodakDVC325},
         {USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},
         {USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index bc9dd9034ab4..e5bf865147d7 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -786,7 +786,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x401d), .driver_info = Nxultra},
         {USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},
 /*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 7307638ac91d..348319371523 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1509,7 +1509,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
         {USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
         {USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 3a162c6d5466..e836e778dfb6 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -1061,7 +1061,7 @@ static const struct sd_desc *sd_desc[2] = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x401a), .driver_info = Rev072A},
         {USB_DEVICE(0x041e, 0x403b), .driver_info = Rev012A},
         {USB_DEVICE(0x0458, 0x7004), .driver_info = Rev072A},
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 404067745775..2e9c06175192 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -396,7 +396,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 }
 
 /* Table of supported USB devices */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x2770, 0x9120)},
         {}
 };
diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c
index 8ba199543856..457563b7a71b 100644
--- a/drivers/media/video/gspca/sq905c.c
+++ b/drivers/media/video/gspca/sq905c.c
@@ -298,7 +298,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 }
 
 /* Table of supported USB devices */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x2770, 0x905c)},
         {USB_DEVICE(0x2770, 0x9050)},
         {USB_DEVICE(0x2770, 0x9051)},
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index a4a98811b9e3..8215d5dcd456 100644
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -1163,7 +1163,7 @@ static const struct sd_desc sd_desc = {
 #define ST(sensor, type) \
         .driver_info = (SENSOR_ ## sensor << 8) \
                         | (type)
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x4038), ST(MI0360, 0)},
         {USB_DEVICE(0x041e, 0x403c), ST(LZ24BP, 0)},
         {USB_DEVICE(0x041e, 0x403d), ST(LZ24BP, 0)},
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 11a192b95ed4..87be52b5e1e3 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -495,7 +495,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x05e1, 0x0893)},
         {}
 };
diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/video/gspca/stv0680.c
index b199ad4666bd..e2ef41cf72d7 100644
--- a/drivers/media/video/gspca/stv0680.c
+++ b/drivers/media/video/gspca/stv0680.c
@@ -327,7 +327,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0553, 0x0202)},
         {USB_DEVICE(0x041e, 0x4007)},
         {}
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 28ea4175b80e..7e0661429293 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -564,7 +564,7 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
 
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         /* QuickCam Express */
         {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },
         /* LEGO cam / QuickCam Web */
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index a9cbcd6011d9..543542af2720 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1162,7 +1162,7 @@ static const struct sd_desc sd_desc = {
 #define BS(bridge, subtype) \
         .driver_info = (BRIDGE_ ## bridge << 8) \
                         | (subtype)
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x400b), BS(SPCA504C, 0)},
         {USB_DEVICE(0x041e, 0x4012), BS(SPCA504C, 0)},
         {USB_DEVICE(0x041e, 0x4013), BS(SPCA504C, 0)},
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 8f0c33116e0d..a3eccd815766 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -1416,7 +1416,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x17a1, 0x0128)},
         {}
 };
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index 38c22f0a4263..933ef2ca658c 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -388,7 +388,7 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x046d, 0x0920)},
         {USB_DEVICE(0x046d, 0x0921)},
         {USB_DEVICE(0x0545, 0x808b)},
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 9b2ae1b6cc75..6caed734a06a 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -4192,7 +4192,7 @@ static const struct sd_desc sd_desc = {
 #define BF(bridge, flags) \
         .driver_info = (BRIDGE_ ## bridge << 8) \
                 | (flags)
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x405b), BF(VC0323, FL_VFLIP)},
         {USB_DEVICE(0x046d, 0x0892), BF(VC0321, 0)},
         {USB_DEVICE(0x046d, 0x0896), BF(VC0321, 0)},
diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index 5b5039a02031..c089a0f6f1d0 100644
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -3270,7 +3270,7 @@ static const struct sd_desc sd_desc_isoc_nego = {
 };
 
 /* -- module initialisation -- */
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         { USB_DEVICE_VER(0x0545, 0x8080, 0x0001, 0x0001), .driver_info = CIT_MODEL0 },
         { USB_DEVICE_VER(0x0545, 0x8080, 0x0002, 0x0002), .driver_info = CIT_MODEL1 },
         { USB_DEVICE_VER(0x0545, 0x8080, 0x030a, 0x030a), .driver_info = CIT_MODEL2 },
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 14b85d483163..47236a58bf33 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -5793,7 +5793,7 @@ static void usb_exchange(struct gspca_dev *gspca_dev,
                         break;
                 default:
 /*              case 0xdd:       * delay */
-                        msleep(action->val / 64 + 10);
+                        msleep(action->idx);
                         break;
                 }
                 action++;
@@ -5830,7 +5830,7 @@ static void setmatrix(struct gspca_dev *gspca_dev)
                 [SENSOR_GC0305] =       gc0305_matrix,
                 [SENSOR_HDCS2020b] =    NULL,
                 [SENSOR_HV7131B] =      NULL,
-                [SENSOR_HV7131R] =      NULL,
+                [SENSOR_HV7131R] =      po2030_matrix,
                 [SENSOR_ICM105A] =      po2030_matrix,
                 [SENSOR_MC501CB] =      NULL,
                 [SENSOR_MT9V111_1] =    gc0305_matrix,
@@ -5936,6 +5936,7 @@ static void setquality(struct gspca_dev *gspca_dev)
         case SENSOR_ADCM2700:
         case SENSOR_GC0305:
         case SENSOR_HV7131B:
+        case SENSOR_HV7131R:
         case SENSOR_OV7620:
         case SENSOR_PAS202B:
         case SENSOR_PO2030:
@@ -6108,11 +6109,13 @@ static void send_unknown(struct gspca_dev *gspca_dev, int sensor)
                 reg_w(gspca_dev, 0x02, 0x003b);
                 reg_w(gspca_dev, 0x00, 0x0038);
                 break;
+        case SENSOR_HV7131R:
         case SENSOR_PAS202B:
                 reg_w(gspca_dev, 0x03, 0x003b);
                 reg_w(gspca_dev, 0x0c, 0x003a);
                 reg_w(gspca_dev, 0x0b, 0x0039);
-                reg_w(gspca_dev, 0x0b, 0x0038);
+                if (sensor == SENSOR_PAS202B)
+                        reg_w(gspca_dev, 0x0b, 0x0038);
                 break;
         }
 }
@@ -6704,10 +6707,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 reg_w(gspca_dev, 0x02, 0x003b);
                 reg_w(gspca_dev, 0x00, 0x0038);
                 break;
+        case SENSOR_HV7131R:
         case SENSOR_PAS202B:
                 reg_w(gspca_dev, 0x03, 0x003b);
                 reg_w(gspca_dev, 0x0c, 0x003a);
                 reg_w(gspca_dev, 0x0b, 0x0039);
+                if (sd->sensor == SENSOR_HV7131R)
+                        reg_w(gspca_dev, 0x50, ZC3XX_R11D_GLOBALGAIN);
                 break;
         }
 
@@ -6720,6 +6726,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 break;
         case SENSOR_PAS202B:
         case SENSOR_GC0305:
+        case SENSOR_HV7131R:
         case SENSOR_TAS5130C:
                 reg_r(gspca_dev, 0x0008);
                 /* fall thru */
@@ -6760,6 +6767,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                                 /* ms-win + */
                 reg_w(gspca_dev, 0x40, 0x0117);
                 break;
+        case SENSOR_HV7131R:
+                i2c_write(gspca_dev, 0x25, 0x04, 0x00); /* exposure */
+                i2c_write(gspca_dev, 0x26, 0x93, 0x00);
+                i2c_write(gspca_dev, 0x27, 0xe0, 0x00);
+                reg_w(gspca_dev, 0x00, ZC3XX_R1A7_CALCGLOBALMEAN);
+                break;
         case SENSOR_GC0305:
         case SENSOR_TAS5130C:
                 reg_w(gspca_dev, 0x09, 0x01ad); /* (from win traces) */
@@ -6808,9 +6821,17 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (data[0] == 0xff && data[1] == 0xd8) {       /* start of frame */
+        /* check the JPEG end of frame */
+        if (len >= 3
+         && data[len - 3] == 0xff && data[len - 2] == 0xd9) {
+/*fixme: what does the last byte mean?*/
                 gspca_frame_add(gspca_dev, LAST_PACKET,
-                                        NULL, 0);
+                                        data, len - 1);
+                return;
+        }
+
+        /* check the JPEG start of a frame */
+        if (data[0] == 0xff && data[1] == 0xd8) {
                 /* put the JPEG header in the new frame */
                 gspca_frame_add(gspca_dev, FIRST_PACKET,
                         sd->jpeg_hdr, JPEG_HDR_SZ);
@@ -6909,7 +6930,7 @@ static const struct sd_desc sd_desc = {
 #endif
 };
 
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x041e)},
         {USB_DEVICE(0x041e, 0x4017)},
         {USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},
diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
index e0230fcb2e36..3baa9f613ca3 100644
--- a/drivers/media/video/hdpvr/Makefile
+++ b/drivers/media/video/hdpvr/Makefile
@@ -1,6 +1,4 @@
-hdpvr-objs      := hdpvr-control.o hdpvr-core.o hdpvr-video.o
-
-hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
+hdpvr-objs      := hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o
 
 obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
 
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index f7d1ee55185a..a27d93b503a5 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -283,6 +283,7 @@ static int hdpvr_probe(struct usb_interface *interface,
         struct hdpvr_device *dev;
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
+        struct i2c_client *client;
         size_t buffer_size;
         int i;
         int retval = -ENOMEM;
@@ -378,25 +379,35 @@ static int hdpvr_probe(struct usb_interface *interface,
                 goto error;
         }
 
-#ifdef CONFIG_I2C
-        /* until i2c is working properly */
-        retval = 0; /* hdpvr_register_i2c_adapter(dev); */
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        retval = hdpvr_register_i2c_adapter(dev);
         if (retval < 0) {
-                v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
+                v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
                 goto error;
         }
 
-        /* until i2c is working properly */
-        retval = 0; /* hdpvr_register_i2c_ir(dev); */
-        if (retval < 0)
-                v4l2_err(&dev->v4l2_dev, "registering i2c IR devices failed\n");
-#endif /* CONFIG_I2C */
+        client = hdpvr_register_ir_rx_i2c(dev);
+        if (!client) {
+                v4l2_err(&dev->v4l2_dev, "i2c IR RX device register failed\n");
+                goto reg_fail;
+        }
+
+        client = hdpvr_register_ir_tx_i2c(dev);
+        if (!client) {
+                v4l2_err(&dev->v4l2_dev, "i2c IR TX device register failed\n");
+                goto reg_fail;
+        }
+#endif
 
         /* let the user know what node this device is now attached to */
         v4l2_info(&dev->v4l2_dev, "device now attached to %s\n",
                   video_device_node_name(dev->video_dev));
         return 0;
 
+reg_fail:
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_del_adapter(&dev->i2c_adapter);
+#endif
 error:
         if (dev) {
                 /* Destroy single thread */
@@ -426,6 +437,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
         mutex_lock(&dev->io_mutex);
         hdpvr_cancel_queue(dev);
         mutex_unlock(&dev->io_mutex);
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_del_adapter(&dev->i2c_adapter);
+#endif
         video_unregister_device(dev->video_dev);
         atomic_dec(&dev_nr);
 }
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index 24966aa02a70..e53fa55d56a1 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -13,6 +13,8 @@
  *
  */
 
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+
 #include <linux/i2c.h>
 #include <linux/slab.h>
 
@@ -28,106 +30,86 @@
 #define Z8F0811_IR_TX_I2C_ADDR  0x70
 #define Z8F0811_IR_RX_I2C_ADDR  0x71
 
-static const u8 ir_i2c_addrs[] = {
-        Z8F0811_IR_TX_I2C_ADDR,
-        Z8F0811_IR_RX_I2C_ADDR,
-};
-
-static const char * const ir_devicenames[] = {
-        "ir_tx_z8f0811_hdpvr",
-        "ir_rx_z8f0811_hdpvr",
-};
 
-static int hdpvr_new_i2c_ir(struct hdpvr_device *dev, struct i2c_adapter *adap,
-                            const char *type, u8 addr)
+struct i2c_client *hdpvr_register_ir_tx_i2c(struct hdpvr_device *dev)
 {
-        struct i2c_board_info info;
         struct IR_i2c_init_data *init_data = &dev->ir_i2c_init_data;
-        unsigned short addr_list[2] = { addr, I2C_CLIENT_END };
+        struct i2c_board_info hdpvr_ir_tx_i2c_board_info = {
+                I2C_BOARD_INFO("ir_tx_z8f0811_hdpvr", Z8F0811_IR_TX_I2C_ADDR),
+        };
 
-        memset(&info, 0, sizeof(struct i2c_board_info));
-        strlcpy(info.type, type, I2C_NAME_SIZE);
-
-        /* Our default information for ir-kbd-i2c.c to use */
-        switch (addr) {
-        case Z8F0811_IR_RX_I2C_ADDR:
-                init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
-                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
-                init_data->type = RC_TYPE_RC5;
-                init_data->name = "HD PVR";
-                info.platform_data = init_data;
-                break;
-        }
+        init_data->name = "HD-PVR";
+        hdpvr_ir_tx_i2c_board_info.platform_data = init_data;
 
-        return i2c_new_probed_device(adap, &info, addr_list, NULL) == NULL ?
-               -1 : 0;
+        return i2c_new_device(&dev->i2c_adapter, &hdpvr_ir_tx_i2c_board_info);
 }
 
-int hdpvr_register_i2c_ir(struct hdpvr_device *dev)
+struct i2c_client *hdpvr_register_ir_rx_i2c(struct hdpvr_device *dev)
 {
-        int i;
-        int ret = 0;
+        struct IR_i2c_init_data *init_data = &dev->ir_i2c_init_data;
+        struct i2c_board_info hdpvr_ir_rx_i2c_board_info = {
+                I2C_BOARD_INFO("ir_rx_z8f0811_hdpvr", Z8F0811_IR_RX_I2C_ADDR),
+        };
 
-        for (i = 0; i < ARRAY_SIZE(ir_i2c_addrs); i++)
-                ret += hdpvr_new_i2c_ir(dev, dev->i2c_adapter,
-                                        ir_devicenames[i], ir_i2c_addrs[i]);
+        /* Our default information for ir-kbd-i2c.c to use */
+        init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
+        init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
+        init_data->type = RC_TYPE_RC5;
+        init_data->name = "HD-PVR";
+        hdpvr_ir_rx_i2c_board_info.platform_data = init_data;
 
-        return ret;
+        return i2c_new_device(&dev->i2c_adapter, &hdpvr_ir_rx_i2c_board_info);
 }
 
-static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
-                          char *data, int len)
+static int hdpvr_i2c_read(struct hdpvr_device *dev, int bus,
+                          unsigned char addr, char *data, int len)
 {
         int ret;
-        char *buf = kmalloc(len, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
+
+        if (len > sizeof(dev->i2c_buf))
+                return -EINVAL;
 
         ret = usb_control_msg(dev->udev,
                               usb_rcvctrlpipe(dev->udev, 0),
                               REQTYPE_I2C_READ, CTRL_READ_REQUEST,
-                              0x100|addr, 0, buf, len, 1000);
+                              (bus << 8) | addr, 0, &dev->i2c_buf, len, 1000);
 
         if (ret == len) {
-                memcpy(data, buf, len);
+                memcpy(data, &dev->i2c_buf, len);
                 ret = 0;
         } else if (ret >= 0)
                 ret = -EIO;
 
-        kfree(buf);
-
         return ret;
 }
 
-static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
-                           char *data, int len)
+static int hdpvr_i2c_write(struct hdpvr_device *dev, int bus,
+                           unsigned char addr, char *data, int len)
 {
         int ret;
-        char *buf = kmalloc(len, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
 
-        memcpy(buf, data, len);
+        if (len > sizeof(dev->i2c_buf))
+                return -EINVAL;
+
+        memcpy(&dev->i2c_buf, data, len);
         ret = usb_control_msg(dev->udev,
                               usb_sndctrlpipe(dev->udev, 0),
                               REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
-                              0x100|addr, 0, buf, len, 1000);
+                              (bus << 8) | addr, 0, &dev->i2c_buf, len, 1000);
 
         if (ret < 0)
-                goto error;
+                return ret;
 
         ret = usb_control_msg(dev->udev,
                               usb_rcvctrlpipe(dev->udev, 0),
                               REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
-                              0, 0, buf, 2, 1000);
+                              0, 0, &dev->i2c_buf, 2, 1000);
 
-        if (ret == 2)
+        if ((ret == 2) && (dev->i2c_buf[1] == (len - 1)))
                 ret = 0;
         else if (ret >= 0)
                 ret = -EIO;
 
-error:
-        kfree(buf);
         return ret;
 }
 
@@ -146,10 +128,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
                 addr = msgs[i].addr << 1;
 
                 if (msgs[i].flags & I2C_M_RD)
-                        retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
+                        retval = hdpvr_i2c_read(dev, 1, addr, msgs[i].buf,
                                                 msgs[i].len);
                 else
-                        retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
+                        retval = hdpvr_i2c_write(dev, 1, addr, msgs[i].buf,
                                                  msgs[i].len);
         }
 
@@ -168,30 +150,47 @@ static struct i2c_algorithm hdpvr_algo = {
         .functionality = hdpvr_functionality,
 };
 
+static struct i2c_adapter hdpvr_i2c_adapter_template = {
+        .name   = "Hauppage HD PVR I2C",
+        .owner  = THIS_MODULE,
+        .algo   = &hdpvr_algo,
+};
+
+static int hdpvr_activate_ir(struct hdpvr_device *dev)
+{
+        char buffer[8];
+
+        mutex_lock(&dev->i2c_mutex);
+
+        hdpvr_i2c_read(dev, 0, 0x54, buffer, 1);
+
+        buffer[0] = 0;
+        buffer[1] = 0x8;
+        hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
+
+        buffer[1] = 0x18;
+        hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
+
+        mutex_unlock(&dev->i2c_mutex);
+
+        return 0;
+}
+
 int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
 {
-        struct i2c_adapter *i2c_adap;
         int retval = -ENOMEM;
 
-        i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-        if (i2c_adap == NULL)
-                goto error;
-
-        strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
-                sizeof(i2c_adap->name));
-        i2c_adap->algo  = &hdpvr_algo;
-        i2c_adap->owner = THIS_MODULE;
-        i2c_adap->dev.parent = &dev->udev->dev;
+        hdpvr_activate_ir(dev);
 
-        i2c_set_adapdata(i2c_adap, dev);
+        memcpy(&dev->i2c_adapter, &hdpvr_i2c_adapter_template,
+               sizeof(struct i2c_adapter));
+        dev->i2c_adapter.dev.parent = &dev->udev->dev;
 
-        retval = i2c_add_adapter(i2c_adap);
+        i2c_set_adapdata(&dev->i2c_adapter, dev);
 
-        if (!retval)
-                dev->i2c_adapter = i2c_adap;
-        else
-                kfree(i2c_adap);
+        retval = i2c_add_adapter(&dev->i2c_adapter);
 
-error:
         return retval;
 }
+
+#endif
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index d38fe1043e47..514aea76eaa5 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -1220,12 +1220,9 @@ static void hdpvr_device_release(struct video_device *vdev)
         v4l2_device_unregister(&dev->v4l2_dev);
 
         /* deregister I2C adapter */
-#ifdef CONFIG_I2C
+#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
         mutex_lock(&dev->i2c_mutex);
-        if (dev->i2c_adapter)
-                i2c_del_adapter(dev->i2c_adapter);
-        kfree(dev->i2c_adapter);
-        dev->i2c_adapter = NULL;
+        i2c_del_adapter(&dev->i2c_adapter);
         mutex_unlock(&dev->i2c_mutex);
 #endif /* CONFIG_I2C */
 
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
index 37f1e4c7675d..072f23c570f3 100644
--- a/drivers/media/video/hdpvr/hdpvr.h
+++ b/drivers/media/video/hdpvr/hdpvr.h
@@ -25,6 +25,7 @@
         KERNEL_VERSION(HDPVR_MAJOR_VERSION, HDPVR_MINOR_VERSION, HDPVR_RELEASE)
 
 #define HDPVR_MAX 8
+#define HDPVR_I2C_MAX_SIZE 128
 
 /* Define these values to match your devices */
 #define HD_PVR_VENDOR_ID        0x2040
@@ -106,9 +107,11 @@ struct hdpvr_device {
         struct work_struct      worker;
 
         /* I2C adapter */
-        struct i2c_adapter      *i2c_adapter;
+        struct i2c_adapter      i2c_adapter;
         /* I2C lock */
         struct mutex            i2c_mutex;
+        /* I2C message buffer space */
+        char                    i2c_buf[HDPVR_I2C_MAX_SIZE];
 
         /* For passing data to ir-kbd-i2c */
         struct IR_i2c_init_data ir_i2c_init_data;
@@ -310,7 +313,8 @@ int hdpvr_cancel_queue(struct hdpvr_device *dev);
 /* i2c adapter registration */
 int hdpvr_register_i2c_adapter(struct hdpvr_device *dev);
 
-int hdpvr_register_i2c_ir(struct hdpvr_device *dev);
+struct i2c_client *hdpvr_register_ir_rx_i2c(struct hdpvr_device *dev);
+struct i2c_client *hdpvr_register_ir_tx_i2c(struct hdpvr_device *dev);
 
 /*========================================================================*/
 /* buffer management */
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index c87b6bc45555..a221ad68b330 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -128,6 +128,19 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 
 static int get_key_haup_xvr(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
+        int ret;
+        unsigned char buf[1] = { 0 };
+
+        /*
+         * This is the same apparent "are you ready?" poll command observed
+         * watching Windows driver traffic and implemented in lirc_zilog. With
+         * this added, we get far saner remote behavior with z8 chips on usb
+         * connected devices, even with the default polling interval of 100ms.
+         */
+        ret = i2c_master_send(ir->c, buf, 1);
+        if (ret != 1)
+                return (ret < 0) ? ret : -EINVAL;
+
         return get_key_haup_common (ir, ir_key, ir_raw, 6, 3);
 }
 
@@ -244,15 +257,17 @@ static void ir_key_poll(struct IR_i2c *ir)
         static u32 ir_key, ir_raw;
         int rc;
 
-        dprintk(2,"ir_poll_key\n");
+        dprintk(3, "%s\n", __func__);
         rc = ir->get_key(ir, &ir_key, &ir_raw);
         if (rc < 0) {
                 dprintk(2,"error\n");
                 return;
         }
 
-        if (rc)
+        if (rc) {
+                dprintk(1, "%s: keycode = 0x%04x\n", __func__, ir_key);
                 rc_keydown(ir->rc, ir_key, 0);
+        }
 }
 
 static void ir_work(struct work_struct *work)
@@ -321,6 +336,12 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 rc_type     = RC_TYPE_OTHER;
                 ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;
                 break;
+        case 0x71:
+                name        = "Hauppauge/Zilog Z8";
+                ir->get_key = get_key_haup_xvr;
+                rc_type     = RC_TYPE_RC5;
+                ir_codes    = hauppauge ? RC_MAP_HAUPPAUGE_NEW : RC_MAP_RC5_TV;
+                break;
         }
 
         /* Let the caller override settings */
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index e103b8fc7452..9fb86a081c0f 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -300,10 +300,15 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                                 adap, type, 0, I2C_ADDRS(hw_addrs[idx]));
         } else if (hw == IVTV_HW_CX25840) {
                 struct cx25840_platform_data pdata;
+                struct i2c_board_info cx25840_info = {
+                        .type = "cx25840",
+                        .addr = hw_addrs[idx],
+                        .platform_data = &pdata,
+                };
 
                 pdata.pvr150_workaround = itv->pvr150_workaround;
-                sd = v4l2_i2c_new_subdev_cfg(&itv->v4l2_dev,
-                                adap, type, 0, &pdata, hw_addrs[idx], NULL);
+                sd = v4l2_i2c_new_subdev_board(&itv->v4l2_dev, adap,
+                                &cx25840_info, NULL);
         } else {
                 sd = v4l2_i2c_new_subdev(&itv->v4l2_dev,
                                 adap, type, hw_addrs[idx], NULL);
diff --git a/drivers/media/video/mt9v011.c b/drivers/media/video/mt9v011.c
index 209ff97261a9..4904d25f689f 100644
--- a/drivers/media/video/mt9v011.c
+++ b/drivers/media/video/mt9v011.c
@@ -12,17 +12,41 @@
 #include <asm/div64.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include "mt9v011.h"
+#include <media/mt9v011.h>
 
 MODULE_DESCRIPTION("Micron mt9v011 sensor driver");
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
 MODULE_LICENSE("GPL");
 
-
 static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-2)");
 
+#define R00_MT9V011_CHIP_VERSION        0x00
+#define R01_MT9V011_ROWSTART            0x01
+#define R02_MT9V011_COLSTART            0x02
+#define R03_MT9V011_HEIGHT              0x03
+#define R04_MT9V011_WIDTH               0x04
+#define R05_MT9V011_HBLANK              0x05
+#define R06_MT9V011_VBLANK              0x06
+#define R07_MT9V011_OUT_CTRL            0x07
+#define R09_MT9V011_SHUTTER_WIDTH       0x09
+#define R0A_MT9V011_CLK_SPEED           0x0a
+#define R0B_MT9V011_RESTART             0x0b
+#define R0C_MT9V011_SHUTTER_DELAY       0x0c
+#define R0D_MT9V011_RESET               0x0d
+#define R1E_MT9V011_DIGITAL_ZOOM        0x1e
+#define R20_MT9V011_READ_MODE           0x20
+#define R2B_MT9V011_GREEN_1_GAIN        0x2b
+#define R2C_MT9V011_BLUE_GAIN           0x2c
+#define R2D_MT9V011_RED_GAIN            0x2d
+#define R2E_MT9V011_GREEN_2_GAIN        0x2e
+#define R35_MT9V011_GLOBAL_GAIN         0x35
+#define RF1_MT9V011_CHIP_ENABLE         0xf1
+
+#define MT9V011_VERSION                 0x8232
+#define MT9V011_REV_B_VERSION           0x8243
+
 /* supported controls */
 static struct v4l2_queryctrl mt9v011_qctrl[] = {
         {
@@ -469,23 +493,6 @@ static int mt9v011_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
         return 0;
 }
 
-static int mt9v011_s_config(struct v4l2_subdev *sd, int dumb, void *data)
-{
-        struct mt9v011 *core = to_mt9v011(sd);
-        unsigned *xtal = data;
-
-        v4l2_dbg(1, debug, sd, "s_config called\n");
-
-        if (xtal) {
-                core->xtal = *xtal;
-                v4l2_dbg(1, debug, sd, "xtal set to %d.%03d MHz\n",
-                         *xtal / 1000000, (*xtal / 1000) % 1000);
-        }
-
-        return 0;
-}
-
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int mt9v011_g_register(struct v4l2_subdev *sd,
                               struct v4l2_dbg_register *reg)
@@ -536,7 +543,6 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = {
         .g_ctrl = mt9v011_g_ctrl,
         .s_ctrl = mt9v011_s_ctrl,
         .reset = mt9v011_reset,
-        .s_config = mt9v011_s_config,
         .g_chip_ident = mt9v011_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = mt9v011_g_register,
@@ -596,6 +602,14 @@ static int mt9v011_probe(struct i2c_client *c,
         core->height = 480;
         core->xtal = 27000000;  /* Hz */
 
+        if (c->dev.platform_data) {
+                struct mt9v011_platform_data *pdata = c->dev.platform_data;
+
+                core->xtal = pdata->xtal;
+                v4l2_dbg(1, debug, sd, "xtal set to %d.%03d MHz\n",
+                        core->xtal / 1000000, (core->xtal / 1000) % 1000);
+        }
+
         v4l_info(c, "chip found @ 0x%02x (%s - chip version 0x%04x)\n",
                  c->addr << 1, c->adapter->name, version);
 
diff --git a/drivers/media/video/mt9v011.h b/drivers/media/video/mt9v011.h
deleted file mode 100644
index 3350fd6083c3..000000000000
--- a/drivers/media/video/mt9v011.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * mt9v011 -Micron 1/4-Inch VGA Digital Image Sensor
- *
- * Copyright (c) 2009 Mauro Carvalho Chehab (mchehab@redhat.com)
- * This code is placed under the terms of the GNU General Public License v2
- */
-
-#ifndef MT9V011_H_
-#define MT9V011_H_
-
-#define R00_MT9V011_CHIP_VERSION        0x00
-#define R01_MT9V011_ROWSTART            0x01
-#define R02_MT9V011_COLSTART            0x02
-#define R03_MT9V011_HEIGHT              0x03
-#define R04_MT9V011_WIDTH               0x04
-#define R05_MT9V011_HBLANK              0x05
-#define R06_MT9V011_VBLANK              0x06
-#define R07_MT9V011_OUT_CTRL            0x07
-#define R09_MT9V011_SHUTTER_WIDTH       0x09
-#define R0A_MT9V011_CLK_SPEED           0x0a
-#define R0B_MT9V011_RESTART             0x0b
-#define R0C_MT9V011_SHUTTER_DELAY       0x0c
-#define R0D_MT9V011_RESET               0x0d
-#define R1E_MT9V011_DIGITAL_ZOOM        0x1e
-#define R20_MT9V011_READ_MODE           0x20
-#define R2B_MT9V011_GREEN_1_GAIN        0x2b
-#define R2C_MT9V011_BLUE_GAIN           0x2c
-#define R2D_MT9V011_RED_GAIN            0x2d
-#define R2E_MT9V011_GREEN_2_GAIN        0x2e
-#define R35_MT9V011_GLOBAL_GAIN         0x35
-#define RF1_MT9V011_CHIP_ENABLE         0xf1
-
-#define MT9V011_VERSION                 0x8232
-#define MT9V011_REV_B_VERSION           0x8243
-
-#endif
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index c881a64b41fd..d4e7c11553c3 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -1449,47 +1449,6 @@ static int ov7670_g_chip_ident(struct v4l2_subdev *sd,
         return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_OV7670, 0);
 }
 
-static int ov7670_s_config(struct v4l2_subdev *sd, int dumb, void *data)
-{
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct ov7670_config *config = data;
-        struct ov7670_info *info = to_state(sd);
-        int ret;
-
-        info->clock_speed = 30; /* default: a guess */
-
-        /*
-         * Must apply configuration before initializing device, because it
-         * selects I/O method.
-         */
-        if (config) {
-                info->min_width = config->min_width;
-                info->min_height = config->min_height;
-                info->use_smbus = config->use_smbus;
-
-                if (config->clock_speed)
-                        info->clock_speed = config->clock_speed;
-        }
-
-        /* Make sure it's an ov7670 */
-        ret = ov7670_detect(sd);
-        if (ret) {
-                v4l_dbg(1, debug, client,
-                        "chip found @ 0x%x (%s) is not an ov7670 chip.\n",
-                        client->addr << 1, client->adapter->name);
-                kfree(info);
-                return ret;
-        }
-        v4l_info(client, "chip found @ 0x%02x (%s)\n",
-                        client->addr << 1, client->adapter->name);
-
-        info->fmt = &ov7670_formats[0];
-        info->sat = 128;        /* Review this */
-        info->clkrc = info->clock_speed / 30;
-
-        return 0;
-}
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int ov7670_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
 {
@@ -1528,7 +1487,6 @@ static const struct v4l2_subdev_core_ops ov7670_core_ops = {
         .s_ctrl = ov7670_s_ctrl,
         .queryctrl = ov7670_queryctrl,
         .reset = ov7670_reset,
-        .s_config = ov7670_s_config,
         .init = ov7670_init,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = ov7670_g_register,
@@ -1558,6 +1516,7 @@ static int ov7670_probe(struct i2c_client *client,
 {
         struct v4l2_subdev *sd;
         struct ov7670_info *info;
+        int ret;
 
         info = kzalloc(sizeof(struct ov7670_info), GFP_KERNEL);
         if (info == NULL)
@@ -1565,6 +1524,37 @@ static int ov7670_probe(struct i2c_client *client,
         sd = &info->sd;
         v4l2_i2c_subdev_init(sd, client, &ov7670_ops);
 
+        info->clock_speed = 30; /* default: a guess */
+        if (client->dev.platform_data) {
+                struct ov7670_config *config = client->dev.platform_data;
+
+                /*
+                 * Must apply configuration before initializing device, because it
+                 * selects I/O method.
+                 */
+                info->min_width = config->min_width;
+                info->min_height = config->min_height;
+                info->use_smbus = config->use_smbus;
+
+                if (config->clock_speed)
+                        info->clock_speed = config->clock_speed;
+        }
+
+        /* Make sure it's an ov7670 */
+        ret = ov7670_detect(sd);
+        if (ret) {
+                v4l_dbg(1, debug, client,
+                        "chip found @ 0x%x (%s) is not an ov7670 chip.\n",
+                        client->addr << 1, client->adapter->name);
+                kfree(info);
+                return ret;
+        }
+        v4l_info(client, "chip found @ 0x%02x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+
+        info->fmt = &ov7670_formats[0];
+        info->sat = 128;        /* Review this */
+        info->clkrc = info->clock_speed / 30;
         return 0;
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index ac94a8bf883e..305e6aaa844a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -40,6 +40,7 @@
 #include "pvrusb2-io.h"
 #include <media/v4l2-device.h>
 #include <media/cx2341x.h>
+#include <media/ir-kbd-i2c.h>
 #include "pvrusb2-devattr.h"
 
 /* Legal values for PVR2_CID_HSM */
@@ -202,6 +203,7 @@ struct pvr2_hdw {
 
         /* IR related */
         unsigned int ir_scheme_active; /* IR scheme as seen from the outside */
+        struct IR_i2c_init_data ir_init_data; /* params passed to IR modules */
 
         /* Frequency table */
         unsigned int freqTable[FREQTABLE_SIZE];
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 7cbe18c4ca95..451ecd485f97 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/i2c.h>
+#include <media/ir-kbd-i2c.h>
 #include "pvrusb2-i2c-core.h"
 #include "pvrusb2-hdw-internal.h"
 #include "pvrusb2-debug.h"
@@ -48,13 +49,6 @@ module_param_named(disable_autoload_ir_video, pvr2_disable_ir_video,
 MODULE_PARM_DESC(disable_autoload_ir_video,
                  "1=do not try to autoload ir_video IR receiver");
 
-/* Mapping of IR schemes to known I2C addresses - if any */
-static const unsigned char ir_video_addresses[] = {
-        [PVR2_IR_SCHEME_ZILOG] = 0x71,
-        [PVR2_IR_SCHEME_29XXX] = 0x18,
-        [PVR2_IR_SCHEME_24XXX] = 0x18,
-};
-
 static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
                           u8 i2c_addr,      /* I2C address we're talking to */
                           u8 *data,         /* Data to write */
@@ -574,26 +568,55 @@ static void do_i2c_scan(struct pvr2_hdw *hdw)
 static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw)
 {
         struct i2c_board_info info;
-        unsigned char addr = 0;
+        struct IR_i2c_init_data *init_data = &hdw->ir_init_data;
         if (pvr2_disable_ir_video) {
                 pvr2_trace(PVR2_TRACE_INFO,
                            "Automatic binding of ir_video has been disabled.");
                 return;
         }
-        if (hdw->ir_scheme_active < ARRAY_SIZE(ir_video_addresses)) {
-                addr = ir_video_addresses[hdw->ir_scheme_active];
-        }
-        if (!addr) {
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        switch (hdw->ir_scheme_active) {
+        case PVR2_IR_SCHEME_24XXX: /* FX2-controlled IR */
+        case PVR2_IR_SCHEME_29XXX: /* Original 29xxx device */
+                init_data->ir_codes              = RC_MAP_HAUPPAUGE_NEW;
+                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
+                init_data->type                  = RC_TYPE_RC5;
+                init_data->name                  = hdw->hdw_desc->description;
+                init_data->polling_interval      = 100; /* ms From ir-kbd-i2c */
+                /* IR Receiver */
+                info.addr          = 0x18;
+                info.platform_data = init_data;
+                strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+                pvr2_trace(PVR2_TRACE_INFO, "Binding %s to i2c address 0x%02x.",
+                           info.type, info.addr);
+                i2c_new_device(&hdw->i2c_adap, &info);
+                break;
+        case PVR2_IR_SCHEME_ZILOG:     /* HVR-1950 style */
+        case PVR2_IR_SCHEME_24XXX_MCE: /* 24xxx MCE device */
+                init_data->ir_codes              = RC_MAP_HAUPPAUGE_NEW;
+                init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
+                init_data->type                  = RC_TYPE_RC5;
+                init_data->name                  = hdw->hdw_desc->description;
+                /* IR Receiver */
+                info.addr          = 0x71;
+                info.platform_data = init_data;
+                strlcpy(info.type, "ir_rx_z8f0811_haup", I2C_NAME_SIZE);
+                pvr2_trace(PVR2_TRACE_INFO, "Binding %s to i2c address 0x%02x.",
+                           info.type, info.addr);
+                i2c_new_device(&hdw->i2c_adap, &info);
+                /* IR Trasmitter */
+                info.addr          = 0x70;
+                info.platform_data = init_data;
+                strlcpy(info.type, "ir_tx_z8f0811_haup", I2C_NAME_SIZE);
+                pvr2_trace(PVR2_TRACE_INFO, "Binding %s to i2c address 0x%02x.",
+                           info.type, info.addr);
+                i2c_new_device(&hdw->i2c_adap, &info);
+                break;
+        default:
                 /* The device either doesn't support I2C-based IR or we
                    don't know (yet) how to operate IR on the device. */
-                return;
+                break;
         }
-        pvr2_trace(PVR2_TRACE_INFO,
-                   "Binding ir_video to i2c address 0x%02x.", addr);
-        memset(&info, 0, sizeof(struct i2c_board_info));
-        strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
-        info.addr = addr;
-        i2c_new_device(&hdw->i2c_adap, &info);
 }
 
 void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index f35459d1f42f..0db90922ee93 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1565,7 +1565,7 @@ static int saa711x_probe(struct i2c_client *client,
         chip_id = name[5];
 
         /* Check whether this chip is part of the saa711x series */
-        if (memcmp(name, "1f711", 5)) {
+        if (memcmp(name + 1, "f711", 4)) {
                 v4l_dbg(1, debug, client, "chip found @ 0x%x (ID %s) does not match a known saa711x chip.\n",
                         client->addr << 1, name);
                 return -ENODEV;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e7aa588c6c5a..deb8fcf4aa49 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5179,18 +5179,8 @@ struct saa7134_board saa7134_boards[] = {
         [SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG] = {
                 .name           = "Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid",
                 .audio_clock    = 0x00187de7,
-#if 0
-        /*
-         * FIXME: Analog mode doesn't work, if digital is enabled. The proper
-         * fix is to use tda8290 driver, but Kworld seems to use an
-         * unsupported version of tda8295.
-         */
-                .tuner_type     = TUNER_NXP_TDA18271,   /* TUNER_PHILIPS_TDA8290 */
-                .tuner_addr     = 0x60,
-#else
-                .tuner_type     = UNSET,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .tuner_addr     = ADDR_UNSET,
-#endif
                 .radio_type     = UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x8e054000,
@@ -6932,10 +6922,17 @@ static inline int saa7134_kworld_sbtvd_toggle_agc(struct saa7134_dev *dev,
         /* toggle AGC switch through GPIO 27 */
         switch (mode) {
         case TDA18271_ANALOG:
-                saa7134_set_gpio(dev, 27, 0);
+                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
+                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x4000);
+                msleep(20);
                 break;
         case TDA18271_DIGITAL:
-                saa7134_set_gpio(dev, 27, 1);
+                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x14000);
+                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x14000);
+                msleep(20);
+                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x54000);
+                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x54000);
+                msleep(30);
                 break;
         default:
                 return -EINVAL;
@@ -6993,6 +6990,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
 int saa7134_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct saa7134_dev *dev = priv;
+
         if (dev != NULL) {
                 switch (dev->tuner_type) {
                 case TUNER_PHILIPS_TDA8290:
@@ -7659,36 +7657,11 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 break;
         }
         case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
-        {
-                struct i2c_msg msg = { .addr = 0x4b, .flags = 0 };
-                int i;
-                static u8 buffer[][2] = {
-                        {0x30, 0x31},
-                        {0xff, 0x00},
-                        {0x41, 0x03},
-                        {0x41, 0x1a},
-                        {0xff, 0x02},
-                        {0x34, 0x00},
-                        {0x45, 0x97},
-                        {0x45, 0xc1},
-                };
                 saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
                 saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x4000);
 
-                /*
-                 * FIXME: identify what device is at addr 0x4b and what means
-                 * this initialization
-                 */
-                for (i = 0; i < ARRAY_SIZE(buffer); i++) {
-                        msg.buf = &buffer[i][0];
-                        msg.len = ARRAY_SIZE(buffer[0]);
-                        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
-                                printk(KERN_WARNING
-                                       "%s: Unable to enable tuner(%i).\n",
-                                       dev->name, i);
-                }
+                saa7134_set_gpio(dev, 27, 0);
                 break;
-        }
         } /* switch() */
 
         /* initialize tuner */
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 3315a48a848b..f65cad287b83 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -237,12 +237,39 @@ static struct tda18271_std_map mb86a20s_tda18271_std_map = {
 static struct tda18271_config kworld_tda18271_config = {
         .std_map = &mb86a20s_tda18271_std_map,
         .gate    = TDA18271_GATE_DIGITAL,
+        .config  = 3,   /* Use tuner callback for AGC */
+
 };
 
 static const struct mb86a20s_config kworld_mb86a20s_config = {
         .demod_address = 0x10,
 };
 
+static int kworld_sbtvd_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        struct saa7134_dev *dev = fe->dvb->priv;
+
+        unsigned char initmsg[] = {0x45, 0x97};
+        unsigned char msg_enable[] = {0x45, 0xc1};
+        unsigned char msg_disable[] = {0x45, 0x81};
+        struct i2c_msg msg = {.addr = 0x4b, .flags = 0, .buf = initmsg, .len = 2};
+
+        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) {
+                wprintk("could not access the I2C gate\n");
+                return -EIO;
+        }
+        if (enable)
+                msg.buf = msg_enable;
+        else
+                msg.buf = msg_disable;
+        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) {
+                wprintk("could not access the I2C gate\n");
+                return -EIO;
+        }
+        msleep(20);
+        return 0;
+}
+
 /* ==================================================================
  * tda1004x based DVB-T cards, helper functions
  */
@@ -623,37 +650,6 @@ static struct tda827x_config tda827x_cfg_2_sw42 = {
 
 /* ------------------------------------------------------------------ */
 
-static int __kworld_sbtvd_i2c_gate_ctrl(struct saa7134_dev *dev, int enable)
-{
-        unsigned char initmsg[] = {0x45, 0x97};
-        unsigned char msg_enable[] = {0x45, 0xc1};
-        unsigned char msg_disable[] = {0x45, 0x81};
-        struct i2c_msg msg = {.addr = 0x4b, .flags = 0, .buf = initmsg, .len = 2};
-
-        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) {
-                wprintk("could not access the I2C gate\n");
-                return -EIO;
-        }
-        if (enable)
-                msg.buf = msg_enable;
-        else
-                msg.buf = msg_disable;
-        if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) {
-                wprintk("could not access the I2C gate\n");
-                return -EIO;
-        }
-        msleep(20);
-        return 0;
-}
-static int kworld_sbtvd_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-
-        return __kworld_sbtvd_i2c_gate_ctrl(dev, enable);
-}
-
-/* ------------------------------------------------------------------ */
-
 static struct tda1004x_config tda827x_lifeview_config = {
         .demod_address = 0x08,
         .invert        = 1,
@@ -1660,27 +1656,23 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
-                __kworld_sbtvd_i2c_gate_ctrl(dev, 0);
-                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x14000);
-                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x14000);
-                msleep(20);
-                saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x54000);
-                saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x54000);
-                msleep(20);
+                /* Switch to digital mode */
+                saa7134_tuner_callback(dev, 0,
+                                       TDA18271_CALLBACK_CMD_AGC_ENABLE, 1);
                 fe0->dvb.frontend = dvb_attach(mb86a20s_attach,
                                                &kworld_mb86a20s_config,
                                                &dev->i2c_adap);
-                __kworld_sbtvd_i2c_gate_ctrl(dev, 1);
                 if (fe0->dvb.frontend != NULL) {
+                        dvb_attach(tda829x_attach, fe0->dvb.frontend,
+                                   &dev->i2c_adap, 0x4b,
+                                   &tda829x_no_probe);
                         dvb_attach(tda18271_attach, fe0->dvb.frontend,
                                    0x60, &dev->i2c_adap,
                                    &kworld_tda18271_config);
-                        /*
-                         * Only after success, it can initialize the gate, otherwise
-                         * an OOPS will hit, due to kfree(fe0->dvb.frontend)
-                         */
-                        fe0->dvb.frontend->ops.i2c_gate_ctrl = kworld_sbtvd_i2c_gate_ctrl;
+                        fe0->dvb.frontend->ops.i2c_gate_ctrl = kworld_sbtvd_gate_ctrl;
                 }
+
+                /* mb86a20s need to use the I2C gateway */
                 break;
         default:
                 wprintk("Huh? unknown DVB card?\n");
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index 41064c7b5ef8..b3d2cc729657 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -47,8 +47,8 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */
-#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
+#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },
 #if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
@@ -56,78 +56,68 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },
 #endif
-        { SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), }, /* not in sonixb */
 #if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */
         { SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
 #endif
-        { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
+        { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), }, /* not in sonixb */
         /* SN9C103 */
-        { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), }, non existent ? */
+        { SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), }, /* not in sonixb */
+#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x6083, BRIDGE_SN9C103), }, HY7131D/E */
-        { SN9C102_USB_DEVICE(0x0c45, 0x6088, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x608a, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6088, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x608a, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), }, non existent ? */
         { SN9C102_USB_DEVICE(0x0c45, 0x608c, BRIDGE_SN9C103), },
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), }, CISVF10 */
-#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x608f, BRIDGE_SN9C103), },
-#endif
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a2, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60a0, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60a2, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), }, non existent ? */
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), }, PAS106 */
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), }, TAS5130 */
-/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), }, TAS5130 */
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), }, TAS5110, non existent */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), }, non existent ? */
         { SN9C102_USB_DEVICE(0x0c45, 0x60af, BRIDGE_SN9C103), },
-#if !defined CONFIG_USB_GSPCA_SONIXB && !defined CONFIG_USB_GSPCA_SONIXB_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x60b0, BRIDGE_SN9C103), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60b3, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60b8, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ba, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60bb, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60bc, BRIDGE_SN9C103), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60be, BRIDGE_SN9C103), }, non existent ? */
 #endif
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b2, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b3, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60b8, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ba, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60bb, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60bc, BRIDGE_SN9C103), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60be, BRIDGE_SN9C103), },
         /* SN9C105 */
 #if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE
         { 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), },
-#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x60c0, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60c2, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60c8, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60cc, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ea, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ec, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60ef, BRIDGE_SN9C105), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x60fa, BRIDGE_SN9C105), },
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60c2, BRIDGE_SN9C105), }, PO1030 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60c8, BRIDGE_SN9C105), }, OM6801 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60cc, BRIDGE_SN9C105), }, HV7131GP */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ea, BRIDGE_SN9C105), }, non existent ? */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ec, BRIDGE_SN9C105), }, MO4000 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60ef, BRIDGE_SN9C105), }, ICM105C */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x60fa, BRIDGE_SN9C105), }, OV7648 */
         { SN9C102_USB_DEVICE(0x0c45, 0x60fb, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60fc, BRIDGE_SN9C105), },
         { SN9C102_USB_DEVICE(0x0c45, 0x60fe, BRIDGE_SN9C105), },
         /* SN9C120 */
         { SN9C102_USB_DEVICE(0x0458, 0x7025, BRIDGE_SN9C120), },
-#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE
-        { SN9C102_USB_DEVICE(0x0c45, 0x6102, BRIDGE_SN9C120), },
-#endif
-        { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), },
-#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6102, BRIDGE_SN9C120), }, po2030 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), }, om6801 */
+/*      { SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), }, S5K53BEB */
         { SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },
-#endif
 /*      { SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */
-#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },
-#endif
         { SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },
-#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE
         { SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },
         { SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), },
 #endif
diff --git a/drivers/media/video/sr030pc30.c b/drivers/media/video/sr030pc30.c
index 864696b7a006..c901721a1db3 100644
--- a/drivers/media/video/sr030pc30.c
+++ b/drivers/media/video/sr030pc30.c
@@ -714,15 +714,6 @@ static int sr030pc30_base_config(struct v4l2_subdev *sd)
         return ret;
 }
 
-static int sr030pc30_s_config(struct v4l2_subdev *sd,
-                              int irq, void *platform_data)
-{
-        struct sr030pc30_info *info = to_sr030pc30(sd);
-
-        info->pdata = platform_data;
-        return 0;
-}
-
 static int sr030pc30_s_stream(struct v4l2_subdev *sd, int enable)
 {
         return 0;
@@ -763,7 +754,6 @@ static int sr030pc30_s_power(struct v4l2_subdev *sd, int on)
 }
 
 static const struct v4l2_subdev_core_ops sr030pc30_core_ops = {
-        .s_config       = sr030pc30_s_config,
         .s_power        = sr030pc30_s_power,
         .queryctrl      = sr030pc30_queryctrl,
         .s_ctrl         = sr030pc30_s_ctrl,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
deleted file mode 100644
index 35b6ff5db319..000000000000
--- a/drivers/media/video/tda9875.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * For the TDA9875 chip
- * (The TDA9875 is used on the Diamond DTV2000 french version
- * Other cards probably use these chips as well.)
- * This driver will not complain if used with any
- * other i2c device with the same address.
- *
- * Copyright (c) 2000 Guillaume Delvit based on Gerd Knorr source and
- * Eric Sandeen
- * Copyright (c) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
- * This code is placed under the terms of the GNU General Public License
- * Based on tda9855.c by Steve VanDeBogart (vandebo@uclink.berkeley.edu)
- * Which was based on tda8425.c by Greg Alexander (c) 1998
- *
- * OPTIONS:
- * debug   - set to 1 if you'd like to see debug messages
- *
- *  Revision: 0.1 - original version
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/videodev2.h>
-#include <media/v4l2-device.h>
-#include <media/i2c-addr.h>
-
-static int debug; /* insmod parameter */
-module_param(debug, int, S_IRUGO | S_IWUSR);
-MODULE_LICENSE("GPL");
-
-
-/* This is a superset of the TDA9875 */
-struct tda9875 {
-        struct v4l2_subdev sd;
-        int rvol, lvol;
-        int bass, treble;
-};
-
-static inline struct tda9875 *to_state(struct v4l2_subdev *sd)
-{
-        return container_of(sd, struct tda9875, sd);
-}
-
-#define dprintk  if (debug) printk
-
-/* The TDA9875 is made by Philips Semiconductor
- * http://www.semiconductors.philips.com
- * TDA9875: I2C-bus controlled DSP audio processor, FM demodulator
- *
- */
-
-                /* subaddresses for TDA9875 */
-#define TDA9875_MUT         0x12  /*General mute  (value --> 0b11001100*/
-#define TDA9875_CFG         0x01  /* Config register (value --> 0b00000000 */
-#define TDA9875_DACOS       0x13  /*DAC i/o select (ADC) 0b0000100*/
-#define TDA9875_LOSR        0x16  /*Line output select regirter 0b0100 0001*/
-
-#define TDA9875_CH1V        0x0c  /*Channel 1 volume (mute)*/
-#define TDA9875_CH2V        0x0d  /*Channel 2 volume (mute)*/
-#define TDA9875_SC1         0x14  /*SCART 1 in (mono)*/
-#define TDA9875_SC2         0x15  /*SCART 2 in (mono)*/
-
-#define TDA9875_ADCIS       0x17  /*ADC input select (mono) 0b0110 000*/
-#define TDA9875_AER         0x19  /*Audio effect (AVL+Pseudo) 0b0000 0110*/
-#define TDA9875_MCS         0x18  /*Main channel select (DAC) 0b0000100*/
-#define TDA9875_MVL         0x1a  /* Main volume gauche */
-#define TDA9875_MVR         0x1b  /* Main volume droite */
-#define TDA9875_MBA         0x1d  /* Main Basse */
-#define TDA9875_MTR         0x1e  /* Main treble */
-#define TDA9875_ACS         0x1f  /* Auxilary channel select (FM) 0b0000000*/
-#define TDA9875_AVL         0x20  /* Auxilary volume gauche */
-#define TDA9875_AVR         0x21  /* Auxilary volume droite */
-#define TDA9875_ABA         0x22  /* Auxilary Basse */
-#define TDA9875_ATR         0x23  /* Auxilary treble */
-
-#define TDA9875_MSR         0x02  /* Monitor select register */
-#define TDA9875_C1MSB       0x03  /* Carrier 1 (FM) frequency register MSB */
-#define TDA9875_C1MIB       0x04  /* Carrier 1 (FM) frequency register (16-8]b */
-#define TDA9875_C1LSB       0x05  /* Carrier 1 (FM) frequency register LSB */
-#define TDA9875_C2MSB       0x06  /* Carrier 2 (nicam) frequency register MSB */
-#define TDA9875_C2MIB       0x07  /* Carrier 2 (nicam) frequency register (16-8]b */
-#define TDA9875_C2LSB       0x08  /* Carrier 2 (nicam) frequency register LSB */
-#define TDA9875_DCR         0x09  /* Demodulateur configuration regirter*/
-#define TDA9875_DEEM        0x0a  /* FM de-emphasis regirter*/
-#define TDA9875_FMAT        0x0b  /* FM Matrix regirter*/
-
-/* values */
-#define TDA9875_MUTE_ON     0xff /* general mute */
-#define TDA9875_MUTE_OFF    0xcc /* general no mute */
-
-
-
-/* Begin code */
-
-static int tda9875_write(struct v4l2_subdev *sd, int subaddr, unsigned char val)
-{
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-        unsigned char buffer[2];
-
-        v4l2_dbg(1, debug, sd, "Writing %d 0x%x\n", subaddr, val);
-        buffer[0] = subaddr;
-        buffer[1] = val;
-        if (2 != i2c_master_send(client, buffer, 2)) {
-                v4l2_warn(sd, "I/O error, trying (write %d 0x%x)\n",
-                       subaddr, val);
-                return -1;
-        }
-        return 0;
-}
-
-
-static int i2c_read_register(struct i2c_client *client, int addr, int reg)
-{
-        unsigned char write[1];
-        unsigned char read[1];
-        struct i2c_msg msgs[2] = {
-                { addr, 0,        1, write },
-                { addr, I2C_M_RD, 1, read  }
-        };
-
-        write[0] = reg;
-
-        if (2 != i2c_transfer(client->adapter, msgs, 2)) {
-                v4l_warn(client, "I/O error (read2)\n");
-                return -1;
-        }
-        v4l_dbg(1, debug, client, "chip_read2: reg%d=0x%x\n", reg, read[0]);
-        return read[0];
-}
-
-static void tda9875_set(struct v4l2_subdev *sd)
-{
-        struct tda9875 *tda = to_state(sd);
-        unsigned char a;
-
-        v4l2_dbg(1, debug, sd, "tda9875_set(%04x,%04x,%04x,%04x)\n",
-                tda->lvol, tda->rvol, tda->bass, tda->treble);
-
-        a = tda->lvol & 0xff;
-        tda9875_write(sd, TDA9875_MVL, a);
-        a =tda->rvol & 0xff;
-        tda9875_write(sd, TDA9875_MVR, a);
-        a =tda->bass & 0xff;
-        tda9875_write(sd, TDA9875_MBA, a);
-        a =tda->treble  & 0xff;
-        tda9875_write(sd, TDA9875_MTR, a);
-}
-
-static void do_tda9875_init(struct v4l2_subdev *sd)
-{
-        struct tda9875 *t = to_state(sd);
-
-        v4l2_dbg(1, debug, sd, "In tda9875_init\n");
-        tda9875_write(sd, TDA9875_CFG, 0xd0); /*reg de config 0 (reset)*/
-        tda9875_write(sd, TDA9875_MSR, 0x03);    /* Monitor 0b00000XXX*/
-        tda9875_write(sd, TDA9875_C1MSB, 0x00);  /*Car1(FM) MSB XMHz*/
-        tda9875_write(sd, TDA9875_C1MIB, 0x00);  /*Car1(FM) MIB XMHz*/
-        tda9875_write(sd, TDA9875_C1LSB, 0x00);  /*Car1(FM) LSB XMHz*/
-        tda9875_write(sd, TDA9875_C2MSB, 0x00);  /*Car2(NICAM) MSB XMHz*/
-        tda9875_write(sd, TDA9875_C2MIB, 0x00);  /*Car2(NICAM) MIB XMHz*/
-        tda9875_write(sd, TDA9875_C2LSB, 0x00);  /*Car2(NICAM) LSB XMHz*/
-        tda9875_write(sd, TDA9875_DCR, 0x00);    /*Demod config 0x00*/
-        tda9875_write(sd, TDA9875_DEEM, 0x44);   /*DE-Emph 0b0100 0100*/
-        tda9875_write(sd, TDA9875_FMAT, 0x00);   /*FM Matrix reg 0x00*/
-        tda9875_write(sd, TDA9875_SC1, 0x00);    /* SCART 1 (SC1)*/
-        tda9875_write(sd, TDA9875_SC2, 0x01);    /* SCART 2 (sc2)*/
-
-        tda9875_write(sd, TDA9875_CH1V, 0x10);  /* Channel volume 1 mute*/
-        tda9875_write(sd, TDA9875_CH2V, 0x10);  /* Channel volume 2 mute */
-        tda9875_write(sd, TDA9875_DACOS, 0x02); /* sig DAC i/o(in:nicam)*/
-        tda9875_write(sd, TDA9875_ADCIS, 0x6f); /* sig ADC input(in:mono)*/
-        tda9875_write(sd, TDA9875_LOSR, 0x00);  /* line out (in:mono)*/
-        tda9875_write(sd, TDA9875_AER, 0x00);   /*06 Effect (AVL+PSEUDO) */
-        tda9875_write(sd, TDA9875_MCS, 0x44);   /* Main ch select (DAC) */
-        tda9875_write(sd, TDA9875_MVL, 0x03);   /* Vol Main left 10dB */
-        tda9875_write(sd, TDA9875_MVR, 0x03);   /* Vol Main right 10dB*/
-        tda9875_write(sd, TDA9875_MBA, 0x00);   /* Main Bass Main 0dB*/
-        tda9875_write(sd, TDA9875_MTR, 0x00);   /* Main Treble Main 0dB*/
-        tda9875_write(sd, TDA9875_ACS, 0x44);   /* Aux chan select (dac)*/
-        tda9875_write(sd, TDA9875_AVL, 0x00);   /* Vol Aux left 0dB*/
-        tda9875_write(sd, TDA9875_AVR, 0x00);   /* Vol Aux right 0dB*/
-        tda9875_write(sd, TDA9875_ABA, 0x00);   /* Aux Bass Main 0dB*/
-        tda9875_write(sd, TDA9875_ATR, 0x00);   /* Aux Aigus Main 0dB*/
-
-        tda9875_write(sd, TDA9875_MUT, 0xcc);   /* General mute  */
-
-        t->lvol = t->rvol = 0;          /* 0dB */
-        t->bass = 0;                    /* 0dB */
-        t->treble = 0;                  /* 0dB */
-        tda9875_set(sd);
-}
-
-
-static int tda9875_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct tda9875 *t = to_state(sd);
-
-        switch (ctrl->id) {
-        case V4L2_CID_AUDIO_VOLUME:
-        {
-                int left = (t->lvol+84)*606;
-                int right = (t->rvol+84)*606;
-
-                ctrl->value=max(left,right);
-                return 0;
-        }
-        case V4L2_CID_AUDIO_BALANCE:
-        {
-                int left = (t->lvol+84)*606;
-                int right = (t->rvol+84)*606;
-                int volume = max(left,right);
-                int balance = (32768*min(left,right))/
-                              (volume ? volume : 1);
-                ctrl->value=(left<right)?
-                        (65535-balance) : balance;
-                return 0;
-        }
-        case V4L2_CID_AUDIO_BASS:
-                ctrl->value = (t->bass+12)*2427;    /* min -12 max +15 */
-                return 0;
-        case V4L2_CID_AUDIO_TREBLE:
-                ctrl->value = (t->treble+12)*2730;/* min -12 max +12 */
-                return 0;
-        }
-        return -EINVAL;
-}
-
-static int tda9875_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-        struct tda9875 *t = to_state(sd);
-        int chvol = 0, volume = 0, balance = 0, left, right;
-
-        switch (ctrl->id) {
-        case V4L2_CID_AUDIO_VOLUME:
-                left = (t->lvol+84)*606;
-                right = (t->rvol+84)*606;
-
-                volume = max(left,right);
-                balance = (32768*min(left,right))/
-                              (volume ? volume : 1);
-                balance =(left<right)?
-                        (65535-balance) : balance;
-
-                volume = ctrl->value;
-
-                chvol=1;
-                break;
-        case V4L2_CID_AUDIO_BALANCE:
-                left = (t->lvol+84)*606;
-                right = (t->rvol+84)*606;
-
-                volume=max(left,right);
-
-                balance = ctrl->value;
-
-                chvol=1;
-                break;
-        case V4L2_CID_AUDIO_BASS:
-                t->bass = ((ctrl->value/2400)-12) & 0xff;
-                if (t->bass > 15)
-                        t->bass = 15;
-                if (t->bass < -12)
-                        t->bass = -12 & 0xff;
-                break;
-        case V4L2_CID_AUDIO_TREBLE:
-                t->treble = ((ctrl->value/2700)-12) & 0xff;
-                if (t->treble > 12)
-                        t->treble = 12;
-                if (t->treble < -12)
-                        t->treble = -12 & 0xff;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        if (chvol) {
-                left = (min(65536 - balance,32768) *
-                        volume) / 32768;
-                right = (min(balance,32768) *
-                                volume) / 32768;
-                t->lvol = ((left/606)-84) & 0xff;
-                if (t->lvol > 24)
-                        t->lvol = 24;
-                if (t->lvol < -84)
-                        t->lvol = -84 & 0xff;
-
-                t->rvol = ((right/606)-84) & 0xff;
-                if (t->rvol > 24)
-                        t->rvol = 24;
-                if (t->rvol < -84)
-                        t->rvol = -84 & 0xff;
-        }
-
-        tda9875_set(sd);
-        return 0;
-}
-
-static int tda9875_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
-{
-        switch (qc->id) {
-        case V4L2_CID_AUDIO_VOLUME:
-                return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 58880);
-        case V4L2_CID_AUDIO_BASS:
-        case V4L2_CID_AUDIO_TREBLE:
-                return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
-        }
-        return -EINVAL;
-}
-
-/* ----------------------------------------------------------------------- */
-
-static const struct v4l2_subdev_core_ops tda9875_core_ops = {
-        .queryctrl = tda9875_queryctrl,
-        .g_ctrl = tda9875_g_ctrl,
-        .s_ctrl = tda9875_s_ctrl,
-};
-
-static const struct v4l2_subdev_ops tda9875_ops = {
-        .core = &tda9875_core_ops,
-};
-
-/* ----------------------------------------------------------------------- */
-
-
-/* *********************** *
- * i2c interface functions *
- * *********************** */
-
-static int tda9875_checkit(struct i2c_client *client, int addr)
-{
-        int dic, rev;
-
-        dic = i2c_read_register(client, addr, 254);
-        rev = i2c_read_register(client, addr, 255);
-
-        if (dic == 0 || dic == 2) { /* tda9875 and tda9875A */
-                v4l_info(client, "tda9875%s rev. %d detected at 0x%02x\n",
-                        dic == 0 ? "" : "A", rev, addr << 1);
-                return 1;
-        }
-        v4l_info(client, "no such chip at 0x%02x (dic=0x%x rev=0x%x)\n",
-                        addr << 1, dic, rev);
-        return 0;
-}
-
-static int tda9875_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-        struct tda9875 *t;
-        struct v4l2_subdev *sd;
-
-        v4l_info(client, "chip found @ 0x%02x (%s)\n",
-                        client->addr << 1, client->adapter->name);
-
-        if (!tda9875_checkit(client, client->addr))
-                return -ENODEV;
-
-        t = kzalloc(sizeof(*t), GFP_KERNEL);
-        if (!t)
-                return -ENOMEM;
-        sd = &t->sd;
-        v4l2_i2c_subdev_init(sd, client, &tda9875_ops);
-
-        do_tda9875_init(sd);
-        return 0;
-}
-
-static int tda9875_remove(struct i2c_client *client)
-{
-        struct v4l2_subdev *sd = i2c_get_clientdata(client);
-
-        do_tda9875_init(sd);
-        v4l2_device_unregister_subdev(sd);
-        kfree(to_state(sd));
-        return 0;
-}
-
-static const struct i2c_device_id tda9875_id[] = {
-        { "tda9875", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, tda9875_id);
-
-static struct i2c_driver tda9875_driver = {
-        .driver = {
-                .owner  = THIS_MODULE,
-                .name   = "tda9875",
-        },
-        .probe          = tda9875_probe,
-        .remove         = tda9875_remove,
-        .id_table       = tda9875_id,
-};
-
-static __init int init_tda9875(void)
-{
-        return i2c_add_driver(&tda9875_driver);
-}
-
-static __exit void exit_tda9875(void)
-{
-        i2c_del_driver(&tda9875_driver);
-}
-
-module_init(init_tda9875);
-module_exit(exit_tda9875);
diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c
index a1ffe18640fe..df33a1d188bb 100644
--- a/drivers/media/video/tlg2300/pd-video.c
+++ b/drivers/media/video/tlg2300/pd-video.c
@@ -512,19 +512,20 @@ int alloc_bulk_urbs_generic(struct urb **urb_array, int num,
                         int buf_size, gfp_t gfp_flags,
                         usb_complete_t complete_fn, void *context)
 {
-        struct urb *urb;
-        void *mem;
-        int i;
+        int i = 0;
 
-        for (i = 0; i < num; i++) {
-                urb = usb_alloc_urb(0, gfp_flags);
+        for (; i < num; i++) {
+                void *mem;
+                struct urb *urb = usb_alloc_urb(0, gfp_flags);
                 if (urb == NULL)
                         return i;
 
                 mem = usb_alloc_coherent(udev, buf_size, gfp_flags,
                                          &urb->transfer_dma);
-                if (mem == NULL)
+                if (mem == NULL) {
+                        usb_free_urb(urb);
                         return i;
+                }
 
                 usb_fill_bulk_urb(urb, udev, usb_rcvbulkpipe(udev, ep_addr),
                                 mem, buf_size, complete_fn, context);
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 3f0871b550ad..810eef43c216 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -407,18 +407,6 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
 
-        if (sd) {
-                /* We return errors from v4l2_subdev_call only if we have the
-                   callback as the .s_config is not mandatory */
-                int err = v4l2_subdev_call(sd, core, s_config,
-                                info->irq, info->platform_data);
-
-                if (err && err != -ENOIOCTLCMD) {
-                        v4l2_device_unregister_subdev(sd);
-                        sd = NULL;
-                }
-        }
-
 error:
         /* If we have a client but no subdev, then something went wrong and
            we must unregister the client. */
@@ -428,9 +416,8 @@ error:
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_board);
 
-struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
                 struct i2c_adapter *adapter, const char *client_type,
-                int irq, void *platform_data,
                 u8 addr, const unsigned short *probe_addrs)
 {
         struct i2c_board_info info;
@@ -440,12 +427,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
         memset(&info, 0, sizeof(info));
         strlcpy(info.type, client_type, sizeof(info.type));
         info.addr = addr;
-        info.irq = irq;
-        info.platform_data = platform_data;
 
         return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, probe_addrs);
 }
-EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_cfg);
+EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
 
 /* Return i2c client address of v4l2_subdev. */
 unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd)
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index 8f81efcfcf56..ef66d2af0c57 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -569,7 +569,7 @@ static int user_to_new(struct v4l2_ext_control *c,
         int ret;
         u32 size;
 
-        ctrl->has_new = 1;
+        ctrl->is_new = 1;
         switch (ctrl->type) {
         case V4L2_CTRL_TYPE_INTEGER64:
                 ctrl->val64 = c->value64;
@@ -1280,8 +1280,12 @@ int v4l2_ctrl_handler_setup(struct v4l2_ctrl_handler *hdl)
                 if (ctrl->done)
                         continue;
 
-                for (i = 0; i < master->ncontrols; i++)
-                        cur_to_new(master->cluster[i]);
+                for (i = 0; i < master->ncontrols; i++) {
+                        if (master->cluster[i]) {
+                                cur_to_new(master->cluster[i]);
+                                master->cluster[i]->is_new = 1;
+                        }
+                }
 
                 /* Skip button controls and read-only controls. */
                 if (ctrl->type == V4L2_CTRL_TYPE_BUTTON ||
@@ -1340,12 +1344,15 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc)
 
         ctrl = ref->ctrl;
         memset(qc, 0, sizeof(*qc));
-        qc->id = ctrl->id;
+        if (id >= V4L2_CID_PRIVATE_BASE)
+                qc->id = id;
+        else
+                qc->id = ctrl->id;
         strlcpy(qc->name, ctrl->name, sizeof(qc->name));
         qc->minimum = ctrl->minimum;
         qc->maximum = ctrl->maximum;
         qc->default_value = ctrl->default_value;
-        if (qc->type == V4L2_CTRL_TYPE_MENU)
+        if (ctrl->type == V4L2_CTRL_TYPE_MENU)
                 qc->step = 1;
         else
                 qc->step = ctrl->step;
@@ -1645,7 +1652,7 @@ static int try_or_set_control_cluster(struct v4l2_ctrl *master, bool set)
                 if (ctrl == NULL)
                         continue;
 
-                if (ctrl->has_new) {
+                if (ctrl->is_new) {
                         /* Double check this: it may have changed since the
                            last check in try_or_set_ext_ctrls(). */
                         if (set && (ctrl->flags & V4L2_CTRL_FLAG_GRABBED))
@@ -1719,13 +1726,13 @@ static int try_or_set_ext_ctrls(struct v4l2_ctrl_handler *hdl,
 
                 v4l2_ctrl_lock(ctrl);
 
-                /* Reset the 'has_new' flags of the cluster */
+                /* Reset the 'is_new' flags of the cluster */
                 for (j = 0; j < master->ncontrols; j++)
                         if (master->cluster[j])
-                                master->cluster[j]->has_new = 0;
+                                master->cluster[j]->is_new = 0;
 
                 /* Copy the new caller-supplied control values.
-                   user_to_new() sets 'has_new' to 1. */
+                   user_to_new() sets 'is_new' to 1. */
                 ret = cluster_walk(i, cs, helpers, user_to_new);
 
                 if (!ret)
@@ -1820,15 +1827,18 @@ static int set_ctrl(struct v4l2_ctrl *ctrl, s32 *val)
         int ret;
         int i;
 
+        if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
+                return -EACCES;
+
         v4l2_ctrl_lock(ctrl);
 
-        /* Reset the 'has_new' flags of the cluster */
+        /* Reset the 'is_new' flags of the cluster */
         for (i = 0; i < master->ncontrols; i++)
                 if (master->cluster[i])
-                        master->cluster[i]->has_new = 0;
+                        master->cluster[i]->is_new = 0;
 
         ctrl->val = *val;
-        ctrl->has_new = 1;
+        ctrl->is_new = 1;
         ret = try_or_set_control_cluster(master, false);
         if (!ret)
                 ret = try_or_set_control_cluster(master, true);
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 359e23290a7e..341764a3a990 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -419,6 +419,10 @@ static int get_index(struct video_device *vdev)
  *      The registration code assigns minor numbers and device node numbers
  *      based on the requested type and registers the new device node with
  *      the kernel.
+ *
+ *      This function assumes that struct video_device was zeroed when it
+ *      was allocated and does not contain any stale date.
+ *
  *      An error is returned if no free minor or device node number could be
  *      found, or if the registration of the device node failed.
  *
@@ -440,7 +444,6 @@ static int __video_register_device(struct video_device *vdev, int type, int nr,
         int minor_offset = 0;
         int minor_cnt = VIDEO_NUM_DEVICES;
         const char *name_base;
-        void *priv = vdev->dev.p;
 
         /* A minor value of -1 marks this video device as never
            having been registered */
@@ -559,10 +562,6 @@ static int __video_register_device(struct video_device *vdev, int type, int nr,
         }
 
         /* Part 4: register the device with sysfs */
-        memset(&vdev->dev, 0, sizeof(vdev->dev));
-        /* The memset above cleared the device's device_private, so
-           put back the copy we made earlier. */
-        vdev->dev.p = priv;
         vdev->dev.class = &video_class;
         vdev->dev.devt = MKDEV(VIDEO_MAJOR, vdev->minor);
         if (vdev->parent)
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 7fe6f92af480..ce64fe16bc60 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -100,6 +100,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
                            is a platform bus, then it is never deleted. */
                         if (client)
                                 i2c_unregister_device(client);
+                        continue;
                 }
 #endif
 #if defined(CONFIG_SPI)
@@ -108,6 +109,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
 
                         if (spi)
                                 spi_unregister_device(spi);
+                        continue;
                 }
 #endif
         }
@@ -126,11 +128,19 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
         WARN_ON(sd->v4l2_dev != NULL);
         if (!try_module_get(sd->owner))
                 return -ENODEV;
+        sd->v4l2_dev = v4l2_dev;
+        if (sd->internal_ops && sd->internal_ops->registered) {
+                err = sd->internal_ops->registered(sd);
+                if (err)
+                        return err;
+        }
         /* This just returns 0 if either of the two args is NULL */
         err = v4l2_ctrl_add_handler(v4l2_dev->ctrl_handler, sd->ctrl_handler);
-        if (err)
+        if (err) {
+                if (sd->internal_ops && sd->internal_ops->unregistered)
+                        sd->internal_ops->unregistered(sd);
                 return err;
-        sd->v4l2_dev = v4l2_dev;
+        }
         spin_lock(&v4l2_dev->lock);
         list_add_tail(&sd->list, &v4l2_dev->subdevs);
         spin_unlock(&v4l2_dev->lock);
@@ -146,6 +156,8 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
         spin_lock(&sd->v4l2_dev->lock);
         list_del(&sd->list);
         spin_unlock(&sd->v4l2_dev->lock);
+        if (sd->internal_ops && sd->internal_ops->unregistered)
+                sd->internal_ops->unregistered(sd);
         sd->v4l2_dev = NULL;
         module_put(sd->owner);
 }
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 7e47f15f350d..f51327ef6757 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1659,20 +1659,24 @@ static long __video_do_ioctl(struct file *file,
         {
                 struct v4l2_dbg_register *p = arg;
 
-                if (!capable(CAP_SYS_ADMIN))
-                        ret = -EPERM;
-                else if (ops->vidioc_g_register)
-                        ret = ops->vidioc_g_register(file, fh, p);
+                if (ops->vidioc_g_register) {
+                        if (!capable(CAP_SYS_ADMIN))
+                                ret = -EPERM;
+                        else
+                                ret = ops->vidioc_g_register(file, fh, p);
+                }
                 break;
         }
         case VIDIOC_DBG_S_REGISTER:
         {
                 struct v4l2_dbg_register *p = arg;
 
-                if (!capable(CAP_SYS_ADMIN))
-                        ret = -EPERM;
-                else if (ops->vidioc_s_register)
-                        ret = ops->vidioc_s_register(file, fh, p);
+                if (ops->vidioc_s_register) {
+                        if (!capable(CAP_SYS_ADMIN))
+                                ret = -EPERM;
+                        else
+                                ret = ops->vidioc_s_register(file, fh, p);
+                }
                 break;
         }
 #endif
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 019ee206cbee..fa35639d0c15 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -937,6 +937,7 @@ static void w9966_term(struct w9966 *cam)
                 parport_unregister_device(cam->pdev);
                 w9966_set_state(cam, W9966_STATE_PDEV, 0);
         }
+        memset(cam, 0, sizeof(*cam));
 }
 
 
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 9cdc3bb15b15..9f2bac519647 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1041,7 +1041,7 @@ zr36057_init (struct zoran *zr)
         /* allocate memory *before* doing anything to the hardware
          * in case allocation fails */
         zr->stat_com = kzalloc(BUZ_NUM_STAT_COM * 4, GFP_KERNEL);
-        zr->video_dev = kmalloc(sizeof(struct video_device), GFP_KERNEL);
+        zr->video_dev = video_device_alloc();
         if (!zr->stat_com || !zr->video_dev) {
                 dprintk(1,
                         KERN_ERR
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 20895e7a99c9..793300c554b4 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -361,12 +361,6 @@ static struct pm860x_irq_data pm860x_irqs[] = {
         },
 };
 
-static inline struct pm860x_irq_data *irq_to_pm860x(struct pm860x_chip *chip,
-                                                    int irq)
-{
-        return &pm860x_irqs[irq - chip->irq_base];
-}
-
 static irqreturn_t pm860x_irq(int irq, void *data)
 {
         struct pm860x_chip *chip = data;
@@ -388,16 +382,16 @@ static irqreturn_t pm860x_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void pm860x_irq_lock(unsigned int irq)
+static void pm860x_irq_lock(struct irq_data *data)
 {
-        struct pm860x_chip *chip = get_irq_chip_data(irq);
+        struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&chip->irq_lock);
 }
 
-static void pm860x_irq_sync_unlock(unsigned int irq)
+static void pm860x_irq_sync_unlock(struct irq_data *data)
 {
-        struct pm860x_chip *chip = get_irq_chip_data(irq);
+        struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
         struct pm860x_irq_data *irq_data;
         struct i2c_client *i2c;
         static unsigned char cached[3] = {0x0, 0x0, 0x0};
@@ -439,25 +433,25 @@ static void pm860x_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&chip->irq_lock);
 }
 
-static void pm860x_irq_enable(unsigned int irq)
+static void pm860x_irq_enable(struct irq_data *data)
 {
-        struct pm860x_chip *chip = get_irq_chip_data(irq);
-        pm860x_irqs[irq - chip->irq_base].enable
-                = pm860x_irqs[irq - chip->irq_base].offs;
+        struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
+        pm860x_irqs[data->irq - chip->irq_base].enable
+                = pm860x_irqs[data->irq - chip->irq_base].offs;
 }
 
-static void pm860x_irq_disable(unsigned int irq)
+static void pm860x_irq_disable(struct irq_data *data)
 {
-        struct pm860x_chip *chip = get_irq_chip_data(irq);
-        pm860x_irqs[irq - chip->irq_base].enable = 0;
+        struct pm860x_chip *chip = irq_data_get_irq_chip_data(data);
+        pm860x_irqs[data->irq - chip->irq_base].enable = 0;
 }
 
 static struct irq_chip pm860x_irq_chip = {
         .name           = "88pm860x",
-        .bus_lock       = pm860x_irq_lock,
-        .bus_sync_unlock = pm860x_irq_sync_unlock,
-        .enable         = pm860x_irq_enable,
-        .disable        = pm860x_irq_disable,
+        .irq_bus_lock   = pm860x_irq_lock,
+        .irq_bus_sync_unlock = pm860x_irq_sync_unlock,
+        .irq_enable     = pm860x_irq_enable,
+        .irq_disable    = pm860x_irq_disable,
 };
 
 static int __devinit device_gpadc_init(struct pm860x_chip *chip,
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index da9d2971102e..fd018366d670 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -496,13 +496,13 @@ config EZX_PCAP
 
 config AB8500_CORE
         bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"
-        depends on GENERIC_HARDIRQS && ABX500_CORE && SPI_MASTER && ARCH_U8500
+        depends on GENERIC_HARDIRQS && ABX500_CORE
         select MFD_CORE
         help
           Select this option to enable access to AB8500 power management
-          chip. This connects to U8500 either on the SSP/SPI bus
-          or the I2C bus via PRCMU. It also adds the irq_chip
-          parts for handling the Mixed Signal chip events.
+          chip. This connects to U8500 either on the SSP/SPI bus (deprecated
+          since hardware version v1.0) or the I2C bus via PRCMU. It also adds
+          the irq_chip parts for handling the Mixed Signal chip events.
           This chip embeds various other multimedia funtionalities as well.
 
 config AB8500_I2C_CORE
@@ -537,6 +537,14 @@ config AB3550_CORE
           LEDs, vibrator, system power and temperature, power management
           and ALSA sound.
 
+config MFD_CS5535
+        tristate "Support for CS5535 and CS5536 southbridge core functions"
+        select MFD_CORE
+        depends on PCI
+        ---help---
+          This is the core driver for CS5535/CS5536 MFD functions.  This is
+          necessary for using the board's GPIO and MFGPT functionality.
+
 config MFD_TIMBERDALE
         tristate "Support for the Timberdale FPGA"
         select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 848e7eac75aa..a54e2c7c6a1c 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -70,7 +70,7 @@ obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o
 obj-$(CONFIG_AB3100_CORE)       += ab3100-core.o
 obj-$(CONFIG_AB3100_OTP)        += ab3100-otp.o
 obj-$(CONFIG_AB3550_CORE)       += ab3550-core.o
-obj-$(CONFIG_AB8500_CORE)       += ab8500-core.o ab8500-spi.o
+obj-$(CONFIG_AB8500_CORE)       += ab8500-core.o
 obj-$(CONFIG_AB8500_I2C_CORE)   += ab8500-i2c.o
 obj-$(CONFIG_AB8500_DEBUG)      += ab8500-debugfs.o
 obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o
@@ -82,3 +82,4 @@ obj-$(CONFIG_MFD_JZ4740_ADC)	+= jz4740-adc.o
 obj-$(CONFIG_MFD_TPS6586X)      += tps6586x.o
 obj-$(CONFIG_MFD_VX855)         += vx855.o
 obj-$(CONFIG_MFD_WL1273_CORE)   += wl1273-core.o
+obj-$(CONFIG_MFD_CS5535)        += cs5535-mfd.o
diff --git a/drivers/mfd/ab3550-core.c b/drivers/mfd/ab3550-core.c
index 8a98739e6d9c..5fbca346b998 100644
--- a/drivers/mfd/ab3550-core.c
+++ b/drivers/mfd/ab3550-core.c
@@ -1159,15 +1159,16 @@ static void ab3550_mask_work(struct work_struct *work)
         }
 }
 
-static void ab3550_mask(unsigned int irq)
+static void ab3550_mask(struct irq_data *data)
 {
         unsigned long flags;
         struct ab3550 *ab;
         struct ab3550_platform_data *plf_data;
+        int irq;
 
-        ab = get_irq_chip_data(irq);
+        ab = irq_data_get_irq_chip_data(data);
         plf_data = ab->i2c_client[0]->dev.platform_data;
-        irq -= plf_data->irq.base;
+        irq = data->irq - plf_data->irq.base;
 
         spin_lock_irqsave(&ab->event_lock, flags);
         ab->event_mask[irq / 8] |= BIT(irq % 8);
@@ -1176,15 +1177,16 @@ static void ab3550_mask(unsigned int irq)
         schedule_work(&ab->mask_work);
 }
 
-static void ab3550_unmask(unsigned int irq)
+static void ab3550_unmask(struct irq_data *data)
 {
         unsigned long flags;
         struct ab3550 *ab;
         struct ab3550_platform_data *plf_data;
+        int irq;
 
-        ab = get_irq_chip_data(irq);
+        ab = irq_data_get_irq_chip_data(data);
         plf_data = ab->i2c_client[0]->dev.platform_data;
-        irq -= plf_data->irq.base;
+        irq = data->irq - plf_data->irq.base;
 
         spin_lock_irqsave(&ab->event_lock, flags);
         ab->event_mask[irq / 8] &= ~BIT(irq % 8);
@@ -1193,20 +1195,16 @@ static void ab3550_unmask(unsigned int irq)
         schedule_work(&ab->mask_work);
 }
 
-static void noop(unsigned int irq)
+static void noop(struct irq_data *data)
 {
 }
 
 static struct irq_chip ab3550_irq_chip = {
         .name           = "ab3550-core", /* Keep the same name as the request */
-        .startup        = NULL, /* defaults to enable */
-        .shutdown       = NULL, /* defaults to disable */
-        .enable         = NULL, /* defaults to unmask */
-        .disable        = ab3550_mask, /* No default to mask in chip.c */
-        .ack            = noop,
-        .mask           = ab3550_mask,
-        .unmask         = ab3550_unmask,
-        .end            = NULL,
+        .irq_disable    = ab3550_mask, /* No default to mask in chip.c */
+        .irq_ack        = noop,
+        .irq_mask       = ab3550_mask,
+        .irq_unmask     = ab3550_unmask,
 };
 
 struct ab_family_id {
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index d9640a623ff4..b6887014d687 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -52,6 +52,7 @@
 #define AB8500_IT_LATCH8_REG            0x27
 #define AB8500_IT_LATCH9_REG            0x28
 #define AB8500_IT_LATCH10_REG           0x29
+#define AB8500_IT_LATCH12_REG           0x2B
 #define AB8500_IT_LATCH19_REG           0x32
 #define AB8500_IT_LATCH20_REG           0x33
 #define AB8500_IT_LATCH21_REG           0x34
@@ -98,13 +99,17 @@
  * offset 0.
  */
 static const int ab8500_irq_regoffset[AB8500_NUM_IRQ_REGS] = {
-        0, 1, 2, 3, 4, 6, 7, 8, 9, 18, 19, 20, 21,
+        0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21,
 };
 
 static int ab8500_get_chip_id(struct device *dev)
 {
-        struct ab8500 *ab8500 = dev_get_drvdata(dev->parent);
-        return (int)ab8500->chip_id;
+        struct ab8500 *ab8500;
+
+        if (!dev)
+                return -EINVAL;
+        ab8500 = dev_get_drvdata(dev->parent);
+        return ab8500 ? (int)ab8500->chip_id : -EINVAL;
 }
 
 static int set_register_interruptible(struct ab8500 *ab8500, u8 bank,
@@ -228,16 +233,16 @@ static struct abx500_ops ab8500_ops = {
         .startup_irq_enabled = NULL,
 };
 
-static void ab8500_irq_lock(unsigned int irq)
+static void ab8500_irq_lock(struct irq_data *data)
 {
-        struct ab8500 *ab8500 = get_irq_chip_data(irq);
+        struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&ab8500->irq_lock);
 }
 
-static void ab8500_irq_sync_unlock(unsigned int irq)
+static void ab8500_irq_sync_unlock(struct irq_data *data)
 {
-        struct ab8500 *ab8500 = get_irq_chip_data(irq);
+        struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < AB8500_NUM_IRQ_REGS; i++) {
@@ -248,6 +253,10 @@ static void ab8500_irq_sync_unlock(unsigned int irq)
                 if (new == old)
                         continue;
 
+                /* Interrupt register 12 does'nt exist prior to version 0x20 */
+                if (ab8500_irq_regoffset[i] == 11 && ab8500->chip_id < 0x20)
+                        continue;
+
                 ab8500->oldmask[i] = new;
 
                 reg = AB8500_IT_MASK1_REG + ab8500_irq_regoffset[i];
@@ -257,20 +266,20 @@ static void ab8500_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&ab8500->irq_lock);
 }
 
-static void ab8500_irq_mask(unsigned int irq)
+static void ab8500_irq_mask(struct irq_data *data)
 {
-        struct ab8500 *ab8500 = get_irq_chip_data(irq);
-        int offset = irq - ab8500->irq_base;
+        struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data);
+        int offset = data->irq - ab8500->irq_base;
         int index = offset / 8;
         int mask = 1 << (offset % 8);
 
         ab8500->mask[index] |= mask;
 }
 
-static void ab8500_irq_unmask(unsigned int irq)
+static void ab8500_irq_unmask(struct irq_data *data)
 {
-        struct ab8500 *ab8500 = get_irq_chip_data(irq);
-        int offset = irq - ab8500->irq_base;
+        struct ab8500 *ab8500 = irq_data_get_irq_chip_data(data);
+        int offset = data->irq - ab8500->irq_base;
         int index = offset / 8;
         int mask = 1 << (offset % 8);
 
@@ -279,10 +288,10 @@ static void ab8500_irq_unmask(unsigned int irq)
 
 static struct irq_chip ab8500_irq_chip = {
         .name                   = "ab8500",
-        .bus_lock               = ab8500_irq_lock,
-        .bus_sync_unlock        = ab8500_irq_sync_unlock,
-        .mask                   = ab8500_irq_mask,
-        .unmask                 = ab8500_irq_unmask,
+        .irq_bus_lock           = ab8500_irq_lock,
+        .irq_bus_sync_unlock    = ab8500_irq_sync_unlock,
+        .irq_mask               = ab8500_irq_mask,
+        .irq_unmask             = ab8500_irq_unmask,
 };
 
 static irqreturn_t ab8500_irq(int irq, void *dev)
@@ -297,6 +306,10 @@ static irqreturn_t ab8500_irq(int irq, void *dev)
                 int status;
                 u8 value;
 
+                /* Interrupt register 12 does'nt exist prior to version 0x20 */
+                if (regoffset == 11 && ab8500->chip_id < 0x20)
+                        continue;
+
                 status = get_register_interruptible(ab8500, AB8500_INTERRUPT,
                         AB8500_IT_LATCH1_REG + regoffset, &value);
                 if (status < 0 || value == 0)
@@ -393,13 +406,195 @@ static struct resource ab8500_poweronkey_db_resources[] = {
         },
 };
 
+static struct resource ab8500_bm_resources[] = {
+        {
+                .name = "MAIN_EXT_CH_NOT_OK",
+                .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .end = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BATT_OVV",
+                .start = AB8500_INT_BATT_OVV,
+                .end = AB8500_INT_BATT_OVV,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CH_UNPLUG_DET",
+                .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
+                .end = AB8500_INT_MAIN_CH_UNPLUG_DET,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CHARGE_PLUG_DET",
+                .start = AB8500_INT_MAIN_CH_PLUG_DET,
+                .end = AB8500_INT_MAIN_CH_PLUG_DET,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_F",
+                .start = AB8500_INT_VBUS_DET_F,
+                .end = AB8500_INT_VBUS_DET_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_R",
+                .start = AB8500_INT_VBUS_DET_R,
+                .end = AB8500_INT_VBUS_DET_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BAT_CTRL_INDB",
+                .start = AB8500_INT_BAT_CTRL_INDB,
+                .end = AB8500_INT_BAT_CTRL_INDB,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "CH_WD_EXP",
+                .start = AB8500_INT_CH_WD_EXP,
+                .end = AB8500_INT_CH_WD_EXP,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_OVV",
+                .start = AB8500_INT_VBUS_OVV,
+                .end = AB8500_INT_VBUS_OVV,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "NCONV_ACCU",
+                .start = AB8500_INT_CCN_CONV_ACC,
+                .end = AB8500_INT_CCN_CONV_ACC,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "LOW_BAT_F",
+                .start = AB8500_INT_LOW_BAT_F,
+                .end = AB8500_INT_LOW_BAT_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "LOW_BAT_R",
+                .start = AB8500_INT_LOW_BAT_R,
+                .end = AB8500_INT_LOW_BAT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BTEMP_LOW",
+                .start = AB8500_INT_BTEMP_LOW,
+                .end = AB8500_INT_BTEMP_LOW,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BTEMP_HIGH",
+                .start = AB8500_INT_BTEMP_HIGH,
+                .end = AB8500_INT_BTEMP_HIGH,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGER_NOT_OKR",
+                .start = AB8500_INT_USB_CHARGER_NOT_OK,
+                .end = AB8500_INT_USB_CHARGER_NOT_OK,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGE_DET_DONE",
+                .start = AB8500_INT_USB_CHG_DET_DONE,
+                .end = AB8500_INT_USB_CHG_DET_DONE,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CH_TH_PROT_R",
+                .start = AB8500_INT_USB_CH_TH_PROT_R,
+                .end = AB8500_INT_USB_CH_TH_PROT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CH_TH_PROT_R",
+                .start = AB8500_INT_MAIN_CH_TH_PROT_R,
+                .end = AB8500_INT_MAIN_CH_TH_PROT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGER_NOT_OKF",
+                .start = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .end = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_debug_resources[] = {
+        {
+                .name   = "IRQ_FIRST",
+                .start  = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .end    = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .name   = "IRQ_LAST",
+                .start  = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .end    = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_usb_resources[] = {
+        {
+                .name = "ID_WAKEUP_R",
+                .start = AB8500_INT_ID_WAKEUP_R,
+                .end = AB8500_INT_ID_WAKEUP_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "ID_WAKEUP_F",
+                .start = AB8500_INT_ID_WAKEUP_F,
+                .end = AB8500_INT_ID_WAKEUP_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_F",
+                .start = AB8500_INT_VBUS_DET_F,
+                .end = AB8500_INT_VBUS_DET_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_R",
+                .start = AB8500_INT_VBUS_DET_R,
+                .end = AB8500_INT_VBUS_DET_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_LINK_STATUS",
+                .start = AB8500_INT_USB_LINK_STATUS,
+                .end = AB8500_INT_USB_LINK_STATUS,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_temp_resources[] = {
+        {
+                .name  = "AB8500_TEMP_WARM",
+                .start = AB8500_INT_TEMP_WARM,
+                .end   = AB8500_INT_TEMP_WARM,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
 static struct mfd_cell ab8500_devs[] = {
 #ifdef CONFIG_DEBUG_FS
         {
                 .name = "ab8500-debug",
+                .num_resources = ARRAY_SIZE(ab8500_debug_resources),
+                .resources = ab8500_debug_resources,
         },
 #endif
         {
+                .name = "ab8500-sysctrl",
+        },
+        {
+                .name = "ab8500-regulator",
+        },
+        {
                 .name = "ab8500-gpadc",
                 .num_resources = ARRAY_SIZE(ab8500_gpadc_resources),
                 .resources = ab8500_gpadc_resources,
@@ -410,6 +605,22 @@ static struct mfd_cell ab8500_devs[] = {
                 .resources = ab8500_rtc_resources,
         },
         {
+                .name = "ab8500-bm",
+                .num_resources = ARRAY_SIZE(ab8500_bm_resources),
+                .resources = ab8500_bm_resources,
+        },
+        { .name = "ab8500-codec", },
+        {
+                .name = "ab8500-usb",
+                .num_resources = ARRAY_SIZE(ab8500_usb_resources),
+                .resources = ab8500_usb_resources,
+        },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
+        {
                 .name = "ab8500-pwm",
                 .id = 1,
         },
@@ -421,17 +632,37 @@ static struct mfd_cell ab8500_devs[] = {
                 .name = "ab8500-pwm",
                 .id = 3,
         },
-        { .name = "ab8500-charger", },
-        { .name = "ab8500-audio", },
-        { .name = "ab8500-usb", },
-        { .name = "ab8500-regulator", },
+        { .name = "ab8500-leds", },
         {
-                .name = "ab8500-poweron-key",
-                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
-                .resources = ab8500_poweronkey_db_resources,
+                .name = "ab8500-denc",
+        },
+        {
+                .name = "ab8500-temp",
+                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
+                .resources = ab8500_temp_resources,
         },
 };
 
+static ssize_t show_chip_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct ab8500 *ab8500;
+
+        ab8500 = dev_get_drvdata(dev);
+        return sprintf(buf, "%#x\n", ab8500 ? ab8500->chip_id : -EINVAL);
+}
+
+static DEVICE_ATTR(chip_id, S_IRUGO, show_chip_id, NULL);
+
+static struct attribute *ab8500_sysfs_entries[] = {
+        &dev_attr_chip_id.attr,
+        NULL,
+};
+
+static struct attribute_group ab8500_attr_group = {
+        .attrs  = ab8500_sysfs_entries,
+};
+
 int __devinit ab8500_init(struct ab8500 *ab8500)
 {
         struct ab8500_platform_data *plat = dev_get_platdata(ab8500->dev);
@@ -454,8 +685,9 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
          * 0x0 - Early Drop
          * 0x10 - Cut 1.0
          * 0x11 - Cut 1.1
+         * 0x20 - Cut 2.0
          */
-        if (value == 0x0 || value == 0x10 || value == 0x11) {
+        if (value == 0x0 || value == 0x10 || value == 0x11 || value == 0x20) {
                 ab8500->revision = value;
                 dev_info(ab8500->dev, "detected chip, revision: %#x\n", value);
         } else {
@@ -468,18 +700,16 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
                 plat->init(ab8500);
 
         /* Clear and mask all interrupts */
-        for (i = 0; i < 10; i++) {
-                get_register_interruptible(ab8500, AB8500_INTERRUPT,
-                        AB8500_IT_LATCH1_REG + i, &value);
-                set_register_interruptible(ab8500, AB8500_INTERRUPT,
-                        AB8500_IT_MASK1_REG + i, 0xff);
-        }
+        for (i = 0; i < AB8500_NUM_IRQ_REGS; i++) {
+                /* Interrupt register 12 does'nt exist prior to version 0x20 */
+                if (ab8500_irq_regoffset[i] == 11 && ab8500->chip_id < 0x20)
+                        continue;
 
-        for (i = 18; i < 24; i++) {
                 get_register_interruptible(ab8500, AB8500_INTERRUPT,
-                        AB8500_IT_LATCH1_REG + i, &value);
+                        AB8500_IT_LATCH1_REG + ab8500_irq_regoffset[i],
+                        &value);
                 set_register_interruptible(ab8500, AB8500_INTERRUPT,
-                        AB8500_IT_MASK1_REG + i, 0xff);
+                        AB8500_IT_MASK1_REG + ab8500_irq_regoffset[i], 0xff);
         }
 
         ret = abx500_register_ops(ab8500->dev, &ab8500_ops);
@@ -495,7 +725,8 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
                         return ret;
 
                 ret = request_threaded_irq(ab8500->irq, NULL, ab8500_irq,
-                                           IRQF_ONESHOT, "ab8500", ab8500);
+                                           IRQF_ONESHOT | IRQF_NO_SUSPEND,
+                                           "ab8500", ab8500);
                 if (ret)
                         goto out_removeirq;
         }
@@ -506,6 +737,10 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
         if (ret)
                 goto out_freeirq;
 
+        ret = sysfs_create_group(&ab8500->dev->kobj, &ab8500_attr_group);
+        if (ret)
+                dev_err(ab8500->dev, "error creating sysfs entries\n");
+
         return ret;
 
 out_freeirq:
@@ -519,6 +754,7 @@ out_removeirq:
 
 int __devexit ab8500_exit(struct ab8500 *ab8500)
 {
+        sysfs_remove_group(&ab8500->dev->kobj, &ab8500_attr_group);
         mfd_remove_devices(ab8500->dev);
         if (ab8500->irq_base) {
                 free_irq(ab8500->irq, ab8500);
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index 8d1e05a39815..3c1541ae7223 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -24,9 +24,9 @@ static u32 debug_address;
  * @perm: access permissions for the range
  */
 struct ab8500_reg_range {
-       u8 first;
-       u8 last;
-       u8 perm;
+        u8 first;
+        u8 last;
+        u8 perm;
 };
 
 /**
@@ -36,9 +36,9 @@ struct ab8500_reg_range {
  * @range: the list of register ranges
  */
 struct ab8500_i2c_ranges {
-       u8 num_ranges;
-       u8 bankid;
-       const struct ab8500_reg_range *range;
+        u8 num_ranges;
+        u8 bankid;
+        const struct ab8500_reg_range *range;
 };
 
 #define AB8500_NAME_STRING "ab8500"
@@ -47,521 +47,521 @@ struct ab8500_i2c_ranges {
 #define AB8500_REV_REG 0x80
 
 static struct ab8500_i2c_ranges debug_ranges[AB8500_NUM_BANKS] = {
-       [0x0] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [AB8500_SYS_CTRL1_BLOCK] = {
-               .num_ranges = 3,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x02,
-                       },
-                       {
-                               .first = 0x42,
-                               .last = 0x42,
-                       },
-                       {
-                               .first = 0x80,
-                               .last = 0x81,
-                       },
-               },
-       },
-       [AB8500_SYS_CTRL2_BLOCK] = {
-               .num_ranges = 4,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x0D,
-                       },
-                       {
-                               .first = 0x0F,
-                               .last = 0x17,
-                       },
-                       {
-                               .first = 0x30,
-                               .last = 0x30,
-                       },
-                       {
-                               .first = 0x32,
-                               .last = 0x33,
-                       },
-               },
-       },
-       [AB8500_REGU_CTRL1] = {
-               .num_ranges = 3,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x00,
-                       },
-                       {
-                               .first = 0x03,
-                               .last = 0x10,
-                       },
-                       {
-                               .first = 0x80,
-                               .last = 0x84,
-                       },
-               },
-       },
-       [AB8500_REGU_CTRL2] = {
-               .num_ranges = 5,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x15,
-                       },
-                       {
-                               .first = 0x17,
-                               .last = 0x19,
-                       },
-                       {
-                               .first = 0x1B,
-                               .last = 0x1D,
-                       },
-                       {
-                               .first = 0x1F,
-                               .last = 0x22,
-                       },
-                       {
-                               .first = 0x40,
-                               .last = 0x44,
-                       },
-                       /* 0x80-0x8B is SIM registers and should
-                        * not be accessed from here */
-               },
-       },
-       [AB8500_USB] = {
-               .num_ranges = 2,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x80,
-                               .last = 0x83,
-                       },
-                       {
-                               .first = 0x87,
-                               .last = 0x8A,
-                       },
-               },
-       },
-       [AB8500_TVOUT] = {
-               .num_ranges = 9,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x12,
-                       },
-                       {
-                               .first = 0x15,
-                               .last = 0x17,
-                       },
-                       {
-                               .first = 0x19,
-                               .last = 0x21,
-                       },
-                       {
-                               .first = 0x27,
-                               .last = 0x2C,
-                       },
-                       {
-                               .first = 0x41,
-                               .last = 0x41,
-                       },
-                       {
-                               .first = 0x45,
-                               .last = 0x5B,
-                       },
-                       {
-                               .first = 0x5D,
-                               .last = 0x5D,
-                       },
-                       {
-                               .first = 0x69,
-                               .last = 0x69,
-                       },
-                       {
-                               .first = 0x80,
-                               .last = 0x81,
-                       },
-               },
-       },
-       [AB8500_DBI] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [AB8500_ECI_AV_ACC] = {
-               .num_ranges = 1,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x80,
-                               .last = 0x82,
-                       },
-               },
-       },
-       [0x9] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [AB8500_GPADC] = {
-               .num_ranges = 1,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x08,
-                       },
-               },
-       },
-       [AB8500_CHARGER] = {
-               .num_ranges = 8,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x03,
-                       },
-                       {
-                               .first = 0x05,
-                               .last = 0x05,
-                       },
-                       {
-                               .first = 0x40,
-                               .last = 0x40,
-                       },
-                       {
-                               .first = 0x42,
-                               .last = 0x42,
-                       },
-                       {
-                               .first = 0x44,
-                               .last = 0x44,
-                       },
-                       {
-                               .first = 0x50,
-                               .last = 0x55,
-                       },
-                       {
-                               .first = 0x80,
-                               .last = 0x82,
-                       },
-                       {
-                               .first = 0xC0,
-                               .last = 0xC2,
-                       },
-               },
-       },
-       [AB8500_GAS_GAUGE] = {
-               .num_ranges = 3,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x00,
-                       },
-                       {
-                               .first = 0x07,
-                               .last = 0x0A,
-                       },
-                       {
-                               .first = 0x10,
-                               .last = 0x14,
-                       },
-               },
-       },
-       [AB8500_AUDIO] = {
-               .num_ranges = 1,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x6F,
-                       },
-               },
-       },
-       [AB8500_INTERRUPT] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [AB8500_RTC] = {
-               .num_ranges = 1,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x0F,
-                       },
-               },
-       },
-       [AB8500_MISC] = {
-               .num_ranges = 8,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x00,
-                               .last = 0x05,
-                       },
-                       {
-                               .first = 0x10,
-                               .last = 0x15,
-                       },
-                       {
-                               .first = 0x20,
-                               .last = 0x25,
-                       },
-                       {
-                               .first = 0x30,
-                               .last = 0x35,
-                       },
-                       {
-                               .first = 0x40,
-                               .last = 0x45,
-                       },
-                       {
-                               .first = 0x50,
-                               .last = 0x50,
-                       },
-                       {
-                               .first = 0x60,
-                               .last = 0x67,
-                       },
-                       {
-                               .first = 0x80,
-                               .last = 0x80,
-                       },
-               },
-       },
-       [0x11] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [0x12] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [0x13] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [0x14] = {
-               .num_ranges = 0,
-               .range = 0,
-       },
-       [AB8500_OTP_EMUL] = {
-               .num_ranges = 1,
-               .range = (struct ab8500_reg_range[]) {
-                       {
-                               .first = 0x01,
-                               .last = 0x0F,
-                       },
-               },
-       },
+        [0x0] = {
+                .num_ranges = 0,
+                .range = 0,
+        },
+        [AB8500_SYS_CTRL1_BLOCK] = {
+                .num_ranges = 3,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x02,
+                        },
+                        {
+                                .first = 0x42,
+                                .last = 0x42,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x81,
+                        },
+                },
+        },
+        [AB8500_SYS_CTRL2_BLOCK] = {
+                .num_ranges = 4,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x0D,
+                        },
+                        {
+                                .first = 0x0F,
+                                .last = 0x17,
+                        },
+                        {
+                                .first = 0x30,
+                                .last = 0x30,
+                        },
+                        {
+                                .first = 0x32,
+                                .last = 0x33,
+                        },
+                },
+        },
+        [AB8500_REGU_CTRL1] = {
+                .num_ranges = 3,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x00,
+                        },
+                        {
+                                .first = 0x03,
+                                .last = 0x10,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x84,
+                        },
+                },
+        },
+        [AB8500_REGU_CTRL2] = {
+                .num_ranges = 5,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x15,
+                        },
+                        {
+                                .first = 0x17,
+                                .last = 0x19,
+                        },
+                        {
+                                .first = 0x1B,
+                                .last = 0x1D,
+                        },
+                        {
+                                .first = 0x1F,
+                                .last = 0x22,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x44,
+                        },
+                        /* 0x80-0x8B is SIM registers and should
+                         * not be accessed from here */
+                },
+        },
+        [AB8500_USB] = {
+                .num_ranges = 2,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x80,
+                                .last = 0x83,
+                        },
+                        {
+                                .first = 0x87,
+                                .last = 0x8A,
+                        },
+                },
+        },
+        [AB8500_TVOUT] = {
+                .num_ranges = 9,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x12,
+                        },
+                        {
+                                .first = 0x15,
+                                .last = 0x17,
+                        },
+                        {
+                                .first = 0x19,
+                                .last = 0x21,
+                        },
+                        {
+                                .first = 0x27,
+                                .last = 0x2C,
+                        },
+                        {
+                                .first = 0x41,
+                                .last = 0x41,
+                        },
+                        {
+                                .first = 0x45,
+                                .last = 0x5B,
+                        },
+                        {
+                                .first = 0x5D,
+                                .last = 0x5D,
+                        },
+                        {
+                                .first = 0x69,
+                                .last = 0x69,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x81,
+                        },
+                },
+        },
+        [AB8500_DBI] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [AB8500_ECI_AV_ACC] = {
+                .num_ranges = 1,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x80,
+                                .last = 0x82,
+                        },
+                },
+        },
+        [0x9] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [AB8500_GPADC] = {
+                .num_ranges = 1,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x08,
+                        },
+                },
+        },
+        [AB8500_CHARGER] = {
+                .num_ranges = 8,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x03,
+                        },
+                        {
+                                .first = 0x05,
+                                .last = 0x05,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x40,
+                        },
+                        {
+                                .first = 0x42,
+                                .last = 0x42,
+                        },
+                        {
+                                .first = 0x44,
+                                .last = 0x44,
+                        },
+                        {
+                                .first = 0x50,
+                                .last = 0x55,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x82,
+                        },
+                        {
+                                .first = 0xC0,
+                                .last = 0xC2,
+                        },
+                },
+        },
+        [AB8500_GAS_GAUGE] = {
+                .num_ranges = 3,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x00,
+                        },
+                        {
+                                .first = 0x07,
+                                .last = 0x0A,
+                        },
+                        {
+                                .first = 0x10,
+                                .last = 0x14,
+                        },
+                },
+        },
+        [AB8500_AUDIO] = {
+                .num_ranges = 1,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x6F,
+                        },
+                },
+        },
+        [AB8500_INTERRUPT] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [AB8500_RTC] = {
+                .num_ranges = 1,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x0F,
+                        },
+                },
+        },
+        [AB8500_MISC] = {
+                .num_ranges = 8,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x00,
+                                .last = 0x05,
+                        },
+                        {
+                                .first = 0x10,
+                                .last = 0x15,
+                        },
+                        {
+                                .first = 0x20,
+                                .last = 0x25,
+                        },
+                        {
+                                .first = 0x30,
+                                .last = 0x35,
+                        },
+                        {
+                                .first = 0x40,
+                                .last = 0x45,
+                        },
+                        {
+                                .first = 0x50,
+                                .last = 0x50,
+                        },
+                        {
+                                .first = 0x60,
+                                .last = 0x67,
+                        },
+                        {
+                                .first = 0x80,
+                                .last = 0x80,
+                        },
+                },
+        },
+        [0x11] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [0x12] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [0x13] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [0x14] = {
+                .num_ranges = 0,
+                .range = NULL,
+        },
+        [AB8500_OTP_EMUL] = {
+                .num_ranges = 1,
+                .range = (struct ab8500_reg_range[]) {
+                        {
+                                .first = 0x01,
+                                .last = 0x0F,
+                        },
+                },
+        },
 };
 
 static int ab8500_registers_print(struct seq_file *s, void *p)
 {
-       struct device *dev = s->private;
-       unsigned int i;
-       u32 bank = debug_bank;
-
-       seq_printf(s, AB8500_NAME_STRING " register values:\n");
-
-       seq_printf(s, " bank %u:\n", bank);
-       for (i = 0; i < debug_ranges[bank].num_ranges; i++) {
-               u32 reg;
-
-               for (reg = debug_ranges[bank].range[i].first;
-                       reg <= debug_ranges[bank].range[i].last;
-                       reg++) {
-                       u8 value;
-                       int err;
-
-                       err = abx500_get_register_interruptible(dev,
-                               (u8)bank, (u8)reg, &value);
-                       if (err < 0) {
-                               dev_err(dev, "ab->read fail %d\n", err);
-                               return err;
-                       }
-
-                       err = seq_printf(s, "  [%u/0x%02X]: 0x%02X\n", bank,
-                               reg, value);
-                       if (err < 0) {
-                               dev_err(dev, "seq_printf overflow\n");
-                               /* Error is not returned here since
-                                * the output is wanted in any case */
-                               return 0;
-                       }
-               }
-       }
-       return 0;
+        struct device *dev = s->private;
+        unsigned int i;
+        u32 bank = debug_bank;
+
+        seq_printf(s, AB8500_NAME_STRING " register values:\n");
+
+        seq_printf(s, " bank %u:\n", bank);
+        for (i = 0; i < debug_ranges[bank].num_ranges; i++) {
+                u32 reg;
+
+                for (reg = debug_ranges[bank].range[i].first;
+                        reg <= debug_ranges[bank].range[i].last;
+                        reg++) {
+                        u8 value;
+                        int err;
+
+                        err = abx500_get_register_interruptible(dev,
+                                (u8)bank, (u8)reg, &value);
+                        if (err < 0) {
+                                dev_err(dev, "ab->read fail %d\n", err);
+                                return err;
+                        }
+
+                        err = seq_printf(s, "  [%u/0x%02X]: 0x%02X\n", bank,
+                                reg, value);
+                        if (err < 0) {
+                                dev_err(dev, "seq_printf overflow\n");
+                                /* Error is not returned here since
+                                 * the output is wanted in any case */
+                                return 0;
+                        }
+                }
+        }
+        return 0;
 }
 
 static int ab8500_registers_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, ab8500_registers_print, inode->i_private);
+        return single_open(file, ab8500_registers_print, inode->i_private);
 }
 
 static const struct file_operations ab8500_registers_fops = {
-       .open = ab8500_registers_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
+        .open = ab8500_registers_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
 };
 
 static int ab8500_bank_print(struct seq_file *s, void *p)
 {
-       return seq_printf(s, "%d\n", debug_bank);
+        return seq_printf(s, "%d\n", debug_bank);
 }
 
 static int ab8500_bank_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, ab8500_bank_print, inode->i_private);
+        return single_open(file, ab8500_bank_print, inode->i_private);
 }
 
 static ssize_t ab8500_bank_write(struct file *file,
-       const char __user *user_buf,
-       size_t count, loff_t *ppos)
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
 {
-       struct device *dev = ((struct seq_file *)(file->private_data))->private;
-       char buf[32];
-       int buf_size;
-       unsigned long user_bank;
-       int err;
-
-       /* Get userspace string and assure termination */
-       buf_size = min(count, (sizeof(buf) - 1));
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-       buf[buf_size] = 0;
-
-       err = strict_strtoul(buf, 0, &user_bank);
-       if (err)
-               return -EINVAL;
-
-       if (user_bank >= AB8500_NUM_BANKS) {
-               dev_err(dev, "debugfs error input > number of banks\n");
-               return -EINVAL;
-       }
-
-       debug_bank = user_bank;
-
-       return buf_size;
+        struct device *dev = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_bank;
+        int err;
+
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf) - 1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+
+        err = strict_strtoul(buf, 0, &user_bank);
+        if (err)
+                return -EINVAL;
+
+        if (user_bank >= AB8500_NUM_BANKS) {
+                dev_err(dev, "debugfs error input > number of banks\n");
+                return -EINVAL;
+        }
+
+        debug_bank = user_bank;
+
+        return buf_size;
 }
 
 static int ab8500_address_print(struct seq_file *s, void *p)
 {
-       return seq_printf(s, "0x%02X\n", debug_address);
+        return seq_printf(s, "0x%02X\n", debug_address);
 }
 
 static int ab8500_address_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, ab8500_address_print, inode->i_private);
+        return single_open(file, ab8500_address_print, inode->i_private);
 }
 
 static ssize_t ab8500_address_write(struct file *file,
-       const char __user *user_buf,
-       size_t count, loff_t *ppos)
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
 {
-       struct device *dev = ((struct seq_file *)(file->private_data))->private;
-       char buf[32];
-       int buf_size;
-       unsigned long user_address;
-       int err;
-
-       /* Get userspace string and assure termination */
-       buf_size = min(count, (sizeof(buf) - 1));
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-       buf[buf_size] = 0;
-
-       err = strict_strtoul(buf, 0, &user_address);
-       if (err)
-               return -EINVAL;
-       if (user_address > 0xff) {
-               dev_err(dev, "debugfs error input > 0xff\n");
-               return -EINVAL;
-       }
-       debug_address = user_address;
-       return buf_size;
+        struct device *dev = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_address;
+        int err;
+
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf) - 1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+
+        err = strict_strtoul(buf, 0, &user_address);
+        if (err)
+                return -EINVAL;
+        if (user_address > 0xff) {
+                dev_err(dev, "debugfs error input > 0xff\n");
+                return -EINVAL;
+        }
+        debug_address = user_address;
+        return buf_size;
 }
 
 static int ab8500_val_print(struct seq_file *s, void *p)
 {
-       struct device *dev = s->private;
-       int ret;
-       u8 regvalue;
-
-       ret = abx500_get_register_interruptible(dev,
-               (u8)debug_bank, (u8)debug_address, &regvalue);
-       if (ret < 0) {
-               dev_err(dev, "abx500_get_reg fail %d, %d\n",
-                       ret, __LINE__);
-               return -EINVAL;
-       }
-       seq_printf(s, "0x%02X\n", regvalue);
-
-       return 0;
+        struct device *dev = s->private;
+        int ret;
+        u8 regvalue;
+
+        ret = abx500_get_register_interruptible(dev,
+                (u8)debug_bank, (u8)debug_address, &regvalue);
+        if (ret < 0) {
+                dev_err(dev, "abx500_get_reg fail %d, %d\n",
+                        ret, __LINE__);
+                return -EINVAL;
+        }
+        seq_printf(s, "0x%02X\n", regvalue);
+
+        return 0;
 }
 
 static int ab8500_val_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, ab8500_val_print, inode->i_private);
+        return single_open(file, ab8500_val_print, inode->i_private);
 }
 
 static ssize_t ab8500_val_write(struct file *file,
-       const char __user *user_buf,
-       size_t count, loff_t *ppos)
+        const char __user *user_buf,
+        size_t count, loff_t *ppos)
 {
-       struct device *dev = ((struct seq_file *)(file->private_data))->private;
-       char buf[32];
-       int buf_size;
-       unsigned long user_val;
-       int err;
-
-       /* Get userspace string and assure termination */
-       buf_size = min(count, (sizeof(buf)-1));
-       if (copy_from_user(buf, user_buf, buf_size))
-               return -EFAULT;
-       buf[buf_size] = 0;
-
-       err = strict_strtoul(buf, 0, &user_val);
-       if (err)
-               return -EINVAL;
-       if (user_val > 0xff) {
-               dev_err(dev, "debugfs error input > 0xff\n");
-               return -EINVAL;
-       }
-       err = abx500_set_register_interruptible(dev,
-               (u8)debug_bank, debug_address, (u8)user_val);
-       if (err < 0) {
-               printk(KERN_ERR "abx500_set_reg failed %d, %d", err, __LINE__);
-               return -EINVAL;
-       }
-
-       return buf_size;
+        struct device *dev = ((struct seq_file *)(file->private_data))->private;
+        char buf[32];
+        int buf_size;
+        unsigned long user_val;
+        int err;
+
+        /* Get userspace string and assure termination */
+        buf_size = min(count, (sizeof(buf)-1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+
+        err = strict_strtoul(buf, 0, &user_val);
+        if (err)
+                return -EINVAL;
+        if (user_val > 0xff) {
+                dev_err(dev, "debugfs error input > 0xff\n");
+                return -EINVAL;
+        }
+        err = abx500_set_register_interruptible(dev,
+                (u8)debug_bank, debug_address, (u8)user_val);
+        if (err < 0) {
+                printk(KERN_ERR "abx500_set_reg failed %d, %d", err, __LINE__);
+                return -EINVAL;
+        }
+
+        return buf_size;
 }
 
 static const struct file_operations ab8500_bank_fops = {
-       .open = ab8500_bank_open,
-       .write = ab8500_bank_write,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
+        .open = ab8500_bank_open,
+        .write = ab8500_bank_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
 };
 
 static const struct file_operations ab8500_address_fops = {
-       .open = ab8500_address_open,
-       .write = ab8500_address_write,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
+        .open = ab8500_address_open,
+        .write = ab8500_address_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
 };
 
 static const struct file_operations ab8500_val_fops = {
-       .open = ab8500_val_open,
-       .write = ab8500_val_write,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .owner = THIS_MODULE,
+        .open = ab8500_val_open,
+        .write = ab8500_val_write,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+        .owner = THIS_MODULE,
 };
 
 static struct dentry *ab8500_dir;
@@ -572,77 +572,77 @@ static struct dentry *ab8500_val_file;
 
 static int __devinit ab8500_debug_probe(struct platform_device *plf)
 {
-       debug_bank = AB8500_MISC;
-       debug_address = AB8500_REV_REG & 0x00FF;
+        debug_bank = AB8500_MISC;
+        debug_address = AB8500_REV_REG & 0x00FF;
 
-       ab8500_dir = debugfs_create_dir(AB8500_NAME_STRING, NULL);
-       if (!ab8500_dir)
-               goto exit_no_debugfs;
+        ab8500_dir = debugfs_create_dir(AB8500_NAME_STRING, NULL);
+        if (!ab8500_dir)
+                goto exit_no_debugfs;
 
-       ab8500_reg_file = debugfs_create_file("all-bank-registers",
-               S_IRUGO, ab8500_dir, &plf->dev, &ab8500_registers_fops);
-       if (!ab8500_reg_file)
-               goto exit_destroy_dir;
+        ab8500_reg_file = debugfs_create_file("all-bank-registers",
+                S_IRUGO, ab8500_dir, &plf->dev, &ab8500_registers_fops);
+        if (!ab8500_reg_file)
+                goto exit_destroy_dir;
 
-       ab8500_bank_file = debugfs_create_file("register-bank",
-               (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev, &ab8500_bank_fops);
-       if (!ab8500_bank_file)
-               goto exit_destroy_reg;
+        ab8500_bank_file = debugfs_create_file("register-bank",
+                (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev, &ab8500_bank_fops);
+        if (!ab8500_bank_file)
+                goto exit_destroy_reg;
 
-       ab8500_address_file = debugfs_create_file("register-address",
-               (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev,
-               &ab8500_address_fops);
-       if (!ab8500_address_file)
-               goto exit_destroy_bank;
+        ab8500_address_file = debugfs_create_file("register-address",
+                (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev,
+                &ab8500_address_fops);
+        if (!ab8500_address_file)
+                goto exit_destroy_bank;
 
-       ab8500_val_file = debugfs_create_file("register-value",
-               (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev, &ab8500_val_fops);
-       if (!ab8500_val_file)
-               goto exit_destroy_address;
+        ab8500_val_file = debugfs_create_file("register-value",
+                (S_IRUGO | S_IWUGO), ab8500_dir, &plf->dev, &ab8500_val_fops);
+        if (!ab8500_val_file)
+                goto exit_destroy_address;
 
-       return 0;
+        return 0;
 
 exit_destroy_address:
-       debugfs_remove(ab8500_address_file);
+        debugfs_remove(ab8500_address_file);
 exit_destroy_bank:
-       debugfs_remove(ab8500_bank_file);
+        debugfs_remove(ab8500_bank_file);
 exit_destroy_reg:
-       debugfs_remove(ab8500_reg_file);
+        debugfs_remove(ab8500_reg_file);
 exit_destroy_dir:
-       debugfs_remove(ab8500_dir);
+        debugfs_remove(ab8500_dir);
 exit_no_debugfs:
-       dev_err(&plf->dev, "failed to create debugfs entries.\n");
-       return -ENOMEM;
+        dev_err(&plf->dev, "failed to create debugfs entries.\n");
+        return -ENOMEM;
 }
 
 static int __devexit ab8500_debug_remove(struct platform_device *plf)
 {
-       debugfs_remove(ab8500_val_file);
-       debugfs_remove(ab8500_address_file);
-       debugfs_remove(ab8500_bank_file);
-       debugfs_remove(ab8500_reg_file);
-       debugfs_remove(ab8500_dir);
+        debugfs_remove(ab8500_val_file);
+        debugfs_remove(ab8500_address_file);
+        debugfs_remove(ab8500_bank_file);
+        debugfs_remove(ab8500_reg_file);
+        debugfs_remove(ab8500_dir);
 
-       return 0;
+        return 0;
 }
 
 static struct platform_driver ab8500_debug_driver = {
-       .driver = {
-               .name = "ab8500-debug",
-               .owner = THIS_MODULE,
-       },
-       .probe  = ab8500_debug_probe,
-       .remove = __devexit_p(ab8500_debug_remove)
+        .driver = {
+                .name = "ab8500-debug",
+                .owner = THIS_MODULE,
+        },
+        .probe  = ab8500_debug_probe,
+        .remove = __devexit_p(ab8500_debug_remove)
 };
 
 static int __init ab8500_debug_init(void)
 {
-       return platform_driver_register(&ab8500_debug_driver);
+        return platform_driver_register(&ab8500_debug_driver);
 }
 
 static void __exit ab8500_debug_exit(void)
 {
-       platform_driver_unregister(&ab8500_debug_driver);
+        platform_driver_unregister(&ab8500_debug_driver);
 }
 subsys_initcall(ab8500_debug_init);
 module_exit(ab8500_debug_exit);
diff --git a/drivers/mfd/ab8500-spi.c b/drivers/mfd/ab8500-spi.c
deleted file mode 100644
index b1653421edb5..000000000000
--- a/drivers/mfd/ab8500-spi.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- * Author: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/mfd/ab8500.h>
-
-/*
- * This funtion writes to any AB8500 registers using
- * SPI protocol &  before it writes it packs the data
- * in the below 24 bit frame format
- *
- *       *|------------------------------------|
- *       *| 23|22...18|17.......10|9|8|7......0|
- *       *| r/w  bank       adr          data  |
- *       * ------------------------------------
- *
- * This function shouldn't be called from interrupt
- * context
- */
-static int ab8500_spi_write(struct ab8500 *ab8500, u16 addr, u8 data)
-{
-        struct spi_device *spi = container_of(ab8500->dev, struct spi_device,
-                                              dev);
-        unsigned long spi_data = addr << 10 | data;
-        struct spi_transfer xfer;
-        struct spi_message msg;
-
-        ab8500->tx_buf[0] = spi_data;
-        ab8500->rx_buf[0] = 0;
-
-        xfer.tx_buf     = ab8500->tx_buf;
-        xfer.rx_buf     = NULL;
-        xfer.len        = sizeof(unsigned long);
-
-        spi_message_init(&msg);
-        spi_message_add_tail(&xfer, &msg);
-
-        return spi_sync(spi, &msg);
-}
-
-static int ab8500_spi_read(struct ab8500 *ab8500, u16 addr)
-{
-        struct spi_device *spi = container_of(ab8500->dev, struct spi_device,
-                                              dev);
-        unsigned long spi_data = 1 << 23 | addr << 10;
-        struct spi_transfer xfer;
-        struct spi_message msg;
-        int ret;
-
-        ab8500->tx_buf[0] = spi_data;
-        ab8500->rx_buf[0] = 0;
-
-        xfer.tx_buf     = ab8500->tx_buf;
-        xfer.rx_buf     = ab8500->rx_buf;
-        xfer.len        = sizeof(unsigned long);
-
-        spi_message_init(&msg);
-        spi_message_add_tail(&xfer, &msg);
-
-        ret = spi_sync(spi, &msg);
-        if (!ret)
-                /*
-                 * Only the 8 lowermost bytes are
-                 * defined with value, the rest may
-                 * vary depending on chip/board noise.
-                 */
-                ret = ab8500->rx_buf[0] & 0xFFU;
-
-        return ret;
-}
-
-static int __devinit ab8500_spi_probe(struct spi_device *spi)
-{
-        struct ab8500 *ab8500;
-        int ret;
-
-        spi->bits_per_word = 24;
-        ret = spi_setup(spi);
-        if (ret < 0)
-                return ret;
-
-        ab8500 = kzalloc(sizeof *ab8500, GFP_KERNEL);
-        if (!ab8500)
-                return -ENOMEM;
-
-        ab8500->dev = &spi->dev;
-        ab8500->irq = spi->irq;
-
-        ab8500->read = ab8500_spi_read;
-        ab8500->write = ab8500_spi_write;
-
-        spi_set_drvdata(spi, ab8500);
-
-        ret = ab8500_init(ab8500);
-        if (ret)
-                kfree(ab8500);
-
-        return ret;
-}
-
-static int __devexit ab8500_spi_remove(struct spi_device *spi)
-{
-        struct ab8500 *ab8500 = spi_get_drvdata(spi);
-
-        ab8500_exit(ab8500);
-        kfree(ab8500);
-
-        return 0;
-}
-
-static struct spi_driver ab8500_spi_driver = {
-        .driver = {
-                .name = "ab8500-spi",
-                .owner = THIS_MODULE,
-        },
-        .probe  = ab8500_spi_probe,
-        .remove = __devexit_p(ab8500_spi_remove)
-};
-
-static int __init ab8500_spi_init(void)
-{
-        return spi_register_driver(&ab8500_spi_driver);
-}
-subsys_initcall(ab8500_spi_init);
-
-static void __exit ab8500_spi_exit(void)
-{
-        spi_unregister_driver(&ab8500_spi_driver);
-}
-module_exit(ab8500_spi_exit);
-
-MODULE_AUTHOR("Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com");
-MODULE_DESCRIPTION("AB8500 SPI");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 7de708d15d72..6a1f94042612 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -57,7 +57,7 @@ struct asic3_clk {
                 .rate = _rate,                  \
         }
 
-struct asic3_clk asic3_clk_init[] __initdata = {
+static struct asic3_clk asic3_clk_init[] __initdata = {
         INIT_CDEX(SPI, 0),
         INIT_CDEX(OWM, 5000000),
         INIT_CDEX(PWM0, 0),
@@ -102,7 +102,7 @@ static inline u32 asic3_read_register(struct asic3 *asic,
                         (reg >> asic->bus_shift));
 }
 
-void asic3_set_register(struct asic3 *asic, u32 reg, u32 bits, bool set)
+static void asic3_set_register(struct asic3 *asic, u32 reg, u32 bits, bool set)
 {
         unsigned long flags;
         u32 val;
@@ -226,14 +226,14 @@ static inline int asic3_irq_to_index(struct asic3 *asic, int irq)
         return (irq - asic->irq_base) & 0xf;
 }
 
-static void asic3_mask_gpio_irq(unsigned int irq)
+static void asic3_mask_gpio_irq(struct irq_data *data)
 {
-        struct asic3 *asic = get_irq_chip_data(irq);
+        struct asic3 *asic = irq_data_get_irq_chip_data(data);
         u32 val, bank, index;
         unsigned long flags;
 
-        bank = asic3_irq_to_bank(asic, irq);
-        index = asic3_irq_to_index(asic, irq);
+        bank = asic3_irq_to_bank(asic, data->irq);
+        index = asic3_irq_to_index(asic, data->irq);
 
         spin_lock_irqsave(&asic->lock, flags);
         val = asic3_read_register(asic, bank + ASIC3_GPIO_MASK);
@@ -242,9 +242,9 @@ static void asic3_mask_gpio_irq(unsigned int irq)
         spin_unlock_irqrestore(&asic->lock, flags);
 }
 
-static void asic3_mask_irq(unsigned int irq)
+static void asic3_mask_irq(struct irq_data *data)
 {
-        struct asic3 *asic = get_irq_chip_data(irq);
+        struct asic3 *asic = irq_data_get_irq_chip_data(data);
         int regval;
         unsigned long flags;
 
@@ -254,7 +254,7 @@ static void asic3_mask_irq(unsigned int irq)
                                      ASIC3_INTR_INT_MASK);
 
         regval &= ~(ASIC3_INTMASK_MASK0 <<
-                    (irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
+                    (data->irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
 
         asic3_write_register(asic,
                              ASIC3_INTR_BASE +
@@ -263,14 +263,14 @@ static void asic3_mask_irq(unsigned int irq)
         spin_unlock_irqrestore(&asic->lock, flags);
 }
 
-static void asic3_unmask_gpio_irq(unsigned int irq)
+static void asic3_unmask_gpio_irq(struct irq_data *data)
 {
-        struct asic3 *asic = get_irq_chip_data(irq);
+        struct asic3 *asic = irq_data_get_irq_chip_data(data);
         u32 val, bank, index;
         unsigned long flags;
 
-        bank = asic3_irq_to_bank(asic, irq);
-        index = asic3_irq_to_index(asic, irq);
+        bank = asic3_irq_to_bank(asic, data->irq);
+        index = asic3_irq_to_index(asic, data->irq);
 
         spin_lock_irqsave(&asic->lock, flags);
         val = asic3_read_register(asic, bank + ASIC3_GPIO_MASK);
@@ -279,9 +279,9 @@ static void asic3_unmask_gpio_irq(unsigned int irq)
         spin_unlock_irqrestore(&asic->lock, flags);
 }
 
-static void asic3_unmask_irq(unsigned int irq)
+static void asic3_unmask_irq(struct irq_data *data)
 {
-        struct asic3 *asic = get_irq_chip_data(irq);
+        struct asic3 *asic = irq_data_get_irq_chip_data(data);
         int regval;
         unsigned long flags;
 
@@ -291,7 +291,7 @@ static void asic3_unmask_irq(unsigned int irq)
                                      ASIC3_INTR_INT_MASK);
 
         regval |= (ASIC3_INTMASK_MASK0 <<
-                   (irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
+                   (data->irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
 
         asic3_write_register(asic,
                              ASIC3_INTR_BASE +
@@ -300,15 +300,15 @@ static void asic3_unmask_irq(unsigned int irq)
         spin_unlock_irqrestore(&asic->lock, flags);
 }
 
-static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
+static int asic3_gpio_irq_type(struct irq_data *data, unsigned int type)
 {
-        struct asic3 *asic = get_irq_chip_data(irq);
+        struct asic3 *asic = irq_data_get_irq_chip_data(data);
         u32 bank, index;
         u16 trigger, level, edge, bit;
         unsigned long flags;
 
-        bank = asic3_irq_to_bank(asic, irq);
-        index = asic3_irq_to_index(asic, irq);
+        bank = asic3_irq_to_bank(asic, data->irq);
+        index = asic3_irq_to_index(asic, data->irq);
         bit = 1<<index;
 
         spin_lock_irqsave(&asic->lock, flags);
@@ -318,7 +318,7 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
                                    bank + ASIC3_GPIO_EDGE_TRIGGER);
         trigger = asic3_read_register(asic,
                                       bank + ASIC3_GPIO_TRIGGER_TYPE);
-        asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit;
+        asic->irq_bothedge[(data->irq - asic->irq_base) >> 4] &= ~bit;
 
         if (type == IRQ_TYPE_EDGE_RISING) {
                 trigger |= bit;
@@ -328,11 +328,11 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
                 edge &= ~bit;
         } else if (type == IRQ_TYPE_EDGE_BOTH) {
                 trigger |= bit;
-                if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base))
+                if (asic3_gpio_get(&asic->gpio, data->irq - asic->irq_base))
                         edge &= ~bit;
                 else
                         edge |= bit;
-                asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit;
+                asic->irq_bothedge[(data->irq - asic->irq_base) >> 4] |= bit;
         } else if (type == IRQ_TYPE_LEVEL_LOW) {
                 trigger &= ~bit;
                 level &= ~bit;
@@ -359,17 +359,17 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
 
 static struct irq_chip asic3_gpio_irq_chip = {
         .name           = "ASIC3-GPIO",
-        .ack            = asic3_mask_gpio_irq,
-        .mask           = asic3_mask_gpio_irq,
-        .unmask         = asic3_unmask_gpio_irq,
-        .set_type       = asic3_gpio_irq_type,
+        .irq_ack        = asic3_mask_gpio_irq,
+        .irq_mask       = asic3_mask_gpio_irq,
+        .irq_unmask     = asic3_unmask_gpio_irq,
+        .irq_set_type   = asic3_gpio_irq_type,
 };
 
 static struct irq_chip asic3_irq_chip = {
         .name           = "ASIC3",
-        .ack            = asic3_mask_irq,
-        .mask           = asic3_mask_irq,
-        .unmask         = asic3_unmask_irq,
+        .irq_ack        = asic3_mask_irq,
+        .irq_mask       = asic3_mask_irq,
+        .irq_unmask     = asic3_unmask_irq,
 };
 
 static int __init asic3_irq_probe(struct platform_device *pdev)
@@ -635,7 +635,7 @@ static struct resource ds1wm_resources[] = {
         },
         {
                 .start = ASIC3_IRQ_OWM,
-                .start = ASIC3_IRQ_OWM,
+                .end   = ASIC3_IRQ_OWM,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
 };
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
new file mode 100644
index 000000000000..59ca6f151e78
--- /dev/null
+++ b/drivers/mfd/cs5535-mfd.c
@@ -0,0 +1,151 @@
+/*
+ * cs5535-mfd.c - core MFD driver for CS5535/CS5536 southbridges
+ *
+ * The CS5535 and CS5536 has an ISA bridge on the PCI bus that is
+ * used for accessing GPIOs, MFGPTs, ACPI, etc.  Each subdevice has
+ * an IO range that's specified in a single BAR.  The BAR order is
+ * hardcoded in the CS553x specifications.
+ *
+ * Copyright (c) 2010  Andres Salomon <dilinger@queued.net>
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
+#define DRV_NAME "cs5535-mfd"
+
+enum cs5535_mfd_bars {
+        SMB_BAR = 0,
+        GPIO_BAR = 1,
+        MFGPT_BAR = 2,
+        PMS_BAR = 4,
+        ACPI_BAR = 5,
+        NR_BARS,
+};
+
+static __devinitdata struct resource cs5535_mfd_resources[NR_BARS];
+
+static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {
+        {
+                .id = SMB_BAR,
+                .name = "cs5535-smb",
+                .num_resources = 1,
+                .resources = &cs5535_mfd_resources[SMB_BAR],
+        },
+        {
+                .id = GPIO_BAR,
+                .name = "cs5535-gpio",
+                .num_resources = 1,
+                .resources = &cs5535_mfd_resources[GPIO_BAR],
+        },
+        {
+                .id = MFGPT_BAR,
+                .name = "cs5535-mfgpt",
+                .num_resources = 1,
+                .resources = &cs5535_mfd_resources[MFGPT_BAR],
+        },
+        {
+                .id = PMS_BAR,
+                .name = "cs5535-pms",
+                .num_resources = 1,
+                .resources = &cs5535_mfd_resources[PMS_BAR],
+        },
+        {
+                .id = ACPI_BAR,
+                .name = "cs5535-acpi",
+                .num_resources = 1,
+                .resources = &cs5535_mfd_resources[ACPI_BAR],
+        },
+};
+
+static int __devinit cs5535_mfd_probe(struct pci_dev *pdev,
+                const struct pci_device_id *id)
+{
+        int err, i;
+
+        err = pci_enable_device(pdev);
+        if (err)
+                return err;
+
+        /* fill in IO range for each cell; subdrivers handle the region */
+        for (i = 0; i < ARRAY_SIZE(cs5535_mfd_cells); i++) {
+                int bar = cs5535_mfd_cells[i].id;
+                struct resource *r = &cs5535_mfd_resources[bar];
+
+                r->flags = IORESOURCE_IO;
+                r->start = pci_resource_start(pdev, bar);
+                r->end = pci_resource_end(pdev, bar);
+
+                /* id is used for temporarily storing BAR; unset it now */
+                cs5535_mfd_cells[i].id = 0;
+        }
+
+        err = mfd_add_devices(&pdev->dev, -1, cs5535_mfd_cells,
+                        ARRAY_SIZE(cs5535_mfd_cells), NULL, 0);
+        if (err) {
+                dev_err(&pdev->dev, "MFD add devices failed: %d\n", err);
+                goto err_disable;
+        }
+
+        dev_info(&pdev->dev, "%zu devices registered.\n",
+                        ARRAY_SIZE(cs5535_mfd_cells));
+
+        return 0;
+
+err_disable:
+        pci_disable_device(pdev);
+        return err;
+}
+
+static void __devexit cs5535_mfd_remove(struct pci_dev *pdev)
+{
+        mfd_remove_devices(&pdev->dev);
+        pci_disable_device(pdev);
+}
+
+static struct pci_device_id cs5535_mfd_pci_tbl[] = {
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, cs5535_mfd_pci_tbl);
+
+static struct pci_driver cs5535_mfd_drv = {
+        .name = DRV_NAME,
+        .id_table = cs5535_mfd_pci_tbl,
+        .probe = cs5535_mfd_probe,
+        .remove = __devexit_p(cs5535_mfd_remove),
+};
+
+static int __init cs5535_mfd_init(void)
+{
+        return pci_register_driver(&cs5535_mfd_drv);
+}
+
+static void __exit cs5535_mfd_exit(void)
+{
+        pci_unregister_driver(&cs5535_mfd_drv);
+}
+
+module_init(cs5535_mfd_init);
+module_exit(cs5535_mfd_exit);
+
+MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
+MODULE_DESCRIPTION("MFD driver for CS5535/CS5536 southbridge's ISA PCI device");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index c2b698d69a93..9e2d8dd5f9e5 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -144,26 +144,26 @@ int pcap_to_irq(struct pcap_chip *pcap, int irq)
 }
 EXPORT_SYMBOL_GPL(pcap_to_irq);
 
-static void pcap_mask_irq(unsigned int irq)
+static void pcap_mask_irq(struct irq_data *d)
 {
-        struct pcap_chip *pcap = get_irq_chip_data(irq);
+        struct pcap_chip *pcap = irq_data_get_irq_chip_data(d);
 
-        pcap->msr |= 1 << irq_to_pcap(pcap, irq);
+        pcap->msr |= 1 << irq_to_pcap(pcap, d->irq);
         queue_work(pcap->workqueue, &pcap->msr_work);
 }
 
-static void pcap_unmask_irq(unsigned int irq)
+static void pcap_unmask_irq(struct irq_data *d)
 {
-        struct pcap_chip *pcap = get_irq_chip_data(irq);
+        struct pcap_chip *pcap = irq_data_get_irq_chip_data(d);
 
-        pcap->msr &= ~(1 << irq_to_pcap(pcap, irq));
+        pcap->msr &= ~(1 << irq_to_pcap(pcap, d->irq));
         queue_work(pcap->workqueue, &pcap->msr_work);
 }
 
 static struct irq_chip pcap_irq_chip = {
-        .name   = "pcap",
-        .mask   = pcap_mask_irq,
-        .unmask = pcap_unmask_irq,
+        .name           = "pcap",
+        .irq_mask       = pcap_mask_irq,
+        .irq_unmask     = pcap_unmask_irq,
 };
 
 static void pcap_msr_work(struct work_struct *work)
@@ -199,8 +199,7 @@ static void pcap_isr_work(struct work_struct *work)
                         if (service & 1) {
                                 struct irq_desc *desc = irq_to_desc(irq);
 
-                                if (WARN(!desc, KERN_WARNING
-                                                "Invalid PCAP IRQ %d\n", irq))
+                                if (WARN(!desc, "Invalid PCAP IRQ %d\n", irq))
                                         break;
 
                                 if (desc->status & IRQ_DISABLED)
@@ -218,7 +217,7 @@ static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         struct pcap_chip *pcap = get_irq_data(irq);
 
-        desc->chip->ack(irq);
+        desc->irq_data.chip->irq_ack(&desc->irq_data);
         queue_work(pcap->workqueue, &pcap->isr_work);
         return;
 }
@@ -282,7 +281,7 @@ static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
         mutex_lock(&pcap->adc_mutex);
         req = pcap->adc_queue[pcap->adc_head];
 
-        if (WARN(!req, KERN_WARNING "adc irq without pending request\n")) {
+        if (WARN(!req, "adc irq without pending request\n")) {
                 mutex_unlock(&pcap->adc_mutex);
                 return IRQ_HANDLED;
         }
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index d3e74f8585e0..d00b6d1a69e5 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -70,31 +70,32 @@ static inline void ack_irqs(struct egpio_info *ei)
                         ei->ack_write, ei->ack_register << ei->bus_shift);
 }
 
-static void egpio_ack(unsigned int irq)
+static void egpio_ack(struct irq_data *data)
 {
 }
 
 /* There does not appear to be a way to proactively mask interrupts
  * on the egpio chip itself.  So, we simply ignore interrupts that
  * aren't desired. */
-static void egpio_mask(unsigned int irq)
+static void egpio_mask(struct irq_data *data)
 {
-        struct egpio_info *ei = get_irq_chip_data(irq);
-        ei->irqs_enabled &= ~(1 << (irq - ei->irq_start));
-        pr_debug("EGPIO mask %d %04x\n", irq, ei->irqs_enabled);
+        struct egpio_info *ei = irq_data_get_irq_chip_data(data);
+        ei->irqs_enabled &= ~(1 << (data->irq - ei->irq_start));
+        pr_debug("EGPIO mask %d %04x\n", data->irq, ei->irqs_enabled);
 }
-static void egpio_unmask(unsigned int irq)
+
+static void egpio_unmask(struct irq_data *data)
 {
-        struct egpio_info *ei = get_irq_chip_data(irq);
-        ei->irqs_enabled |= 1 << (irq - ei->irq_start);
-        pr_debug("EGPIO unmask %d %04x\n", irq, ei->irqs_enabled);
+        struct egpio_info *ei = irq_data_get_irq_chip_data(data);
+        ei->irqs_enabled |= 1 << (data->irq - ei->irq_start);
+        pr_debug("EGPIO unmask %d %04x\n", data->irq, ei->irqs_enabled);
 }
 
 static struct irq_chip egpio_muxed_chip = {
-        .name   = "htc-egpio",
-        .ack    = egpio_ack,
-        .mask   = egpio_mask,
-        .unmask = egpio_unmask,
+        .name           = "htc-egpio",
+        .irq_ack        = egpio_ack,
+        .irq_mask       = egpio_mask,
+        .irq_unmask     = egpio_unmask,
 };
 
 static void egpio_handler(unsigned int irq, struct irq_desc *desc)
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index 594c9a8e25e1..296ad1562f69 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -82,25 +82,25 @@ struct htcpld_data {
 /* There does not appear to be a way to proactively mask interrupts
  * on the htcpld chip itself.  So, we simply ignore interrupts that
  * aren't desired. */
-static void htcpld_mask(unsigned int irq)
+static void htcpld_mask(struct irq_data *data)
 {
-        struct htcpld_chip *chip = get_irq_chip_data(irq);
-        chip->irqs_enabled &= ~(1 << (irq - chip->irq_start));
-        pr_debug("HTCPLD mask %d %04x\n", irq, chip->irqs_enabled);
+        struct htcpld_chip *chip = irq_data_get_irq_chip_data(data);
+        chip->irqs_enabled &= ~(1 << (data->irq - chip->irq_start));
+        pr_debug("HTCPLD mask %d %04x\n", data->irq, chip->irqs_enabled);
 }
-static void htcpld_unmask(unsigned int irq)
+static void htcpld_unmask(struct irq_data *data)
 {
-        struct htcpld_chip *chip = get_irq_chip_data(irq);
-        chip->irqs_enabled |= 1 << (irq - chip->irq_start);
-        pr_debug("HTCPLD unmask %d %04x\n", irq, chip->irqs_enabled);
+        struct htcpld_chip *chip = irq_data_get_irq_chip_data(data);
+        chip->irqs_enabled |= 1 << (data->irq - chip->irq_start);
+        pr_debug("HTCPLD unmask %d %04x\n", data->irq, chip->irqs_enabled);
 }
 
-static int htcpld_set_type(unsigned int irq, unsigned int flags)
+static int htcpld_set_type(struct irq_data *data, unsigned int flags)
 {
-        struct irq_desc *d = irq_to_desc(irq);
+        struct irq_desc *d = irq_to_desc(data->irq);
 
         if (!d) {
-                pr_err("HTCPLD invalid IRQ: %d\n", irq);
+                pr_err("HTCPLD invalid IRQ: %d\n", data->irq);
                 return -EINVAL;
         }
 
@@ -118,10 +118,10 @@ static int htcpld_set_type(unsigned int irq, unsigned int flags)
 }
 
 static struct irq_chip htcpld_muxed_chip = {
-        .name     = "htcpld",
-        .mask     = htcpld_mask,
-        .unmask   = htcpld_unmask,
-        .set_type = htcpld_set_type,
+        .name         = "htcpld",
+        .irq_mask     = htcpld_mask,
+        .irq_unmask   = htcpld_unmask,
+        .irq_set_type = htcpld_set_type,
 };
 
 /* To properly dispatch IRQ events, we need to read from the
@@ -235,7 +235,7 @@ static irqreturn_t htcpld_handler(int irq, void *dev)
  * and that work is scheduled in the set routine.  The kernel can then run
  * the I2C functions, which will sleep, in process context.
  */
-void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val)
+static void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val)
 {
         struct i2c_client *client;
         struct htcpld_chip *chip_data;
@@ -259,7 +259,7 @@ void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val)
         schedule_work(&(chip_data->set_val_work));
 }
 
-void htcpld_chip_set_ni(struct work_struct *work)
+static void htcpld_chip_set_ni(struct work_struct *work)
 {
         struct htcpld_chip *chip_data;
         struct i2c_client *client;
@@ -269,7 +269,7 @@ void htcpld_chip_set_ni(struct work_struct *work)
         i2c_smbus_read_byte_data(client, chip_data->cache_out);
 }
 
-int htcpld_chip_get(struct gpio_chip *chip, unsigned offset)
+static int htcpld_chip_get(struct gpio_chip *chip, unsigned offset)
 {
         struct htcpld_chip *chip_data;
         int val = 0;
@@ -316,7 +316,7 @@ static int htcpld_direction_input(struct gpio_chip *chip,
         return (offset < chip->ngpio) ? 0 : -EINVAL;
 }
 
-int htcpld_chip_to_irq(struct gpio_chip *chip, unsigned offset)
+static int htcpld_chip_to_irq(struct gpio_chip *chip, unsigned offset)
 {
         struct htcpld_chip *chip_data;
 
@@ -328,7 +328,7 @@ int htcpld_chip_to_irq(struct gpio_chip *chip, unsigned offset)
                 return -EINVAL;
 }
 
-void htcpld_chip_reset(struct i2c_client *client)
+static void htcpld_chip_reset(struct i2c_client *client)
 {
         struct htcpld_chip *chip_data = i2c_get_clientdata(client);
         if (!chip_data)
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 9dd1b33f2275..0cc59795f600 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -84,31 +84,30 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,
         spin_unlock_irqrestore(&adc->lock, flags);
 }
 
-static void jz4740_adc_irq_mask(unsigned int irq)
+static void jz4740_adc_irq_mask(struct irq_data *data)
 {
-        struct jz4740_adc *adc = get_irq_chip_data(irq);
-        jz4740_adc_irq_set_masked(adc, irq, true);
+        struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
+        jz4740_adc_irq_set_masked(adc, data->irq, true);
 }
 
-static void jz4740_adc_irq_unmask(unsigned int irq)
+static void jz4740_adc_irq_unmask(struct irq_data *data)
 {
-        struct jz4740_adc *adc = get_irq_chip_data(irq);
-        jz4740_adc_irq_set_masked(adc, irq, false);
+        struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
+        jz4740_adc_irq_set_masked(adc, data->irq, false);
 }
 
-static void jz4740_adc_irq_ack(unsigned int irq)
+static void jz4740_adc_irq_ack(struct irq_data *data)
 {
-        struct jz4740_adc *adc = get_irq_chip_data(irq);
-
-        irq -= adc->irq_base;
+        struct jz4740_adc *adc = irq_data_get_irq_chip_data(data);
+        unsigned int irq = data->irq - adc->irq_base;
         writeb(BIT(irq), adc->base + JZ_REG_ADC_STATUS);
 }
 
 static struct irq_chip jz4740_adc_irq_chip = {
         .name = "jz4740-adc",
-        .mask = jz4740_adc_irq_mask,
-        .unmask = jz4740_adc_irq_unmask,
-        .ack = jz4740_adc_irq_ack,
+        .irq_mask = jz4740_adc_irq_mask,
+        .irq_unmask = jz4740_adc_irq_unmask,
+        .irq_ack = jz4740_adc_irq_ack,
 };
 
 static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc)
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 44695f5a1800..0e998dc4e7d8 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -407,16 +407,16 @@ static irqreturn_t max8925_tsc_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void max8925_irq_lock(unsigned int irq)
+static void max8925_irq_lock(struct irq_data *data)
 {
-        struct max8925_chip *chip = get_irq_chip_data(irq);
+        struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&chip->irq_lock);
 }
 
-static void max8925_irq_sync_unlock(unsigned int irq)
+static void max8925_irq_sync_unlock(struct irq_data *data)
 {
-        struct max8925_chip *chip = get_irq_chip_data(irq);
+        struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
         struct max8925_irq_data *irq_data;
         static unsigned char cache_chg[2] = {0xff, 0xff};
         static unsigned char cache_on[2] = {0xff, 0xff};
@@ -492,25 +492,25 @@ static void max8925_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&chip->irq_lock);
 }
 
-static void max8925_irq_enable(unsigned int irq)
+static void max8925_irq_enable(struct irq_data *data)
 {
-        struct max8925_chip *chip = get_irq_chip_data(irq);
-        max8925_irqs[irq - chip->irq_base].enable
-                = max8925_irqs[irq - chip->irq_base].offs;
+        struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+        max8925_irqs[data->irq - chip->irq_base].enable
+                = max8925_irqs[data->irq - chip->irq_base].offs;
 }
 
-static void max8925_irq_disable(unsigned int irq)
+static void max8925_irq_disable(struct irq_data *data)
 {
-        struct max8925_chip *chip = get_irq_chip_data(irq);
-        max8925_irqs[irq - chip->irq_base].enable = 0;
+        struct max8925_chip *chip = irq_data_get_irq_chip_data(data);
+        max8925_irqs[data->irq - chip->irq_base].enable = 0;
 }
 
 static struct irq_chip max8925_irq_chip = {
         .name           = "max8925",
-        .bus_lock       = max8925_irq_lock,
-        .bus_sync_unlock = max8925_irq_sync_unlock,
-        .enable         = max8925_irq_enable,
-        .disable        = max8925_irq_disable,
+        .irq_bus_lock   = max8925_irq_lock,
+        .irq_bus_sync_unlock = max8925_irq_sync_unlock,
+        .irq_enable     = max8925_irq_enable,
+        .irq_disable    = max8925_irq_disable,
 };
 
 static int max8925_irq_init(struct max8925_chip *chip, int irq,
diff --git a/drivers/mfd/max8998-irq.c b/drivers/mfd/max8998-irq.c
index 45bfe77b639b..3903e1fbb334 100644
--- a/drivers/mfd/max8998-irq.c
+++ b/drivers/mfd/max8998-irq.c
@@ -102,16 +102,16 @@ irq_to_max8998_irq(struct max8998_dev *max8998, int irq)
         return &max8998_irqs[irq - max8998->irq_base];
 }
 
-static void max8998_irq_lock(unsigned int irq)
+static void max8998_irq_lock(struct irq_data *data)
 {
-        struct max8998_dev *max8998 = get_irq_chip_data(irq);
+        struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&max8998->irqlock);
 }
 
-static void max8998_irq_sync_unlock(unsigned int irq)
+static void max8998_irq_sync_unlock(struct irq_data *data)
 {
-        struct max8998_dev *max8998 = get_irq_chip_data(irq);
+        struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(max8998->irq_masks_cur); i++) {
@@ -129,28 +129,30 @@ static void max8998_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&max8998->irqlock);
 }
 
-static void max8998_irq_unmask(unsigned int irq)
+static void max8998_irq_unmask(struct irq_data *data)
 {
-        struct max8998_dev *max8998 = get_irq_chip_data(irq);
-        struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq);
+        struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
+        struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998,
+                                                               data->irq);
 
         max8998->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;
 }
 
-static void max8998_irq_mask(unsigned int irq)
+static void max8998_irq_mask(struct irq_data *data)
 {
-        struct max8998_dev *max8998 = get_irq_chip_data(irq);
-        struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq);
+        struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
+        struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998,
+                                                               data->irq);
 
         max8998->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
 }
 
 static struct irq_chip max8998_irq_chip = {
         .name = "max8998",
-        .bus_lock = max8998_irq_lock,
-        .bus_sync_unlock = max8998_irq_sync_unlock,
-        .mask = max8998_irq_mask,
-        .unmask = max8998_irq_unmask,
+        .irq_bus_lock = max8998_irq_lock,
+        .irq_bus_sync_unlock = max8998_irq_sync_unlock,
+        .irq_mask = max8998_irq_mask,
+        .irq_unmask = max8998_irq_unmask,
 };
 
 static irqreturn_t max8998_irq_thread(int irq, void *data)
@@ -181,6 +183,13 @@ static irqreturn_t max8998_irq_thread(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+int max8998_irq_resume(struct max8998_dev *max8998)
+{
+        if (max8998->irq && max8998->irq_base)
+                max8998_irq_thread(max8998->irq_base, max8998);
+        return 0;
+}
+
 int max8998_irq_init(struct max8998_dev *max8998)
 {
         int i;
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index bb9977bebe78..bbfe86732602 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -25,6 +25,8 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/pm_runtime.h>
 #include <linux/mutex.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max8998.h>
@@ -40,6 +42,14 @@ static struct mfd_cell max8998_devs[] = {
         },
 };
 
+static struct mfd_cell lp3974_devs[] = {
+        {
+                .name = "lp3974-pmic",
+        }, {
+                .name = "lp3974-rtc",
+        },
+};
+
 int max8998_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest)
 {
         struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
@@ -135,6 +145,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
         if (pdata) {
                 max8998->ono = pdata->ono;
                 max8998->irq_base = pdata->irq_base;
+                max8998->wakeup = pdata->wakeup;
         }
         mutex_init(&max8998->iolock);
 
@@ -143,9 +154,23 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
 
         max8998_irq_init(max8998);
 
-        ret = mfd_add_devices(max8998->dev, -1,
-                              max8998_devs, ARRAY_SIZE(max8998_devs),
-                              NULL, 0);
+        pm_runtime_set_active(max8998->dev);
+
+        switch (id->driver_data) {
+        case TYPE_LP3974:
+                ret = mfd_add_devices(max8998->dev, -1,
+                                lp3974_devs, ARRAY_SIZE(lp3974_devs),
+                                NULL, 0);
+                break;
+        case TYPE_MAX8998:
+                ret = mfd_add_devices(max8998->dev, -1,
+                                max8998_devs, ARRAY_SIZE(max8998_devs),
+                                NULL, 0);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
         if (ret < 0)
                 goto err;
 
@@ -178,10 +203,113 @@ static const struct i2c_device_id max8998_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);
 
+static int max8998_suspend(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
+
+        if (max8998->wakeup)
+                set_irq_wake(max8998->irq, 1);
+        return 0;
+}
+
+static int max8998_resume(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8998_dev *max8998 = i2c_get_clientdata(i2c);
+
+        if (max8998->wakeup)
+                set_irq_wake(max8998->irq, 0);
+        /*
+         * In LP3974, if IRQ registers are not "read & clear"
+         * when it's set during sleep, the interrupt becomes
+         * disabled.
+         */
+        return max8998_irq_resume(i2c_get_clientdata(i2c));
+}
+
+struct max8998_reg_dump {
+        u8      addr;
+        u8      val;
+};
+#define SAVE_ITEM(x)    { .addr = (x), .val = 0x0, }
+struct max8998_reg_dump max8998_dump[] = {
+        SAVE_ITEM(MAX8998_REG_IRQM1),
+        SAVE_ITEM(MAX8998_REG_IRQM2),
+        SAVE_ITEM(MAX8998_REG_IRQM3),
+        SAVE_ITEM(MAX8998_REG_IRQM4),
+        SAVE_ITEM(MAX8998_REG_STATUSM1),
+        SAVE_ITEM(MAX8998_REG_STATUSM2),
+        SAVE_ITEM(MAX8998_REG_CHGR1),
+        SAVE_ITEM(MAX8998_REG_CHGR2),
+        SAVE_ITEM(MAX8998_REG_LDO_ACTIVE_DISCHARGE1),
+        SAVE_ITEM(MAX8998_REG_LDO_ACTIVE_DISCHARGE1),
+        SAVE_ITEM(MAX8998_REG_BUCK_ACTIVE_DISCHARGE3),
+        SAVE_ITEM(MAX8998_REG_ONOFF1),
+        SAVE_ITEM(MAX8998_REG_ONOFF2),
+        SAVE_ITEM(MAX8998_REG_ONOFF3),
+        SAVE_ITEM(MAX8998_REG_ONOFF4),
+        SAVE_ITEM(MAX8998_REG_BUCK1_VOLTAGE1),
+        SAVE_ITEM(MAX8998_REG_BUCK1_VOLTAGE2),
+        SAVE_ITEM(MAX8998_REG_BUCK1_VOLTAGE3),
+        SAVE_ITEM(MAX8998_REG_BUCK1_VOLTAGE4),
+        SAVE_ITEM(MAX8998_REG_BUCK2_VOLTAGE1),
+        SAVE_ITEM(MAX8998_REG_BUCK2_VOLTAGE2),
+        SAVE_ITEM(MAX8998_REG_LDO2_LDO3),
+        SAVE_ITEM(MAX8998_REG_LDO4),
+        SAVE_ITEM(MAX8998_REG_LDO5),
+        SAVE_ITEM(MAX8998_REG_LDO6),
+        SAVE_ITEM(MAX8998_REG_LDO7),
+        SAVE_ITEM(MAX8998_REG_LDO8_LDO9),
+        SAVE_ITEM(MAX8998_REG_LDO10_LDO11),
+        SAVE_ITEM(MAX8998_REG_LDO12),
+        SAVE_ITEM(MAX8998_REG_LDO13),
+        SAVE_ITEM(MAX8998_REG_LDO14),
+        SAVE_ITEM(MAX8998_REG_LDO15),
+        SAVE_ITEM(MAX8998_REG_LDO16),
+        SAVE_ITEM(MAX8998_REG_LDO17),
+        SAVE_ITEM(MAX8998_REG_BKCHR),
+        SAVE_ITEM(MAX8998_REG_LBCNFG1),
+        SAVE_ITEM(MAX8998_REG_LBCNFG2),
+};
+/* Save registers before hibernation */
+static int max8998_freeze(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(max8998_dump); i++)
+                max8998_read_reg(i2c, max8998_dump[i].addr,
+                                &max8998_dump[i].val);
+
+        return 0;
+}
+
+/* Restore registers after hibernation */
+static int max8998_restore(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(max8998_dump); i++)
+                max8998_write_reg(i2c, max8998_dump[i].addr,
+                                max8998_dump[i].val);
+
+        return 0;
+}
+
+const struct dev_pm_ops max8998_pm = {
+        .suspend = max8998_suspend,
+        .resume = max8998_resume,
+        .freeze = max8998_freeze,
+        .restore = max8998_restore,
+};
+
 static struct i2c_driver max8998_i2c_driver = {
         .driver = {
                    .name = "max8998",
                    .owner = THIS_MODULE,
+                   .pm = &max8998_pm,
         },
         .probe = max8998_i2c_probe,
         .remove = max8998_i2c_remove,
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index a2ac2ed6d64c..b9fcaf0004da 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -749,7 +749,7 @@ static int mc13xxx_probe(struct spi_device *spi)
         if (ret) {
 err_mask:
 err_revision:
-                mutex_unlock(&mc13xxx->lock);
+                mc13xxx_unlock(mc13xxx);
                 dev_set_drvdata(&spi->dev, NULL);
                 kfree(mc13xxx);
                 return ret;
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index ec99f681e773..d83ad0f141af 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include <linux/mfd/core.h>
+#include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
 static int mfd_add_device(struct device *parent, int id,
@@ -82,6 +83,9 @@ static int mfd_add_device(struct device *parent, int id,
         if (ret)
                 goto fail_res;
 
+        if (cell->pm_runtime_no_callbacks)
+                pm_runtime_no_callbacks(&pdev->dev);
+
         kfree(res);
 
         return 0;
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index bc9275c12133..5de3a760ea1e 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -26,7 +26,7 @@
 #include <linux/sm501-regs.h>
 #include <linux/serial_8250.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 struct sm501_device {
         struct list_head                list;
@@ -745,11 +745,8 @@ static int sm501_register_device(struct sm501_devdata *sm,
         int ret;
 
         for (ptr = 0; ptr < pdev->num_resources; ptr++) {
-                printk(KERN_DEBUG "%s[%d] flags %08lx: %08llx..%08llx\n",
-                       pdev->name, ptr,
-                       pdev->resource[ptr].flags,
-                       (unsigned long long)pdev->resource[ptr].start,
-                       (unsigned long long)pdev->resource[ptr].end);
+                printk(KERN_DEBUG "%s[%d] %pR\n",
+                       pdev->name, ptr, &pdev->resource[ptr]);
         }
 
         ret = platform_device_register(pdev);
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index b11487f1e1cb..3e5732b58c49 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -699,16 +699,16 @@ static irqreturn_t stmpe_irq(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void stmpe_irq_lock(unsigned int irq)
+static void stmpe_irq_lock(struct irq_data *data)
 {
-        struct stmpe *stmpe = get_irq_chip_data(irq);
+        struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&stmpe->irq_lock);
 }
 
-static void stmpe_irq_sync_unlock(unsigned int irq)
+static void stmpe_irq_sync_unlock(struct irq_data *data)
 {
-        struct stmpe *stmpe = get_irq_chip_data(irq);
+        struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
         struct stmpe_variant_info *variant = stmpe->variant;
         int num = DIV_ROUND_UP(variant->num_irqs, 8);
         int i;
@@ -727,20 +727,20 @@ static void stmpe_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&stmpe->irq_lock);
 }
 
-static void stmpe_irq_mask(unsigned int irq)
+static void stmpe_irq_mask(struct irq_data *data)
 {
-        struct stmpe *stmpe = get_irq_chip_data(irq);
-        int offset = irq - stmpe->irq_base;
+        struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
+        int offset = data->irq - stmpe->irq_base;
         int regoffset = offset / 8;
         int mask = 1 << (offset % 8);
 
         stmpe->ier[regoffset] &= ~mask;
 }
 
-static void stmpe_irq_unmask(unsigned int irq)
+static void stmpe_irq_unmask(struct irq_data *data)
 {
-        struct stmpe *stmpe = get_irq_chip_data(irq);
-        int offset = irq - stmpe->irq_base;
+        struct stmpe *stmpe = irq_data_get_irq_chip_data(data);
+        int offset = data->irq - stmpe->irq_base;
         int regoffset = offset / 8;
         int mask = 1 << (offset % 8);
 
@@ -749,10 +749,10 @@ static void stmpe_irq_unmask(unsigned int irq)
 
 static struct irq_chip stmpe_irq_chip = {
         .name                   = "stmpe",
-        .bus_lock               = stmpe_irq_lock,
-        .bus_sync_unlock        = stmpe_irq_sync_unlock,
-        .mask                   = stmpe_irq_mask,
-        .unmask                 = stmpe_irq_unmask,
+        .irq_bus_lock           = stmpe_irq_lock,
+        .irq_bus_sync_unlock    = stmpe_irq_sync_unlock,
+        .irq_mask               = stmpe_irq_mask,
+        .irq_unmask             = stmpe_irq_unmask,
 };
 
 static int __devinit stmpe_irq_init(struct stmpe *stmpe)
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 006c121f3f0d..9caeb4ac6ea6 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -199,37 +199,37 @@ static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
                                 generic_handle_irq(irq_base + i);
 }
 
-static void t7l66xb_irq_mask(unsigned int irq)
+static void t7l66xb_irq_mask(struct irq_data *data)
 {
-        struct t7l66xb *t7l66xb = get_irq_chip_data(irq);
+        struct t7l66xb *t7l66xb = irq_data_get_irq_chip_data(data);
         unsigned long                   flags;
         u8 imr;
 
         spin_lock_irqsave(&t7l66xb->lock, flags);
         imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
-        imr |= 1 << (irq - t7l66xb->irq_base);
+        imr |= 1 << (data->irq - t7l66xb->irq_base);
         tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
         spin_unlock_irqrestore(&t7l66xb->lock, flags);
 }
 
-static void t7l66xb_irq_unmask(unsigned int irq)
+static void t7l66xb_irq_unmask(struct irq_data *data)
 {
-        struct t7l66xb *t7l66xb = get_irq_chip_data(irq);
+        struct t7l66xb *t7l66xb = irq_data_get_irq_chip_data(data);
         unsigned long flags;
         u8 imr;
 
         spin_lock_irqsave(&t7l66xb->lock, flags);
         imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
-        imr &= ~(1 << (irq - t7l66xb->irq_base));
+        imr &= ~(1 << (data->irq - t7l66xb->irq_base));
         tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
         spin_unlock_irqrestore(&t7l66xb->lock, flags);
 }
 
 static struct irq_chip t7l66xb_chip = {
-        .name   = "t7l66xb",
-        .ack    = t7l66xb_irq_mask,
-        .mask   = t7l66xb_irq_mask,
-        .unmask = t7l66xb_irq_unmask,
+        .name           = "t7l66xb",
+        .irq_ack        = t7l66xb_irq_mask,
+        .irq_mask       = t7l66xb_irq_mask,
+        .irq_unmask     = t7l66xb_irq_unmask,
 };
 
 /*--------------------------------------------------------------------------*/
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 1ea80d8ad915..9a238633a54d 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -527,41 +527,41 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc)
                 }
 }
 
-static void tc6393xb_irq_ack(unsigned int irq)
+static void tc6393xb_irq_ack(struct irq_data *data)
 {
 }
 
-static void tc6393xb_irq_mask(unsigned int irq)
+static void tc6393xb_irq_mask(struct irq_data *data)
 {
-        struct tc6393xb *tc6393xb = get_irq_chip_data(irq);
+        struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(data);
         unsigned long flags;
         u8 imr;
 
         spin_lock_irqsave(&tc6393xb->lock, flags);
         imr = tmio_ioread8(tc6393xb->scr + SCR_IMR);
-        imr |= 1 << (irq - tc6393xb->irq_base);
+        imr |= 1 << (data->irq - tc6393xb->irq_base);
         tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR);
         spin_unlock_irqrestore(&tc6393xb->lock, flags);
 }
 
-static void tc6393xb_irq_unmask(unsigned int irq)
+static void tc6393xb_irq_unmask(struct irq_data *data)
 {
-        struct tc6393xb *tc6393xb = get_irq_chip_data(irq);
+        struct tc6393xb *tc6393xb = irq_data_get_irq_chip_data(data);
         unsigned long flags;
         u8 imr;
 
         spin_lock_irqsave(&tc6393xb->lock, flags);
         imr = tmio_ioread8(tc6393xb->scr + SCR_IMR);
-        imr &= ~(1 << (irq - tc6393xb->irq_base));
+        imr &= ~(1 << (data->irq - tc6393xb->irq_base));
         tmio_iowrite8(imr, tc6393xb->scr + SCR_IMR);
         spin_unlock_irqrestore(&tc6393xb->lock, flags);
 }
 
 static struct irq_chip tc6393xb_chip = {
-        .name   = "tc6393xb",
-        .ack    = tc6393xb_irq_ack,
-        .mask   = tc6393xb_irq_mask,
-        .unmask = tc6393xb_irq_unmask,
+        .name           = "tc6393xb",
+        .irq_ack        = tc6393xb_irq_ack,
+        .irq_mask       = tc6393xb_irq_mask,
+        .irq_unmask     = tc6393xb_irq_unmask,
 };
 
 static void tc6393xb_attach_irq(struct platform_device *dev)
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 90187fe33e04..93d5fdf020c7 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -34,7 +34,7 @@
 
 #include <linux/i2c/tps65010.h>
 
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index b4931ab34929..627cf577b16d 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -46,8 +46,6 @@
 
 /* device id */
 #define TPS6586X_VERSIONCRC     0xcd
-#define TPS658621A_VERSIONCRC   0x15
-#define TPS658621C_VERSIONCRC   0x2c
 
 struct tps6586x_irq_data {
         u8      mask_reg;
@@ -325,37 +323,37 @@ static int tps6586x_remove_subdevs(struct tps6586x *tps6586x)
         return device_for_each_child(tps6586x->dev, NULL, __remove_subdev);
 }
 
-static void tps6586x_irq_lock(unsigned int irq)
+static void tps6586x_irq_lock(struct irq_data *data)
 {
-        struct tps6586x *tps6586x = get_irq_chip_data(irq);
+        struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&tps6586x->irq_lock);
 }
 
-static void tps6586x_irq_enable(unsigned int irq)
+static void tps6586x_irq_enable(struct irq_data *irq_data)
 {
-        struct tps6586x *tps6586x = get_irq_chip_data(irq);
-        unsigned int __irq = irq - tps6586x->irq_base;
+        struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);
+        unsigned int __irq = irq_data->irq - tps6586x->irq_base;
         const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
 
         tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask;
         tps6586x->irq_en |= (1 << __irq);
 }
 
-static void tps6586x_irq_disable(unsigned int irq)
+static void tps6586x_irq_disable(struct irq_data *irq_data)
 {
-        struct tps6586x *tps6586x = get_irq_chip_data(irq);
+        struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);
 
-        unsigned int __irq = irq - tps6586x->irq_base;
+        unsigned int __irq = irq_data->irq - tps6586x->irq_base;
         const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
 
         tps6586x->mask_reg[data->mask_reg] |= data->mask_mask;
         tps6586x->irq_en &= ~(1 << __irq);
 }
 
-static void tps6586x_irq_sync_unlock(unsigned int irq)
+static void tps6586x_irq_sync_unlock(struct irq_data *data)
 {
-        struct tps6586x *tps6586x = get_irq_chip_data(irq);
+        struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(tps6586x->mask_reg); i++) {
@@ -421,10 +419,10 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
         tps6586x->irq_base = irq_base;
 
         tps6586x->irq_chip.name = "tps6586x";
-        tps6586x->irq_chip.enable = tps6586x_irq_enable;
-        tps6586x->irq_chip.disable = tps6586x_irq_disable;
-        tps6586x->irq_chip.bus_lock = tps6586x_irq_lock;
-        tps6586x->irq_chip.bus_sync_unlock = tps6586x_irq_sync_unlock;
+        tps6586x->irq_chip.irq_enable = tps6586x_irq_enable;
+        tps6586x->irq_chip.irq_disable = tps6586x_irq_disable;
+        tps6586x->irq_chip.irq_bus_lock = tps6586x_irq_lock;
+        tps6586x->irq_chip.irq_bus_sync_unlock = tps6586x_irq_sync_unlock;
 
         for (i = 0; i < ARRAY_SIZE(tps6586x_irqs); i++) {
                 int __irq = i + tps6586x->irq_base;
@@ -498,11 +496,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
                 return -EIO;
         }
 
-        if ((ret != TPS658621A_VERSIONCRC) &&
-            (ret != TPS658621C_VERSIONCRC)) {
-                dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
-                return -ENODEV;
-        }
+        dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);
 
         tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL);
         if (tps6586x == NULL)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 12abd5b924b3..a35fa7dcbf53 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1003,7 +1003,7 @@ static int twl_remove(struct i2c_client *client)
 }
 
 /* NOTE:  this driver only handles a single twl4030/tps659x0 chip */
-static int __init
+static int __devinit
 twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         int                             status;
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 5d3a1478004b..63a30e88908f 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -599,38 +599,38 @@ static void twl4030_sih_do_edge(struct work_struct *work)
  * completion, potentially including some re-ordering, of these requests.
  */
 
-static void twl4030_sih_mask(unsigned irq)
+static void twl4030_sih_mask(struct irq_data *data)
 {
-        struct sih_agent *sih = get_irq_chip_data(irq);
+        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
         unsigned long flags;
 
         spin_lock_irqsave(&sih_agent_lock, flags);
-        sih->imr |= BIT(irq - sih->irq_base);
+        sih->imr |= BIT(data->irq - sih->irq_base);
         sih->imr_change_pending = true;
         queue_work(wq, &sih->mask_work);
         spin_unlock_irqrestore(&sih_agent_lock, flags);
 }
 
-static void twl4030_sih_unmask(unsigned irq)
+static void twl4030_sih_unmask(struct irq_data *data)
 {
-        struct sih_agent *sih = get_irq_chip_data(irq);
+        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
         unsigned long flags;
 
         spin_lock_irqsave(&sih_agent_lock, flags);
-        sih->imr &= ~BIT(irq - sih->irq_base);
+        sih->imr &= ~BIT(data->irq - sih->irq_base);
         sih->imr_change_pending = true;
         queue_work(wq, &sih->mask_work);
         spin_unlock_irqrestore(&sih_agent_lock, flags);
 }
 
-static int twl4030_sih_set_type(unsigned irq, unsigned trigger)
+static int twl4030_sih_set_type(struct irq_data *data, unsigned trigger)
 {
-        struct sih_agent *sih = get_irq_chip_data(irq);
-        struct irq_desc *desc = irq_to_desc(irq);
+        struct sih_agent *sih = irq_data_get_irq_chip_data(data);
+        struct irq_desc *desc = irq_to_desc(data->irq);
         unsigned long flags;
 
         if (!desc) {
-                pr_err("twl4030: Invalid IRQ: %d\n", irq);
+                pr_err("twl4030: Invalid IRQ: %d\n", data->irq);
                 return -EINVAL;
         }
 
@@ -641,7 +641,7 @@ static int twl4030_sih_set_type(unsigned irq, unsigned trigger)
         if ((desc->status & IRQ_TYPE_SENSE_MASK) != trigger) {
                 desc->status &= ~IRQ_TYPE_SENSE_MASK;
                 desc->status |= trigger;
-                sih->edge_change |= BIT(irq - sih->irq_base);
+                sih->edge_change |= BIT(data->irq - sih->irq_base);
                 queue_work(wq, &sih->edge_work);
         }
         spin_unlock_irqrestore(&sih_agent_lock, flags);
@@ -650,9 +650,9 @@ static int twl4030_sih_set_type(unsigned irq, unsigned trigger)
 
 static struct irq_chip twl4030_sih_irq_chip = {
         .name           = "twl4030",
-        .mask           = twl4030_sih_mask,
-        .unmask         = twl4030_sih_unmask,
-        .set_type       = twl4030_sih_set_type,
+        .irq_mask       = twl4030_sih_mask,
+        .irq_unmask     = twl4030_sih_unmask,
+        .irq_set_type   = twl4030_sih_set_type,
 };
 
 /*----------------------------------------------------------------------*/
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 06c8955907e9..4082ed73613f 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -332,7 +332,7 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
          */
         twl6030_irq_chip = dummy_irq_chip;
         twl6030_irq_chip.name = "twl6030";
-        twl6030_irq_chip.set_type = NULL;
+        twl6030_irq_chip.irq_set_type = NULL;
 
         for (i = irq_base; i < irq_end; i++) {
                 set_irq_chip_and_handler(i, &twl6030_irq_chip,
diff --git a/drivers/mfd/vx855.c b/drivers/mfd/vx855.c
index ebb059765edd..348052aa5dbf 100644
--- a/drivers/mfd/vx855.c
+++ b/drivers/mfd/vx855.c
@@ -112,7 +112,7 @@ out:
         return ret;
 }
 
-static void vx855_remove(struct pci_dev *pdev)
+static void __devexit vx855_remove(struct pci_dev *pdev)
 {
         mfd_remove_devices(&pdev->dev);
         pci_disable_device(pdev);
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 76cadcf3b1fe..3fe9a58fe6c7 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1541,6 +1541,12 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 dev_info(wm831x->dev, "WM8325 revision %c\n", 'A' + rev);
                 break;
 
+        case WM8326:
+                parent = WM8326;
+                wm831x->num_gpio = 12;
+                dev_info(wm831x->dev, "WM8326 revision %c\n", 'A' + rev);
+                break;
+
         default:
                 dev_err(wm831x->dev, "Unknown WM831x device %04x\n", ret);
                 ret = -EINVAL;
@@ -1610,18 +1616,9 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 break;
 
         case WM8320:
-                ret = mfd_add_devices(wm831x->dev, -1,
-                                      wm8320_devs, ARRAY_SIZE(wm8320_devs),
-                                      NULL, 0);
-                break;
-
         case WM8321:
-                ret = mfd_add_devices(wm831x->dev, -1,
-                                      wm8320_devs, ARRAY_SIZE(wm8320_devs),
-                                      NULL, 0);
-                break;
-
         case WM8325:
+        case WM8326:
                 ret = mfd_add_devices(wm831x->dev, -1,
                                       wm8320_devs, ARRAY_SIZE(wm8320_devs),
                                       NULL, wm831x->irq_base);
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 156b19859e81..3853fa8e7cc2 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -94,9 +94,9 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
         return 0;
 }
 
-static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
+static int wm831x_i2c_suspend(struct device *dev)
 {
-        struct wm831x *wm831x = i2c_get_clientdata(i2c);
+        struct wm831x *wm831x = dev_get_drvdata(dev);
 
         return wm831x_device_suspend(wm831x);
 }
@@ -108,19 +108,23 @@ static const struct i2c_device_id wm831x_i2c_id[] = {
         { "wm8320", WM8320 },
         { "wm8321", WM8321 },
         { "wm8325", WM8325 },
+        { "wm8326", WM8326 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id);
 
+static const struct dev_pm_ops wm831x_pm_ops = {
+        .suspend = wm831x_i2c_suspend,
+};
 
 static struct i2c_driver wm831x_i2c_driver = {
         .driver = {
-                   .name = "wm831x",
-                   .owner = THIS_MODULE,
+                .name = "wm831x",
+                .owner = THIS_MODULE,
+                .pm = &wm831x_pm_ops,
         },
         .probe = wm831x_i2c_probe,
         .remove = wm831x_i2c_remove,
-        .suspend = wm831x_i2c_suspend,
         .id_table = wm831x_i2c_id,
 };
 
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
index 294183b6260b..f7192d438aab 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
@@ -345,16 +345,16 @@ static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,
         return &wm831x_irqs[irq - wm831x->irq_base];
 }
 
-static void wm831x_irq_lock(unsigned int irq)
+static void wm831x_irq_lock(struct irq_data *data)
 {
-        struct wm831x *wm831x = get_irq_chip_data(irq);
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&wm831x->irq_lock);
 }
 
-static void wm831x_irq_sync_unlock(unsigned int irq)
+static void wm831x_irq_sync_unlock(struct irq_data *data)
 {
-        struct wm831x *wm831x = get_irq_chip_data(irq);
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(wm831x->irq_masks_cur); i++) {
@@ -371,28 +371,30 @@ static void wm831x_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&wm831x->irq_lock);
 }
 
-static void wm831x_irq_unmask(unsigned int irq)
+static void wm831x_irq_unmask(struct irq_data *data)
 {
-        struct wm831x *wm831x = get_irq_chip_data(irq);
-        struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x, irq);
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
+        struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
+                                                             data->irq);
 
         wm831x->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;
 }
 
-static void wm831x_irq_mask(unsigned int irq)
+static void wm831x_irq_mask(struct irq_data *data)
 {
-        struct wm831x *wm831x = get_irq_chip_data(irq);
-        struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x, irq);
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
+        struct wm831x_irq_data *irq_data = irq_to_wm831x_irq(wm831x,
+                                                             data->irq);
 
         wm831x->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
 }
 
-static int wm831x_irq_set_type(unsigned int irq, unsigned int type)
+static int wm831x_irq_set_type(struct irq_data *data, unsigned int type)
 {
-        struct wm831x *wm831x = get_irq_chip_data(irq);
-        int val;
+        struct wm831x *wm831x = irq_data_get_irq_chip_data(data);
+        int val, irq;
 
-        irq = irq - wm831x->irq_base;
+        irq = data->irq - wm831x->irq_base;
 
         if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11) {
                 /* Ignore internal-only IRQs */
@@ -421,12 +423,12 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type)
 }
 
 static struct irq_chip wm831x_irq_chip = {
-        .name = "wm831x",
-        .bus_lock = wm831x_irq_lock,
-        .bus_sync_unlock = wm831x_irq_sync_unlock,
-        .mask = wm831x_irq_mask,
-        .unmask = wm831x_irq_unmask,
-        .set_type = wm831x_irq_set_type,
+        .name                   = "wm831x",
+        .irq_bus_lock           = wm831x_irq_lock,
+        .irq_bus_sync_unlock    = wm831x_irq_sync_unlock,
+        .irq_mask               = wm831x_irq_mask,
+        .irq_unmask             = wm831x_irq_unmask,
+        .irq_set_type           = wm831x_irq_set_type,
 };
 
 /* The processing of the primary interrupt occurs in a thread so that
@@ -515,6 +517,17 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
                 return 0;
         }
 
+        /* Try to flag /IRQ as a wake source; there are a number of
+         * unconditional wake sources in the PMIC so this isn't
+         * conditional but we don't actually care *too* much if it
+         * fails.
+         */
+        ret = enable_irq_wake(irq);
+        if (ret != 0) {
+                dev_warn(wm831x->dev, "Can't enable IRQ as wake source: %d\n",
+                         ret);
+        }
+
         wm831x->irq = irq;
         wm831x->irq_base = pdata->irq_base;
 
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 2789b151b0f9..0a8f772be88c 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -81,6 +81,8 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
                 type = WM8321;
         else if (strcmp(spi->modalias, "wm8325") == 0)
                 type = WM8325;
+        else if (strcmp(spi->modalias, "wm8326") == 0)
+                type = WM8326;
         else {
                 dev_err(&spi->dev, "Unknown device type\n");
                 return -EINVAL;
@@ -184,6 +186,17 @@ static struct spi_driver wm8325_spi_driver = {
         .suspend        = wm831x_spi_suspend,
 };
 
+static struct spi_driver wm8326_spi_driver = {
+        .driver = {
+                .name   = "wm8326",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = wm831x_spi_probe,
+        .remove         = __devexit_p(wm831x_spi_remove),
+        .suspend        = wm831x_spi_suspend,
+};
+
 static int __init wm831x_spi_init(void)
 {
         int ret;
@@ -212,12 +225,17 @@ static int __init wm831x_spi_init(void)
         if (ret != 0)
                 pr_err("Failed to register WM8325 SPI driver: %d\n", ret);
 
+        ret = spi_register_driver(&wm8326_spi_driver);
+        if (ret != 0)
+                pr_err("Failed to register WM8326 SPI driver: %d\n", ret);
+
         return 0;
 }
 subsys_initcall(wm831x_spi_init);
 
 static void __exit wm831x_spi_exit(void)
 {
+        spi_unregister_driver(&wm8326_spi_driver);
         spi_unregister_driver(&wm8325_spi_driver);
         spi_unregister_driver(&wm8321_spi_driver);
         spi_unregister_driver(&wm8320_spi_driver);
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index f56c9adf9493..5839966ebd85 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -417,16 +417,16 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data)
         return IRQ_HANDLED;
 }
 
-static void wm8350_irq_lock(unsigned int irq)
+static void wm8350_irq_lock(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&wm8350->irq_lock);
 }
 
-static void wm8350_irq_sync_unlock(unsigned int irq)
+static void wm8350_irq_sync_unlock(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(wm8350->irq_masks); i++) {
@@ -442,28 +442,30 @@ static void wm8350_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&wm8350->irq_lock);
 }
 
-static void wm8350_irq_enable(unsigned int irq)
+static void wm8350_irq_enable(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
-        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
+        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
+                                                             data->irq);
 
         wm8350->irq_masks[irq_data->reg] &= ~irq_data->mask;
 }
 
-static void wm8350_irq_disable(unsigned int irq)
+static void wm8350_irq_disable(struct irq_data *data)
 {
-        struct wm8350 *wm8350 = get_irq_chip_data(irq);
-        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350, irq);
+        struct wm8350 *wm8350 = irq_data_get_irq_chip_data(data);
+        struct wm8350_irq_data *irq_data = irq_to_wm8350_irq(wm8350,
+                                                             data->irq);
 
         wm8350->irq_masks[irq_data->reg] |= irq_data->mask;
 }
 
 static struct irq_chip wm8350_irq_chip = {
-        .name = "wm8350",
-        .bus_lock = wm8350_irq_lock,
-        .bus_sync_unlock = wm8350_irq_sync_unlock,
-        .disable = wm8350_irq_disable,
-        .enable = wm8350_irq_enable,
+        .name                   = "wm8350",
+        .irq_bus_lock           = wm8350_irq_lock,
+        .irq_bus_sync_unlock    = wm8350_irq_sync_unlock,
+        .irq_disable            = wm8350_irq_disable,
+        .irq_enable             = wm8350_irq_enable,
 };
 
 int wm8350_irq_init(struct wm8350 *wm8350, int irq,
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 8d221ba5e38d..41233c7fa581 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/mfd/core.h>
+#include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/machine.h>
 
@@ -169,8 +170,16 @@ out:
 EXPORT_SYMBOL_GPL(wm8994_set_bits);
 
 static struct mfd_cell wm8994_regulator_devs[] = {
-        { .name = "wm8994-ldo", .id = 1 },
-        { .name = "wm8994-ldo", .id = 2 },
+        {
+                .name = "wm8994-ldo",
+                .id = 1,
+                .pm_runtime_no_callbacks = true,
+        },
+        {
+                .name = "wm8994-ldo",
+                .id = 2,
+                .pm_runtime_no_callbacks = true,
+        },
 };
 
 static struct resource wm8994_codec_resources[] = {
@@ -200,6 +209,7 @@ static struct mfd_cell wm8994_devs[] = {
                 .name = "wm8994-gpio",
                 .num_resources = ARRAY_SIZE(wm8994_gpio_resources),
                 .resources = wm8994_gpio_resources,
+                .pm_runtime_no_callbacks = true,
         },
 };
 
@@ -231,7 +241,7 @@ static const char *wm8958_main_supplies[] = {
 };
 
 #ifdef CONFIG_PM
-static int wm8994_device_suspend(struct device *dev)
+static int wm8994_suspend(struct device *dev)
 {
         struct wm8994 *wm8994 = dev_get_drvdata(dev);
         int ret;
@@ -261,7 +271,7 @@ static int wm8994_device_suspend(struct device *dev)
         return 0;
 }
 
-static int wm8994_device_resume(struct device *dev)
+static int wm8994_resume(struct device *dev)
 {
         struct wm8994 *wm8994 = dev_get_drvdata(dev);
         int ret;
@@ -471,6 +481,9 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 goto err_irq;
         }
 
+        pm_runtime_enable(wm8994->dev);
+        pm_runtime_resume(wm8994->dev);
+
         return 0;
 
 err_irq:
@@ -490,6 +503,7 @@ err:
 
 static void wm8994_device_exit(struct wm8994 *wm8994)
 {
+        pm_runtime_disable(wm8994->dev);
         mfd_remove_devices(wm8994->dev);
         wm8994_irq_exit(wm8994);
         regulator_bulk_disable(wm8994->num_supplies,
@@ -573,21 +587,6 @@ static int wm8994_i2c_remove(struct i2c_client *i2c)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm8994_i2c_suspend(struct i2c_client *i2c, pm_message_t state)
-{
-        return wm8994_device_suspend(&i2c->dev);
-}
-
-static int wm8994_i2c_resume(struct i2c_client *i2c)
-{
-        return wm8994_device_resume(&i2c->dev);
-}
-#else
-#define wm8994_i2c_suspend NULL
-#define wm8994_i2c_resume NULL
-#endif
-
 static const struct i2c_device_id wm8994_i2c_id[] = {
         { "wm8994", WM8994 },
         { "wm8958", WM8958 },
@@ -595,15 +594,16 @@ static const struct i2c_device_id wm8994_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wm8994_i2c_id);
 
+UNIVERSAL_DEV_PM_OPS(wm8994_pm_ops, wm8994_suspend, wm8994_resume, NULL);
+
 static struct i2c_driver wm8994_i2c_driver = {
         .driver = {
-                   .name = "wm8994",
-                   .owner = THIS_MODULE,
+                .name = "wm8994",
+                .owner = THIS_MODULE,
+                .pm = &wm8994_pm_ops,
         },
         .probe = wm8994_i2c_probe,
         .remove = wm8994_i2c_remove,
-        .suspend = wm8994_i2c_suspend,
-        .resume = wm8994_i2c_resume,
         .id_table = wm8994_i2c_id,
 };
 
diff --git a/drivers/mfd/wm8994-irq.c b/drivers/mfd/wm8994-irq.c
index 8400eb1ee5db..29e8faf9c01c 100644
--- a/drivers/mfd/wm8994-irq.c
+++ b/drivers/mfd/wm8994-irq.c
@@ -156,16 +156,16 @@ static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994,
         return &wm8994_irqs[irq - wm8994->irq_base];
 }
 
-static void wm8994_irq_lock(unsigned int irq)
+static void wm8994_irq_lock(struct irq_data *data)
 {
-        struct wm8994 *wm8994 = get_irq_chip_data(irq);
+        struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
 
         mutex_lock(&wm8994->irq_lock);
 }
 
-static void wm8994_irq_sync_unlock(unsigned int irq)
+static void wm8994_irq_sync_unlock(struct irq_data *data)
 {
-        struct wm8994 *wm8994 = get_irq_chip_data(irq);
+        struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(wm8994->irq_masks_cur); i++) {
@@ -182,28 +182,30 @@ static void wm8994_irq_sync_unlock(unsigned int irq)
         mutex_unlock(&wm8994->irq_lock);
 }
 
-static void wm8994_irq_unmask(unsigned int irq)
+static void wm8994_irq_unmask(struct irq_data *data)
 {
-        struct wm8994 *wm8994 = get_irq_chip_data(irq);
-        struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994, irq);
+        struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
+        struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
+                                                             data->irq);
 
         wm8994->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;
 }
 
-static void wm8994_irq_mask(unsigned int irq)
+static void wm8994_irq_mask(struct irq_data *data)
 {
-        struct wm8994 *wm8994 = get_irq_chip_data(irq);
-        struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994, irq);
+        struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);
+        struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
+                                                             data->irq);
 
         wm8994->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
 }
 
 static struct irq_chip wm8994_irq_chip = {
-        .name = "wm8994",
-        .bus_lock = wm8994_irq_lock,
-        .bus_sync_unlock = wm8994_irq_sync_unlock,
-        .mask = wm8994_irq_mask,
-        .unmask = wm8994_irq_unmask,
+        .name                   = "wm8994",
+        .irq_bus_lock           = wm8994_irq_lock,
+        .irq_bus_sync_unlock    = wm8994_irq_sync_unlock,
+        .irq_mask               = wm8994_irq_mask,
+        .irq_unmask             = wm8994_irq_unmask,
 };
 
 /* The processing of the primary interrupt occurs in a thread so that
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 1e1a4be8eb6c..cc8e49db45fe 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -64,7 +64,7 @@ config ATMEL_PWM
 
 config AB8500_PWM
         bool "AB8500 PWM support"
-        depends on AB8500_CORE
+        depends on AB8500_CORE && ARCH_U8500
         select HAVE_PWM
         help
           This driver exports functions to enable/disble/config/free Pulse
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index 6f6218061b0d..d02d302ee6d5 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -16,12 +16,11 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/pci.h>
+#include <linux/platform_device.h>
 #include <linux/cs5535.h>
 #include <linux/slab.h>
 
 #define DRV_NAME "cs5535-mfgpt"
-#define MFGPT_BAR 2
 
 static int mfgpt_reset_timers;
 module_param_named(mfgptfix, mfgpt_reset_timers, int, 0644);
@@ -37,7 +36,7 @@ static struct cs5535_mfgpt_chip {
         DECLARE_BITMAP(avail, MFGPT_MAX_TIMERS);
         resource_size_t base;
 
-        struct pci_dev *pdev;
+        struct platform_device *pdev;
         spinlock_t lock;
         int initialized;
 } cs5535_mfgpt_chip;
@@ -290,10 +289,10 @@ static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
         return timers;
 }
 
-static int __init cs5535_mfgpt_probe(struct pci_dev *pdev,
-                const struct pci_device_id *pci_id)
+static int __devinit cs5535_mfgpt_probe(struct platform_device *pdev)
 {
-        int err, t;
+        struct resource *res;
+        int err = -EIO, t;
 
         /* There are two ways to get the MFGPT base address; one is by
          * fetching it from MSR_LBAR_MFGPT, the other is by reading the
@@ -302,29 +301,27 @@ static int __init cs5535_mfgpt_probe(struct pci_dev *pdev,
          * it turns out to be unreliable in the face of crappy BIOSes, we
          * can always go back to using MSRs.. */
 
-        err = pci_enable_device_io(pdev);
-        if (err) {
-                dev_err(&pdev->dev, "can't enable device IO\n");
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "can't fetch device resource info\n");
                 goto done;
         }
 
-        err = pci_request_region(pdev, MFGPT_BAR, DRV_NAME);
-        if (err) {
-                dev_err(&pdev->dev, "can't alloc PCI BAR #%d\n", MFGPT_BAR);
+        if (!request_region(res->start, resource_size(res), pdev->name)) {
+                dev_err(&pdev->dev, "can't request region\n");
                 goto done;
         }
 
         /* set up the driver-specific struct */
-        cs5535_mfgpt_chip.base = pci_resource_start(pdev, MFGPT_BAR);
+        cs5535_mfgpt_chip.base = res->start;
         cs5535_mfgpt_chip.pdev = pdev;
         spin_lock_init(&cs5535_mfgpt_chip.lock);
 
-        dev_info(&pdev->dev, "allocated PCI BAR #%d: base 0x%llx\n", MFGPT_BAR,
-                        (unsigned long long) cs5535_mfgpt_chip.base);
+        dev_info(&pdev->dev, "reserved resource region %pR\n", res);
 
         /* detect the available timers */
         t = scan_timers(&cs5535_mfgpt_chip);
-        dev_info(&pdev->dev, DRV_NAME ": %d MFGPT timers available\n", t);
+        dev_info(&pdev->dev, "%d MFGPT timers available\n", t);
         cs5535_mfgpt_chip.initialized = 1;
         return 0;
 
@@ -332,47 +329,18 @@ done:
         return err;
 }
 
-static struct pci_device_id cs5535_mfgpt_pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
-        { 0, },
+static struct platform_driver cs5535_mfgpt_drv = {
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = cs5535_mfgpt_probe,
 };
-MODULE_DEVICE_TABLE(pci, cs5535_mfgpt_pci_tbl);
 
-/*
- * Just like with the cs5535-gpio driver, we can't use the standard PCI driver
- * registration stuff.  It only allows only one driver to bind to each PCI
- * device, and we want the GPIO and MFGPT drivers to be able to share a PCI
- * device.  Instead, we manually scan for the PCI device, request a single
- * region, and keep track of the devices that we're using.
- */
-
-static int __init cs5535_mfgpt_scan_pci(void)
-{
-        struct pci_dev *pdev;
-        int err = -ENODEV;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(cs5535_mfgpt_pci_tbl); i++) {
-                pdev = pci_get_device(cs5535_mfgpt_pci_tbl[i].vendor,
-                                cs5535_mfgpt_pci_tbl[i].device, NULL);
-                if (pdev) {
-                        err = cs5535_mfgpt_probe(pdev,
-                                        &cs5535_mfgpt_pci_tbl[i]);
-                        if (err)
-                                pci_dev_put(pdev);
-
-                        /* we only support a single CS5535/6 southbridge */
-                        break;
-                }
-        }
-
-        return err;
-}
 
 static int __init cs5535_mfgpt_init(void)
 {
-        return cs5535_mfgpt_scan_pci();
+        return platform_driver_register(&cs5535_mfgpt_drv);
 }
 
 module_init(cs5535_mfgpt_init);
@@ -380,3 +348,4 @@ module_init(cs5535_mfgpt_init);
 MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
 MODULE_DESCRIPTION("CS5535/CS5536 MFGPT timer driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index bac7d62866b7..0371bf502249 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -462,7 +462,7 @@ static int __devinit sdh_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        mmc = mmc_alloc_host(sizeof(*mmc), &pdev->dev);
+        mmc = mmc_alloc_host(sizeof(struct sdh_host), &pdev->dev);
         if (!mmc) {
                 ret = -ENOMEM;
                 goto out;
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index b3a0ab0e4c2b..74218ad677e4 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/mmc/host.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
@@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
         }
 
         host->clk = clk_get(&pdev->dev, "mmc");
-        if (!host->clk) {
-                ret = -ENOENT;
+        if (IS_ERR(host->clk)) {
+                ret = PTR_ERR(host->clk);
                 dev_err(&pdev->dev, "Failed to get mmc clock\n");
                 goto err_free_host;
         }
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 563022825667..2d6de3e03e2d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -14,6 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/highmem.h>
@@ -46,10 +47,6 @@ static unsigned int fmax = 515633;
  *            is asserted (likewise for RX)
  * @fifohalfsize: number of bytes that can be written when MCI_TXFIFOHALFEMPTY
  *                is asserted (likewise for RX)
- * @broken_blockend: the MCI_DATABLOCKEND is broken on the hardware
- *              and will not work at all.
- * @broken_blockend_dma: the MCI_DATABLOCKEND is broken on the hardware when
- *              using DMA.
  * @sdio: variant supports SDIO
  * @st_clkdiv: true if using a ST-specific clock divider algorithm
  */
@@ -59,8 +56,6 @@ struct variant_data {
         unsigned int            datalength_bits;
         unsigned int            fifosize;
         unsigned int            fifohalfsize;
-        bool                    broken_blockend;
-        bool                    broken_blockend_dma;
         bool                    sdio;
         bool                    st_clkdiv;
 };
@@ -76,7 +71,6 @@ static struct variant_data variant_u300 = {
         .fifohalfsize           = 8 * 4,
         .clkreg_enable          = 1 << 13, /* HWFCEN */
         .datalength_bits        = 16,
-        .broken_blockend_dma    = true,
         .sdio                   = true,
 };
 
@@ -86,7 +80,6 @@ static struct variant_data variant_ux500 = {
         .clkreg                 = MCI_CLK_ENABLE,
         .clkreg_enable          = 1 << 14, /* HWFCEN */
         .datalength_bits        = 24,
-        .broken_blockend        = true,
         .sdio                   = true,
         .st_clkdiv              = true,
 };
@@ -210,8 +203,6 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
         host->data = data;
         host->size = data->blksz * data->blocks;
         host->data_xfered = 0;
-        host->blockend = false;
-        host->dataend = false;
 
         mmci_init_sg(host, data);
 
@@ -288,21 +279,26 @@ static void
 mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
               unsigned int status)
 {
-        struct variant_data *variant = host->variant;
-
         /* First check for errors */
         if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
+                u32 remain, success;
+
+                /* Calculate how far we are into the transfer */
+                remain = readl(host->base + MMCIDATACNT);
+                success = data->blksz * data->blocks - remain;
+
                 dev_dbg(mmc_dev(host->mmc), "MCI ERROR IRQ (status %08x)\n", status);
-                if (status & MCI_DATACRCFAIL)
+                if (status & MCI_DATACRCFAIL) {
+                        /* Last block was not successful */
+                        host->data_xfered = round_down(success - 1, data->blksz);
                         data->error = -EILSEQ;
-                else if (status & MCI_DATATIMEOUT)
+                } else if (status & MCI_DATATIMEOUT) {
+                        host->data_xfered = round_down(success, data->blksz);
                         data->error = -ETIMEDOUT;
-                else if (status & (MCI_TXUNDERRUN|MCI_RXOVERRUN))
+                } else if (status & (MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
+                        host->data_xfered = round_down(success, data->blksz);
                         data->error = -EIO;
-
-                /* Force-complete the transaction */
-                host->blockend = true;
-                host->dataend = true;
+                }
 
                 /*
                  * We hit an error condition.  Ensure that any data
@@ -321,61 +317,14 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
                 }
         }
 
-        /*
-         * On ARM variants in PIO mode, MCI_DATABLOCKEND
-         * is always sent first, and we increase the
-         * transfered number of bytes for that IRQ. Then
-         * MCI_DATAEND follows and we conclude the transaction.
-         *
-         * On the Ux500 single-IRQ variant MCI_DATABLOCKEND
-         * doesn't seem to immediately clear from the status,
-         * so we can't use it keep count when only one irq is
-         * used because the irq will hit for other reasons, and
-         * then the flag is still up. So we use the MCI_DATAEND
-         * IRQ at the end of the entire transfer because
-         * MCI_DATABLOCKEND is broken.
-         *
-         * In the U300, the IRQs can arrive out-of-order,
-         * e.g. MCI_DATABLOCKEND sometimes arrives after MCI_DATAEND,
-         * so for this case we use the flags "blockend" and
-         * "dataend" to make sure both IRQs have arrived before
-         * concluding the transaction. (This does not apply
-         * to the Ux500 which doesn't fire MCI_DATABLOCKEND
-         * at all.) In DMA mode it suffers from the same problem
-         * as the Ux500.
-         */
-        if (status & MCI_DATABLOCKEND) {
-                /*
-                 * Just being a little over-cautious, we do not
-                 * use this progressive update if the hardware blockend
-                 * flag is unreliable: since it can stay high between
-                 * IRQs it will corrupt the transfer counter.
-                 */
-                if (!variant->broken_blockend)
-                        host->data_xfered += data->blksz;
-                host->blockend = true;
-        }
-
-        if (status & MCI_DATAEND)
-                host->dataend = true;
+        if (status & MCI_DATABLOCKEND)
+                dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n");
 
-        /*
-         * On variants with broken blockend we shall only wait for dataend,
-         * on others we must sync with the blockend signal since they can
-         * appear out-of-order.
-         */
-        if (host->dataend && (host->blockend || variant->broken_blockend)) {
+        if (status & MCI_DATAEND || data->error) {
                 mmci_stop_data(host);
 
-                /* Reset these flags */
-                host->blockend = false;
-                host->dataend = false;
-
-                /*
-                 * Variants with broken blockend flags need to handle the
-                 * end of the entire transfer here.
-                 */
-                if (variant->broken_blockend && !data->error)
+                if (!data->error)
+                        /* The error clause is handled above, success! */
                         host->data_xfered += data->blksz * data->blocks;
 
                 if (!data->stop) {
@@ -394,15 +343,15 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
 
         host->cmd = NULL;
 
-        cmd->resp[0] = readl(base + MMCIRESPONSE0);
-        cmd->resp[1] = readl(base + MMCIRESPONSE1);
-        cmd->resp[2] = readl(base + MMCIRESPONSE2);
-        cmd->resp[3] = readl(base + MMCIRESPONSE3);
-
         if (status & MCI_CMDTIMEOUT) {
                 cmd->error = -ETIMEDOUT;
         } else if (status & MCI_CMDCRCFAIL && cmd->flags & MMC_RSP_CRC) {
                 cmd->error = -EILSEQ;
+        } else {
+                cmd->resp[0] = readl(base + MMCIRESPONSE0);
+                cmd->resp[1] = readl(base + MMCIRESPONSE1);
+                cmd->resp[2] = readl(base + MMCIRESPONSE2);
+                cmd->resp[3] = readl(base + MMCIRESPONSE3);
         }
 
         if (!cmd->data || cmd->error) {
@@ -770,7 +719,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
         struct variant_data *variant = id->data;
         struct mmci_host *host;
         struct mmc_host *mmc;
-        unsigned int mask;
         int ret;
 
         /* must have platform data */
@@ -951,12 +899,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
                         goto irq0_free;
         }
 
-        mask = MCI_IRQENABLE;
-        /* Don't use the datablockend flag if it's broken */
-        if (variant->broken_blockend)
-                mask &= ~MCI_DATABLOCKEND;
-
-        writel(mask, host->base + MMCIMASK0);
+        writel(MCI_IRQENABLE, host->base + MMCIMASK0);
 
         amba_set_drvdata(dev, mmc);
 
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index df06f01aac89..c1df7b82d36c 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -137,7 +137,7 @@
 #define MCI_IRQENABLE   \
         (MCI_CMDCRCFAILMASK|MCI_DATACRCFAILMASK|MCI_CMDTIMEOUTMASK|     \
         MCI_DATATIMEOUTMASK|MCI_TXUNDERRUNMASK|MCI_RXOVERRUNMASK|       \
-        MCI_CMDRESPENDMASK|MCI_CMDSENTMASK|MCI_DATABLOCKENDMASK)
+        MCI_CMDRESPENDMASK|MCI_CMDSENTMASK)
 
 /* These interrupts are directed to IRQ1 when two IRQ lines are available */
 #define MCI_IRQ1MASK \
@@ -177,9 +177,6 @@ struct mmci_host {
         struct timer_list       timer;
         unsigned int            oldstat;
 
-        bool                    blockend;
-        bool                    dataend;
-
         /* pio stuff */
         struct sg_mapping_iter  sg_miter;
         unsigned int            size;
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 5decfd0bd61d..153ab977a013 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -383,14 +383,30 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
         host->curr.user_pages = 0;
 
         box = &nc->cmd[0];
-        for (i = 0; i < host->dma.num_ents; i++) {
-                box->cmd = CMD_MODE_BOX;
 
-        /* Initialize sg dma address */
-        sg->dma_address = page_to_dma(mmc_dev(host->mmc), sg_page(sg))
-                                + sg->offset;
+        /* location of command block must be 64 bit aligned */
+        BUG_ON(host->dma.cmd_busaddr & 0x07);
 
-        if (i == (host->dma.num_ents - 1))
+        nc->cmdptr = (host->dma.cmd_busaddr >> 3) | CMD_PTR_LP;
+        host->dma.hdr.cmdptr = DMOV_CMD_PTR_LIST |
+                               DMOV_CMD_ADDR(host->dma.cmdptr_busaddr);
+        host->dma.hdr.complete_func = msmsdcc_dma_complete_func;
+
+        n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
+                        host->dma.num_ents, host->dma.dir);
+        if (n == 0) {
+                printk(KERN_ERR "%s: Unable to map in all sg elements\n",
+                        mmc_hostname(host->mmc));
+                host->dma.sg = NULL;
+                host->dma.num_ents = 0;
+                return -ENOMEM;
+        }
+
+        for_each_sg(host->dma.sg, sg, n, i) {
+
+                box->cmd = CMD_MODE_BOX;
+
+                if (i == n - 1)
                         box->cmd |= CMD_LC;
                 rows = (sg_dma_len(sg) % MCI_FIFOSIZE) ?
                         (sg_dma_len(sg) / MCI_FIFOSIZE) + 1 :
@@ -418,27 +434,6 @@ static int msmsdcc_config_dma(struct msmsdcc_host *host, struct mmc_data *data)
                         box->cmd |= CMD_DST_CRCI(crci);
                 }
                 box++;
-                sg++;
-        }
-
-        /* location of command block must be 64 bit aligned */
-        BUG_ON(host->dma.cmd_busaddr & 0x07);
-
-        nc->cmdptr = (host->dma.cmd_busaddr >> 3) | CMD_PTR_LP;
-        host->dma.hdr.cmdptr = DMOV_CMD_PTR_LIST |
-                               DMOV_CMD_ADDR(host->dma.cmdptr_busaddr);
-        host->dma.hdr.complete_func = msmsdcc_dma_complete_func;
-
-        n = dma_map_sg(mmc_dev(host->mmc), host->dma.sg,
-                        host->dma.num_ents, host->dma.dir);
-/* dsb inside dma_map_sg will write nc out to mem as well */
-
-        if (n != host->dma.num_ents) {
-                printk(KERN_ERR "%s: Unable to map in all sg elements\n",
-                        mmc_hostname(host->mmc));
-                host->dma.sg = NULL;
-                host->dma.num_ents = 0;
-                return -ENOMEM;
         }
 
         return 0;
@@ -1331,9 +1326,6 @@ msmsdcc_probe(struct platform_device *pdev)
         if (host->timer.function)
                 pr_info("%s: Polling status mode enabled\n", mmc_hostname(mmc));
 
-#if BUSCLK_PWRSAVE
-        msmsdcc_disable_clocks(host, 1);
-#endif
         return 0;
  cmd_irq_free:
         free_irq(cmd_irqres->start, host);
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index fa19d849a920..dd84124f4209 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -13,6 +13,7 @@
  * your option) any later version.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/io.h>
@@ -20,8 +21,12 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/mmc/host.h>
+#ifdef CONFIG_PPC
 #include <asm/machdep.h>
+#endif
 #include "sdhci-of.h"
 #include "sdhci.h"
 
@@ -112,7 +117,11 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
                 return true;
 
         /* Old device trees don't have the wp-inverted property. */
+#ifdef CONFIG_PPC
         return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
+#else
+        return false;
+#endif
 }
 
 static int __devinit sdhci_of_probe(struct platform_device *ofdev,
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 17203586305c..5309ab95aada 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -277,10 +277,43 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
         host->clock = clock;
 }
 
+/**
+ * sdhci_s3c_platform_8bit_width - support 8bit buswidth
+ * @host: The SDHCI host being queried
+ * @width: MMC_BUS_WIDTH_ macro for the bus width being requested
+ *
+ * We have 8-bit width support but is not a v3 controller.
+ * So we add platform_8bit_width() and support 8bit width.
+ */
+static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
+{
+        u8 ctrl;
+
+        ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
+
+        switch (width) {
+        case MMC_BUS_WIDTH_8:
+                ctrl |= SDHCI_CTRL_8BITBUS;
+                ctrl &= ~SDHCI_CTRL_4BITBUS;
+                break;
+        case MMC_BUS_WIDTH_4:
+                ctrl |= SDHCI_CTRL_4BITBUS;
+                ctrl &= ~SDHCI_CTRL_8BITBUS;
+                break;
+        default:
+                break;
+        }
+
+        sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
+
+        return 0;
+}
+
 static struct sdhci_ops sdhci_s3c_ops = {
         .get_max_clock          = sdhci_s3c_get_max_clk,
         .set_clock              = sdhci_s3c_set_clock,
         .get_min_clock          = sdhci_s3c_get_min_clock,
+        .platform_8bit_width    = sdhci_s3c_platform_8bit_width,
 };
 
 static void sdhci_s3c_notify_change(struct platform_device *dev, int state)
@@ -473,6 +506,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
         if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
                 host->mmc->caps = MMC_CAP_NONREMOVABLE;
 
+        if (pdata->host_caps)
+                host->mmc->caps |= pdata->host_caps;
+
         host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
                          SDHCI_QUIRK_32BIT_DMA_SIZE);
 
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
index f8f65df9b017..f08f944ac53c 100644
--- a/drivers/mmc/host/ushc.c
+++ b/drivers/mmc/host/ushc.c
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/kernel.h>
-#include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/mmc/host.h>
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index b1f768917395..77414702cb00 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -53,9 +53,10 @@ config MTD_PARTITIONS
           devices. Partitioning on NFTL 'devices' is a different - that's the
           'normal' form of partitioning used on a block device.
 
+if MTD_PARTITIONS
+
 config MTD_REDBOOT_PARTS
         tristate "RedBoot partition table parsing"
-        depends on MTD_PARTITIONS
         ---help---
           RedBoot is a ROM monitor and bootloader which deals with multiple
           'images' in flash devices by putting a table one of the erase
@@ -72,9 +73,10 @@ config MTD_REDBOOT_PARTS
           SA1100 map driver (CONFIG_MTD_SA1100) has an option for this, for
           example.
 
+if MTD_REDBOOT_PARTS
+
 config MTD_REDBOOT_DIRECTORY_BLOCK
         int "Location of RedBoot partition table"
-        depends on MTD_REDBOOT_PARTS
         default "-1"
         ---help---
           This option is the Linux counterpart to the
@@ -91,18 +93,18 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
 
 config MTD_REDBOOT_PARTS_UNALLOCATED
         bool "Include unallocated flash regions"
-        depends on MTD_REDBOOT_PARTS
         help
           If you need to register each unallocated flash region as a MTD
           'partition', enable this option.
 
 config MTD_REDBOOT_PARTS_READONLY
         bool "Force read-only for RedBoot system images"
-        depends on MTD_REDBOOT_PARTS
         help
           If you need to force read-only for 'RedBoot', 'RedBoot Config' and
           'FIS directory' images, enable this option.
 
+endif # MTD_REDBOOT_PARTS
+
 config MTD_CMDLINE_PARTS
         bool "Command line partition table parsing"
         depends on MTD_PARTITIONS = "y" && MTD = "y"
@@ -142,7 +144,7 @@ config MTD_CMDLINE_PARTS
 
 config MTD_AFS_PARTS
         tristate "ARM Firmware Suite partition parsing"
-        depends on ARM && MTD_PARTITIONS
+        depends on ARM
         ---help---
           The ARM Firmware Suite allows the user to divide flash devices into
           multiple 'images'. Each such image has a header containing its name
@@ -158,8 +160,8 @@ config MTD_AFS_PARTS
           example.
 
 config MTD_OF_PARTS
-        tristate "Flash partition map based on OF description"
-        depends on OF && MTD_PARTITIONS
+        def_bool y
+        depends on OF
         help
           This provides a partition parsing function which derives
           the partition map from the children of the flash node,
@@ -167,10 +169,11 @@ config MTD_OF_PARTS
 
 config MTD_AR7_PARTS
         tristate "TI AR7 partitioning support"
-        depends on MTD_PARTITIONS
         ---help---
           TI AR7 partitioning support
 
+endif # MTD_PARTITIONS
+
 comment "User Modules And Translation Layers"
 
 config MTD_CHAR
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 760abc533395..d4e7f25b1ebb 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -6,13 +6,13 @@
 obj-$(CONFIG_MTD)               += mtd.o
 mtd-y                           := mtdcore.o mtdsuper.o
 mtd-$(CONFIG_MTD_PARTITIONS)    += mtdpart.o
+mtd-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
 
 obj-$(CONFIG_MTD_CONCAT)        += mtdconcat.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-$(CONFIG_MTD_AFS_PARTS)     += afs.o
 obj-$(CONFIG_MTD_AR7_PARTS)     += ar7part.o
-obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
 
 # 'Users' - code which presents functionality to userspace.
 obj-$(CONFIG_MTD_CHAR)          += mtdchar.o
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index ad9268b44416..a8c3e1c9b02a 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -162,7 +162,7 @@ static void cfi_tell_features(struct cfi_pri_intelext *extp)
 #endif
 
 /* Atmel chips don't use the same PRI format as Intel chips */
-static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
+static void fixup_convert_atmel_pri(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -202,7 +202,7 @@ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
         cfi->cfiq->BufWriteTimeoutMax = 0;
 }
 
-static void fixup_at49bv640dx_lock(struct mtd_info *mtd, void *param)
+static void fixup_at49bv640dx_lock(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -214,7 +214,7 @@ static void fixup_at49bv640dx_lock(struct mtd_info *mtd, void *param)
 
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
 /* Some Intel Strata Flash prior to FPO revision C has bugs in this area */
-static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
+static void fixup_intel_strataflash(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -227,7 +227,7 @@ static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
 #endif
 
 #ifdef CMDSET0001_DISABLE_WRITE_SUSPEND
-static void fixup_no_write_suspend(struct mtd_info *mtd, void* param)
+static void fixup_no_write_suspend(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -240,7 +240,7 @@ static void fixup_no_write_suspend(struct mtd_info *mtd, void* param)
 }
 #endif
 
-static void fixup_st_m28w320ct(struct mtd_info *mtd, void* param)
+static void fixup_st_m28w320ct(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -249,7 +249,7 @@ static void fixup_st_m28w320ct(struct mtd_info *mtd, void* param)
         cfi->cfiq->BufWriteTimeoutMax = 0;      /* Not supported */
 }
 
-static void fixup_st_m28w320cb(struct mtd_info *mtd, void* param)
+static void fixup_st_m28w320cb(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -259,7 +259,7 @@ static void fixup_st_m28w320cb(struct mtd_info *mtd, void* param)
                 (cfi->cfiq->EraseRegionInfo[1] & 0xffff0000) | 0x3e;
 };
 
-static void fixup_use_point(struct mtd_info *mtd, void *param)
+static void fixup_use_point(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         if (!mtd->point && map_is_linear(map)) {
@@ -268,7 +268,7 @@ static void fixup_use_point(struct mtd_info *mtd, void *param)
         }
 }
 
-static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
+static void fixup_use_write_buffers(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -282,7 +282,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
 /*
  * Some chips power-up with all sectors locked by default.
  */
-static void fixup_unlock_powerup_lock(struct mtd_info *mtd, void *param)
+static void fixup_unlock_powerup_lock(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -295,31 +295,31 @@ static void fixup_unlock_powerup_lock(struct mtd_info *mtd, void *param)
 }
 
 static struct cfi_fixup cfi_fixup_table[] = {
-        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
-        { CFI_MFR_ATMEL, AT49BV640D, fixup_at49bv640dx_lock, NULL },
-        { CFI_MFR_ATMEL, AT49BV640DT, fixup_at49bv640dx_lock, NULL },
+        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri },
+        { CFI_MFR_ATMEL, AT49BV640D, fixup_at49bv640dx_lock },
+        { CFI_MFR_ATMEL, AT49BV640DT, fixup_at49bv640dx_lock },
 #ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash },
 #endif
 #ifdef CMDSET0001_DISABLE_WRITE_SUSPEND
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_no_write_suspend, NULL },
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_no_write_suspend },
 #endif
 #if !FORCE_WORD_WRITE
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL },
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers },
 #endif
-        { CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct, NULL },
-        { CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb, NULL },
-        { CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock, NULL, },
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct },
+        { CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb },
+        { CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock },
+        { 0, 0, NULL }
 };
 
 static struct cfi_fixup jedec_fixup_table[] = {
-        { CFI_MFR_INTEL, I82802AB,   fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_INTEL, I82802AC,   fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_ST,    M50LPW080,  fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_ST,    M50FLW080A, fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_ST,    M50FLW080B, fixup_use_fwh_lock, NULL, },
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_INTEL, I82802AB,   fixup_use_fwh_lock },
+        { CFI_MFR_INTEL, I82802AC,   fixup_use_fwh_lock },
+        { CFI_MFR_ST,    M50LPW080,  fixup_use_fwh_lock },
+        { CFI_MFR_ST,    M50FLW080A, fixup_use_fwh_lock },
+        { CFI_MFR_ST,    M50FLW080B, fixup_use_fwh_lock },
+        { 0, 0, NULL }
 };
 static struct cfi_fixup fixup_table[] = {
         /* The CFI vendor ids and the JEDEC vendor IDs appear
@@ -327,8 +327,8 @@ static struct cfi_fixup fixup_table[] = {
          * well.  This table is to pick all cases where
          * we know that is the case.
          */
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_point, NULL },
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_point },
+        { 0, 0, NULL }
 };
 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
@@ -455,6 +455,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
         mtd->flags   = MTD_CAP_NORFLASH;
         mtd->name    = map->name;
         mtd->writesize = 1;
+        mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;
 
         mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 3b8e32d87977..f072fcfde04e 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -134,7 +134,7 @@ static void cfi_tell_features(struct cfi_pri_amdstd *extp)
 
 #ifdef AMD_BOOTLOC_BUG
 /* Wheee. Bring me the head of someone at AMD. */
-static void fixup_amd_bootblock(struct mtd_info *mtd, void* param)
+static void fixup_amd_bootblock(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -186,7 +186,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd, void* param)
 }
 #endif
 
-static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
+static void fixup_use_write_buffers(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -197,7 +197,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
 }
 
 /* Atmel chips don't use the same PRI format as AMD chips */
-static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
+static void fixup_convert_atmel_pri(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -228,14 +228,14 @@ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
         cfi->cfiq->BufWriteTimeoutMax = 0;
 }
 
-static void fixup_use_secsi(struct mtd_info *mtd, void *param)
+static void fixup_use_secsi(struct mtd_info *mtd)
 {
         /* Setup for chips with a secsi area */
         mtd->read_user_prot_reg = cfi_amdstd_secsi_read;
         mtd->read_fact_prot_reg = cfi_amdstd_secsi_read;
 }
 
-static void fixup_use_erase_chip(struct mtd_info *mtd, void *param)
+static void fixup_use_erase_chip(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -250,7 +250,7 @@ static void fixup_use_erase_chip(struct mtd_info *mtd, void *param)
  * Some Atmel chips (e.g. the AT49BV6416) power-up with all sectors
  * locked by default.
  */
-static void fixup_use_atmel_lock(struct mtd_info *mtd, void *param)
+static void fixup_use_atmel_lock(struct mtd_info *mtd)
 {
         mtd->lock = cfi_atmel_lock;
         mtd->unlock = cfi_atmel_unlock;
@@ -271,7 +271,7 @@ static void fixup_old_sst_eraseregion(struct mtd_info *mtd)
         cfi->cfiq->NumEraseRegions = 1;
 }
 
-static void fixup_sst39vf(struct mtd_info *mtd, void *param)
+static void fixup_sst39vf(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -282,7 +282,7 @@ static void fixup_sst39vf(struct mtd_info *mtd, void *param)
         cfi->addr_unlock2 = 0x2AAA;
 }
 
-static void fixup_sst39vf_rev_b(struct mtd_info *mtd, void *param)
+static void fixup_sst39vf_rev_b(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -295,12 +295,12 @@ static void fixup_sst39vf_rev_b(struct mtd_info *mtd, void *param)
         cfi->sector_erase_cmd = CMD(0x50);
 }
 
-static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd, void *param)
+static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
 
-        fixup_sst39vf_rev_b(mtd, param);
+        fixup_sst39vf_rev_b(mtd);
 
         /*
          * CFI reports 1024 sectors (0x03ff+1) of 64KBytes (0x0100*256) where
@@ -310,7 +310,7 @@ static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd, void *param)
         pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name);
 }
 
-static void fixup_s29gl064n_sectors(struct mtd_info *mtd, void *param)
+static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -321,7 +321,7 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd, void *param)
         }
 }
 
-static void fixup_s29gl032n_sectors(struct mtd_info *mtd, void *param)
+static void fixup_s29gl032n_sectors(struct mtd_info *mtd)
 {
         struct map_info *map = mtd->priv;
         struct cfi_private *cfi = map->fldrv_priv;
@@ -334,47 +334,47 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd, void *param)
 
 /* Used to fix CFI-Tables of chips without Extended Query Tables */
 static struct cfi_fixup cfi_nopri_fixup_table[] = {
-        { CFI_MFR_SST, 0x234A, fixup_sst39vf, NULL, }, /* SST39VF1602 */
-        { CFI_MFR_SST, 0x234B, fixup_sst39vf, NULL, }, /* SST39VF1601 */
-        { CFI_MFR_SST, 0x235A, fixup_sst39vf, NULL, }, /* SST39VF3202 */
-        { CFI_MFR_SST, 0x235B, fixup_sst39vf, NULL, }, /* SST39VF3201 */
-        { CFI_MFR_SST, 0x235C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3202B */
-        { CFI_MFR_SST, 0x235D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3201B */
-        { CFI_MFR_SST, 0x236C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6402B */
-        { CFI_MFR_SST, 0x236D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6401B */
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_SST, 0x234a, fixup_sst39vf }, /* SST39VF1602 */
+        { CFI_MFR_SST, 0x234b, fixup_sst39vf }, /* SST39VF1601 */
+        { CFI_MFR_SST, 0x235a, fixup_sst39vf }, /* SST39VF3202 */
+        { CFI_MFR_SST, 0x235b, fixup_sst39vf }, /* SST39VF3201 */
+        { CFI_MFR_SST, 0x235c, fixup_sst39vf_rev_b }, /* SST39VF3202B */
+        { CFI_MFR_SST, 0x235d, fixup_sst39vf_rev_b }, /* SST39VF3201B */
+        { CFI_MFR_SST, 0x236c, fixup_sst39vf_rev_b }, /* SST39VF6402B */
+        { CFI_MFR_SST, 0x236d, fixup_sst39vf_rev_b }, /* SST39VF6401B */
+        { 0, 0, NULL }
 };
 
 static struct cfi_fixup cfi_fixup_table[] = {
-        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
+        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri },
 #ifdef AMD_BOOTLOC_BUG
-        { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
-        { CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },
+        { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock },
+        { CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock },
 #endif
-        { CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x0055, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x0056, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x005C, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x005F, fixup_use_secsi, NULL, },
-        { CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors, NULL, },
-        { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors, NULL, },
-        { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors, NULL, },
-        { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors, NULL, },
-        { CFI_MFR_SST, 0x536A, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6402 */
-        { CFI_MFR_SST, 0x536B, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6401 */
-        { CFI_MFR_SST, 0x536C, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6404 */
-        { CFI_MFR_SST, 0x536D, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6403 */
+        { CFI_MFR_AMD, 0x0050, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x0053, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x0055, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x0056, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x005C, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x005F, fixup_use_secsi },
+        { CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors },
+        { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
+        { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
+        { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
+        { CFI_MFR_SST, 0x536a, fixup_sst38vf640x_sectorsize }, /* SST38VF6402 */
+        { CFI_MFR_SST, 0x536b, fixup_sst38vf640x_sectorsize }, /* SST38VF6401 */
+        { CFI_MFR_SST, 0x536c, fixup_sst38vf640x_sectorsize }, /* SST38VF6404 */
+        { CFI_MFR_SST, 0x536d, fixup_sst38vf640x_sectorsize }, /* SST38VF6403 */
 #if !FORCE_WORD_WRITE
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers },
 #endif
-        { 0, 0, NULL, NULL }
+        { 0, 0, NULL }
 };
 static struct cfi_fixup jedec_fixup_table[] = {
-        { CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
-        { CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock },
+        { CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock },
+        { CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock },
+        { 0, 0, NULL }
 };
 
 static struct cfi_fixup fixup_table[] = {
@@ -383,18 +383,30 @@ static struct cfi_fixup fixup_table[] = {
          * well.  This table is to pick all cases where
          * we know that is the case.
          */
-        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
-        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
-        { 0, 0, NULL, NULL }
+        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip },
+        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock },
+        { 0, 0, NULL }
 };
 
 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
                                   struct cfi_pri_amdstd *extp)
 {
-        if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
-            extp->MajorVersion == '0')
-                extp->MajorVersion = '1';
+        if (cfi->mfr == CFI_MFR_SAMSUNG) {
+                if ((extp->MajorVersion == '0' && extp->MinorVersion == '0') ||
+                    (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
+                        /*
+                         * Samsung K8P2815UQB and K8D6x16UxM chips
+                         * report major=0 / minor=0.
+                         * K8D3x16UxC chips report major=3 / minor=3.
+                         */
+                        printk(KERN_NOTICE "  Fixing Samsung's Amd/Fujitsu"
+                               " Extended Query version to 1.%c\n",
+                               extp->MinorVersion);
+                        extp->MajorVersion = '1';
+                }
+        }
+
         /*
          * SST 38VF640x chips report major=0xFF / minor=0xFF.
          */
@@ -428,6 +440,10 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
         mtd->flags   = MTD_CAP_NORFLASH;
         mtd->name    = map->name;
         mtd->writesize = 1;
+        mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;
+
+        DEBUG(MTD_DEBUG_LEVEL3, "MTD %s(): write buffer size %d\n",
+                __func__, mtd->writebufsize);
 
         mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 314af1f5a370..c04b7658abe9 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -238,6 +238,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         mtd->resume = cfi_staa_resume;
         mtd->flags = MTD_CAP_NORFLASH & ~MTD_BIT_WRITEABLE;
         mtd->writesize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */
+        mtd->writebufsize = 1 << cfi->cfiq->MaxBufWriteSize;
         map->fldrv = &cfi_staa_chipdrv;
         __module_get(THIS_MODULE);
         mtd->name = map->name;
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index 360525c637d2..6ae3d111e1e7 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -156,7 +156,7 @@ void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup *fixups)
         for (f=fixups; f->fixup; f++) {
                 if (((f->mfr == CFI_MFR_ANY) || (f->mfr == cfi->mfr)) &&
                     ((f->id  == CFI_ID_ANY)  || (f->id  == cfi->id))) {
-                        f->fixup(mtd, f->param);
+                        f->fixup(mtd);
                 }
         }
 }
diff --git a/drivers/mtd/chips/fwh_lock.h b/drivers/mtd/chips/fwh_lock.h
index d18064977192..5e3cc80128aa 100644
--- a/drivers/mtd/chips/fwh_lock.h
+++ b/drivers/mtd/chips/fwh_lock.h
@@ -98,7 +98,7 @@ static int fwh_unlock_varsize(struct mtd_info *mtd, loff_t ofs, uint64_t len)
         return ret;
 }
 
-static void fixup_use_fwh_lock(struct mtd_info *mtd, void *param)
+static void fixup_use_fwh_lock(struct mtd_info *mtd)
 {
         printk(KERN_NOTICE "using fwh lock/unlock method\n");
         /* Setup for the chips with the fwh lock method */
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index bf5a002209bd..e4eba6cc1b2e 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -51,6 +51,10 @@
 #define OPCODE_WRDI             0x04    /* Write disable */
 #define OPCODE_AAI_WP           0xad    /* Auto address increment word program */
 
+/* Used for Macronix flashes only. */
+#define OPCODE_EN4B             0xb7    /* Enter 4-byte mode */
+#define OPCODE_EX4B             0xe9    /* Exit 4-byte mode */
+
 /* Status Register bits. */
 #define SR_WIP                  1       /* Write in progress */
 #define SR_WEL                  2       /* Write enable latch */
@@ -62,7 +66,7 @@
 
 /* Define max times to check status register before we give up. */
 #define MAX_READY_WAIT_JIFFIES  (40 * HZ)       /* M25P16 specs 40s max chip erase */
-#define MAX_CMD_SIZE            4
+#define MAX_CMD_SIZE            5
 
 #ifdef CONFIG_M25PXX_USE_FAST_READ
 #define OPCODE_READ     OPCODE_FAST_READ
@@ -152,6 +156,16 @@ static inline int write_disable(struct m25p *flash)
 }
 
 /*
+ * Enable/disable 4-byte addressing mode.
+ */
+static inline int set_4byte(struct m25p *flash, int enable)
+{
+        u8      code = enable ? OPCODE_EN4B : OPCODE_EX4B;
+
+        return spi_write_then_read(flash->spi, &code, 1, NULL, 0);
+}
+
+/*
  * Service routine to read status register until ready, or timeout occurs.
  * Returns non-zero if error.
  */
@@ -207,6 +221,7 @@ static void m25p_addr2cmd(struct m25p *flash, unsigned int addr, u8 *cmd)
         cmd[1] = addr >> (flash->addr_width * 8 -  8);
         cmd[2] = addr >> (flash->addr_width * 8 - 16);
         cmd[3] = addr >> (flash->addr_width * 8 - 24);
+        cmd[4] = addr >> (flash->addr_width * 8 - 32);
 }
 
 static int m25p_cmdsz(struct m25p *flash)
@@ -482,6 +497,10 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
         size_t actual;
         int cmd_sz, ret;
 
+        DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
+                        dev_name(&flash->spi->dev), __func__, "to",
+                        (u32)to, len);
+
         *retlen = 0;
 
         /* sanity checks */
@@ -607,7 +626,6 @@ struct flash_info {
                 .sector_size = (_sector_size),                          \
                 .n_sectors = (_n_sectors),                              \
                 .page_size = 256,                                       \
-                .addr_width = 3,                                        \
                 .flags = (_flags),                                      \
         })
 
@@ -635,7 +653,7 @@ static const struct spi_device_id m25p_ids[] = {
         { "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },
         { "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) },
         { "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
-        { "at26df321",  INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
+        { "at26df321",  INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) },
 
         /* EON -- en25pxx */
         { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
@@ -653,6 +671,8 @@ static const struct spi_device_id m25p_ids[] = {
         { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
         { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
         { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+        { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
+        { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
 
         /* Spansion -- single (large) sector size only, at least
          * for the chips listed here (without boot sectors).
@@ -764,6 +784,7 @@ static const struct spi_device_id *__devinit jedec_probe(struct spi_device *spi)
                         return &m25p_ids[tmp];
                 }
         }
+        dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);
         return ERR_PTR(-ENODEV);
 }
 
@@ -883,7 +904,17 @@ static int __devinit m25p_probe(struct spi_device *spi)
 
         flash->mtd.dev.parent = &spi->dev;
         flash->page_size = info->page_size;
-        flash->addr_width = info->addr_width;
+
+        if (info->addr_width)
+                flash->addr_width = info->addr_width;
+        else {
+                /* enable 4-byte addressing if the device exceeds 16MiB */
+                if (flash->mtd.size > 0x1000000) {
+                        flash->addr_width = 4;
+                        set_4byte(flash, 1);
+                } else
+                        flash->addr_width = 3;
+        }
 
         dev_info(&spi->dev, "%s (%lld Kbytes)\n", id->name,
                         (long long)flash->mtd.size >> 10);
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 684247a8a5ed..c163e619abc9 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -335,7 +335,7 @@ out:
         return ret;
 }
 
-static struct flash_info *__init sst25l_match_device(struct spi_device *spi)
+static struct flash_info *__devinit sst25l_match_device(struct spi_device *spi)
 {
         struct flash_info *flash_info = NULL;
         struct spi_message m;
@@ -375,7 +375,7 @@ static struct flash_info *__init sst25l_match_device(struct spi_device *spi)
         return flash_info;
 }
 
-static int __init sst25l_probe(struct spi_device *spi)
+static int __devinit sst25l_probe(struct spi_device *spi)
 {
         struct flash_info *flash_info;
         struct sst25l_flash *flash;
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 19fe92db0c46..77d64ce19e9f 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -149,11 +149,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
                 printk(KERN_ERR MOD_NAME
-                        " %s(): Unable to register resource"
-                        " 0x%.16llx-0x%.16llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                       " %s(): Unable to register resource %pR - kernel bug?\n",
+                       __func__, &window->rsrc);
         }
 
 
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index d175c120ee84..1f3049590d9e 100644
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -196,10 +196,15 @@ static int bcm963xx_probe(struct platform_device *pdev)
         bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
         if (!bcm963xx_mtd_info) {
                 dev_err(&pdev->dev, "failed to probe using CFI\n");
+                bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map);
+                if (bcm963xx_mtd_info)
+                        goto probe_ok;
+                dev_err(&pdev->dev, "failed to probe using JEDEC\n");
                 err = -EIO;
                 goto err_probe;
         }
 
+probe_ok:
         bcm963xx_mtd_info->owner = THIS_MODULE;
 
         /* This is mutually exclusive */
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index ddb462bea9b5..5fdb7b26cea3 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -178,11 +178,8 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
                 printk(KERN_ERR MOD_NAME
-                        " %s(): Unable to register resource"
-                        " 0x%.016llx-0x%.016llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                       " %s(): Unable to register resource %pR - kernel bug?\n",
+                        __func__, &window->rsrc);
         }
 
 
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index d12c93dc1aad..4feb7507ab7c 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -242,12 +242,9 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
         window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
-                printk(KERN_DEBUG MOD_NAME
-                        ": %s(): Unable to register resource"
-                        " 0x%.08llx-0x%.08llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                printk(KERN_DEBUG MOD_NAME ": "
+                       "%s(): Unable to register resource %pR - kernel bug?\n",
+                        __func__, &window->rsrc);
         }
 
         /* Map the firmware hub into my address space. */
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index f102bf243a74..1337a4191a0c 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -175,12 +175,9 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
         window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
-                printk(KERN_DEBUG MOD_NAME
-                        ": %s(): Unable to register resource"
-                        " 0x%.16llx-0x%.16llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                printk(KERN_DEBUG MOD_NAME ": "
+                       "%s(): Unable to register resource %pR - kernel bug?\n",
+                       __func__, &window->rsrc);
         }
 
         /* Map the firmware hub into my address space. */
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 9861814aa027..8506578e6a35 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -274,9 +274,7 @@ static int __devinit of_flash_probe(struct platform_device *dev,
                         continue;
                 }
 
-                dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
-                        (unsigned long long)res.start,
-                        (unsigned long long)res.end);
+                dev_dbg(&dev->dev, "of_flash device: %pR\n", &res);
 
                 err = -EBUSY;
                 res_size = resource_size(&res);
diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index b5391ebb736e..027e628a4f1d 100644
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -166,9 +166,8 @@ static int __init init_scx200_docflash(void)
                 outl(pmr, scx200_cb_base + SCx200_PMR);
         }
 
-        printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
-                        (unsigned long long)docmem.start,
-                        (unsigned long long)docmem.end, width);
+        printk(KERN_INFO NAME ": DOCCS mapped at %pR, width %d\n",
+               &docmem, width);
 
         scx200_docflash_map.size = size;
         if (width == 8)
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 60146984f4be..c08e140d40ed 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -139,7 +139,7 @@ static int __init init_tqm_mtd(void)
                         goto error_mem;
                 }
 
-                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
+                map_banks[idx]->name = kmalloc(16, GFP_KERNEL);
 
                 if (!map_banks[idx]->name) {
                         ret = -ENOMEM;
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index ee4bb3330bdf..145b3d0dc0db 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -522,10 +522,6 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        /* Only master mtd device must be used to control partitions */
-        if (!mtd_is_master(mtd))
-                return -EINVAL;
-
         if (copy_from_user(&a, arg, sizeof(struct blkpg_ioctl_arg)))
                 return -EFAULT;
 
@@ -535,6 +531,10 @@ static int mtd_blkpg_ioctl(struct mtd_info *mtd,
         switch (a.op) {
         case BLKPG_ADD_PARTITION:
 
+                /* Only master mtd device must be used to add partitions */
+                if (mtd_is_partition(mtd))
+                        return -EINVAL;
+
                 return mtd_add_partition(mtd, p.devname, p.start, p.length);
 
         case BLKPG_DEL_PARTITION:
@@ -601,6 +601,7 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
         }
 
         case MEMGETINFO:
+                memset(&info, 0, sizeof(info));
                 info.type       = mtd->type;
                 info.flags      = mtd->flags;
                 info.size       = mtd->size;
@@ -609,7 +610,6 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
                 info.oobsize    = mtd->oobsize;
                 /* The below fields are obsolete */
                 info.ecctype    = -1;
-                info.eccsize    = 0;
                 if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
                         return -EFAULT;
                 break;
@@ -1201,7 +1201,7 @@ err_unregister_chdev:
 static void __exit cleanup_mtdchar(void)
 {
         unregister_mtd_user(&mtdchar_notifier);
-        mntput_long(mtd_inode_mnt);
+        mntput(mtd_inode_mnt);
         unregister_filesystem(&mtd_inodefs_type);
         __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
 }
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index bf8de0943103..5f5777bd3f75 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -776,6 +776,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
         concat->mtd.size = subdev[0]->size;
         concat->mtd.erasesize = subdev[0]->erasesize;
         concat->mtd.writesize = subdev[0]->writesize;
+        concat->mtd.writebufsize = subdev[0]->writebufsize;
         concat->mtd.subpage_sft = subdev[0]->subpage_sft;
         concat->mtd.oobsize = subdev[0]->oobsize;
         concat->mtd.oobavail = subdev[0]->oobavail;
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index c948150079be..e3e40f440323 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -401,7 +401,8 @@ static void mtdoops_notify_remove(struct mtd_info *mtd)
                 printk(KERN_WARNING "mtdoops: could not unregister kmsg_dumper\n");
 
         cxt->mtd = NULL;
-        flush_scheduled_work();
+        flush_work_sync(&cxt->work_erase);
+        flush_work_sync(&cxt->work_write);
 }
 
 
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 79e3689f1e16..0a4760174782 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -120,8 +120,25 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
                 return -EINVAL;
         if (ops->datbuf && from + ops->len > mtd->size)
                 return -EINVAL;
-        res = part->master->read_oob(part->master, from + part->offset, ops);
 
+        /*
+         * If OOB is also requested, make sure that we do not read past the end
+         * of this partition.
+         */
+        if (ops->oobbuf) {
+                size_t len, pages;
+
+                if (ops->mode == MTD_OOB_AUTO)
+                        len = mtd->oobavail;
+                else
+                        len = mtd->oobsize;
+                pages = mtd_div_by_ws(mtd->size, mtd);
+                pages -= mtd_div_by_ws(from, mtd);
+                if (ops->ooboffs + ops->ooblen > pages * len)
+                        return -EINVAL;
+        }
+
+        res = part->master->read_oob(part->master, from + part->offset, ops);
         if (unlikely(res)) {
                 if (res == -EUCLEAN)
                         mtd->ecc_stats.corrected++;
@@ -384,6 +401,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *master,
         slave->mtd.flags = master->flags & ~part->mask_flags;
         slave->mtd.size = part->size;
         slave->mtd.writesize = master->writesize;
+        slave->mtd.writebufsize = master->writebufsize;
         slave->mtd.oobsize = master->oobsize;
         slave->mtd.oobavail = master->oobavail;
         slave->mtd.subpage_sft = master->subpage_sft;
@@ -720,19 +738,19 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
 }
 EXPORT_SYMBOL_GPL(parse_mtd_partitions);
 
-int mtd_is_master(struct mtd_info *mtd)
+int mtd_is_partition(struct mtd_info *mtd)
 {
         struct mtd_part *part;
-        int nopart = 0;
+        int ispart = 0;
 
         mutex_lock(&mtd_partitions_mutex);
         list_for_each_entry(part, &mtd_partitions, list)
                 if (&part->mtd == mtd) {
-                        nopart = 1;
+                        ispart = 1;
                         break;
                 }
         mutex_unlock(&mtd_partitions_mutex);
 
-        return nopart;
+        return ispart;
 }
-EXPORT_SYMBOL_GPL(mtd_is_master);
+EXPORT_SYMBOL_GPL(mtd_is_partition);
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 8229802b4346..c89592239bc7 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -96,6 +96,7 @@ config MTD_NAND_SPIA
 config MTD_NAND_AMS_DELTA
         tristate "NAND Flash device on Amstrad E3"
         depends on MACH_AMS_DELTA
+        default y
         help
           Support for NAND flash on Amstrad E3 (Delta).
 
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 2548e1065bf8..a067d090cb31 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -4,6 +4,8 @@
  *  Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
  *
  *  Derived from drivers/mtd/toto.c
+ *  Converted to platform driver by Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
+ *  Partially stolen from drivers/mtd/nand/plat_nand.c
  *
  * 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
@@ -62,9 +64,10 @@ static struct mtd_partition partition_info[] = {
 static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)
 {
         struct nand_chip *this = mtd->priv;
+        void __iomem *io_base = this->priv;
 
-        omap_writew(0, (OMAP1_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
-        omap_writew(byte, this->IO_ADDR_W);
+        writew(0, io_base + OMAP_MPUIO_IO_CNTL);
+        writew(byte, this->IO_ADDR_W);
         ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0);
         ndelay(40);
         ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE,
@@ -75,11 +78,12 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd)
 {
         u_char res;
         struct nand_chip *this = mtd->priv;
+        void __iomem *io_base = this->priv;
 
         ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0);
         ndelay(40);
-        omap_writew(~0, (OMAP1_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
-        res = omap_readw(this->IO_ADDR_R);
+        writew(~0, io_base + OMAP_MPUIO_IO_CNTL);
+        res = readw(this->IO_ADDR_R);
         ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE,
                                AMS_DELTA_LATCH2_NAND_NRE);
 
@@ -151,11 +155,16 @@ static int ams_delta_nand_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int __init ams_delta_init(void)
+static int __devinit ams_delta_init(struct platform_device *pdev)
 {
         struct nand_chip *this;
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        void __iomem *io_base;
         int err = 0;
 
+        if (!res)
+                return -ENXIO;
+
         /* Allocate memory for MTD device structure and private data */
         ams_delta_mtd = kmalloc(sizeof(struct mtd_info) +
                                 sizeof(struct nand_chip), GFP_KERNEL);
@@ -177,9 +186,25 @@ static int __init ams_delta_init(void)
         /* Link the private data with the MTD structure */
         ams_delta_mtd->priv = this;
 
+        if (!request_mem_region(res->start, resource_size(res),
+                        dev_name(&pdev->dev))) {
+                dev_err(&pdev->dev, "request_mem_region failed\n");
+                err = -EBUSY;
+                goto out_free;
+        }
+
+        io_base = ioremap(res->start, resource_size(res));
+        if (io_base == NULL) {
+                dev_err(&pdev->dev, "ioremap failed\n");
+                err = -EIO;
+                goto out_release_io;
+        }
+
+        this->priv = io_base;
+
         /* Set address of NAND IO lines */
-        this->IO_ADDR_R = (OMAP1_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH);
-        this->IO_ADDR_W = (OMAP1_MPUIO_BASE + OMAP_MPUIO_OUTPUT);
+        this->IO_ADDR_R = io_base + OMAP_MPUIO_INPUT_LATCH;
+        this->IO_ADDR_W = io_base + OMAP_MPUIO_OUTPUT;
         this->read_byte = ams_delta_read_byte;
         this->write_buf = ams_delta_write_buf;
         this->read_buf = ams_delta_read_buf;
@@ -195,6 +220,8 @@ static int __init ams_delta_init(void)
         this->chip_delay = 30;
         this->ecc.mode = NAND_ECC_SOFT;
 
+        platform_set_drvdata(pdev, io_base);
+
         /* Set chip enabled, but  */
         ams_delta_latch2_write(NAND_MASK, AMS_DELTA_LATCH2_NAND_NRE |
                                           AMS_DELTA_LATCH2_NAND_NWE |
@@ -214,25 +241,56 @@ static int __init ams_delta_init(void)
         goto out;
 
  out_mtd:
+        platform_set_drvdata(pdev, NULL);
+        iounmap(io_base);
+out_release_io:
+        release_mem_region(res->start, resource_size(res));
+out_free:
         kfree(ams_delta_mtd);
  out:
         return err;
 }
 
-module_init(ams_delta_init);
-
 /*
  * Clean up routine
  */
-static void __exit ams_delta_cleanup(void)
+static int __devexit ams_delta_cleanup(struct platform_device *pdev)
 {
+        void __iomem *io_base = platform_get_drvdata(pdev);
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
         /* Release resources, unregister device */
         nand_release(ams_delta_mtd);
 
+        iounmap(io_base);
+        release_mem_region(res->start, resource_size(res));
+
         /* Free the MTD device structure */
         kfree(ams_delta_mtd);
+
+        return 0;
+}
+
+static struct platform_driver ams_delta_nand_driver = {
+        .probe          = ams_delta_init,
+        .remove         = __devexit_p(ams_delta_cleanup),
+        .driver         = {
+                .name   = "ams-delta-nand",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ams_delta_nand_init(void)
+{
+        return platform_driver_register(&ams_delta_nand_driver);
+}
+module_init(ams_delta_nand_init);
+
+static void __exit ams_delta_nand_exit(void)
+{
+        platform_driver_unregister(&ams_delta_nand_driver);
 }
-module_exit(ams_delta_cleanup);
+module_exit(ams_delta_nand_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jonathan McDowell <noodles@earth.li>");
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index c141b07b25d1..7a13d42cbabd 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -388,6 +388,8 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                          "page_addr: 0x%x, column: 0x%x.\n",
                          page_addr, column);
 
+                elbc_fcm_ctrl->column = column;
+                elbc_fcm_ctrl->oob = 0;
                 elbc_fcm_ctrl->use_mdr = 1;
 
                 fcr = (NAND_CMD_STATUS   << FCR_CMD1_SHIFT) |
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 02edfba25b0c..205b10b9f9b9 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -31,6 +31,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/mtd/fsmc.h>
+#include <linux/amba/bus.h>
 #include <mtd/mtd-abi.h>
 
 static struct nand_ecclayout fsmc_ecc1_layout = {
@@ -119,21 +120,36 @@ static struct fsmc_eccplace fsmc_ecc4_sp_place = {
         }
 };
 
-/*
- * Default partition tables to be used if the partition information not
- * provided through platform data
- */
-#define PARTITION(n, off, sz)   {.name = n, .offset = off, .size = sz}
 
+#ifdef CONFIG_MTD_PARTITIONS
 /*
+ * Default partition tables to be used if the partition information not
+ * provided through platform data.
+ *
  * Default partition layout for small page(= 512 bytes) devices
  * Size for "Root file system" is updated in driver based on actual device size
  */
 static struct mtd_partition partition_info_16KB_blk[] = {
-        PARTITION("X-loader", 0, 4 * 0x4000),
-        PARTITION("U-Boot", 0x10000, 20 * 0x4000),
-        PARTITION("Kernel", 0x60000, 256 * 0x4000),
-        PARTITION("Root File System", 0x460000, 0),
+        {
+                .name = "X-loader",
+                .offset = 0,
+                .size = 4*0x4000,
+        },
+        {
+                .name = "U-Boot",
+                .offset = 0x10000,
+                .size = 20*0x4000,
+        },
+        {
+                .name = "Kernel",
+                .offset = 0x60000,
+                .size = 256*0x4000,
+        },
+        {
+                .name = "Root File System",
+                .offset = 0x460000,
+                .size = 0,
+        },
 };
 
 /*
@@ -141,19 +157,37 @@ static struct mtd_partition partition_info_16KB_blk[] = {
  * Size for "Root file system" is updated in driver based on actual device size
  */
 static struct mtd_partition partition_info_128KB_blk[] = {
-        PARTITION("X-loader", 0, 4 * 0x20000),
-        PARTITION("U-Boot", 0x80000, 12 * 0x20000),
-        PARTITION("Kernel", 0x200000, 48 * 0x20000),
-        PARTITION("Root File System", 0x800000, 0),
+        {
+                .name = "X-loader",
+                .offset = 0,
+                .size = 4*0x20000,
+        },
+        {
+                .name = "U-Boot",
+                .offset = 0x80000,
+                .size = 12*0x20000,
+        },
+        {
+                .name = "Kernel",
+                .offset = 0x200000,
+                .size = 48*0x20000,
+        },
+        {
+                .name = "Root File System",
+                .offset = 0x800000,
+                .size = 0,
+        },
 };
 
 #ifdef CONFIG_MTD_CMDLINE_PARTS
 const char *part_probes[] = { "cmdlinepart", NULL };
 #endif
+#endif
 
 /**
- * struct fsmc_nand_data - atructure for FSMC NAND device state
+ * struct fsmc_nand_data - structure for FSMC NAND device state
  *
+ * @pid:                Part ID on the AMBA PrimeCell format
  * @mtd:                MTD info for a NAND flash.
  * @nand:               Chip related info for a NAND flash.
  * @partitions:         Partition info for a NAND Flash.
@@ -169,6 +203,7 @@ const char *part_probes[] = { "cmdlinepart", NULL };
  * @regs_va:            FSMC regs base address.
  */
 struct fsmc_nand_data {
+        u32                     pid;
         struct mtd_info         mtd;
         struct nand_chip        nand;
         struct mtd_partition    *partitions;
@@ -508,7 +543,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
         struct nand_chip *nand;
         struct fsmc_regs *regs;
         struct resource *res;
-        int nr_parts, ret = 0;
+        int ret = 0;
+        u32 pid;
+        int i;
 
         if (!pdata) {
                 dev_err(&pdev->dev, "platform data is NULL\n");
@@ -598,6 +635,18 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
         if (ret)
                 goto err_probe1;
 
+        /*
+         * This device ID is actually a common AMBA ID as used on the
+         * AMBA PrimeCell bus. However it is not a PrimeCell.
+         */
+        for (pid = 0, i = 0; i < 4; i++)
+                pid |= (readl(host->regs_va + resource_size(res) - 0x20 + 4 * i) & 255) << (i * 8);
+        host->pid = pid;
+        dev_info(&pdev->dev, "FSMC device partno %03x, manufacturer %02x, "
+                 "revision %02x, config %02x\n",
+                 AMBA_PART_BITS(pid), AMBA_MANF_BITS(pid),
+                 AMBA_REV_BITS(pid), AMBA_CONFIG_BITS(pid));
+
         host->bank = pdata->bank;
         host->select_chip = pdata->select_bank;
         regs = host->regs_va;
@@ -625,7 +674,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
 
         fsmc_nand_setup(regs, host->bank, nand->options & NAND_BUSWIDTH_16);
 
-        if (get_fsmc_version(host->regs_va) == FSMC_VER8) {
+        if (AMBA_REV_BITS(host->pid) >= 8) {
                 nand->ecc.read_page = fsmc_read_page_hwecc;
                 nand->ecc.calculate = fsmc_read_hwecc_ecc4;
                 nand->ecc.correct = fsmc_correct_data;
@@ -645,7 +694,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
                 goto err_probe;
         }
 
-        if (get_fsmc_version(host->regs_va) == FSMC_VER8) {
+        if (AMBA_REV_BITS(host->pid) >= 8) {
                 if (host->mtd.writesize == 512) {
                         nand->ecc.layout = &fsmc_ecc4_sp_layout;
                         host->ecc_place = &fsmc_ecc4_sp_place;
@@ -676,11 +725,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
          * Check if partition info passed via command line
          */
         host->mtd.name = "nand";
-        nr_parts = parse_mtd_partitions(&host->mtd, part_probes,
+        host->nr_partitions = parse_mtd_partitions(&host->mtd, part_probes,
                         &host->partitions, 0);
-        if (nr_parts > 0) {
-                host->nr_partitions = nr_parts;
-        } else {
+        if (host->nr_partitions <= 0) {
 #endif
                 /*
                  * Check if partition info passed via command line
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 67343fc31bd5..cea38a5d4ac5 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -251,58 +251,6 @@ static int jz_nand_correct_ecc_rs(struct mtd_info *mtd, uint8_t *dat,
         return 0;
 }
 
-
-/* Copy paste of nand_read_page_hwecc_oob_first except for different eccpos
- * handling. The ecc area is for 4k chips 72 bytes long and thus does not fit
- * into the eccpos array. */
-static int jz_nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
-        struct nand_chip *chip, uint8_t *buf, int page)
-{
-        int i, eccsize = chip->ecc.size;
-        int eccbytes = chip->ecc.bytes;
-        int eccsteps = chip->ecc.steps;
-        uint8_t *p = buf;
-        unsigned int ecc_offset = chip->page_shift;
-
-        /* Read the OOB area first */
-        chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
-        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
-        chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
-
-        for (i = ecc_offset; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
-                int stat;
-
-                chip->ecc.hwctl(mtd, NAND_ECC_READ);
-                chip->read_buf(mtd, p, eccsize);
-
-                stat = chip->ecc.correct(mtd, p, &chip->oob_poi[i], NULL);
-                if (stat < 0)
-                        mtd->ecc_stats.failed++;
-                else
-                        mtd->ecc_stats.corrected += stat;
-        }
-        return 0;
-}
-
-/* Copy-and-paste of nand_write_page_hwecc with different eccpos handling. */
-static void jz_nand_write_page_hwecc(struct mtd_info *mtd,
-        struct nand_chip *chip, const uint8_t *buf)
-{
-        int i, eccsize = chip->ecc.size;
-        int eccbytes = chip->ecc.bytes;
-        int eccsteps = chip->ecc.steps;
-        const uint8_t *p = buf;
-        unsigned int ecc_offset = chip->page_shift;
-
-        for (i = ecc_offset; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
-                chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
-                chip->write_buf(mtd, p, eccsize);
-                chip->ecc.calculate(mtd, p, &chip->oob_poi[i]);
-        }
-
-        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
-}
-
 #ifdef CONFIG_MTD_CMDLINE_PARTS
 static const char *part_probes[] = {"cmdline", NULL};
 #endif
@@ -393,9 +341,6 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
         chip->ecc.size          = 512;
         chip->ecc.bytes         = 9;
 
-        chip->ecc.read_page     = jz_nand_read_page_hwecc_oob_first;
-        chip->ecc.write_page    = jz_nand_write_page_hwecc;
-
         if (pdata)
                 chip->ecc.layout = pdata->ecc_layout;
 
@@ -489,7 +434,7 @@ static int __devexit jz_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver jz_nand_driver = {
+static struct platform_driver jz_nand_driver = {
         .probe = jz_nand_probe,
         .remove = __devexit_p(jz_nand_remove),
         .driver = {
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 214b03afdd48..ef932ba55a0b 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1009,7 +1009,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         struct mxc_nand_platform_data *pdata = pdev->dev.platform_data;
         struct mxc_nand_host *host;
         struct resource *res;
-        int err = 0, nr_parts = 0;
+        int err = 0, __maybe_unused nr_parts = 0;
         struct nand_ecclayout *oob_smallpage, *oob_largepage;
 
         /* Allocate memory for MTD device structure and private data */
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 31bf376b82a0..a9c6ce745767 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2865,20 +2865,24 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
 
         /* check version */
         val = le16_to_cpu(p->revision);
-        if (val == 1 || val > (1 << 4)) {
-                printk(KERN_INFO "%s: unsupported ONFI version: %d\n",
-                                                                __func__, val);
-                return 0;
-        }
-
-        if (val & (1 << 4))
+        if (val & (1 << 5))
+                chip->onfi_version = 23;
+        else if (val & (1 << 4))
                 chip->onfi_version = 22;
         else if (val & (1 << 3))
                 chip->onfi_version = 21;
         else if (val & (1 << 2))
                 chip->onfi_version = 20;
-        else
+        else if (val & (1 << 1))
                 chip->onfi_version = 10;
+        else
+                chip->onfi_version = 0;
+
+        if (!chip->onfi_version) {
+                printk(KERN_INFO "%s: unsupported ONFI version: %d\n",
+                                                                __func__, val);
+                return 0;
+        }
 
         sanitize_string(p->manufacturer, sizeof(p->manufacturer));
         sanitize_string(p->model, sizeof(p->model));
@@ -2887,7 +2891,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
         mtd->writesize = le32_to_cpu(p->byte_per_page);
         mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize;
         mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
-        chip->chipsize = le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
+        chip->chipsize = (uint64_t)le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
         busw = 0;
         if (le16_to_cpu(p->features) & 1)
                 busw = NAND_BUSWIDTH_16;
@@ -3157,7 +3161,7 @@ ident_done:
         printk(KERN_INFO "NAND device: Manufacturer ID:"
                 " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
                 nand_manuf_ids[maf_idx].name,
-        chip->onfi_version ? type->name : chip->onfi_params.model);
+                chip->onfi_version ? chip->onfi_params.model : type->name);
 
         return type;
 }
@@ -3435,6 +3439,7 @@ int nand_scan_tail(struct mtd_info *mtd)
         mtd->resume = nand_resume;
         mtd->block_isbad = nand_block_isbad;
         mtd->block_markbad = nand_block_markbad;
+        mtd->writebufsize = mtd->writesize;
 
         /* propagate ecc.layout to mtd_info */
         mtd->ecclayout = chip->ecc.layout;
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 586b981f0e61..6ebd869993aa 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -1092,7 +1092,8 @@ static void mark_bbt_region(struct mtd_info *mtd, struct nand_bbt_descr *td)
 
 /**
  * verify_bbt_descr - verify the bad block description
- * @bd:                 the table to verify
+ * @mtd:        MTD device structure
+ * @bd:         the table to verify
  *
  * This functions performs a few sanity checks on the bad block description
  * table.
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index a6a73aab1253..a5aa99f014ba 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -210,12 +210,12 @@ MODULE_PARM_DESC(bbt,		 "0 OOB, 1 BBT with marker in OOB, 2 BBT with marker in d
 #define STATE_CMD_READ0        0x00000001 /* read data from the beginning of page */
 #define STATE_CMD_READ1        0x00000002 /* read data from the second half of page */
 #define STATE_CMD_READSTART    0x00000003 /* read data second command (large page devices) */
-#define STATE_CMD_PAGEPROG     0x00000004 /* start page programm */
+#define STATE_CMD_PAGEPROG     0x00000004 /* start page program */
 #define STATE_CMD_READOOB      0x00000005 /* read OOB area */
 #define STATE_CMD_ERASE1       0x00000006 /* sector erase first command */
 #define STATE_CMD_STATUS       0x00000007 /* read status */
 #define STATE_CMD_STATUS_M     0x00000008 /* read multi-plane status (isn't implemented) */
-#define STATE_CMD_SEQIN        0x00000009 /* sequential data imput */
+#define STATE_CMD_SEQIN        0x00000009 /* sequential data input */
 #define STATE_CMD_READID       0x0000000A /* read ID */
 #define STATE_CMD_ERASE2       0x0000000B /* sector erase second command */
 #define STATE_CMD_RESET        0x0000000C /* reset */
@@ -230,7 +230,7 @@ MODULE_PARM_DESC(bbt,		 "0 OOB, 1 BBT with marker in OOB, 2 BBT with marker in d
 #define STATE_ADDR_ZERO        0x00000040 /* one byte zero address was accepted */
 #define STATE_ADDR_MASK        0x00000070 /* address states mask */
 
-/* Durind data input/output the simulator is in these states */
+/* During data input/output the simulator is in these states */
 #define STATE_DATAIN           0x00000100 /* waiting for data input */
 #define STATE_DATAIN_MASK      0x00000100 /* data input states mask */
 
@@ -248,7 +248,7 @@ MODULE_PARM_DESC(bbt,		 "0 OOB, 1 BBT with marker in OOB, 2 BBT with marker in d
 
 /* Simulator's actions bit masks */
 #define ACTION_CPY       0x00100000 /* copy page/OOB to the internal buffer */
-#define ACTION_PRGPAGE   0x00200000 /* programm the internal buffer to flash */
+#define ACTION_PRGPAGE   0x00200000 /* program the internal buffer to flash */
 #define ACTION_SECERASE  0x00300000 /* erase sector */
 #define ACTION_ZEROOFF   0x00400000 /* don't add any offset to address */
 #define ACTION_HALFOFF   0x00500000 /* add to address half of page */
@@ -263,18 +263,18 @@ MODULE_PARM_DESC(bbt,		 "0 OOB, 1 BBT with marker in OOB, 2 BBT with marker in d
 #define OPT_PAGE512      0x00000002 /* 512-byte  page chips */
 #define OPT_PAGE2048     0x00000008 /* 2048-byte page chips */
 #define OPT_SMARTMEDIA   0x00000010 /* SmartMedia technology chips */
-#define OPT_AUTOINCR     0x00000020 /* page number auto inctimentation is possible */
+#define OPT_AUTOINCR     0x00000020 /* page number auto incrementation is possible */
 #define OPT_PAGE512_8BIT 0x00000040 /* 512-byte page chips with 8-bit bus width */
 #define OPT_PAGE4096     0x00000080 /* 4096-byte page chips */
 #define OPT_LARGEPAGE    (OPT_PAGE2048 | OPT_PAGE4096) /* 2048 & 4096-byte page chips */
 #define OPT_SMALLPAGE    (OPT_PAGE256  | OPT_PAGE512)  /* 256 and 512-byte page chips */
 
-/* Remove action bits ftom state */
+/* Remove action bits from state */
 #define NS_STATE(x) ((x) & ~ACTION_MASK)
 
 /*
  * Maximum previous states which need to be saved. Currently saving is
- * only needed for page programm operation with preceeded read command
+ * only needed for page program operation with preceded read command
  * (which is only valid for 512-byte pages).
  */
 #define NS_MAX_PREVSTATES 1
@@ -380,16 +380,16 @@ static struct nandsim_operations {
         /* Read OOB */
         {OPT_SMALLPAGE, {STATE_CMD_READOOB | ACTION_OOBOFF, STATE_ADDR_PAGE | ACTION_CPY,
                         STATE_DATAOUT, STATE_READY}},
-        /* Programm page starting from the beginning */
+        /* Program page starting from the beginning */
         {OPT_ANY, {STATE_CMD_SEQIN, STATE_ADDR_PAGE, STATE_DATAIN,
                         STATE_CMD_PAGEPROG | ACTION_PRGPAGE, STATE_READY}},
-        /* Programm page starting from the beginning */
+        /* Program page starting from the beginning */
         {OPT_SMALLPAGE, {STATE_CMD_READ0, STATE_CMD_SEQIN | ACTION_ZEROOFF, STATE_ADDR_PAGE,
                               STATE_DATAIN, STATE_CMD_PAGEPROG | ACTION_PRGPAGE, STATE_READY}},
-        /* Programm page starting from the second half */
+        /* Program page starting from the second half */
         {OPT_PAGE512, {STATE_CMD_READ1, STATE_CMD_SEQIN | ACTION_HALFOFF, STATE_ADDR_PAGE,
                               STATE_DATAIN, STATE_CMD_PAGEPROG | ACTION_PRGPAGE, STATE_READY}},
-        /* Programm OOB */
+        /* Program OOB */
         {OPT_SMALLPAGE, {STATE_CMD_READOOB, STATE_CMD_SEQIN | ACTION_OOBOFF, STATE_ADDR_PAGE,
                               STATE_DATAIN, STATE_CMD_PAGEPROG | ACTION_PRGPAGE, STATE_READY}},
         /* Erase sector */
@@ -470,7 +470,7 @@ static int alloc_device(struct nandsim *ns)
                         err = -EINVAL;
                         goto err_close;
                 }
-                ns->pages_written = vmalloc(ns->geom.pgnum);
+                ns->pages_written = vzalloc(ns->geom.pgnum);
                 if (!ns->pages_written) {
                         NS_ERR("alloc_device: unable to allocate pages written array\n");
                         err = -ENOMEM;
@@ -483,7 +483,6 @@ static int alloc_device(struct nandsim *ns)
                         goto err_free;
                 }
                 ns->cfile = cfile;
-                memset(ns->pages_written, 0, ns->geom.pgnum);
                 return 0;
         }
 
@@ -1171,9 +1170,9 @@ static inline void switch_to_ready_state(struct nandsim *ns, u_char status)
  * of supported operations.
  *
  * Operation can be unknown because of the following.
- *   1. New command was accepted and this is the firs call to find the
+ *   1. New command was accepted and this is the first call to find the
  *      correspondent states chain. In this case ns->npstates = 0;
- *   2. There is several operations which begin with the same command(s)
+ *   2. There are several operations which begin with the same command(s)
  *      (for example program from the second half and read from the
  *      second half operations both begin with the READ1 command). In this
  *      case the ns->pstates[] array contains previous states.
@@ -1186,7 +1185,7 @@ static inline void switch_to_ready_state(struct nandsim *ns, u_char status)
  * ns->ops, ns->state, ns->nxstate are initialized, ns->npstate is
  * zeroed).
  *
- * If there are several maches, the current state is pushed to the
+ * If there are several matches, the current state is pushed to the
  * ns->pstates.
  *
  * The operation can be unknown only while commands are input to the chip.
@@ -1195,10 +1194,10 @@ static inline void switch_to_ready_state(struct nandsim *ns, u_char status)
  * operation is searched using the following pattern:
  *     ns->pstates[0], ... ns->pstates[ns->npstates], <address input>
  *
- * It is supposed that this pattern must either match one operation on
+ * It is supposed that this pattern must either match one operation or
  * none. There can't be ambiguity in that case.
  *
- * If no matches found, the functions does the following:
+ * If no matches found, the function does the following:
  *   1. if there are saved states present, try to ignore them and search
  *      again only using the last command. If nothing was found, switch
  *      to the STATE_READY state.
@@ -1668,7 +1667,7 @@ static int do_state_action(struct nandsim *ns, uint32_t action)
 
         case ACTION_PRGPAGE:
                 /*
-                 * Programm page - move internal buffer data to the page.
+                 * Program page - move internal buffer data to the page.
                  */
 
                 if (ns->lines.wp) {
@@ -1933,7 +1932,7 @@ static u_char ns_nand_read_byte(struct mtd_info *mtd)
                 NS_DBG("read_byte: all bytes were read\n");
 
                 /*
-                 * The OPT_AUTOINCR allows to read next conseqitive pages without
+                 * The OPT_AUTOINCR allows to read next consecutive pages without
                  * new read operation cycle.
                  */
                 if ((ns->options & OPT_AUTOINCR) && NS_STATE(ns->state) == STATE_DATAOUT) {
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 6ddb2461d740..bb277a54986f 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -107,7 +107,7 @@ static int __devinit pasemi_nand_probe(struct platform_device *ofdev,
         if (pasemi_nand_mtd)
                 return -ENODEV;
 
-        pr_debug("pasemi_nand at %llx-%llx\n", res.start, res.end);
+        pr_debug("pasemi_nand at %pR\n", &res);
 
         /* Allocate memory for MTD device structure and private data */
         pasemi_nand_mtd = kzalloc(sizeof(struct mtd_info) +
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 17f8518cc5eb..ea2c288df3f6 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -885,6 +885,7 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info)
         /* set info fields needed to __readid */
         info->read_id_bytes = (info->page_size == 2048) ? 4 : 2;
         info->reg_ndcr = ndcr;
+        info->cmdset = &default_cmdset;
 
         if (__readid(info, &id))
                 return -ENODEV;
@@ -915,7 +916,6 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info)
 
         info->ndtr0cs0 = nand_readl(info, NDTR0CS0);
         info->ndtr1cs0 = nand_readl(info, NDTR1CS0);
-        info->cmdset = &default_cmdset;
 
         return 0;
 }
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 054a41c0ef4a..ca270a4881a4 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -277,8 +277,9 @@ static int txx9ndfmc_nand_scan(struct mtd_info *mtd)
         ret = nand_scan_ident(mtd, 1, NULL);
         if (!ret) {
                 if (mtd->writesize >= 512) {
-                        chip->ecc.size = mtd->writesize;
-                        chip->ecc.bytes = 3 * (mtd->writesize / 256);
+                        /* Hardware ECC 6 byte ECC per 512 Byte data */
+                        chip->ecc.size = 512;
+                        chip->ecc.bytes = 6;
                 }
                 ret = nand_scan_tail(mtd);
         }
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index d0894ca7798b..ac31f461cc1c 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -35,6 +35,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/regulator/consumer.h>
 
 #include <asm/mach/flash.h>
 #include <plat/gpmc.h>
@@ -63,8 +64,13 @@ struct omap2_onenand {
         int dma_channel;
         int freq;
         int (*setup)(void __iomem *base, int freq);
+        struct regulator *regulator;
 };
 
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probes[] = { "cmdlinepart", NULL,  };
+#endif
+
 static void omap2_onenand_dma_cb(int lch, u16 ch_status, void *data)
 {
         struct omap2_onenand *c = data;
@@ -108,8 +114,9 @@ static void wait_warn(char *msg, int state, unsigned int ctrl,
 static int omap2_onenand_wait(struct mtd_info *mtd, int state)
 {
         struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+        struct onenand_chip *this = mtd->priv;
         unsigned int intr = 0;
-        unsigned int ctrl;
+        unsigned int ctrl, ctrl_mask;
         unsigned long timeout;
         u32 syscfg;
 
@@ -180,7 +187,8 @@ retry:
                         if (result == 0) {
                                 /* Timeout after 20ms */
                                 ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS);
-                                if (ctrl & ONENAND_CTRL_ONGO) {
+                                if (ctrl & ONENAND_CTRL_ONGO &&
+                                    !this->ongoing) {
                                         /*
                                          * The operation seems to be still going
                                          * so give it some more time.
@@ -269,7 +277,11 @@ retry:
                 return -EIO;
         }
 
-        if (ctrl & 0xFE9F)
+        ctrl_mask = 0xFE9F;
+        if (this->ongoing)
+                ctrl_mask &= ~0x8000;
+
+        if (ctrl & ctrl_mask)
                 wait_warn("unexpected controller status", state, ctrl, intr);
 
         return 0;
@@ -591,6 +603,30 @@ static void omap2_onenand_shutdown(struct platform_device *pdev)
         memset((__force void *)c->onenand.base, 0, ONENAND_BUFRAM_SIZE);
 }
 
+static int omap2_onenand_enable(struct mtd_info *mtd)
+{
+        int ret;
+        struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+
+        ret = regulator_enable(c->regulator);
+        if (ret != 0)
+                dev_err(&c->pdev->dev, "cant enable regulator\n");
+
+        return ret;
+}
+
+static int omap2_onenand_disable(struct mtd_info *mtd)
+{
+        int ret;
+        struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
+
+        ret = regulator_disable(c->regulator);
+        if (ret != 0)
+                dev_err(&c->pdev->dev, "cant disable regulator\n");
+
+        return ret;
+}
+
 static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 {
         struct omap_onenand_platform_data *pdata;
@@ -705,8 +741,18 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
                 }
         }
 
+        if (pdata->regulator_can_sleep) {
+                c->regulator = regulator_get(&pdev->dev, "vonenand");
+                if (IS_ERR(c->regulator)) {
+                        dev_err(&pdev->dev,  "Failed to get regulator\n");
+                        goto err_release_dma;
+                }
+                c->onenand.enable = omap2_onenand_enable;
+                c->onenand.disable = omap2_onenand_disable;
+        }
+
         if ((r = onenand_scan(&c->mtd, 1)) < 0)
-                goto err_release_dma;
+                goto err_release_regulator;
 
         switch ((c->onenand.version_id >> 4) & 0xf) {
         case 0:
@@ -727,13 +773,15 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
         }
 
 #ifdef CONFIG_MTD_PARTITIONS
-        if (pdata->parts != NULL)
-                r = add_mtd_partitions(&c->mtd, pdata->parts,
-                                       pdata->nr_parts);
+        r = parse_mtd_partitions(&c->mtd, part_probes, &c->parts, 0);
+        if (r > 0)
+                r = add_mtd_partitions(&c->mtd, c->parts, r);
+        else if (pdata->parts != NULL)
+                r = add_mtd_partitions(&c->mtd, pdata->parts, pdata->nr_parts);
         else
 #endif
                 r = add_mtd_device(&c->mtd);
-        if (r < 0)
+        if (r)
                 goto err_release_onenand;
 
         platform_set_drvdata(pdev, c);
@@ -742,6 +790,8 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 
 err_release_onenand:
         onenand_release(&c->mtd);
+err_release_regulator:
+        regulator_put(c->regulator);
 err_release_dma:
         if (c->dma_channel != -1)
                 omap_free_dma(c->dma_channel);
@@ -757,6 +807,7 @@ err_release_mem_region:
 err_free_cs:
         gpmc_cs_free(c->gpmc_cs);
 err_kfree:
+        kfree(c->parts);
         kfree(c);
 
         return r;
@@ -766,18 +817,8 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
 {
         struct omap2_onenand *c = dev_get_drvdata(&pdev->dev);
 
-        BUG_ON(c == NULL);
-
-#ifdef CONFIG_MTD_PARTITIONS
-        if (c->parts)
-                del_mtd_partitions(&c->mtd);
-        else
-                del_mtd_device(&c->mtd);
-#else
-        del_mtd_device(&c->mtd);
-#endif
-
         onenand_release(&c->mtd);
+        regulator_put(c->regulator);
         if (c->dma_channel != -1)
                 omap_free_dma(c->dma_channel);
         omap2_onenand_shutdown(pdev);
@@ -789,6 +830,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
         iounmap(c->onenand.base);
         release_mem_region(c->phys_base, ONENAND_IO_SIZE);
         gpmc_cs_free(c->gpmc_cs);
+        kfree(c->parts);
         kfree(c);
 
         return 0;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 6b3a875647c9..bac41caa8df7 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -400,8 +400,7 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 value = onenand_bufferram_address(this, block);
                 this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
 
-                if (ONENAND_IS_MLC(this) || ONENAND_IS_2PLANE(this) ||
-                    ONENAND_IS_4KB_PAGE(this))
+                if (ONENAND_IS_2PLANE(this) || ONENAND_IS_4KB_PAGE(this))
                         /* It is always BufferRAM0 */
                         ONENAND_SET_BUFFERRAM0(this);
                 else
@@ -430,7 +429,7 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 case FLEXONENAND_CMD_RECOVER_LSB:
                 case ONENAND_CMD_READ:
                 case ONENAND_CMD_READOOB:
-                        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
+                        if (ONENAND_IS_4KB_PAGE(this))
                                 /* It is always BufferRAM0 */
                                 dataram = ONENAND_SET_BUFFERRAM0(this);
                         else
@@ -949,6 +948,8 @@ static int onenand_get_device(struct mtd_info *mtd, int new_state)
                 if (this->state == FL_READY) {
                         this->state = new_state;
                         spin_unlock(&this->chip_lock);
+                        if (new_state != FL_PM_SUSPENDED && this->enable)
+                                this->enable(mtd);
                         break;
                 }
                 if (new_state == FL_PM_SUSPENDED) {
@@ -975,6 +976,8 @@ static void onenand_release_device(struct mtd_info *mtd)
 {
         struct onenand_chip *this = mtd->priv;
 
+        if (this->state != FL_PM_SUSPENDED && this->disable)
+                this->disable(mtd);
         /* Release the chip */
         spin_lock(&this->chip_lock);
         this->state = FL_READY;
@@ -1353,7 +1356,7 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from,
 
         stats = mtd->ecc_stats;
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         while (read < len) {
                 cond_resched();
@@ -1429,7 +1432,7 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
         int ret;
 
         onenand_get_device(mtd, FL_READING);
-        ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
+        ret = ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
         onenand_release_device(mtd);
@@ -1464,7 +1467,7 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from,
 
         onenand_get_device(mtd, FL_READING);
         if (ops->datbuf)
-                ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
+                ret = ONENAND_IS_4KB_PAGE(this) ?
                         onenand_mlc_read_ops_nolock(mtd, from, ops) :
                         onenand_read_ops_nolock(mtd, from, ops);
         else
@@ -1485,8 +1488,7 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
 {
         struct onenand_chip *this = mtd->priv;
         unsigned long timeout;
-        unsigned int interrupt;
-        unsigned int ctrl;
+        unsigned int interrupt, ctrl, ecc, addr1, addr8;
 
         /* The 20 msec is enough */
         timeout = jiffies + msecs_to_jiffies(20);
@@ -1498,25 +1500,28 @@ static int onenand_bbt_wait(struct mtd_info *mtd, int state)
         /* To get correct interrupt status in timeout case */
         interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
         ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
+        addr1 = this->read_word(this->base + ONENAND_REG_START_ADDRESS1);
+        addr8 = this->read_word(this->base + ONENAND_REG_START_ADDRESS8);
 
         if (interrupt & ONENAND_INT_READ) {
-                int ecc = onenand_read_ecc(this);
+                ecc = onenand_read_ecc(this);
                 if (ecc & ONENAND_ECC_2BIT_ALL) {
-                        printk(KERN_WARNING "%s: ecc error = 0x%04x, "
-                                "controller error 0x%04x\n",
-                                __func__, ecc, ctrl);
+                        printk(KERN_DEBUG "%s: ecc 0x%04x ctrl 0x%04x "
+                               "intr 0x%04x addr1 %#x addr8 %#x\n",
+                               __func__, ecc, ctrl, interrupt, addr1, addr8);
                         return ONENAND_BBT_READ_ECC_ERROR;
                 }
         } else {
-                printk(KERN_ERR "%s: read timeout! ctrl=0x%04x intr=0x%04x\n",
-                        __func__, ctrl, interrupt);
+                printk(KERN_ERR "%s: read timeout! ctrl 0x%04x "
+                       "intr 0x%04x addr1 %#x addr8 %#x\n",
+                       __func__, ctrl, interrupt, addr1, addr8);
                 return ONENAND_BBT_READ_FATAL_ERROR;
         }
 
         /* Initial bad block case: 0x2400 or 0x0400 */
         if (ctrl & ONENAND_CTRL_ERROR) {
-                printk(KERN_DEBUG "%s: controller error = 0x%04x\n",
-                        __func__, ctrl);
+                printk(KERN_DEBUG "%s: ctrl 0x%04x intr 0x%04x addr1 %#x "
+                       "addr8 %#x\n", __func__, ctrl, interrupt, addr1, addr8);
                 return ONENAND_BBT_READ_ERROR;
         }
 
@@ -1558,7 +1563,7 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from,
 
         column = from & (mtd->oobsize - 1);
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         while (read < len) {
                 cond_resched();
@@ -1612,7 +1617,7 @@ static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to
         u_char *oob_buf = this->oob_buf;
         int status, i, readcmd;
 
-        readcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
+        readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB;
 
         this->command(mtd, readcmd, to, mtd->oobsize);
         onenand_update_bufferram(mtd, to, 0);
@@ -1845,7 +1850,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
         const u_char *buf = ops->datbuf;
         const u_char *oob = ops->oobbuf;
         u_char *oobbuf;
-        int ret = 0;
+        int ret = 0, cmd;
 
         DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
                 __func__, (unsigned int) to, (int) len);
@@ -1954,7 +1959,19 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
                         ONENAND_SET_NEXT_BUFFERRAM(this);
                 }
 
-                this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize);
+                this->ongoing = 0;
+                cmd = ONENAND_CMD_PROG;
+
+                /* Exclude 1st OTP and OTP blocks for cache program feature */
+                if (ONENAND_IS_CACHE_PROGRAM(this) &&
+                    likely(onenand_block(this, to) != 0) &&
+                    ONENAND_IS_4KB_PAGE(this) &&
+                    ((written + thislen) < len)) {
+                        cmd = ONENAND_CMD_2X_CACHE_PROG;
+                        this->ongoing = 1;
+                }
+
+                this->command(mtd, cmd, to, mtd->writesize);
 
                 /*
                  * 2 PLANE, MLC, and Flex-OneNAND wait here
@@ -2067,7 +2084,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
 
         oobbuf = this->oob_buf;
 
-        oobcmd = ONENAND_IS_MLC(this) ? ONENAND_CMD_PROG : ONENAND_CMD_PROGOOB;
+        oobcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_PROG : ONENAND_CMD_PROGOOB;
 
         /* Loop until all data write */
         while (written < len) {
@@ -2086,7 +2103,7 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to,
                         memcpy(oobbuf + column, buf, thislen);
                 this->write_bufferram(mtd, ONENAND_SPARERAM, oobbuf, 0, mtd->oobsize);
 
-                if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this)) {
+                if (ONENAND_IS_4KB_PAGE(this)) {
                         /* Set main area of DataRAM to 0xff*/
                         memset(this->page_buf, 0xff, mtd->writesize);
                         this->write_bufferram(mtd, ONENAND_DATARAM,
@@ -2481,7 +2498,8 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
         /* Grab the lock and see if the device is available */
         onenand_get_device(mtd, FL_ERASING);
 
-        if (region || instr->len < MB_ERASE_MIN_BLK_COUNT * block_size) {
+        if (ONENAND_IS_4KB_PAGE(this) || region ||
+            instr->len < MB_ERASE_MIN_BLK_COUNT * block_size) {
                 /* region is set for Flex-OneNAND (no mb erase) */
                 ret = onenand_block_by_block_erase(mtd, instr,
                                                    region, block_size);
@@ -3029,7 +3047,7 @@ static int do_otp_read(struct mtd_info *mtd, loff_t from, size_t len,
         this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
         this->wait(mtd, FL_OTPING);
 
-        ret = ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this) ?
+        ret = ONENAND_IS_4KB_PAGE(this) ?
                 onenand_mlc_read_ops_nolock(mtd, from, &ops) :
                 onenand_read_ops_nolock(mtd, from, &ops);
 
@@ -3377,8 +3395,10 @@ static void onenand_check_features(struct mtd_info *mtd)
         case ONENAND_DEVICE_DENSITY_4Gb:
                 if (ONENAND_IS_DDP(this))
                         this->options |= ONENAND_HAS_2PLANE;
-                else if (numbufs == 1)
+                else if (numbufs == 1) {
                         this->options |= ONENAND_HAS_4KB_PAGE;
+                        this->options |= ONENAND_HAS_CACHE_PROGRAM;
+                }
 
         case ONENAND_DEVICE_DENSITY_2Gb:
                 /* 2Gb DDP does not have 2 plane */
@@ -3399,7 +3419,11 @@ static void onenand_check_features(struct mtd_info *mtd)
                 break;
         }
 
-        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
+        /* The MLC has 4KiB pagesize. */
+        if (ONENAND_IS_MLC(this))
+                this->options |= ONENAND_HAS_4KB_PAGE;
+
+        if (ONENAND_IS_4KB_PAGE(this))
                 this->options &= ~ONENAND_HAS_2PLANE;
 
         if (FLEXONENAND(this)) {
@@ -3415,6 +3439,8 @@ static void onenand_check_features(struct mtd_info *mtd)
                 printk(KERN_DEBUG "Chip has 2 plane\n");
         if (this->options & ONENAND_HAS_4KB_PAGE)
                 printk(KERN_DEBUG "Chip has 4KiB pagesize\n");
+        if (this->options & ONENAND_HAS_CACHE_PROGRAM)
+                printk(KERN_DEBUG "Chip has cache program feature\n");
 }
 
 /**
@@ -3831,7 +3857,7 @@ static int onenand_probe(struct mtd_info *mtd)
         /* The data buffer size is equal to page size */
         mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
         /* We use the full BufferRAM */
-        if (ONENAND_IS_MLC(this) || ONENAND_IS_4KB_PAGE(this))
+        if (ONENAND_IS_4KB_PAGE(this))
                 mtd->writesize <<= 1;
 
         mtd->oobsize = mtd->writesize >> 5;
@@ -4054,6 +4080,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         mtd->block_isbad = onenand_block_isbad;
         mtd->block_markbad = onenand_block_markbad;
         mtd->owner = THIS_MODULE;
+        mtd->writebufsize = mtd->writesize;
 
         /* Unlock whole block */
         this->unlock_all(mtd);
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 01ab5b3c453b..fc2c16a0fd1c 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -91,16 +91,18 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 for (j = 0; j < len; j++) {
                         /* No need to read pages fully,
                          * just read required OOB bytes */
-                        ret = onenand_bbt_read_oob(mtd, from + j * mtd->writesize + bd->offs, &ops);
+                        ret = onenand_bbt_read_oob(mtd,
+                                from + j * this->writesize + bd->offs, &ops);
 
                         /* If it is a initial bad block, just ignore it */
                         if (ret == ONENAND_BBT_READ_FATAL_ERROR)
                                 return -EIO;
 
-                        if (ret || check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
+                        if (ret || check_short_pattern(&buf[j * scanlen],
+                                               scanlen, this->writesize, bd)) {
                                 bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
-                                        i >> 1, (unsigned int) from);
+                                printk(KERN_INFO "OneNAND eraseblock %d is an "
+                                        "initial bad block\n", i >> 1);
                                 mtd->ecc_stats.badblocks++;
                                 break;
                         }
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 0de7a05e6de0..a4c74a9ba430 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -651,7 +651,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
         void __iomem *p;
         void *buf = (void *) buffer;
         dma_addr_t dma_src, dma_dst;
-        int err, page_dma = 0;
+        int err, ofs, page_dma = 0;
         struct device *dev = &onenand->pdev->dev;
 
         p = this->base + area;
@@ -677,10 +677,13 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
                 if (!page)
                         goto normal;
 
+                /* Page offset */
+                ofs = ((size_t) buf & ~PAGE_MASK);
                 page_dma = 1;
+
                 /* DMA routine */
                 dma_src = onenand->phys_base + (p - this->base);
-                dma_dst = dma_map_page(dev, page, 0, count, DMA_FROM_DEVICE);
+                dma_dst = dma_map_page(dev, page, ofs, count, DMA_FROM_DEVICE);
         } else {
                 /* DMA routine */
                 dma_src = onenand->phys_base + (p - this->base);
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index fcdb7f65fe0b..0b8141fc5c26 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -425,12 +425,11 @@ static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi,
 
         /* Read both LEB 0 and LEB 1 into memory */
         ubi_rb_for_each_entry(rb, seb, &sv->root, u.rb) {
-                leb[seb->lnum] = vmalloc(ubi->vtbl_size);
+                leb[seb->lnum] = vzalloc(ubi->vtbl_size);
                 if (!leb[seb->lnum]) {
                         err = -ENOMEM;
                         goto out_free;
                 }
-                memset(leb[seb->lnum], 0, ubi->vtbl_size);
 
                 err = ubi_io_read_data(ubi, leb[seb->lnum], seb->pnum, 0,
                                        ubi->vtbl_size);
@@ -516,10 +515,9 @@ static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi,
         int i;
         struct ubi_vtbl_record *vtbl;
 
-        vtbl = vmalloc(ubi->vtbl_size);
+        vtbl = vzalloc(ubi->vtbl_size);
         if (!vtbl)
                 return ERR_PTR(-ENOMEM);
-        memset(vtbl, 0, ubi->vtbl_size);
 
         for (i = 0; i < ubi->vtbl_slots; i++)
                 memcpy(&vtbl[i], &empty_vtbl_record, UBI_VTBL_RECORD_SIZE);
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4c8bfc97fb4c..03823327db25 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2864,7 +2864,7 @@ config MLX4_CORE
         default n
 
 config MLX4_DEBUG
-        bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+        bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
         depends on MLX4_CORE
         default y
         ---help---
@@ -3389,8 +3389,7 @@ config NETCONSOLE
 
 config NETCONSOLE_DYNAMIC
         bool "Dynamic reconfiguration of logging targets"
-        depends on NETCONSOLE && SYSFS
-        select CONFIGFS_FS
+        depends on NETCONSOLE && SYSFS && CONFIGFS_FS
         help
           This option enables the ability to dynamically reconfigure target
           parameters (interface, IP addresses, port numbers, MAC addresses)
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 54c6d849cf25..aa07657744c3 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -854,12 +854,12 @@ ks8695_set_msglevel(struct net_device *ndev, u32 value)
 }
 
 /**
- *      ks8695_get_settings - Get device-specific settings.
+ *      ks8695_wan_get_settings - Get device-specific settings.
  *      @ndev: The network device to read settings from
  *      @cmd: The ethtool structure to read into
  */
 static int
-ks8695_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
+ks8695_wan_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
 {
         struct ks8695_priv *ksp = netdev_priv(ndev);
         u32 ctrl;
@@ -870,69 +870,50 @@ ks8695_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
                           SUPPORTED_TP | SUPPORTED_MII);
         cmd->transceiver = XCVR_INTERNAL;
 
-        /* Port specific extras */
-        switch (ksp->dtype) {
-        case KS8695_DTYPE_HPNA:
-                cmd->phy_address = 0;
-                /* not supported for HPNA */
-                cmd->autoneg = AUTONEG_DISABLE;
+        cmd->advertising = ADVERTISED_TP | ADVERTISED_MII;
+        cmd->port = PORT_MII;
+        cmd->supported |= (SUPPORTED_Autoneg | SUPPORTED_Pause);
+        cmd->phy_address = 0;
 
-                /* BUG: Erm, dtype hpna implies no phy regs */
-                /*
-                ctrl = readl(KS8695_MISC_VA + KS8695_HMC);
-                cmd->speed = (ctrl & HMC_HSS) ? SPEED_100 : SPEED_10;
-                cmd->duplex = (ctrl & HMC_HDS) ? DUPLEX_FULL : DUPLEX_HALF;
-                */
-                return -EOPNOTSUPP;
-        case KS8695_DTYPE_WAN:
-                cmd->advertising = ADVERTISED_TP | ADVERTISED_MII;
-                cmd->port = PORT_MII;
-                cmd->supported |= (SUPPORTED_Autoneg | SUPPORTED_Pause);
-                cmd->phy_address = 0;
+        ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
+        if ((ctrl & WMC_WAND) == 0) {
+                /* auto-negotiation is enabled */
+                cmd->advertising |= ADVERTISED_Autoneg;
+                if (ctrl & WMC_WANA100F)
+                        cmd->advertising |= ADVERTISED_100baseT_Full;
+                if (ctrl & WMC_WANA100H)
+                        cmd->advertising |= ADVERTISED_100baseT_Half;
+                if (ctrl & WMC_WANA10F)
+                        cmd->advertising |= ADVERTISED_10baseT_Full;
+                if (ctrl & WMC_WANA10H)
+                        cmd->advertising |= ADVERTISED_10baseT_Half;
+                if (ctrl & WMC_WANAP)
+                        cmd->advertising |= ADVERTISED_Pause;
+                cmd->autoneg = AUTONEG_ENABLE;
+
+                cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10;
+                cmd->duplex = (ctrl & WMC_WDS) ?
+                        DUPLEX_FULL : DUPLEX_HALF;
+        } else {
+                /* auto-negotiation is disabled */
+                cmd->autoneg = AUTONEG_DISABLE;
 
-                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-                if ((ctrl & WMC_WAND) == 0) {
-                        /* auto-negotiation is enabled */
-                        cmd->advertising |= ADVERTISED_Autoneg;
-                        if (ctrl & WMC_WANA100F)
-                                cmd->advertising |= ADVERTISED_100baseT_Full;
-                        if (ctrl & WMC_WANA100H)
-                                cmd->advertising |= ADVERTISED_100baseT_Half;
-                        if (ctrl & WMC_WANA10F)
-                                cmd->advertising |= ADVERTISED_10baseT_Full;
-                        if (ctrl & WMC_WANA10H)
-                                cmd->advertising |= ADVERTISED_10baseT_Half;
-                        if (ctrl & WMC_WANAP)
-                                cmd->advertising |= ADVERTISED_Pause;
-                        cmd->autoneg = AUTONEG_ENABLE;
-
-                        cmd->speed = (ctrl & WMC_WSS) ? SPEED_100 : SPEED_10;
-                        cmd->duplex = (ctrl & WMC_WDS) ?
-                                DUPLEX_FULL : DUPLEX_HALF;
-                } else {
-                        /* auto-negotiation is disabled */
-                        cmd->autoneg = AUTONEG_DISABLE;
-
-                        cmd->speed = (ctrl & WMC_WANF100) ?
-                                SPEED_100 : SPEED_10;
-                        cmd->duplex = (ctrl & WMC_WANFF) ?
-                                DUPLEX_FULL : DUPLEX_HALF;
-                }
-                break;
-        case KS8695_DTYPE_LAN:
-                return -EOPNOTSUPP;
+                cmd->speed = (ctrl & WMC_WANF100) ?
+                        SPEED_100 : SPEED_10;
+                cmd->duplex = (ctrl & WMC_WANFF) ?
+                        DUPLEX_FULL : DUPLEX_HALF;
         }
 
         return 0;
 }
 
 /**
- *      ks8695_set_settings - Set device-specific settings.
+ *      ks8695_wan_set_settings - Set device-specific settings.
  *      @ndev: The network device to configure
  *      @cmd: The settings to configure
  */
 static int
-ks8695_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
+ks8695_wan_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
 {
         struct ks8695_priv *ksp = netdev_priv(ndev);
         u32 ctrl;
@@ -956,171 +937,85 @@ ks8695_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
                                 ADVERTISED_100baseT_Full)) == 0)
                         return -EINVAL;
 
-                switch (ksp->dtype) {
-                case KS8695_DTYPE_HPNA:
-                        /* HPNA does not support auto-negotiation. */
-                        return -EINVAL;
-                case KS8695_DTYPE_WAN:
-                        ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-
-                        ctrl &= ~(WMC_WAND | WMC_WANA100F | WMC_WANA100H |
-                                  WMC_WANA10F | WMC_WANA10H);
-                        if (cmd->advertising & ADVERTISED_100baseT_Full)
-                                ctrl |= WMC_WANA100F;
-                        if (cmd->advertising & ADVERTISED_100baseT_Half)
-                                ctrl |= WMC_WANA100H;
-                        if (cmd->advertising & ADVERTISED_10baseT_Full)
-                                ctrl |= WMC_WANA10F;
-                        if (cmd->advertising & ADVERTISED_10baseT_Half)
-                                ctrl |= WMC_WANA10H;
-
-                        /* force a re-negotiation */
-                        ctrl |= WMC_WANR;
-                        writel(ctrl, ksp->phyiface_regs + KS8695_WMC);
-                        break;
-                case KS8695_DTYPE_LAN:
-                        return -EOPNOTSUPP;
-                }
+                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
 
+                ctrl &= ~(WMC_WAND | WMC_WANA100F | WMC_WANA100H |
+                          WMC_WANA10F | WMC_WANA10H);
+                if (cmd->advertising & ADVERTISED_100baseT_Full)
+                        ctrl |= WMC_WANA100F;
+                if (cmd->advertising & ADVERTISED_100baseT_Half)
+                        ctrl |= WMC_WANA100H;
+                if (cmd->advertising & ADVERTISED_10baseT_Full)
+                        ctrl |= WMC_WANA10F;
+                if (cmd->advertising & ADVERTISED_10baseT_Half)
+                        ctrl |= WMC_WANA10H;
+
+                /* force a re-negotiation */
+                ctrl |= WMC_WANR;
+                writel(ctrl, ksp->phyiface_regs + KS8695_WMC);
         } else {
-                switch (ksp->dtype) {
-                case KS8695_DTYPE_HPNA:
-                        /* BUG: dtype_hpna implies no phy registers */
-                        /*
-                        ctrl = __raw_readl(KS8695_MISC_VA + KS8695_HMC);
-
-                        ctrl &= ~(HMC_HSS | HMC_HDS);
-                        if (cmd->speed == SPEED_100)
-                                ctrl |= HMC_HSS;
-                        if (cmd->duplex == DUPLEX_FULL)
-                                ctrl |= HMC_HDS;
-
-                        __raw_writel(ctrl, KS8695_MISC_VA + KS8695_HMC);
-                        */
-                        return -EOPNOTSUPP;
-                case KS8695_DTYPE_WAN:
-                        ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-
-                        /* disable auto-negotiation */
-                        ctrl |= WMC_WAND;
-                        ctrl &= ~(WMC_WANF100 | WMC_WANFF);
-
-                        if (cmd->speed == SPEED_100)
-                                ctrl |= WMC_WANF100;
-                        if (cmd->duplex == DUPLEX_FULL)
-                                ctrl |= WMC_WANFF;
-
-                        writel(ctrl, ksp->phyiface_regs + KS8695_WMC);
-                        break;
-                case KS8695_DTYPE_LAN:
-                        return -EOPNOTSUPP;
-                }
+                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
+
+                /* disable auto-negotiation */
+                ctrl |= WMC_WAND;
+                ctrl &= ~(WMC_WANF100 | WMC_WANFF);
+
+                if (cmd->speed == SPEED_100)
+                        ctrl |= WMC_WANF100;
+                if (cmd->duplex == DUPLEX_FULL)
+                        ctrl |= WMC_WANFF;
+
+                writel(ctrl, ksp->phyiface_regs + KS8695_WMC);
         }
 
         return 0;
 }
 
 /**
- *      ks8695_nwayreset - Restart the autonegotiation on the port.
+ *      ks8695_wan_nwayreset - Restart the autonegotiation on the port.
  *      @ndev: The network device to restart autoneotiation on
  */
 static int
-ks8695_nwayreset(struct net_device *ndev)
+ks8695_wan_nwayreset(struct net_device *ndev)
 {
         struct ks8695_priv *ksp = netdev_priv(ndev);
         u32 ctrl;
 
-        switch (ksp->dtype) {
-        case KS8695_DTYPE_HPNA:
-                /* No phy means no autonegotiation on hpna */
-                return -EINVAL;
-        case KS8695_DTYPE_WAN:
-                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-
-                if ((ctrl & WMC_WAND) == 0)
-                        writel(ctrl | WMC_WANR,
-                               ksp->phyiface_regs + KS8695_WMC);
-                else
-                        /* auto-negotiation not enabled */
-                        return -EINVAL;
-                break;
-        case KS8695_DTYPE_LAN:
-                return -EOPNOTSUPP;
-        }
-
-        return 0;
-}
+        ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
 
-/**
- *      ks8695_get_link - Retrieve link status of network interface
- *      @ndev: The network interface to retrive the link status of.
- */
-static u32
-ks8695_get_link(struct net_device *ndev)
-{
-        struct ks8695_priv *ksp = netdev_priv(ndev);
-        u32 ctrl;
+        if ((ctrl & WMC_WAND) == 0)
+                writel(ctrl | WMC_WANR,
+                       ksp->phyiface_regs + KS8695_WMC);
+        else
+                /* auto-negotiation not enabled */
+                return -EINVAL;
 
-        switch (ksp->dtype) {
-        case KS8695_DTYPE_HPNA:
-                /* HPNA always has link */
-                return 1;
-        case KS8695_DTYPE_WAN:
-                /* WAN we can read the PHY for */
-                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-                return ctrl & WMC_WLS;
-        case KS8695_DTYPE_LAN:
-                return -EOPNOTSUPP;
-        }
         return 0;
 }
 
 /**
- *      ks8695_get_pause - Retrieve network pause/flow-control advertising
+ *      ks8695_wan_get_pause - Retrieve network pause/flow-control advertising
  *      @ndev: The device to retrieve settings from
  *      @param: The structure to fill out with the information
  */
 static void
-ks8695_get_pause(struct net_device *ndev, struct ethtool_pauseparam *param)
+ks8695_wan_get_pause(struct net_device *ndev, struct ethtool_pauseparam *param)
 {
         struct ks8695_priv *ksp = netdev_priv(ndev);
         u32 ctrl;
 
-        switch (ksp->dtype) {
-        case KS8695_DTYPE_HPNA:
-                /* No phy link on hpna to configure */
-                return;
-        case KS8695_DTYPE_WAN:
-                ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
-
-                /* advertise Pause */
-                param->autoneg = (ctrl & WMC_WANAP);
+        ctrl = readl(ksp->phyiface_regs + KS8695_WMC);
 
-                /* current Rx Flow-control */
-                ctrl = ks8695_readreg(ksp, KS8695_DRXC);
-                param->rx_pause = (ctrl & DRXC_RFCE);
+        /* advertise Pause */
+        param->autoneg = (ctrl & WMC_WANAP);
 
-                /* current Tx Flow-control */
-                ctrl = ks8695_readreg(ksp, KS8695_DTXC);
-                param->tx_pause = (ctrl & DTXC_TFCE);
-                break;
-        case KS8695_DTYPE_LAN:
-                /* The LAN's "phy" is a direct-attached switch */
-                return;
-        }
-}
+        /* current Rx Flow-control */
+        ctrl = ks8695_readreg(ksp, KS8695_DRXC);
+        param->rx_pause = (ctrl & DRXC_RFCE);
 
-/**
- *      ks8695_set_pause - Configure pause/flow-control
- *      @ndev: The device to configure
- *      @param: The pause parameters to set
- *
- *      TODO: Implement this
- */
-static int
-ks8695_set_pause(struct net_device *ndev, struct ethtool_pauseparam *param)
-{
-        return -EOPNOTSUPP;
+        /* current Tx Flow-control */
+        ctrl = ks8695_readreg(ksp, KS8695_DTXC);
+        param->tx_pause = (ctrl & DTXC_TFCE);
 }
 
 /**
@@ -1140,12 +1035,17 @@ ks8695_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)
 static const struct ethtool_ops ks8695_ethtool_ops = {
         .get_msglevel   = ks8695_get_msglevel,
         .set_msglevel   = ks8695_set_msglevel,
-        .get_settings   = ks8695_get_settings,
-        .set_settings   = ks8695_set_settings,
-        .nway_reset     = ks8695_nwayreset,
-        .get_link       = ks8695_get_link,
-        .get_pauseparam = ks8695_get_pause,
-        .set_pauseparam = ks8695_set_pause,
+        .get_drvinfo    = ks8695_get_drvinfo,
+};
+
+static const struct ethtool_ops ks8695_wan_ethtool_ops = {
+        .get_msglevel   = ks8695_get_msglevel,
+        .set_msglevel   = ks8695_set_msglevel,
+        .get_settings   = ks8695_wan_get_settings,
+        .set_settings   = ks8695_wan_set_settings,
+        .nway_reset     = ks8695_wan_nwayreset,
+        .get_link       = ethtool_op_get_link,
+        .get_pauseparam = ks8695_wan_get_pause,
         .get_drvinfo    = ks8695_get_drvinfo,
 };
 
@@ -1541,7 +1441,6 @@ ks8695_probe(struct platform_device *pdev)
 
         /* driver system setup */
         ndev->netdev_ops = &ks8695_netdev_ops;
-        SET_ETHTOOL_OPS(ndev, &ks8695_ethtool_ops);
         ndev->watchdog_timeo     = msecs_to_jiffies(watchdog);
 
         netif_napi_add(ndev, &ksp->napi, ks8695_poll, NAPI_WEIGHT);
@@ -1608,12 +1507,15 @@ ks8695_probe(struct platform_device *pdev)
         if (ksp->phyiface_regs && ksp->link_irq == -1) {
                 ks8695_init_switch(ksp);
                 ksp->dtype = KS8695_DTYPE_LAN;
+                SET_ETHTOOL_OPS(ndev, &ks8695_ethtool_ops);
         } else if (ksp->phyiface_regs && ksp->link_irq != -1) {
                 ks8695_init_wan_phy(ksp);
                 ksp->dtype = KS8695_DTYPE_WAN;
+                SET_ETHTOOL_OPS(ndev, &ks8695_wan_ethtool_ops);
         } else {
                 /* No initialisation since HPNA does not have a PHY */
                 ksp->dtype = KS8695_DTYPE_HPNA;
+                SET_ETHTOOL_OPS(ndev, &ks8695_ethtool_ops);
         }
 
         /* And bring up the net_device with the net core */
@@ -1742,7 +1644,7 @@ ks8695_cleanup(void)
 module_init(ks8695_init);
 module_exit(ks8695_cleanup);
 
-MODULE_AUTHOR("Simtec Electronics")
+MODULE_AUTHOR("Simtec Electronics");
 MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" MODULENAME);
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index a699bbf20eb5..3824382faecc 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},
         /* required last entry */
         { 0 }
 };
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 0c7811faf72c..a179cc6d79f2 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1786,6 +1786,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
         spin_lock_bh(&adapter->mcc_lock);
 
         wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
         req = nonemb_cmd->va;
         sge = nonembedded_sgl(wrb);
 
@@ -1801,6 +1805,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
 
         status = be_mcc_notify_wait(adapter);
 
+err:
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index de40d3b7152f..28a32a6c8bf1 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -312,11 +312,9 @@ void be_link_status_update(struct be_adapter *adapter, bool link_up)
         if (adapter->link_up != link_up) {
                 adapter->link_speed = -1;
                 if (link_up) {
-                        netif_start_queue(netdev);
                         netif_carrier_on(netdev);
                         printk(KERN_INFO "%s: Link up\n", netdev->name);
                 } else {
-                        netif_stop_queue(netdev);
                         netif_carrier_off(netdev);
                         printk(KERN_INFO "%s: Link down\n", netdev->name);
                 }
@@ -2628,8 +2626,6 @@ static void be_netdev_init(struct net_device *netdev)
 
         netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,
                 BE_NAPI_WEIGHT);
-
-        netif_stop_queue(netdev);
 }
 
 static void be_unmap_pci_bars(struct be_adapter *adapter)
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 0b9fc5173aef..22abfb39d813 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1284,19 +1284,12 @@ static void bfin_mac_multicast_hash(struct net_device *dev)
 {
         u32 emac_hashhi, emac_hashlo;
         struct netdev_hw_addr *ha;
-        char *addrs;
         u32 crc;
 
         emac_hashhi = emac_hashlo = 0;
 
         netdev_for_each_mc_addr(ha, dev) {
-                addrs = ha->addr;
-
-                /* skip non-multicast addresses */
-                if (!(*addrs & 1))
-                        continue;
-
-                crc = ether_crc(ETH_ALEN, addrs);
+                crc = ether_crc(ETH_ALEN, ha->addr);
                 crc >>= 26;
 
                 if (crc & 0x20)
diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c
index 99be5ae91991..142d6047da27 100644
--- a/drivers/net/bna/bnad_ethtool.c
+++ b/drivers/net/bna/bnad_ethtool.c
@@ -275,7 +275,6 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 
         ioc_attr = kzalloc(sizeof(*ioc_attr), GFP_KERNEL);
         if (ioc_attr) {
-                memset(ioc_attr, 0, sizeof(*ioc_attr));
                 spin_lock_irqsave(&bnad->bna_lock, flags);
                 bfa_nw_ioc_get_attr(&bnad->bna.device.ioc, ioc_attr);
                 spin_unlock_irqrestore(&bnad->bna_lock, flags);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index df99edf3464a..0ba59d5aeb7f 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7553,6 +7553,10 @@ bnx2_set_flags(struct net_device *dev, u32 data)
             !(data & ETH_FLAG_RXVLAN))
                 return -EINVAL;
 
+        /* TSO with VLAN tag won't work with current firmware */
+        if (!(data & ETH_FLAG_TXVLAN))
+                return -EINVAL;
+
         rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN |
                                   ETH_FLAG_TXVLAN);
         if (rc)
@@ -7962,11 +7966,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
                 /* AER (Advanced Error Reporting) hooks */
                 err = pci_enable_pcie_error_reporting(pdev);
-                if (err) {
-                        dev_err(&pdev->dev, "pci_enable_pcie_error_reporting "
-                                            "failed 0x%x\n", err);
-                        /* non-fatal, continue */
-                }
+                if (!err)
+                        bp->flags |= BNX2_FLAG_AER_ENABLED;
 
         } else {
                 bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
@@ -8229,8 +8230,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         return 0;
 
 err_out_unmap:
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                 pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
 
         if (bp->regview) {
                 iounmap(bp->regview);
@@ -8418,8 +8421,10 @@ bnx2_remove_one(struct pci_dev *pdev)
 
         kfree(bp->temp_stats_blk);
 
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                 pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
 
         free_netdev(dev);
 
@@ -8535,7 +8540,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
         }
         rtnl_unlock();
 
-        if (!(bp->flags & BNX2_FLAG_PCIE))
+        if (!(bp->flags & BNX2_FLAG_AER_ENABLED))
                 return result;
 
         err = pci_cleanup_aer_uncorrect_error_status(pdev);
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5488a2e82fe9..f459fb2f9add 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6741,6 +6741,7 @@ struct bnx2 {
 #define BNX2_FLAG_JUMBO_BROKEN          0x00000800
 #define BNX2_FLAG_CAN_KEEP_VLAN         0x00001000
 #define BNX2_FLAG_BROKEN_STATS          0x00002000
+#define BNX2_FLAG_AER_ENABLED           0x00004000
 
         struct bnx2_napi        bnx2_napi[BNX2_MAX_MSIX_VEC];
 
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index a6cd335c9436..653c62475cb6 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -22,8 +22,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.62.00-3"
-#define DRV_MODULE_RELDATE      "2010/12/21"
+#define DRV_MODULE_VERSION      "1.62.00-5"
+#define DRV_MODULE_RELDATE      "2011/01/30"
 #define BNX2X_BC_VER            0x040200
 
 #define BNX2X_MULTI_QUEUE
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index 6238d4f63989..548f5631c0dc 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -352,6 +352,10 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_LANE_SWAP_CFG_31203120          0x0000d8d8
         /* forced only */
 #define PORT_HW_CFG_LANE_SWAP_CFG_32103210          0x0000e4e4
+    /*  Indicate whether to swap the external phy polarity */
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_MASK             0x00010000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_DISABLED      0x00000000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED       0x00010000
 
         u32 external_phy_config;
 #define PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK        0xff000000
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 43b0de24f391..dd1210fddfff 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -1573,7 +1573,7 @@ static void bnx2x_set_aer_mmd_xgxs(struct link_params *params,
 
         offset = phy->addr + ser_lane;
         if (CHIP_IS_E2(bp))
-                aer_val = 0x2800 + offset - 1;
+                aer_val = 0x3800 + offset - 1;
         else
                 aer_val = 0x3800 + offset;
         CL45_WR_OVER_CL22(bp, phy,
@@ -3166,7 +3166,23 @@ u8 bnx2x_set_led(struct link_params *params,
                 if (!vars->link_up)
                         break;
         case LED_MODE_ON:
-                if (SINGLE_MEDIA_DIRECT(params)) {
+                if (params->phy[EXT_PHY1].type ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727 &&
+                    CHIP_IS_E2(bp) && params->num_phys == 2) {
+                        /**
+                        * This is a work-around for E2+8727 Configurations
+                        */
+                        if (mode == LED_MODE_ON ||
+                                speed == SPEED_10000){
+                                REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+                                REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+
+                                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                                EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                        (tmp | EMAC_LED_OVERRIDE));
+                                return rc;
+                        }
+                } else if (SINGLE_MEDIA_DIRECT(params)) {
                         /**
                         * This is a work-around for HW issue found when link
                         * is up in CL73
@@ -3854,11 +3870,14 @@ static void bnx2x_8073_resolve_fc(struct bnx2x_phy *phy,
                            pause_result);
         }
 }
-
-static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
+static u8 bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                                               struct bnx2x_phy *phy,
                                               u8 port)
 {
+        u32 count = 0;
+        u16 fw_ver1, fw_msgout;
+        u8 rc = 0;
+
         /* Boot port from external ROM  */
         /* EDC grst */
         bnx2x_cl45_write(bp, phy,
@@ -3888,56 +3907,45 @@ static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                        MDIO_PMA_REG_GEN_CTRL,
                        MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
 
-        /* wait for 120ms for code download via SPI port */
-        msleep(120);
+        /* Delay 100ms per the PHY specifications */
+        msleep(100);
+
+        /* 8073 sometimes taking longer to download */
+        do {
+                count++;
+                if (count > 300) {
+                        DP(NETIF_MSG_LINK,
+                                 "bnx2x_8073_8727_external_rom_boot port %x:"
+                                 "Download failed. fw version = 0x%x\n",
+                                 port, fw_ver1);
+                        rc = -EINVAL;
+                        break;
+                }
+
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_ROM_VER1, &fw_ver1);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_M8051_MSGOUT_REG, &fw_msgout);
+
+                msleep(1);
+        } while (fw_ver1 == 0 || fw_ver1 == 0x4321 ||
+                        ((fw_msgout & 0xff) != 0x03 && (phy->type ==
+                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)));
 
         /* Clear ser_boot_ctl bit */
         bnx2x_cl45_write(bp, phy,
                        MDIO_PMA_DEVAD,
                        MDIO_PMA_REG_MISC_CTRL1, 0x0000);
         bnx2x_save_bcm_spirom_ver(bp, phy, port);
-}
 
-static void bnx2x_8073_set_xaui_low_power_mode(struct bnx2x *bp,
-                                               struct bnx2x_phy *phy)
-{
-        u16 val;
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8073_CHIP_REV, &val);
-
-        if (val == 0) {
-                /* Mustn't set low power mode in 8073 A0 */
-                return;
-        }
-
-        /* Disable PLL sequencer (use read-modify-write to clear bit 13) */
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val &= ~(1<<13);
-        bnx2x_cl45_write(bp, phy,
-                       MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
-
-        /* PLL controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805E, 0x1077);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805D, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805C, 0x030B);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805B, 0x1240);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805A, 0x2490);
-
-        /* Tx Controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A7, 0x0C74);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A6, 0x9041);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A5, 0x4640);
-
-        /* Rx Controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FE, 0x01C4);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FD, 0x9249);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FC, 0x2015);
+        DP(NETIF_MSG_LINK,
+                 "bnx2x_8073_8727_external_rom_boot port %x:"
+                 "Download complete. fw version = 0x%x\n",
+                 port, fw_ver1);
 
-        /* Enable PLL sequencer  (use read-modify-write to set bit 13) */
-        bnx2x_cl45_read(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val |= (1<<13);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
+        return rc;
 }
 
 /******************************************************************/
@@ -4098,8 +4106,6 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
 
         bnx2x_8073_set_pause_cl37(params, phy, vars);
 
-        bnx2x_8073_set_xaui_low_power_mode(bp, phy);
-
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &tmp1);
 
@@ -4108,6 +4114,25 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
 
         DP(NETIF_MSG_LINK, "Before rom RX_ALARM(port1): 0x%x\n", tmp1);
 
+        /**
+         * If this is forced speed, set to KR or KX (all other are not
+         * supported)
+         */
+        /* Swap polarity if required - Must be done only in non-1G mode */
+        if (params->lane_config & PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                /* Configure the 8073 to swap _P and _N of the KR lines */
+                DP(NETIF_MSG_LINK, "Swapping polarity for the 8073\n");
+                /* 10G Rx/Tx and 1G Tx signal polarity swap */
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL, &val);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL,
+                                 (val | (3<<9)));
+        }
+
+
         /* Enable CL37 BAM */
         if (REG_RD(bp, params->shmem_base +
                          offsetof(struct shmem_region, dev_info.
@@ -4314,8 +4339,32 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
         }
 
         if (link_up) {
+                /* Swap polarity if required */
+                if (params->lane_config &
+                    PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                        /* Configure the 8073 to swap P and N of the KR lines */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_XS_DEVAD,
+                                        MDIO_XS_REG_8073_RX_CTRL_PCIE, &val1);
+                        /**
+                        * Set bit 3 to invert Rx in 1G mode and clear this bit
+                        * when it`s in 10G mode.
+                        */
+                        if (vars->line_speed == SPEED_1000) {
+                                DP(NETIF_MSG_LINK, "Swapping 1G polarity for"
+                                              "the 8073\n");
+                                val1 |= (1<<3);
+                        } else
+                                val1 &= ~(1<<3);
+
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_XS_DEVAD,
+                                         MDIO_XS_REG_8073_RX_CTRL_PCIE,
+                                         val1);
+                }
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
                 bnx2x_8073_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
         }
         return link_up;
 }
@@ -5062,6 +5111,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
                 else
                         vars->line_speed = SPEED_10000;
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
         }
         return link_up;
 }
@@ -5758,8 +5808,11 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "port %x: External link is down\n",
                            params->port);
         }
-        if (link_up)
+        if (link_up) {
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
+                DP(NETIF_MSG_LINK, "duplex = 0x%x\n", vars->duplex);
+        }
 
         if ((DUAL_MEDIA(params)) &&
             (phy->req_line_speed == SPEED_1000)) {
@@ -5875,10 +5928,26 @@ static void bnx2x_848xx_set_led(struct bnx2x *bp,
                          MDIO_PMA_REG_8481_LED2_MASK,
                          0x18);
 
+        /* Select activity source by Tx and Rx, as suggested by PHY AE */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
                          MDIO_PMA_REG_8481_LED3_MASK,
-                         0x0040);
+                         0x0006);
+
+        /* Select the closest activity blink rate to that in 10/100/1000 */
+        bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_8481_LED3_BLINK,
+                        0);
+
+        bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_84823_CTL_LED_CTL_1, &val);
+        val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/
+
+        bnx2x_cl45_write(bp, phy,
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_84823_CTL_LED_CTL_1, val);
 
         /* 'Interrupt Mask' */
         bnx2x_cl45_write(bp, phy,
@@ -6126,6 +6195,7 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
         /* Check link 10G */
         if (val2 & (1<<11)) {
                 vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                 link_up = 1;
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
         } else { /* Check Legacy speed link */
@@ -6405,6 +6475,18 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                                          MDIO_PMA_DEVAD,
                                          MDIO_PMA_REG_8481_LED1_MASK,
                                          0x80);
+
+                        /* Tell LED3 to blink on source */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_PMA_DEVAD,
+                                        MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                        &val);
+                        val &= ~(7<<6);
+                        val |= (1<<6); /* A83B[8:6]= 1 */
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                         val);
                 }
                 break;
         }
@@ -6489,6 +6571,7 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_MASTER_STATUS,
                                 &val2);
                 vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                 DP(NETIF_MSG_LINK, "SFX7101 AN status 0x%x->Master=%x\n",
                            val2, (val2 & (1<<14)));
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
@@ -7605,10 +7688,13 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
         struct bnx2x_phy phy[PORT_MAX];
         struct bnx2x_phy *phy_blk[PORT_MAX];
         u16 val;
-        s8 port;
+        s8 port = 0;
         s8 port_of_path = 0;
-
-        bnx2x_ext_phy_hw_reset(bp, 0);
+        u32 swap_val, swap_override;
+        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
+        port ^= (swap_val && swap_override);
+        bnx2x_ext_phy_hw_reset(bp, port);
         /* PART1 - Reset both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
                 u32 shmem_base, shmem2_base;
@@ -7663,7 +7749,6 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
 
         /* PART2 - Download firmware to both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
                 if (CHIP_IS_E2(bp))
                         port_of_path = 0;
                 else
@@ -7671,19 +7756,9 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
 
                 DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                            phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
-
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8073_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                                                      port_of_path))
                         return -EINVAL;
-                }
 
                 /* Only set bit 10 = 1 (Tx power down) */
                 bnx2x_cl45_read(bp, phy_blk[port],
@@ -7848,27 +7923,17 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
         }
         /* PART2 - Download firmware to both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
                  if (CHIP_IS_E2(bp))
                         port_of_path = 0;
                 else
                         port_of_path = port;
                 DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                            phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8727_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                                                      port_of_path))
                         return -EINVAL;
-                }
-        }
 
+        }
         return 0;
 }
 
@@ -7916,6 +7981,7 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
                          u32 shmem2_base_path[], u32 chip_id)
 {
         u8 rc = 0;
+        u32 phy_ver;
         u8 phy_index;
         u32 ext_phy_type, ext_phy_config;
         DP(NETIF_MSG_LINK, "Begin common phy init\n");
@@ -7923,6 +7989,16 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
         if (CHIP_REV_IS_EMUL(bp))
                 return 0;
 
+        /* Check if common init was already done */
+        phy_ver = REG_RD(bp, shmem_base_path[0] +
+                         offsetof(struct shmem_region,
+                                  port_mb[PORT_0].ext_phy_fw_version));
+        if (phy_ver) {
+                DP(NETIF_MSG_LINK, "Not doing common init; phy ver is 0x%x\n",
+                               phy_ver);
+                return 0;
+        }
+
         /* Read the ext_phy_type for arbitrary port(0) */
         for (phy_index = EXT_PHY1; phy_index < MAX_PHYS;
               phy_index++) {
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 8cdcf5b39d1e..d584d32c747d 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -2301,15 +2301,10 @@ static void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters)
                 /* accept matched ucast */
                 drop_all_ucast = 0;
         }
-        if (filters & BNX2X_ACCEPT_MULTICAST) {
+        if (filters & BNX2X_ACCEPT_MULTICAST)
                 /* accept matched mcast */
                 drop_all_mcast = 0;
-                if (IS_MF_SI(bp))
-                        /* since mcast addresses won't arrive with ovlan,
-                         * fw needs to accept all of them in
-                         * switch-independent mode */
-                        accp_all_mcast = 1;
-        }
+
         if (filters & BNX2X_ACCEPT_ALL_UNICAST) {
                 /* accept all mcast */
                 drop_all_ucast = 0;
@@ -4281,9 +4276,12 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                 def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                 BNX2X_ACCEPT_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST |
+                                                  BNX2X_ACCEPT_MULTICAST);
+                }
 #endif
                 break;
 
@@ -4291,18 +4289,29 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                 def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                 BNX2X_ACCEPT_ALL_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                /*
+                 *  Prevent duplication of multicast packets by configuring FCoE
+                 *  L2 Client to receive only matched unicast frames.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST);
+                }
 #endif
                 break;
 
         case BNX2X_RX_MODE_PROMISC:
                 def_q_filters |= BNX2X_PROMISCUOUS_MODE;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                /*
+                 *  Prevent packets duplication by configuring DROP_ALL for FCoE
+                 *  L2 Client.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_NONE);
+                }
 #endif
                 /* pass management unicast packets as well */
                 llh_mask |= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;
@@ -5296,10 +5305,6 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code)
                 }
         }
 
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
-
         bnx2x_setup_fan_failure_detection(bp);
 
         /* clear PXP2 attentions */
@@ -5503,9 +5508,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
 
         bnx2x_init_block(bp, MCP_BLOCK, init_stage);
         bnx2x_init_block(bp, DMAE_BLOCK, init_stage);
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
         if (bnx2x_fan_failure_det_req(bp, bp->common.shmem_base,
                                       bp->common.shmem2_base, port)) {
                 u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
@@ -8379,6 +8381,17 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
                  (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))
                 bp->mdio.prtad =
                         XGXS_EXT_PHY_ADDR(ext_phy_config);
+
+        /*
+         * Check if hw lock is required to access MDC/MDIO bus to the PHY(s)
+         * In MF mode, it is set to cover self test cases
+         */
+        if (IS_MF(bp))
+                bp->port.need_hw_lock = 1;
+        else
+                bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
+                                                        bp->common.shmem_base,
+                                                        bp->common.shmem2_base);
 }
 
 static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index c939683e3d61..e01330bb36c7 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -6194,7 +6194,11 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER        0x0000
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER         0x0100
 #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G                       0x1000
+#define MDIO_CTL_REG_84823_USER_CTRL_REG                0x4005
+#define MDIO_CTL_REG_84823_USER_CTRL_CMS                0x0080
 
+#define MDIO_PMA_REG_84823_CTL_LED_CTL_1                0xa8e3
+#define MDIO_PMA_REG_84823_LED3_STRETCH_EN              0x0080
 
 #define IGU_FUNC_BASE                   0x0400
 
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 171782e2bb39..1024ae158227 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2470,6 +2470,10 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
         if (!(dev->flags & IFF_MASTER))
                 goto out;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
                 goto out;
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f4e638c65129..5c6fba802f2b 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -326,6 +326,10 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
                 goto out;
         }
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
                 goto out;
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b1025b85acf1..163e0b06eaa5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2733,6 +2733,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         if (!slave || !slave_do_arp_validate(bond, slave))
                 goto out_unlock;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out_unlock;
+
         if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                 goto out_unlock;
 
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index d5a9db60ade9..5dec456fd4a4 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -23,7 +23,7 @@ config CAN_SLCAN
 
           As only the sending and receiving of CAN frames is implemented, this
           driver should work with the (serial/USB) CAN hardware from:
-          www.canusb.com / www.can232.com / www.mictronic.com / www.canhack.de
+          www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de
 
           Userspace tools to attach the SLCAN line discipline (slcan_attach,
           slcand) can be found in the can-utils at the SocketCAN SVN, see
@@ -117,6 +117,8 @@ source "drivers/net/can/sja1000/Kconfig"
 
 source "drivers/net/can/usb/Kconfig"
 
+source "drivers/net/can/softing/Kconfig"
+
 config CAN_DEBUG_DEVICES
         bool "CAN devices debugging messages"
         depends on CAN
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 07ca159ba3f9..53c82a71778e 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_CAN_DEV)		+= can-dev.o
 can-dev-y                       := dev.o
 
 obj-y                           += usb/
+obj-y                           += softing/
 
 obj-$(CONFIG_CAN_SJA1000)       += sja1000/
 obj-$(CONFIG_CAN_MSCAN)         += mscan/
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 7ef83d06f7ed..57d2ffbbb433 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -2,7 +2,7 @@
  * at91_can.c - CAN network driver for AT91 SoC CAN controller
  *
  * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
- * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de>
+ * (C) 2008, 2009, 2010, 2011 by Marc Kleine-Budde <kernel@pengutronix.de>
  *
  * This software may be distributed under the terms of the GNU General
  * Public License ("GPL") version 2 as distributed in the 'COPYING'
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
+#include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
@@ -40,22 +41,23 @@
 
 #include <mach/board.h>
 
-#define AT91_NAPI_WEIGHT        12
+#define AT91_NAPI_WEIGHT        11
 
 /*
  * RX/TX Mailbox split
  * don't dare to touch
  */
-#define AT91_MB_RX_NUM          12
+#define AT91_MB_RX_NUM          11
 #define AT91_MB_TX_SHIFT        2
 
-#define AT91_MB_RX_FIRST        0
+#define AT91_MB_RX_FIRST        1
 #define AT91_MB_RX_LAST         (AT91_MB_RX_FIRST + AT91_MB_RX_NUM - 1)
 
 #define AT91_MB_RX_MASK(i)      ((1 << (i)) - 1)
 #define AT91_MB_RX_SPLIT        8
 #define AT91_MB_RX_LOW_LAST     (AT91_MB_RX_SPLIT - 1)
-#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT))
+#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT) & \
+                                 ~AT91_MB_RX_MASK(AT91_MB_RX_FIRST))
 
 #define AT91_MB_TX_NUM          (1 << AT91_MB_TX_SHIFT)
 #define AT91_MB_TX_FIRST        (AT91_MB_RX_LAST + 1)
@@ -168,6 +170,8 @@ struct at91_priv {
 
         struct clk              *clk;
         struct at91_can_data    *pdata;
+
+        canid_t                 mb0_id;
 };
 
 static struct can_bittiming_const at91_bittiming_const = {
@@ -220,6 +224,18 @@ static inline void set_mb_mode(const struct at91_priv *priv, unsigned int mb,
         set_mb_mode_prio(priv, mb, mode, 0);
 }
 
+static inline u32 at91_can_id_to_reg_mid(canid_t can_id)
+{
+        u32 reg_mid;
+
+        if (can_id & CAN_EFF_FLAG)
+                reg_mid = (can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
+        else
+                reg_mid = (can_id & CAN_SFF_MASK) << 18;
+
+        return reg_mid;
+}
+
 /*
  * Swtich transceiver on or off
  */
@@ -233,12 +249,22 @@ static void at91_setup_mailboxes(struct net_device *dev)
 {
         struct at91_priv *priv = netdev_priv(dev);
         unsigned int i;
+        u32 reg_mid;
 
         /*
-         * The first 12 mailboxes are used as a reception FIFO. The
-         * last mailbox is configured with overwrite option. The
-         * overwrite flag indicates a FIFO overflow.
+         * Due to a chip bug (errata 50.2.6.3 & 50.3.5.3) the first
+         * mailbox is disabled. The next 11 mailboxes are used as a
+         * reception FIFO. The last mailbox is configured with
+         * overwrite option. The overwrite flag indicates a FIFO
+         * overflow.
          */
+        reg_mid = at91_can_id_to_reg_mid(priv->mb0_id);
+        for (i = 0; i < AT91_MB_RX_FIRST; i++) {
+                set_mb_mode(priv, i, AT91_MB_MODE_DISABLED);
+                at91_write(priv, AT91_MID(i), reg_mid);
+                at91_write(priv, AT91_MCR(i), 0x0);     /* clear dlc */
+        }
+
         for (i = AT91_MB_RX_FIRST; i < AT91_MB_RX_LAST; i++)
                 set_mb_mode(priv, i, AT91_MB_MODE_RX);
         set_mb_mode(priv, AT91_MB_RX_LAST, AT91_MB_MODE_RX_OVRWR);
@@ -254,7 +280,8 @@ static void at91_setup_mailboxes(struct net_device *dev)
                 set_mb_mode_prio(priv, i, AT91_MB_MODE_TX, 0);
 
         /* Reset tx and rx helper pointers */
-        priv->tx_next = priv->tx_echo = priv->rx_next = 0;
+        priv->tx_next = priv->tx_echo = 0;
+        priv->rx_next = AT91_MB_RX_FIRST;
 }
 
 static int at91_set_bittiming(struct net_device *dev)
@@ -372,12 +399,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 netdev_err(dev, "BUG! TX buffer full when queue awake!\n");
                 return NETDEV_TX_BUSY;
         }
-
-        if (cf->can_id & CAN_EFF_FLAG)
-                reg_mid = (cf->can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
-        else
-                reg_mid = (cf->can_id & CAN_SFF_MASK) << 18;
-
+        reg_mid = at91_can_id_to_reg_mid(cf->can_id);
         reg_mcr = ((cf->can_id & CAN_RTR_FLAG) ? AT91_MCR_MRTR : 0) |
                 (cf->can_dlc << 16) | AT91_MCR_MTCR;
 
@@ -539,27 +561,31 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb)
  *
  * Theory of Operation:
  *
- * 12 of the 16 mailboxes on the chip are reserved for RX. we split
- * them into 2 groups. The lower group holds 8 and upper 4 mailboxes.
+ * 11 of the 16 mailboxes on the chip are reserved for RX. we split
+ * them into 2 groups. The lower group holds 7 and upper 4 mailboxes.
  *
  * Like it or not, but the chip always saves a received CAN message
  * into the first free mailbox it finds (starting with the
  * lowest). This makes it very difficult to read the messages in the
  * right order from the chip. This is how we work around that problem:
  *
- * The first message goes into mb nr. 0 and issues an interrupt. All
+ * The first message goes into mb nr. 1 and issues an interrupt. All
  * rx ints are disabled in the interrupt handler and a napi poll is
  * scheduled. We read the mailbox, but do _not_ reenable the mb (to
  * receive another message).
  *
  *    lower mbxs      upper
- *   ______^______    __^__
- *  /             \  /     \
+ *     ____^______    __^__
+ *    /           \  /     \
  * +-+-+-+-+-+-+-+-++-+-+-+-+
- * |x|x|x|x|x|x|x|x|| | | | |
+ * | |x|x|x|x|x|x|x|| | | | |
  * +-+-+-+-+-+-+-+-++-+-+-+-+
  *  0 0 0 0 0 0  0 0 0 0 1 1  \ mail
  *  0 1 2 3 4 5  6 7 8 9 0 1  / box
+ *  ^
+ *  |
+ *   \
+ *     unused, due to chip bug
  *
  * The variable priv->rx_next points to the next mailbox to read a
  * message from. As long we're in the lower mailboxes we just read the
@@ -590,10 +616,10 @@ static int at91_poll_rx(struct net_device *dev, int quota)
                         "order of incoming frames cannot be guaranteed\n");
 
  again:
-        for (mb = find_next_bit(addr, AT91_MB_RX_NUM, priv->rx_next);
-             mb < AT91_MB_RX_NUM && quota > 0;
+        for (mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, priv->rx_next);
+             mb < AT91_MB_RX_LAST + 1 && quota > 0;
              reg_sr = at91_read(priv, AT91_SR),
-             mb = find_next_bit(addr, AT91_MB_RX_NUM, ++priv->rx_next)) {
+             mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, ++priv->rx_next)) {
                 at91_read_msg(dev, mb);
 
                 /* reactivate mailboxes */
@@ -610,8 +636,8 @@ static int at91_poll_rx(struct net_device *dev, int quota)
 
         /* upper group completed, look again in lower */
         if (priv->rx_next > AT91_MB_RX_LOW_LAST &&
-            quota > 0 && mb >= AT91_MB_RX_NUM) {
-                priv->rx_next = 0;
+            quota > 0 && mb > AT91_MB_RX_LAST) {
+                priv->rx_next = AT91_MB_RX_FIRST;
                 goto again;
         }
 
@@ -1037,6 +1063,64 @@ static const struct net_device_ops at91_netdev_ops = {
         .ndo_start_xmit = at91_start_xmit,
 };
 
+static ssize_t at91_sysfs_show_mb0_id(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct at91_priv *priv = netdev_priv(to_net_dev(dev));
+
+        if (priv->mb0_id & CAN_EFF_FLAG)
+                return snprintf(buf, PAGE_SIZE, "0x%08x\n", priv->mb0_id);
+        else
+                return snprintf(buf, PAGE_SIZE, "0x%03x\n", priv->mb0_id);
+}
+
+static ssize_t at91_sysfs_set_mb0_id(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct at91_priv *priv = netdev_priv(ndev);
+        unsigned long can_id;
+        ssize_t ret;
+        int err;
+
+        rtnl_lock();
+
+        if (ndev->flags & IFF_UP) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        err = strict_strtoul(buf, 0, &can_id);
+        if (err) {
+                ret = err;
+                goto out;
+        }
+
+        if (can_id & CAN_EFF_FLAG)
+                can_id &= CAN_EFF_MASK | CAN_EFF_FLAG;
+        else
+                can_id &= CAN_SFF_MASK;
+
+        priv->mb0_id = can_id;
+        ret = count;
+
+ out:
+        rtnl_unlock();
+        return ret;
+}
+
+static DEVICE_ATTR(mb0_id, S_IWUSR | S_IRUGO,
+        at91_sysfs_show_mb0_id, at91_sysfs_set_mb0_id);
+
+static struct attribute *at91_sysfs_attrs[] = {
+        &dev_attr_mb0_id.attr,
+        NULL,
+};
+
+static struct attribute_group at91_sysfs_attr_group = {
+        .attrs = at91_sysfs_attrs,
+};
+
 static int __devinit at91_can_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
@@ -1082,6 +1166,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
         dev->netdev_ops = &at91_netdev_ops;
         dev->irq = irq;
         dev->flags |= IFF_ECHO;
+        dev->sysfs_groups[0] = &at91_sysfs_attr_group;
 
         priv = netdev_priv(dev);
         priv->can.clock.freq = clk_get_rate(clk);
@@ -1093,6 +1178,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->clk = clk;
         priv->pdata = pdev->dev.platform_data;
+        priv->mb0_id = 0x7ff;
 
         netif_napi_add(dev, &priv->napi, at91_poll, AT91_NAPI_WEIGHT);
 
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index b9a6d7a5a739..366f5cc050ae 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1618,7 +1618,7 @@ static ssize_t ican3_sysfs_set_term(struct device *dev,
         return count;
 }
 
-static DEVICE_ATTR(termination, S_IWUGO | S_IRUGO, ican3_sysfs_show_term,
+static DEVICE_ATTR(termination, S_IWUSR | S_IRUGO, ican3_sysfs_show_term,
                                                    ican3_sysfs_set_term);
 
 static struct attribute *ican3_sysfs_attrs[] = {
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c42e97268248..e54712b22c27 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -185,7 +185,7 @@ struct pch_can_priv {
 
 static struct can_bittiming_const pch_can_bittiming_const = {
         .name = KBUILD_MODNAME,
-        .tseg1_min = 1,
+        .tseg1_min = 2,
         .tseg1_max = 16,
         .tseg2_min = 1,
         .tseg2_max = 8,
@@ -959,13 +959,13 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
         struct pch_can_priv *priv = netdev_priv(ndev);
 
         unregister_candev(priv->ndev);
-        pci_iounmap(pdev, priv->regs);
         if (priv->use_msi)
                 pci_disable_msi(priv->dev);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
         pch_can_reset(priv);
+        pci_iounmap(pdev, priv->regs);
         free_candev(priv->ndev);
 }
 
@@ -1238,6 +1238,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
                 priv->use_msi = 0;
         } else {
                 netdev_err(ndev, "PCH CAN opened with MSI\n");
+                pci_set_master(pdev);
                 priv->use_msi = 1;
         }
 
diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig
new file mode 100644
index 000000000000..8ba81b3ddd90
--- /dev/null
+++ b/drivers/net/can/softing/Kconfig
@@ -0,0 +1,30 @@
+config CAN_SOFTING
+        tristate "Softing Gmbh CAN generic support"
+        depends on CAN_DEV && HAS_IOMEM
+        ---help---
+          Support for CAN cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          Softing Gmbh CAN cards come with 1 or 2 physical busses.
+          Those cards typically use Dual Port RAM to communicate
+          with the host CPU. The interface is then identical for PCI
+          and PCMCIA cards. This driver operates on a platform device,
+          which has been created by softing_cs or softing_pci driver.
+          Warning:
+          The API of the card does not allow fine control per bus, but
+          controls the 2 busses on the card together.
+          As such, some actions (start/stop/busoff recovery) on 1 bus
+          must bring down the other bus too temporarily.
+
+config CAN_SOFTING_CS
+        tristate "Softing Gmbh CAN pcmcia cards"
+        depends on PCMCIA
+        select CAN_SOFTING
+        ---help---
+          Support for PCMCIA cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          You need firmware for these, which you can get at
+          http://developer.berlios.de/projects/socketcan/
+          This version of the driver is written against
+          firmware version 4.6 (softing-fw-4.6-binaries.tar.gz)
+          In order to use the card as CAN device, you need the Softing generic
+          support too.
diff --git a/drivers/net/can/softing/Makefile b/drivers/net/can/softing/Makefile
new file mode 100644
index 000000000000..c5e5016c742e
--- /dev/null
+++ b/drivers/net/can/softing/Makefile
@@ -0,0 +1,6 @@
+
+softing-y := softing_main.o softing_fw.o
+obj-$(CONFIG_CAN_SOFTING) += softing.o
+obj-$(CONFIG_CAN_SOFTING_CS) += softing_cs.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/softing/softing.h b/drivers/net/can/softing/softing.h
new file mode 100644
index 000000000000..7ec9f4db3d52
--- /dev/null
+++ b/drivers/net/can/softing/softing.h
@@ -0,0 +1,167 @@
+/*
+ * softing common interfaces
+ *
+ * by Kurt Van Dijck, 2008-2010
+ */
+
+#include <linux/atomic.h>
+#include <linux/netdevice.h>
+#include <linux/ktime.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+
+#include "softing_platform.h"
+
+struct softing;
+
+struct softing_priv {
+        struct can_priv can; /* must be the first member! */
+        struct net_device *netdev;
+        struct softing *card;
+        struct {
+                int pending;
+                /* variables wich hold the circular buffer */
+                int echo_put;
+                int echo_get;
+        } tx;
+        struct can_bittiming_const btr_const;
+        int index;
+        uint8_t output;
+        uint16_t chip;
+};
+#define netdev2softing(netdev)  ((struct softing_priv *)netdev_priv(netdev))
+
+struct softing {
+        const struct softing_platform_data *pdat;
+        struct platform_device *pdev;
+        struct net_device *net[2];
+        spinlock_t spin; /* protect this structure & DPRAM access */
+        ktime_t ts_ref;
+        ktime_t ts_overflow; /* timestamp overflow value, in ktime */
+
+        struct {
+                /* indication of firmware status */
+                int up;
+                /* protection of the 'up' variable */
+                struct mutex lock;
+        } fw;
+        struct {
+                int nr;
+                int requested;
+                int svc_count;
+                unsigned int dpram_position;
+        } irq;
+        struct {
+                int pending;
+                int last_bus;
+                /*
+                 * keep the bus that last tx'd a message,
+                 * in order to let every netdev queue resume
+                 */
+        } tx;
+        __iomem uint8_t *dpram;
+        unsigned long dpram_phys;
+        unsigned long dpram_size;
+        struct {
+                uint16_t fw_version, hw_version, license, serial;
+                uint16_t chip[2];
+                unsigned int freq; /* remote cpu's operating frequency */
+        } id;
+};
+
+extern int softing_default_output(struct net_device *netdev);
+
+extern ktime_t softing_raw2ktime(struct softing *card, u32 raw);
+
+extern int softing_chip_poweron(struct softing *card);
+
+extern int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg);
+
+/* Load firmware after reset */
+extern int softing_load_fw(const char *file, struct softing *card,
+                        __iomem uint8_t *virt, unsigned int size, int offset);
+
+/* Load final application firmware after bootloader */
+extern int softing_load_app_fw(const char *file, struct softing *card);
+
+/*
+ * enable or disable irq
+ * only called with fw.lock locked
+ */
+extern int softing_enable_irq(struct softing *card, int enable);
+
+/* start/stop 1 bus on card */
+extern int softing_startstop(struct net_device *netdev, int up);
+
+/* netif_rx() */
+extern int softing_netdev_rx(struct net_device *netdev,
+                const struct can_frame *msg, ktime_t ktime);
+
+/* SOFTING DPRAM mappings */
+#define DPRAM_RX                0x0000
+        #define DPRAM_RX_SIZE   32
+        #define DPRAM_RX_CNT    16
+#define DPRAM_RX_RD             0x0201  /* uint8_t */
+#define DPRAM_RX_WR             0x0205  /* uint8_t */
+#define DPRAM_RX_LOST           0x0207  /* uint8_t */
+
+#define DPRAM_FCT_PARAM         0x0300  /* int16_t [20] */
+#define DPRAM_FCT_RESULT        0x0328  /* int16_t */
+#define DPRAM_FCT_HOST          0x032b  /* uint16_t */
+
+#define DPRAM_INFO_BUSSTATE     0x0331  /* uint16_t */
+#define DPRAM_INFO_BUSSTATE2    0x0335  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE     0x0339  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE2    0x033d  /* uint16_t */
+#define DPRAM_RESET             0x0341  /* uint16_t */
+#define DPRAM_CLR_RECV_FIFO     0x0345  /* uint16_t */
+#define DPRAM_RESET_TIME        0x034d  /* uint16_t */
+#define DPRAM_TIME              0x0350  /* uint64_t */
+#define DPRAM_WR_START          0x0358  /* uint8_t */
+#define DPRAM_WR_END            0x0359  /* uint8_t */
+#define DPRAM_RESET_RX_FIFO     0x0361  /* uint16_t */
+#define DPRAM_RESET_TX_FIFO     0x0364  /* uint8_t */
+#define DPRAM_READ_FIFO_LEVEL   0x0365  /* uint8_t */
+#define DPRAM_RX_FIFO_LEVEL     0x0366  /* uint16_t */
+#define DPRAM_TX_FIFO_LEVEL     0x0366  /* uint16_t */
+
+#define DPRAM_TX                0x0400  /* uint16_t */
+        #define DPRAM_TX_SIZE   16
+        #define DPRAM_TX_CNT    32
+#define DPRAM_TX_RD             0x0601  /* uint8_t */
+#define DPRAM_TX_WR             0x0605  /* uint8_t */
+
+#define DPRAM_COMMAND           0x07e0  /* uint16_t */
+#define DPRAM_RECEIPT           0x07f0  /* uint16_t */
+#define DPRAM_IRQ_TOHOST        0x07fe  /* uint8_t */
+#define DPRAM_IRQ_TOCARD        0x07ff  /* uint8_t */
+
+#define DPRAM_V2_RESET          0x0e00  /* uint8_t */
+#define DPRAM_V2_IRQ_TOHOST     0x0e02  /* uint8_t */
+
+#define TXMAX   (DPRAM_TX_CNT - 1)
+
+/* DPRAM return codes */
+#define RES_NONE        0
+#define RES_OK          1
+#define RES_NOK         2
+#define RES_UNKNOWN     3
+/* DPRAM flags */
+#define CMD_TX          0x01
+#define CMD_ACK         0x02
+#define CMD_XTD         0x04
+#define CMD_RTR         0x08
+#define CMD_ERR         0x10
+#define CMD_BUS2        0x80
+
+/* returned fifo entry bus state masks */
+#define SF_MASK_BUSOFF          0x80
+#define SF_MASK_EPASSIVE        0x60
+
+/* bus states */
+#define STATE_BUSOFF    2
+#define STATE_EPASSIVE  1
+#define STATE_EACTIVE   0
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
new file mode 100644
index 000000000000..c11bb4de8630
--- /dev/null
+++ b/drivers/net/can/softing/softing_cs.c
@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+
+#include "softing_platform.h"
+
+static int softingcs_index;
+static spinlock_t softingcs_index_lock;
+
+static int softingcs_reset(struct platform_device *pdev, int v);
+static int softingcs_enable_irq(struct platform_device *pdev, int v);
+
+/*
+ * platform_data descriptions
+ */
+#define MHZ (1000*1000)
+static const struct softing_platform_data softingcs_platform_data[] = {
+{
+        .name = "CANcard",
+        .manf = 0x0168, .prod = 0x001,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-NEC",
+        .manf = 0x0168, .prod = 0x002,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-SJA",
+        .manf = 0x0168, .prod = 0x004,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-2",
+        .manf = 0x0168, .prod = 0x005,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "Vector-CANcard",
+        .manf = 0x0168, .prod = 0x081,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-SJA",
+        .manf = 0x0168, .prod = 0x084,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-2",
+        .manf = 0x0168, .prod = 0x085,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "EDICcard-NEC",
+        .manf = 0x0168, .prod = 0x102,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "EDICcard-2",
+        .manf = 0x0168, .prod = 0x105,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        0, 0,
+},
+};
+
+MODULE_FIRMWARE(fw_dir "bcard.bin");
+MODULE_FIRMWARE(fw_dir "ldcard.bin");
+MODULE_FIRMWARE(fw_dir "cancard.bin");
+MODULE_FIRMWARE(fw_dir "cansja.bin");
+
+MODULE_FIRMWARE(fw_dir "bcard2.bin");
+MODULE_FIRMWARE(fw_dir "ldcard2.bin");
+MODULE_FIRMWARE(fw_dir "cancrd2.bin");
+
+static __devinit const struct softing_platform_data
+*softingcs_find_platform_data(unsigned int manf, unsigned int prod)
+{
+        const struct softing_platform_data *lp;
+
+        for (lp = softingcs_platform_data; lp->manf; ++lp) {
+                if ((lp->manf == manf) && (lp->prod == prod))
+                        return lp;
+        }
+        return NULL;
+}
+
+/*
+ * platformdata callbacks
+ */
+static int softingcs_reset(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+
+        dev_dbg(&pdev->dev, "pcmcia config [2] %02x\n", v ? 0 : 0x20);
+        return pcmcia_write_config_byte(pcmcia, 2, v ? 0 : 0x20);
+}
+
+static int softingcs_enable_irq(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+
+        dev_dbg(&pdev->dev, "pcmcia config [0] %02x\n", v ? 0x60 : 0);
+        return pcmcia_write_config_byte(pcmcia, 0, v ? 0x60 : 0);
+}
+
+/*
+ * pcmcia check
+ */
+static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia,
+                void *priv_data)
+{
+        struct softing_platform_data *pdat = priv_data;
+        struct resource *pres;
+        int memspeed = 0;
+
+        WARN_ON(!pdat);
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (resource_size(pres) < 0x1000)
+                return -ERANGE;
+
+        pres->flags |= WIN_MEMORY_TYPE_CM | WIN_ENABLE;
+        if (pdat->generation < 2) {
+                pres->flags |= WIN_USE_WAIT | WIN_DATA_WIDTH_8;
+                memspeed = 3;
+        } else {
+                pres->flags |= WIN_DATA_WIDTH_16;
+        }
+        return pcmcia_request_window(pcmcia, pres, memspeed);
+}
+
+static __devexit void softingcs_remove(struct pcmcia_device *pcmcia)
+{
+        struct platform_device *pdev = pcmcia->priv;
+
+        /* free bits */
+        platform_device_unregister(pdev);
+        /* release pcmcia stuff */
+        pcmcia_disable_device(pcmcia);
+}
+
+/*
+ * platform_device wrapper
+ * pdev->resource has 2 entries: io & irq
+ */
+static void softingcs_pdev_release(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        kfree(pdev);
+}
+
+static __devinit int softingcs_probe(struct pcmcia_device *pcmcia)
+{
+        int ret;
+        struct platform_device *pdev;
+        const struct softing_platform_data *pdat;
+        struct resource *pres;
+        struct dev {
+                struct platform_device pdev;
+                struct resource res[2];
+        } *dev;
+
+        /* find matching platform_data */
+        pdat = softingcs_find_platform_data(pcmcia->manf_id, pcmcia->card_id);
+        if (!pdat)
+                return -ENOTTY;
+
+        /* setup pcmcia device */
+        pcmcia->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IOMEM |
+                CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;
+        ret = pcmcia_loop_config(pcmcia, softingcs_probe_config, (void *)pdat);
+        if (ret)
+                goto pcmcia_failed;
+
+        ret = pcmcia_enable_device(pcmcia);
+        if (ret < 0)
+                goto pcmcia_failed;
+
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (!pres) {
+                ret = -EBADF;
+                goto pcmcia_bad;
+        }
+
+        /* create softing platform device */
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                ret = -ENOMEM;
+                goto mem_failed;
+        }
+        dev->pdev.resource = dev->res;
+        dev->pdev.num_resources = ARRAY_SIZE(dev->res);
+        dev->pdev.dev.release = softingcs_pdev_release;
+
+        pdev = &dev->pdev;
+        pdev->dev.platform_data = (void *)pdat;
+        pdev->dev.parent = &pcmcia->dev;
+        pcmcia->priv = pdev;
+
+        /* platform device resources */
+        pdev->resource[0].flags = IORESOURCE_MEM;
+        pdev->resource[0].start = pres->start;
+        pdev->resource[0].end = pres->end;
+
+        pdev->resource[1].flags = IORESOURCE_IRQ;
+        pdev->resource[1].start = pcmcia->irq;
+        pdev->resource[1].end = pdev->resource[1].start;
+
+        /* platform device setup */
+        spin_lock(&softingcs_index_lock);
+        pdev->id = softingcs_index++;
+        spin_unlock(&softingcs_index_lock);
+        pdev->name = "softing";
+        dev_set_name(&pdev->dev, "softingcs.%i", pdev->id);
+        ret = platform_device_register(pdev);
+        if (ret < 0)
+                goto platform_failed;
+
+        dev_info(&pcmcia->dev, "created %s\n", dev_name(&pdev->dev));
+        return 0;
+
+platform_failed:
+        kfree(dev);
+mem_failed:
+pcmcia_bad:
+pcmcia_failed:
+        pcmcia_disable_device(pcmcia);
+        pcmcia->priv = NULL;
+        return ret ?: -ENODEV;
+}
+
+static /*const*/ struct pcmcia_device_id softingcs_ids[] = {
+        /* softing */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0004),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0005),
+        /* vector, manufacturer? */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0081),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0084),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0085),
+        /* EDIC */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0102),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0105),
+        PCMCIA_DEVICE_NULL,
+};
+
+MODULE_DEVICE_TABLE(pcmcia, softingcs_ids);
+
+static struct pcmcia_driver softingcs_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "softingcs",
+        .id_table       = softingcs_ids,
+        .probe          = softingcs_probe,
+        .remove         = __devexit_p(softingcs_remove),
+};
+
+static int __init softingcs_start(void)
+{
+        spin_lock_init(&softingcs_index_lock);
+        return pcmcia_register_driver(&softingcs_driver);
+}
+
+static void __exit softingcs_stop(void)
+{
+        pcmcia_unregister_driver(&softingcs_driver);
+}
+
+module_init(softingcs_start);
+module_exit(softingcs_stop);
+
+MODULE_DESCRIPTION("softing CANcard driver"
+                ", links PCMCIA card to softing driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
new file mode 100644
index 000000000000..b520784fb197
--- /dev/null
+++ b/drivers/net/can/softing/softing_fw.c
@@ -0,0 +1,691 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/firmware.h>
+#include <linux/sched.h>
+#include <asm/div64.h>
+
+#include "softing.h"
+
+/*
+ * low level DPRAM command.
+ * Make sure that card->dpram[DPRAM_FCT_HOST] is preset
+ */
+static int _softing_fct_cmd(struct softing *card, int16_t cmd, uint16_t vector,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+
+        iowrite16(cmd, &card->dpram[DPRAM_FCT_PARAM]);
+        iowrite8(vector >> 8, &card->dpram[DPRAM_FCT_HOST + 1]);
+        iowrite8(vector, &card->dpram[DPRAM_FCT_HOST]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 1 * HZ;
+        /* wait for card */
+        do {
+                /* DPRAM_FCT_HOST is _not_ aligned */
+                ret = ioread8(&card->dpram[DPRAM_FCT_HOST]) +
+                        (ioread8(&card->dpram[DPRAM_FCT_HOST + 1]) << 8);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        /* read return-value now */
+                        return ioread16(&card->dpram[DPRAM_FCT_RESULT]);
+
+                if ((ret != vector) || time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (1);
+
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "firmware %s failed (%i)\n", msg, ret);
+        return ret;
+}
+
+static int softing_fct_cmd(struct softing *card, int16_t cmd, const char *msg)
+{
+        int ret;
+
+        ret = _softing_fct_cmd(card, cmd, 0, msg);
+        if (ret > 0) {
+                dev_alert(&card->pdev->dev, "%s returned %u\n", msg, ret);
+                ret = -EIO;
+        }
+        return ret;
+}
+
+int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+
+        iowrite16(RES_NONE, &card->dpram[DPRAM_RECEIPT]);
+        iowrite16(cmd, &card->dpram[DPRAM_COMMAND]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 3 * HZ;
+        /* wait for card */
+        do {
+                ret = ioread16(&card->dpram[DPRAM_RECEIPT]);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        return 0;
+                if (time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (!signal_pending(current));
+
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "bootloader %s failed (%i)\n", msg, ret);
+        return ret;
+}
+
+static int fw_parse(const uint8_t **pmem, uint16_t *ptype, uint32_t *paddr,
+                uint16_t *plen, const uint8_t **pdat)
+{
+        uint16_t checksum[2];
+        const uint8_t *mem;
+        const uint8_t *end;
+
+        /*
+         * firmware records are a binary, unaligned stream composed of:
+         * uint16_t type;
+         * uint32_t addr;
+         * uint16_t len;
+         * uint8_t dat[len];
+         * uint16_t checksum;
+         * all values in little endian.
+         * We could define a struct for this, with __attribute__((packed)),
+         * but would that solve the alignment in _all_ cases (cfr. the
+         * struct itself may be an odd address)?
+         *
+         * I chose to use leXX_to_cpup() since this solves both
+         * endianness & alignment.
+         */
+        mem = *pmem;
+        *ptype = le16_to_cpup((void *)&mem[0]);
+        *paddr = le32_to_cpup((void *)&mem[2]);
+        *plen = le16_to_cpup((void *)&mem[6]);
+        *pdat = &mem[8];
+        /* verify checksum */
+        end = &mem[8 + *plen];
+        checksum[0] = le16_to_cpup((void *)end);
+        for (checksum[1] = 0; mem < end; ++mem)
+                checksum[1] += *mem;
+        if (checksum[0] != checksum[1])
+                return -EINVAL;
+        /* increment */
+        *pmem += 10 + *plen;
+        return 0;
+}
+
+int softing_load_fw(const char *file, struct softing *card,
+                __iomem uint8_t *dpram, unsigned int size, int offset)
+{
+        const struct firmware *fw;
+        int ret;
+        const uint8_t *mem, *end, *dat;
+        uint16_t type, len;
+        uint32_t addr;
+        uint8_t *buf = NULL;
+        int buflen = 0;
+        int8_t type_end = 0;
+
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret < 0)
+                return ret;
+        dev_dbg(&card->pdev->dev, "%s, firmware(%s) got %u bytes"
+                ", offset %c0x%04x\n",
+                card->pdat->name, file, (unsigned int)fw->size,
+                (offset >= 0) ? '+' : '-', (unsigned int)abs(offset));
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret < 0)
+                goto failed;
+        if (type != 0xffff)
+                goto failed;
+        if (strncmp("Structured Binary Format, Softing GmbH" , dat, len)) {
+                ret = -EINVAL;
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret < 0)
+                        goto failed;
+                if (type == 3) {
+                        /* start address, not used here */
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        ret = -EINVAL;
+                        goto failed;
+                }
+
+                if ((addr + len + offset) > size)
+                        goto failed;
+                memcpy_toio(&dpram[addr + offset], dat, len);
+                /* be sure to flush caches from IO space */
+                mb();
+                if (len > buflen) {
+                        /* align buflen */
+                        buflen = (len + (1024-1)) & ~(1024-1);
+                        buf = krealloc(buf, buflen, GFP_KERNEL);
+                        if (!buf) {
+                                ret = -ENOMEM;
+                                goto failed;
+                        }
+                }
+                /* verify record data */
+                memcpy_fromio(buf, &dpram[addr + offset], len);
+                if (memcmp(buf, dat, len)) {
+                        /* is not ok */
+                        dev_alert(&card->pdev->dev, "DPRAM readback failed\n");
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end)
+                /* no end record seen */
+                goto failed;
+        ret = 0;
+failed:
+        kfree(buf);
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+
+int softing_load_app_fw(const char *file, struct softing *card)
+{
+        const struct firmware *fw;
+        const uint8_t *mem, *end, *dat;
+        int ret, j;
+        uint16_t type, len;
+        uint32_t addr, start_addr = 0;
+        unsigned int sum, rx_sum;
+        int8_t type_end = 0, type_entrypoint = 0;
+
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret) {
+                dev_alert(&card->pdev->dev, "request_firmware(%s) got %i\n",
+                        file, ret);
+                return ret;
+        }
+        dev_dbg(&card->pdev->dev, "firmware(%s) got %lu bytes\n",
+                file, (unsigned long)fw->size);
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret)
+                goto failed;
+        ret = -EINVAL;
+        if (type != 0xffff) {
+                dev_alert(&card->pdev->dev, "firmware starts with type 0x%x\n",
+                        type);
+                goto failed;
+        }
+        if (strncmp("Structured Binary Format, Softing GmbH", dat, len)) {
+                dev_alert(&card->pdev->dev, "firmware string '%.*s' fault\n",
+                                len, dat);
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret)
+                        goto failed;
+
+                if (type == 3) {
+                        /* start address */
+                        start_addr = addr;
+                        type_entrypoint = 1;
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        dev_alert(&card->pdev->dev,
+                                        "unknown record type 0x%04x\n", type);
+                        ret = -EINVAL;
+                        goto failed;
+                }
+
+                /* regualar data */
+                for (sum = 0, j = 0; j < len; ++j)
+                        sum += dat[j];
+                /* work in 16bit (target) */
+                sum &= 0xffff;
+
+                memcpy_toio(&card->dpram[card->pdat->app.offs], dat, len);
+                iowrite32(card->pdat->app.offs + card->pdat->app.addr,
+                                &card->dpram[DPRAM_COMMAND + 2]);
+                iowrite32(addr, &card->dpram[DPRAM_COMMAND + 6]);
+                iowrite16(len, &card->dpram[DPRAM_COMMAND + 10]);
+                iowrite8(1, &card->dpram[DPRAM_COMMAND + 12]);
+                ret = softing_bootloader_command(card, 1, "loading app.");
+                if (ret < 0)
+                        goto failed;
+                /* verify checksum */
+                rx_sum = ioread16(&card->dpram[DPRAM_RECEIPT + 2]);
+                if (rx_sum != sum) {
+                        dev_alert(&card->pdev->dev, "SRAM seems to be damaged"
+                                ", wanted 0x%04x, got 0x%04x\n", sum, rx_sum);
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end || !type_entrypoint)
+                goto failed;
+        /* start application in card */
+        iowrite32(start_addr, &card->dpram[DPRAM_COMMAND + 2]);
+        iowrite8(1, &card->dpram[DPRAM_COMMAND + 6]);
+        ret = softing_bootloader_command(card, 3, "start app.");
+        if (ret < 0)
+                goto failed;
+        ret = 0;
+failed:
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+
+static int softing_reset_chip(struct softing *card)
+{
+        int ret;
+
+        do {
+                /* reset chip */
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO]);
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO+1]);
+                iowrite8(1, &card->dpram[DPRAM_RESET]);
+                iowrite8(0, &card->dpram[DPRAM_RESET+1]);
+
+                ret = softing_fct_cmd(card, 0, "reset_can");
+                if (!ret)
+                        break;
+                if (signal_pending(current))
+                        /* don't wait any longer */
+                        break;
+        } while (1);
+        card->tx.pending = 0;
+        return ret;
+}
+
+int softing_chip_poweron(struct softing *card)
+{
+        int ret;
+        /* sync */
+        ret = _softing_fct_cmd(card, 99, 0x55, "sync-a");
+        if (ret < 0)
+                goto failed;
+
+        ret = _softing_fct_cmd(card, 99, 0xaa, "sync-b");
+        if (ret < 0)
+                goto failed;
+
+        ret = softing_reset_chip(card);
+        if (ret < 0)
+                goto failed;
+        /* get_serial */
+        ret = softing_fct_cmd(card, 43, "get_serial_number");
+        if (ret < 0)
+                goto failed;
+        card->id.serial = ioread32(&card->dpram[DPRAM_FCT_PARAM]);
+        /* get_version */
+        ret = softing_fct_cmd(card, 12, "get_version");
+        if (ret < 0)
+                goto failed;
+        card->id.fw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 2]);
+        card->id.hw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 4]);
+        card->id.license = ioread16(&card->dpram[DPRAM_FCT_PARAM + 6]);
+        card->id.chip[0] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 8]);
+        card->id.chip[1] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 10]);
+        return 0;
+failed:
+        return ret;
+}
+
+static void softing_initialize_timestamp(struct softing *card)
+{
+        uint64_t ovf;
+
+        card->ts_ref = ktime_get();
+
+        /* 16MHz is the reference */
+        ovf = 0x100000000ULL * 16;
+        do_div(ovf, card->pdat->freq ?: 16);
+
+        card->ts_overflow = ktime_add_us(ktime_set(0, 0), ovf);
+}
+
+ktime_t softing_raw2ktime(struct softing *card, u32 raw)
+{
+        uint64_t rawl;
+        ktime_t now, real_offset;
+        ktime_t target;
+        ktime_t tmp;
+
+        now = ktime_get();
+        real_offset = ktime_sub(ktime_get_real(), now);
+
+        /* find nsec from card */
+        rawl = raw * 16;
+        do_div(rawl, card->pdat->freq ?: 16);
+        target = ktime_add_us(card->ts_ref, rawl);
+        /* test for overflows */
+        tmp = ktime_add(target, card->ts_overflow);
+        while (unlikely(ktime_to_ns(tmp) > ktime_to_ns(now))) {
+                card->ts_ref = ktime_add(card->ts_ref, card->ts_overflow);
+                target = tmp;
+                tmp = ktime_add(target, card->ts_overflow);
+        }
+        return ktime_add(target, real_offset);
+}
+
+static inline int softing_error_reporting(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+                ? 1 : 0;
+}
+
+int softing_startstop(struct net_device *dev, int up)
+{
+        int ret;
+        struct softing *card;
+        struct softing_priv *priv;
+        struct net_device *netdev;
+        int bus_bitmask_start;
+        int j, error_reporting;
+        struct can_frame msg;
+        const struct can_bittiming *bt;
+
+        priv = netdev_priv(dev);
+        card = priv->card;
+
+        if (!card->fw.up)
+                return -EIO;
+
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return ret;
+
+        bus_bitmask_start = 0;
+        if (dev && up)
+                /* prepare to start this bus as well */
+                bus_bitmask_start |= (1 << priv->index);
+        /* bring netdevs down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+
+                if (dev != netdev)
+                        netif_stop_queue(netdev);
+
+                if (netif_running(netdev)) {
+                        if (dev != netdev)
+                                bus_bitmask_start |= (1 << j);
+                        priv->tx.pending = 0;
+                        priv->tx.echo_put = 0;
+                        priv->tx.echo_get = 0;
+                        /*
+                         * this bus' may just have called open_candev()
+                         * which is rather stupid to call close_candev()
+                         * already
+                         * but we may come here from busoff recovery too
+                         * in which case the echo_skb _needs_ flushing too.
+                         * just be sure to call open_candev() again
+                         */
+                        close_candev(netdev);
+                }
+                priv->can.state = CAN_STATE_STOPPED;
+        }
+        card->tx.pending = 0;
+
+        softing_enable_irq(card, 0);
+        ret = softing_reset_chip(card);
+        if (ret)
+                goto failed;
+        if (!bus_bitmask_start)
+                /* no busses to be brought up */
+                goto card_done;
+
+        if ((bus_bitmask_start & 1) && (bus_bitmask_start & 2)
+                        && (softing_error_reporting(card->net[0])
+                                != softing_error_reporting(card->net[1]))) {
+                dev_alert(&card->pdev->dev,
+                                "err_reporting flag differs for busses\n");
+                goto invalid;
+        }
+        error_reporting = 0;
+        if (bus_bitmask_start & 1) {
+                netdev = card->net[0];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip 1 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 1, "initialize_chip[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 3, "set_mode[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 7, "set_filter[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 5, "set_output[0]");
+                if (ret < 0)
+                        goto failed;
+        }
+        if (bus_bitmask_start & 2) {
+                netdev = card->net[1];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip2 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 2, "initialize_chip[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode2 */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 4, "set_mode[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter2 */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 8, "set_filter[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control2 */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 6, "set_output[1]");
+                if (ret < 0)
+                        goto failed;
+        }
+        /* enable_error_frame */
+        /*
+         * Error reporting is switched off at the moment since
+         * the receiving of them is not yet 100% verified
+         * This should be enabled sooner or later
+         *
+        if (error_reporting) {
+                ret = softing_fct_cmd(card, 51, "enable_error_frame");
+                if (ret < 0)
+                        goto failed;
+        }
+        */
+        /* initialize interface */
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 6]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 8]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 10]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 12]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 14]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 16]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 18]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 20]);
+        ret = softing_fct_cmd(card, 17, "initialize_interface");
+        if (ret < 0)
+                goto failed;
+        /* enable_fifo */
+        ret = softing_fct_cmd(card, 36, "enable_fifo");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack */
+        ret = softing_fct_cmd(card, 13, "fifo_tx_ack[0]");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack2 */
+        ret = softing_fct_cmd(card, 14, "fifo_tx_ack[1]");
+        if (ret < 0)
+                goto failed;
+        /* start_chip */
+        ret = softing_fct_cmd(card, 11, "start_chip");
+        if (ret < 0)
+                goto failed;
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE]);
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE2]);
+        if (card->pdat->generation < 2) {
+                iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+                /* flush the DPRAM caches */
+                wmb();
+        }
+
+        softing_initialize_timestamp(card);
+
+        /*
+         * do socketcan notifications/status changes
+         * from here, no errors should occur, or the failed: part
+         * must be reviewed
+         */
+        memset(&msg, 0, sizeof(msg));
+        msg.can_id = CAN_ERR_FLAG | CAN_ERR_RESTARTED;
+        msg.can_dlc = CAN_ERR_DLC;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!(bus_bitmask_start & (1 << j)))
+                        continue;
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                open_candev(netdev);
+                if (dev != netdev) {
+                        /* notify other busses on the restart */
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                        ++priv->can.can_stats.restarts;
+                }
+                netif_wake_queue(netdev);
+        }
+
+        /* enable interrupts */
+        ret = softing_enable_irq(card, 1);
+        if (ret)
+                goto failed;
+card_done:
+        mutex_unlock(&card->fw.lock);
+        return 0;
+invalid:
+        ret = -EINVAL;
+failed:
+        softing_enable_irq(card, 0);
+        softing_reset_chip(card);
+        mutex_unlock(&card->fw.lock);
+        /* bring all other interfaces down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                dev_close(netdev);
+        }
+        return ret;
+}
+
+int softing_default_output(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+        struct softing *card = priv->card;
+
+        switch (priv->chip) {
+        case 1000:
+                return (card->pdat->generation < 2) ? 0xfb : 0xfa;
+        case 5:
+                return 0x60;
+        default:
+                return 0x40;
+        }
+}
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
new file mode 100644
index 000000000000..5157e15e96eb
--- /dev/null
+++ b/drivers/net/can/softing/softing_main.c
@@ -0,0 +1,893 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+
+#include "softing.h"
+
+#define TX_ECHO_SKB_MAX (((TXMAX+1)/2)-1)
+
+/*
+ * test is a specific CAN netdev
+ * is online (ie. up 'n running, not sleeping, not busoff
+ */
+static inline int canif_is_active(struct net_device *netdev)
+{
+        struct can_priv *can = netdev_priv(netdev);
+
+        if (!netif_running(netdev))
+                return 0;
+        return (can->state <= CAN_STATE_ERROR_PASSIVE);
+}
+
+/* reset DPRAM */
+static inline void softing_set_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) & ~1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+
+static inline void softing_clr_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) | 1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+
+/* trigger the tx queue-ing */
+static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,
+                struct net_device *dev)
+{
+        struct softing_priv *priv = netdev_priv(dev);
+        struct softing *card = priv->card;
+        int ret;
+        uint8_t *ptr;
+        uint8_t fifo_wr, fifo_rd;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        uint8_t buf[DPRAM_TX_SIZE];
+
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+
+        spin_lock(&card->spin);
+
+        ret = NETDEV_TX_BUSY;
+        if (!card->fw.up ||
+                        (card->tx.pending >= TXMAX) ||
+                        (priv->tx.pending >= TX_ECHO_SKB_MAX))
+                goto xmit_done;
+        fifo_wr = ioread8(&card->dpram[DPRAM_TX_WR]);
+        fifo_rd = ioread8(&card->dpram[DPRAM_TX_RD]);
+        if (fifo_wr == fifo_rd)
+                /* fifo full */
+                goto xmit_done;
+        memset(buf, 0, sizeof(buf));
+        ptr = buf;
+        *ptr = CMD_TX;
+        if (cf->can_id & CAN_RTR_FLAG)
+                *ptr |= CMD_RTR;
+        if (cf->can_id & CAN_EFF_FLAG)
+                *ptr |= CMD_XTD;
+        if (priv->index)
+                *ptr |= CMD_BUS2;
+        ++ptr;
+        *ptr++ = cf->can_dlc;
+        *ptr++ = (cf->can_id >> 0);
+        *ptr++ = (cf->can_id >> 8);
+        if (cf->can_id & CAN_EFF_FLAG) {
+                *ptr++ = (cf->can_id >> 16);
+                *ptr++ = (cf->can_id >> 24);
+        } else {
+                /* increment 1, not 2 as you might think */
+                ptr += 1;
+        }
+        if (!(cf->can_id & CAN_RTR_FLAG))
+                memcpy(ptr, &cf->data[0], cf->can_dlc);
+        memcpy_toio(&card->dpram[DPRAM_TX + DPRAM_TX_SIZE * fifo_wr],
+                        buf, DPRAM_TX_SIZE);
+        if (++fifo_wr >= DPRAM_TX_CNT)
+                fifo_wr = 0;
+        iowrite8(fifo_wr, &card->dpram[DPRAM_TX_WR]);
+        card->tx.last_bus = priv->index;
+        ++card->tx.pending;
+        ++priv->tx.pending;
+        can_put_echo_skb(skb, dev, priv->tx.echo_put);
+        ++priv->tx.echo_put;
+        if (priv->tx.echo_put >= TX_ECHO_SKB_MAX)
+                priv->tx.echo_put = 0;
+        /* can_put_echo_skb() saves the skb, safe to return TX_OK */
+        ret = NETDEV_TX_OK;
+xmit_done:
+        spin_unlock(&card->spin);
+        if (card->tx.pending >= TXMAX) {
+                int j;
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        if (card->net[j])
+                                netif_stop_queue(card->net[j]);
+                }
+        }
+        if (ret != NETDEV_TX_OK)
+                netif_stop_queue(dev);
+
+        return ret;
+}
+
+/*
+ * shortcut for skb delivery
+ */
+int softing_netdev_rx(struct net_device *netdev, const struct can_frame *msg,
+                ktime_t ktime)
+{
+        struct sk_buff *skb;
+        struct can_frame *cf;
+
+        skb = alloc_can_skb(netdev, &cf);
+        if (!skb)
+                return -ENOMEM;
+        memcpy(cf, msg, sizeof(*msg));
+        skb->tstamp = ktime;
+        return netif_rx(skb);
+}
+
+/*
+ * softing_handle_1
+ * pop 1 entry from the DPRAM queue, and process
+ */
+static int softing_handle_1(struct softing *card)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        ktime_t ktime;
+        struct can_frame msg;
+        int cnt = 0, lost_msg;
+        uint8_t fifo_rd, fifo_wr, cmd;
+        uint8_t *ptr;
+        uint32_t tmp_u32;
+        uint8_t buf[DPRAM_RX_SIZE];
+
+        memset(&msg, 0, sizeof(msg));
+        /* test for lost msgs */
+        lost_msg = ioread8(&card->dpram[DPRAM_RX_LOST]);
+        if (lost_msg) {
+                int j;
+                /* reset condition */
+                iowrite8(0, &card->dpram[DPRAM_RX_LOST]);
+                /* prepare msg */
+                msg.can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
+                msg.can_dlc = CAN_ERR_DLC;
+                msg.data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                /*
+                 * service to all busses, we don't know which it was applicable
+                 * but only service busses that are online
+                 */
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        netdev = card->net[j];
+                        if (!netdev)
+                                continue;
+                        if (!canif_is_active(netdev))
+                                /* a dead bus has no overflows */
+                                continue;
+                        ++netdev->stats.rx_over_errors;
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                }
+                /* prepare for other use */
+                memset(&msg, 0, sizeof(msg));
+                ++cnt;
+        }
+
+        fifo_rd = ioread8(&card->dpram[DPRAM_RX_RD]);
+        fifo_wr = ioread8(&card->dpram[DPRAM_RX_WR]);
+
+        if (++fifo_rd >= DPRAM_RX_CNT)
+                fifo_rd = 0;
+        if (fifo_wr == fifo_rd)
+                return cnt;
+
+        memcpy_fromio(buf, &card->dpram[DPRAM_RX + DPRAM_RX_SIZE*fifo_rd],
+                        DPRAM_RX_SIZE);
+        mb();
+        /* trigger dual port RAM */
+        iowrite8(fifo_rd, &card->dpram[DPRAM_RX_RD]);
+
+        ptr = buf;
+        cmd = *ptr++;
+        if (cmd == 0xff)
+                /* not quite usefull, probably the card has got out */
+                return 0;
+        netdev = card->net[0];
+        if (cmd & CMD_BUS2)
+                netdev = card->net[1];
+        priv = netdev_priv(netdev);
+
+        if (cmd & CMD_ERR) {
+                uint8_t can_state, state;
+
+                state = *ptr++;
+
+                msg.can_id = CAN_ERR_FLAG;
+                msg.can_dlc = CAN_ERR_DLC;
+
+                if (state & SF_MASK_BUSOFF) {
+                        can_state = CAN_STATE_BUS_OFF;
+                        msg.can_id |= CAN_ERR_BUSOFF;
+                        state = STATE_BUSOFF;
+                } else if (state & SF_MASK_EPASSIVE) {
+                        can_state = CAN_STATE_ERROR_PASSIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        msg.data[1] = CAN_ERR_CRTL_TX_PASSIVE;
+                        state = STATE_EPASSIVE;
+                } else {
+                        can_state = CAN_STATE_ERROR_ACTIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        state = STATE_EACTIVE;
+                }
+                /* update DPRAM */
+                iowrite8(state, &card->dpram[priv->index ?
+                                DPRAM_INFO_BUSSTATE2 : DPRAM_INFO_BUSSTATE]);
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+
+                ++netdev->stats.rx_errors;
+                /* update internal status */
+                if (can_state != priv->can.state) {
+                        priv->can.state = can_state;
+                        if (can_state == CAN_STATE_ERROR_PASSIVE)
+                                ++priv->can.can_stats.error_passive;
+                        else if (can_state == CAN_STATE_BUS_OFF) {
+                                /* this calls can_close_cleanup() */
+                                can_bus_off(netdev);
+                                netif_stop_queue(netdev);
+                        }
+                        /* trigger socketcan */
+                        softing_netdev_rx(netdev, &msg, ktime);
+                }
+
+        } else {
+                if (cmd & CMD_RTR)
+                        msg.can_id |= CAN_RTR_FLAG;
+                msg.can_dlc = get_can_dlc(*ptr++);
+                if (cmd & CMD_XTD) {
+                        msg.can_id |= CAN_EFF_FLAG;
+                        msg.can_id |= le32_to_cpup((void *)ptr);
+                        ptr += 4;
+                } else {
+                        msg.can_id |= le16_to_cpup((void *)ptr);
+                        ptr += 2;
+                }
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+                if (!(msg.can_id & CAN_RTR_FLAG))
+                        memcpy(&msg.data[0], ptr, 8);
+                ptr += 8;
+                /* update socket */
+                if (cmd & CMD_ACK) {
+                        /* acknowledge, was tx msg */
+                        struct sk_buff *skb;
+                        skb = priv->can.echo_skb[priv->tx.echo_get];
+                        if (skb)
+                                skb->tstamp = ktime;
+                        can_get_echo_skb(netdev, priv->tx.echo_get);
+                        ++priv->tx.echo_get;
+                        if (priv->tx.echo_get >= TX_ECHO_SKB_MAX)
+                                priv->tx.echo_get = 0;
+                        if (priv->tx.pending)
+                                --priv->tx.pending;
+                        if (card->tx.pending)
+                                --card->tx.pending;
+                        ++netdev->stats.tx_packets;
+                        if (!(msg.can_id & CAN_RTR_FLAG))
+                                netdev->stats.tx_bytes += msg.can_dlc;
+                } else {
+                        int ret;
+
+                        ret = softing_netdev_rx(netdev, &msg, ktime);
+                        if (ret == NET_RX_SUCCESS) {
+                                ++netdev->stats.rx_packets;
+                                if (!(msg.can_id & CAN_RTR_FLAG))
+                                        netdev->stats.rx_bytes += msg.can_dlc;
+                        } else {
+                                ++netdev->stats.rx_dropped;
+                        }
+                }
+        }
+        ++cnt;
+        return cnt;
+}
+
+/*
+ * real interrupt handler
+ */
+static irqreturn_t softing_irq_thread(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        int j, offset, work_done;
+
+        work_done = 0;
+        spin_lock_bh(&card->spin);
+        while (softing_handle_1(card) > 0) {
+                ++card->irq.svc_count;
+                ++work_done;
+        }
+        spin_unlock_bh(&card->spin);
+        /* resume tx queue's */
+        offset = card->tx.last_bus;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (card->tx.pending >= TXMAX)
+                        break;
+                netdev = card->net[(j + offset + 1) % card->pdat->nbus];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                if (!canif_is_active(netdev))
+                        /* it makes no sense to wake dead busses */
+                        continue;
+                if (priv->tx.pending >= TX_ECHO_SKB_MAX)
+                        continue;
+                ++work_done;
+                netif_wake_queue(netdev);
+        }
+        return work_done ? IRQ_HANDLED : IRQ_NONE;
+}
+
+/*
+ * interrupt routines:
+ * schedule the 'real interrupt handler'
+ */
+static irqreturn_t softing_irq_v2(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+
+        ir = ioread8(&card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        return (1 == ir) ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+
+static irqreturn_t softing_irq_v1(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+
+        ir = ioread8(&card->dpram[DPRAM_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_IRQ_TOHOST]);
+        return ir ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+
+/*
+ * netdev/candev inter-operability
+ */
+static int softing_netdev_open(struct net_device *ndev)
+{
+        int ret;
+
+        /* check or determine and set bittime */
+        ret = open_candev(ndev);
+        if (!ret)
+                ret = softing_startstop(ndev, 1);
+        return ret;
+}
+
+static int softing_netdev_stop(struct net_device *ndev)
+{
+        int ret;
+
+        netif_stop_queue(ndev);
+
+        /* softing cycle does close_candev() */
+        ret = softing_startstop(ndev, 0);
+        return ret;
+}
+
+static int softing_candev_set_mode(struct net_device *ndev, enum can_mode mode)
+{
+        int ret;
+
+        switch (mode) {
+        case CAN_MODE_START:
+                /* softing_startstop does close_candev() */
+                ret = softing_startstop(ndev, 1);
+                return ret;
+        case CAN_MODE_STOP:
+        case CAN_MODE_SLEEP:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+
+/*
+ * Softing device management helpers
+ */
+int softing_enable_irq(struct softing *card, int enable)
+{
+        int ret;
+
+        if (!card->irq.nr) {
+                return 0;
+        } else if (card->irq.requested && !enable) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        } else if (!card->irq.requested && enable) {
+                ret = request_threaded_irq(card->irq.nr,
+                                (card->pdat->generation >= 2) ?
+                                        softing_irq_v2 : softing_irq_v1,
+                                softing_irq_thread, IRQF_SHARED,
+                                dev_name(&card->pdev->dev), card);
+                if (ret) {
+                        dev_alert(&card->pdev->dev,
+                                        "request_threaded_irq(%u) failed\n",
+                                        card->irq.nr);
+                        return ret;
+                }
+                card->irq.requested = 1;
+        }
+        return 0;
+}
+
+static void softing_card_shutdown(struct softing *card)
+{
+        int fw_up = 0;
+
+        if (mutex_lock_interruptible(&card->fw.lock))
+                /* return -ERESTARTSYS */;
+        fw_up = card->fw.up;
+        card->fw.up = 0;
+
+        if (card->irq.requested && card->irq.nr) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        }
+        if (fw_up) {
+                if (card->pdat->enable_irq)
+                        card->pdat->enable_irq(card->pdev, 0);
+                softing_set_reset_dpram(card);
+                if (card->pdat->reset)
+                        card->pdat->reset(card->pdev, 1);
+        }
+        mutex_unlock(&card->fw.lock);
+}
+
+static __devinit int softing_card_boot(struct softing *card)
+{
+        int ret, j;
+        static const uint8_t stream[] = {
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, };
+        unsigned char back[sizeof(stream)];
+
+        if (mutex_lock_interruptible(&card->fw.lock))
+                return -ERESTARTSYS;
+        if (card->fw.up) {
+                mutex_unlock(&card->fw.lock);
+                return 0;
+        }
+        /* reset board */
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 1);
+        /* boot card */
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        for (j = 0; (j + sizeof(stream)) < card->dpram_size;
+                        j += sizeof(stream)) {
+
+                memcpy_toio(&card->dpram[j], stream, sizeof(stream));
+                /* flush IO cache */
+                mb();
+                memcpy_fromio(back, &card->dpram[j], sizeof(stream));
+
+                if (!memcmp(back, stream, sizeof(stream)))
+                        continue;
+                /* memory is not equal */
+                dev_alert(&card->pdev->dev, "dpram failed at 0x%04x\n", j);
+                ret = -EIO;
+                goto failed;
+        }
+        wmb();
+        /* load boot firmware */
+        ret = softing_load_fw(card->pdat->boot.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->boot.offs - card->pdat->boot.addr);
+        if (ret < 0)
+                goto failed;
+        /* load loader firmware */
+        ret = softing_load_fw(card->pdat->load.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->load.offs - card->pdat->load.addr);
+        if (ret < 0)
+                goto failed;
+
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 0);
+        softing_clr_reset_dpram(card);
+        ret = softing_bootloader_command(card, 0, "card boot");
+        if (ret < 0)
+                goto failed;
+        ret = softing_load_app_fw(card->pdat->app.fw, card);
+        if (ret < 0)
+                goto failed;
+
+        ret = softing_chip_poweron(card);
+        if (ret < 0)
+                goto failed;
+
+        card->fw.up = 1;
+        mutex_unlock(&card->fw.lock);
+        return 0;
+failed:
+        card->fw.up = 0;
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 0);
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        mutex_unlock(&card->fw.lock);
+        return ret;
+}
+
+/*
+ * netdev sysfs
+ */
+static ssize_t show_channel(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "%i\n", priv->index);
+}
+
+static ssize_t show_chip(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "%i\n", priv->chip);
+}
+
+static ssize_t show_output(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "0x%02x\n", priv->output);
+}
+
+static ssize_t store_output(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        struct softing *card = priv->card;
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 0, &val);
+        if (ret < 0)
+                return ret;
+        val &= 0xFF;
+
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return -ERESTARTSYS;
+        if (netif_running(ndev)) {
+                mutex_unlock(&card->fw.lock);
+                return -EBUSY;
+        }
+        priv->output = val;
+        mutex_unlock(&card->fw.lock);
+        return count;
+}
+
+static const DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
+static const DEVICE_ATTR(chip, S_IRUGO, show_chip, NULL);
+static const DEVICE_ATTR(output, S_IRUGO | S_IWUSR, show_output, store_output);
+
+static const struct attribute *const netdev_sysfs_attrs[] = {
+        &dev_attr_channel.attr,
+        &dev_attr_chip.attr,
+        &dev_attr_output.attr,
+        NULL,
+};
+static const struct attribute_group netdev_sysfs_group = {
+        .name = NULL,
+        .attrs = (struct attribute **)netdev_sysfs_attrs,
+};
+
+static const struct net_device_ops softing_netdev_ops = {
+        .ndo_open = softing_netdev_open,
+        .ndo_stop = softing_netdev_stop,
+        .ndo_start_xmit = softing_netdev_start_xmit,
+};
+
+static const struct can_bittiming_const softing_btr_const = {
+        .tseg1_min = 1,
+        .tseg1_max = 16,
+        .tseg2_min = 1,
+        .tseg2_max = 8,
+        .sjw_max = 4, /* overruled */
+        .brp_min = 1,
+        .brp_max = 32, /* overruled */
+        .brp_inc = 1,
+};
+
+
+static __devinit struct net_device *softing_netdev_create(struct softing *card,
+                uint16_t chip_id)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+
+        netdev = alloc_candev(sizeof(*priv), TX_ECHO_SKB_MAX);
+        if (!netdev) {
+                dev_alert(&card->pdev->dev, "alloc_candev failed\n");
+                return NULL;
+        }
+        priv = netdev_priv(netdev);
+        priv->netdev = netdev;
+        priv->card = card;
+        memcpy(&priv->btr_const, &softing_btr_const, sizeof(priv->btr_const));
+        priv->btr_const.brp_max = card->pdat->max_brp;
+        priv->btr_const.sjw_max = card->pdat->max_sjw;
+        priv->can.bittiming_const = &priv->btr_const;
+        priv->can.clock.freq = 8000000;
+        priv->chip = chip_id;
+        priv->output = softing_default_output(netdev);
+        SET_NETDEV_DEV(netdev, &card->pdev->dev);
+
+        netdev->flags |= IFF_ECHO;
+        netdev->netdev_ops = &softing_netdev_ops;
+        priv->can.do_set_mode = softing_candev_set_mode;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+
+        return netdev;
+}
+
+static __devinit int softing_netdev_register(struct net_device *netdev)
+{
+        int ret;
+
+        netdev->sysfs_groups[0] = &netdev_sysfs_group;
+        ret = register_candev(netdev);
+        if (ret) {
+                dev_alert(&netdev->dev, "register failed\n");
+                return ret;
+        }
+        return 0;
+}
+
+static void softing_netdev_cleanup(struct net_device *netdev)
+{
+        unregister_candev(netdev);
+        free_candev(netdev);
+}
+
+/*
+ * sysfs for Platform device
+ */
+#define DEV_ATTR_RO(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%u\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+
+#define DEV_ATTR_RO_STR(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%s\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+
+DEV_ATTR_RO(serial, id.serial);
+DEV_ATTR_RO_STR(firmware, pdat->app.fw);
+DEV_ATTR_RO(firmware_version, id.fw_version);
+DEV_ATTR_RO_STR(hardware, pdat->name);
+DEV_ATTR_RO(hardware_version, id.hw_version);
+DEV_ATTR_RO(license, id.license);
+DEV_ATTR_RO(frequency, id.freq);
+DEV_ATTR_RO(txpending, tx.pending);
+
+static struct attribute *softing_pdev_attrs[] = {
+        &dev_attr_serial.attr,
+        &dev_attr_firmware.attr,
+        &dev_attr_firmware_version.attr,
+        &dev_attr_hardware.attr,
+        &dev_attr_hardware_version.attr,
+        &dev_attr_license.attr,
+        &dev_attr_frequency.attr,
+        &dev_attr_txpending.attr,
+        NULL,
+};
+
+static const struct attribute_group softing_pdev_group = {
+        .name = NULL,
+        .attrs = softing_pdev_attrs,
+};
+
+/*
+ * platform driver
+ */
+static __devexit int softing_pdev_remove(struct platform_device *pdev)
+{
+        struct softing *card = platform_get_drvdata(pdev);
+        int j;
+
+        /* first, disable card*/
+        softing_card_shutdown(card);
+
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+                card->net[j] = NULL;
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+
+        iounmap(card->dpram);
+        kfree(card);
+        return 0;
+}
+
+static __devinit int softing_pdev_probe(struct platform_device *pdev)
+{
+        const struct softing_platform_data *pdat = pdev->dev.platform_data;
+        struct softing *card;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        struct resource *pres;
+        int ret;
+        int j;
+
+        if (!pdat) {
+                dev_warn(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+        if (pdat->nbus > ARRAY_SIZE(card->net)) {
+                dev_warn(&pdev->dev, "%u nets??\n", pdat->nbus);
+                return -EINVAL;
+        }
+
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+        card->pdat = pdat;
+        card->pdev = pdev;
+        platform_set_drvdata(pdev, card);
+        mutex_init(&card->fw.lock);
+        spin_lock_init(&card->spin);
+
+        ret = -EINVAL;
+        pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!pres)
+                goto platform_resource_failed;;
+        card->dpram_phys = pres->start;
+        card->dpram_size = pres->end - pres->start + 1;
+        card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
+        if (!card->dpram) {
+                dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
+                goto ioremap_failed;
+        }
+
+        pres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (pres)
+                card->irq.nr = pres->start;
+
+        /* reset card */
+        ret = softing_card_boot(card);
+        if (ret < 0) {
+                dev_alert(&pdev->dev, "failed to boot\n");
+                goto boot_failed;
+        }
+
+        /* only now, the chip's are known */
+        card->id.freq = card->pdat->freq;
+
+        ret = sysfs_create_group(&pdev->dev.kobj, &softing_pdev_group);
+        if (ret < 0) {
+                dev_alert(&card->pdev->dev, "sysfs failed\n");
+                goto sysfs_failed;
+        }
+
+        ret = -ENOMEM;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                card->net[j] = netdev =
+                        softing_netdev_create(card, card->id.chip[j]);
+                if (!netdev) {
+                        dev_alert(&pdev->dev, "failed to make can[%i]", j);
+                        goto netdev_failed;
+                }
+                priv = netdev_priv(card->net[j]);
+                priv->index = j;
+                ret = softing_netdev_register(netdev);
+                if (ret) {
+                        free_candev(netdev);
+                        card->net[j] = NULL;
+                        dev_alert(&card->pdev->dev,
+                                        "failed to register can[%i]\n", j);
+                        goto netdev_failed;
+                }
+        }
+        dev_info(&card->pdev->dev, "%s ready.\n", card->pdat->name);
+        return 0;
+
+netdev_failed:
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+sysfs_failed:
+        softing_card_shutdown(card);
+boot_failed:
+        iounmap(card->dpram);
+ioremap_failed:
+platform_resource_failed:
+        kfree(card);
+        return ret;
+}
+
+static struct platform_driver softing_driver = {
+        .driver = {
+                .name = "softing",
+                .owner = THIS_MODULE,
+        },
+        .probe = softing_pdev_probe,
+        .remove = __devexit_p(softing_pdev_remove),
+};
+
+MODULE_ALIAS("platform:softing");
+
+static int __init softing_start(void)
+{
+        return platform_driver_register(&softing_driver);
+}
+
+static void __exit softing_stop(void)
+{
+        platform_driver_unregister(&softing_driver);
+}
+
+module_init(softing_start);
+module_exit(softing_stop);
+
+MODULE_DESCRIPTION("Softing DPRAM CAN driver");
+MODULE_AUTHOR("Kurt Van Dijck <kurt.van.dijck@eia.be>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_platform.h b/drivers/net/can/softing/softing_platform.h
new file mode 100644
index 000000000000..ebbf69815623
--- /dev/null
+++ b/drivers/net/can/softing/softing_platform.h
@@ -0,0 +1,40 @@
+
+#include <linux/platform_device.h>
+
+#ifndef _SOFTING_DEVICE_H_
+#define _SOFTING_DEVICE_H_
+
+/* softing firmware directory prefix */
+#define fw_dir "softing-4.6/"
+
+struct softing_platform_data {
+        unsigned int manf;
+        unsigned int prod;
+        /*
+         * generation
+         * 1st with NEC or SJA1000
+         * 8bit, exclusive interrupt, ...
+         * 2nd only SJA1000
+         * 16bit, shared interrupt
+         */
+        int generation;
+        int nbus; /* # busses on device */
+        unsigned int freq; /* operating frequency in Hz */
+        unsigned int max_brp;
+        unsigned int max_sjw;
+        unsigned long dpram_size;
+        const char *name;
+        struct {
+                unsigned long offs;
+                unsigned long addr;
+                const char *fw;
+        } boot, load, app;
+        /*
+         * reset() function
+         * bring pdev in or out of reset, depending on value
+         */
+        int (*reset)(struct platform_device *pdev, int value);
+        int (*enable_irq)(struct platform_device *pdev, int value);
+};
+
+#endif
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 7206ab2cbbf8..3437613f0454 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -3203,7 +3203,7 @@ static int cas_get_vpd_info(struct cas *cp, unsigned char *dev_addr,
         int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */
         int mac_off  = 0;
 
-#if defined(CONFIG_OF)
+#if defined(CONFIG_SPARC)
         const unsigned char *addr;
 #endif
 
@@ -3354,7 +3354,7 @@ use_random_mac_addr:
         if (found & VPD_FOUND_MAC)
                 goto done;
 
-#if defined(CONFIG_OF)
+#if defined(CONFIG_SPARC)
         addr = of_get_property(cp->of_node, "local-mac-address", NULL);
         if (addr != NULL) {
                 memcpy(dev_addr, addr, 6);
@@ -5031,7 +5031,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE :
           cassini_debug;
 
-#if defined(CONFIG_OF)
+#if defined(CONFIG_SPARC)
         cp->of_node = pci_device_to_OF_node(pdev);
 #endif
 
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 263a2944566f..7ff170cbc7dc 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -699,13 +699,13 @@ static void cnic_free_dma(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 {
         int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
 
         for (i = 0; i < dma->num_pages; i++) {
                 /* Each entry needs to be in big endian format. */
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                 page_table++;
-                *page_table = (u32) dma->pg_map_arr[i];
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                 page_table++;
         }
 }
@@ -713,13 +713,13 @@ static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl_le(struct cnic_dev *dev, struct cnic_dma *dma)
 {
         int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
 
         for (i = 0; i < dma->num_pages; i++) {
                 /* Each entry needs to be in little endian format. */
-                *page_table = dma->pg_map_arr[i] & 0xffffffff;
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                 page_table++;
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                 page_table++;
         }
 }
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 059c1eec8c3f..ec35d458102c 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -2710,6 +2710,8 @@ static int cxgb_open(struct net_device *dev)
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
 
+        netif_carrier_off(dev);
+
         if (!(adapter->flags & FULL_INIT_DONE)) {
                 err = cxgb_up(adapter);
                 if (err < 0)
@@ -3661,7 +3663,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                 pi->xact_addr_filt = -1;
                 pi->rx_offload = RX_CSO;
                 pi->port_id = i;
-                netif_carrier_off(netdev);
                 netdev->irq = pdev->irq;
 
                 netdev->features |= NETIF_F_SG | TSO_FLAGS;
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 1b48b68ad4fd..8b0084d17c8c 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1094,7 +1094,7 @@ static int depca_rx(struct net_device *dev)
                                 }
                         }
                         /* Change buffer ownership for this last frame, back to the adapter */
-                        for (; lp->rx_old != entry; lp->rx_old = (++lp->rx_old) & lp->rxRingMask) {
+                        for (; lp->rx_old != entry; lp->rx_old = (lp->rx_old + 1) & lp->rxRingMask) {
                                 writel(readl(&lp->rx_ring[lp->rx_old].base) | R_OWN, &lp->rx_ring[lp->rx_old].base);
                         }
                         writel(readl(&lp->rx_ring[entry].base) | R_OWN, &lp->rx_ring[entry].base);
@@ -1103,7 +1103,7 @@ static int depca_rx(struct net_device *dev)
                 /*
                    ** Update entry information
                  */
-                lp->rx_new = (++lp->rx_new) & lp->rxRingMask;
+                lp->rx_new = (lp->rx_new + 1) & lp->rxRingMask;
         }
 
         return 0;
@@ -1148,7 +1148,7 @@ static int depca_tx(struct net_device *dev)
                 }
 
                 /* Update all the pointers */
-                lp->tx_old = (++lp->tx_old) & lp->txRingMask;
+                lp->tx_old = (lp->tx_old + 1) & lp->txRingMask;
         }
 
         return 0;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index e1a8216ff692..c05db6046050 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1753,8 +1753,6 @@ rio_close (struct net_device *dev)
 
         /* Free all the skbuffs in the queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                np->rx_ring[i].status = 0;
-                np->rx_ring[i].fraginfo = 0;
                 skb = np->rx_skbuff[i];
                 if (skb) {
                         pci_unmap_single(np->pdev,
@@ -1763,6 +1761,8 @@ rio_close (struct net_device *dev)
                         dev_kfree_skb (skb);
                         np->rx_skbuff[i] = NULL;
                 }
+                np->rx_ring[i].status = 0;
+                np->rx_ring[i].fraginfo = 0;
         }
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index aed223b1b897..7501d977d992 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw)
         case M88E1000_I_PHY_ID:
         case M88E1011_I_PHY_ID:
         case M88E1111_I_PHY_ID:
+        case M88E1118_E_PHY_ID:
                 hw->phy_type = e1000_phy_m88;
                 break;
         case IGP01E1000_I_PHY_ID:
@@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
                 break;
         case e1000_ce4100:
                 if ((hw->phy_id == RTL8211B_PHY_ID) ||
-                    (hw->phy_id == RTL8201N_PHY_ID))
+                    (hw->phy_id == RTL8201N_PHY_ID) ||
+                    (hw->phy_id == M88E1118_E_PHY_ID))
                         match = true;
                 break;
         case e1000_82541:
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 196eeda2dd6c..c70b23d52284 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -2917,6 +2917,7 @@ struct e1000_host_command_info {
 #define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
 #define M88E1011_I_REV_4   0x04
 #define M88E1111_I_PHY_ID  0x01410CC0
+#define M88E1118_E_PHY_ID  0x01410E40
 #define L1LXT971A_PHY_ID   0x001378E0
 
 #define RTL8211B_PHY_ID    0x001CC910
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index de69c54301c1..bfab14092d2c 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3478,9 +3478,17 @@ static irqreturn_t e1000_intr(int irq, void *data)
         struct e1000_hw *hw = &adapter->hw;
         u32 icr = er32(ICR);
 
-        if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags)))
+        if (unlikely((!icr)))
                 return IRQ_NONE;  /* Not our interrupt */
 
+        /*
+         * we might have caused the interrupt, but the above
+         * read cleared it, and just in case the driver is
+         * down there is nothing to do so return handled
+         */
+        if (unlikely(test_bit(__E1000_DOWN, &adapter->flags)))
+                return IRQ_HANDLED;
+
         if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
                 hw->get_link_status = 1;
                 /* guard against interrupt when we're going down */
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 1397da118f0d..89a69035e538 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -1310,7 +1310,7 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                  * apply workaround for hardware errata documented in errata
                  * docs Fixes issue where some error prone or unreliable PCIe
                  * completions are occurring, particularly with ASPM enabled.
-                 * Without fix, issue can cause tx timeouts.
+                 * Without fix, issue can cause Tx timeouts.
                  */
                 reg = er32(GCR2);
                 reg |= 1;
diff --git a/drivers/net/e1000e/Makefile b/drivers/net/e1000e/Makefile
index 360c91369f35..28519acacd2d 100644
--- a/drivers/net/e1000e/Makefile
+++ b/drivers/net/e1000e/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel PRO/1000 Linux driver
-# Copyright(c) 1999 - 2008 Intel Corporation.
+# Copyright(c) 1999 - 2011 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 7245dc2e0b7c..13149983d07e 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 5255be753746..e610e1369053 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index e45a61c8930a..2fefa820302b 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index f8ed03dab9b1..fa08b6336cfb 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index e774380c7cec..bc0860a598c9 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -102,7 +102,7 @@ enum e1e_registers {
         E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
         E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
 #define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
-        E1000_RADV     = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */
+        E1000_RADV     = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */
 
 /* Convenience macros
  *
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 5bb65b7382db..fb46974cfec1 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index ff2872153b21..68aa1749bf66 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -533,7 +533,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                         mac->autoneg_failed = 1;
                         return 0;
                 }
-                e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
+                e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");
 
                 /* Disable auto-negotiation in the TXCW register */
                 ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -556,7 +556,7 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
                  */
-                e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
+                e_dbg("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");
                 ew32(TXCW, mac->txcw);
                 ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
 
@@ -598,7 +598,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                         mac->autoneg_failed = 1;
                         return 0;
                 }
-                e_dbg("NOT RXing /C/, disable AutoNeg and force link.\n");
+                e_dbg("NOT Rx'ing /C/, disable AutoNeg and force link.\n");
 
                 /* Disable auto-negotiation in the TXCW register */
                 ew32(TXCW, (mac->txcw & ~E1000_TXCW_ANE));
@@ -621,7 +621,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
                  * and disable forced link in the Device Control register
                  * in an attempt to auto-negotiate with our link partner.
                  */
-                e_dbg("RXing /C/, enable AutoNeg and stop forcing link.\n");
+                e_dbg("Rx'ing /C/, enable AutoNeg and stop forcing link.\n");
                 ew32(TXCW, mac->txcw);
                 ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));
 
@@ -800,9 +800,9 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
          * The possible values of the "fc" parameter are:
          *      0:  Flow control is completely disabled
          *      1:  Rx flow control is enabled (we can receive pause frames,
-         *        but not send pause frames).
+         *          but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames but we
-         *        do not support receiving pause frames).
+         *          do not support receiving pause frames).
          *      3:  Both Rx and Tx flow control (symmetric) are enabled.
          */
         switch (hw->fc.current_mode) {
@@ -1031,9 +1031,9 @@ s32 e1000e_force_mac_fc(struct e1000_hw *hw)
          * The possible values of the "fc" parameter are:
          *      0:  Flow control is completely disabled
          *      1:  Rx flow control is enabled (we can receive pause
-         *        frames but not send pause frames).
+         *          frames but not send pause frames).
          *      2:  Tx flow control is enabled (we can send pause frames
-         *        frames but we do not receive pause frames).
+         *          frames but we do not receive pause frames).
          *      3:  Both Rx and Tx flow control (symmetric) is enabled.
          *  other:  No other values should be possible at this point.
          */
@@ -1189,7 +1189,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw)
                         } else {
                                 hw->fc.current_mode = e1000_fc_rx_pause;
                                 e_dbg("Flow Control = "
-                                         "RX PAUSE frames only.\r\n");
+                                      "Rx PAUSE frames only.\r\n");
                         }
                 }
                 /*
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index fa5b60452547..3065870cf2a7 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -77,17 +77,17 @@ struct e1000_reg_info {
         char *name;
 };
 
-#define E1000_RDFH      0x02410 /* Rx Data FIFO Head - RW */
-#define E1000_RDFT      0x02418 /* Rx Data FIFO Tail - RW */
-#define E1000_RDFHS     0x02420 /* Rx Data FIFO Head Saved - RW */
-#define E1000_RDFTS     0x02428 /* Rx Data FIFO Tail Saved - RW */
-#define E1000_RDFPC     0x02430 /* Rx Data FIFO Packet Count - RW */
+#define E1000_RDFH      0x02410 /* Rx Data FIFO Head - RW */
+#define E1000_RDFT      0x02418 /* Rx Data FIFO Tail - RW */
+#define E1000_RDFHS     0x02420 /* Rx Data FIFO Head Saved - RW */
+#define E1000_RDFTS     0x02428 /* Rx Data FIFO Tail Saved - RW */
+#define E1000_RDFPC     0x02430 /* Rx Data FIFO Packet Count - RW */
 
-#define E1000_TDFH      0x03410 /* Tx Data FIFO Head - RW */
-#define E1000_TDFT      0x03418 /* Tx Data FIFO Tail - RW */
-#define E1000_TDFHS     0x03420 /* Tx Data FIFO Head Saved - RW */
-#define E1000_TDFTS     0x03428 /* Tx Data FIFO Tail Saved - RW */
-#define E1000_TDFPC     0x03430 /* Tx Data FIFO Packet Count - RW */
+#define E1000_TDFH      0x03410 /* Tx Data FIFO Head - RW */
+#define E1000_TDFT      0x03418 /* Tx Data FIFO Tail - RW */
+#define E1000_TDFHS     0x03420 /* Tx Data FIFO Head Saved - RW */
+#define E1000_TDFTS     0x03428 /* Tx Data FIFO Tail Saved - RW */
+#define E1000_TDFPC     0x03430 /* Tx Data FIFO Packet Count - RW */
 
 static const struct e1000_reg_info e1000_reg_info_tbl[] = {
 
@@ -99,7 +99,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
         /* Interrupt Registers */
         {E1000_ICR, "ICR"},
 
-        /* RX Registers */
+        /* Rx Registers */
         {E1000_RCTL, "RCTL"},
         {E1000_RDLEN, "RDLEN"},
         {E1000_RDH, "RDH"},
@@ -115,7 +115,7 @@ static const struct e1000_reg_info e1000_reg_info_tbl[] = {
         {E1000_RDFTS, "RDFTS"},
         {E1000_RDFPC, "RDFPC"},
 
-        /* TX Registers */
+        /* Tx Registers */
         {E1000_TCTL, "TCTL"},
         {E1000_TDBAL, "TDBAL"},
         {E1000_TDBAH, "TDBAH"},
@@ -160,7 +160,7 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)
                 break;
         default:
                 printk(KERN_INFO "%-15s %08x\n",
-                        reginfo->name, __er32(hw, reginfo->ofs));
+                       reginfo->name, __er32(hw, reginfo->ofs));
                 return;
         }
 
@@ -171,9 +171,8 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo)
         printk(KERN_CONT "\n");
 }
 
-
 /*
- * e1000e_dump - Print registers, tx-ring and rx-ring
+ * e1000e_dump - Print registers, Tx-ring and Rx-ring
  */
 static void e1000e_dump(struct e1000_adapter *adapter)
 {
@@ -182,12 +181,20 @@ static void e1000e_dump(struct e1000_adapter *adapter)
         struct e1000_reg_info *reginfo;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_tx_desc *tx_desc;
-        struct my_u0 { u64 a; u64 b; } *u0;
+        struct my_u0 {
+                u64 a;
+                u64 b;
+        } *u0;
         struct e1000_buffer *buffer_info;
         struct e1000_ring *rx_ring = adapter->rx_ring;
         union e1000_rx_desc_packet_split *rx_desc_ps;
         struct e1000_rx_desc *rx_desc;
-        struct my_u1 { u64 a; u64 b; u64 c; u64 d; } *u1;
+        struct my_u1 {
+                u64 a;
+                u64 b;
+                u64 c;
+                u64 d;
+        } *u1;
         u32 staterr;
         int i = 0;
 
@@ -198,12 +205,10 @@ static void e1000e_dump(struct e1000_adapter *adapter)
         if (netdev) {
                 dev_info(&adapter->pdev->dev, "Net device Info\n");
                 printk(KERN_INFO "Device Name     state            "
-                        "trans_start      last_rx\n");
+                       "trans_start      last_rx\n");
                 printk(KERN_INFO "%-15s %016lX %016lX %016lX\n",
-                        netdev->name,
-                        netdev->state,
-                        netdev->trans_start,
-                        netdev->last_rx);
+                       netdev->name, netdev->state, netdev->trans_start,
+                       netdev->last_rx);
         }
 
         /* Print Registers */
@@ -214,26 +219,26 @@ static void e1000e_dump(struct e1000_adapter *adapter)
                 e1000_regdump(hw, reginfo);
         }
 
-        /* Print TX Ring Summary */
+        /* Print Tx Ring Summary */
         if (!netdev || !netif_running(netdev))
                 goto exit;
 
-        dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
+        dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
         printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma  ]"
-                " leng ntw timestamp\n");
+               " leng ntw timestamp\n");
         buffer_info = &tx_ring->buffer_info[tx_ring->next_to_clean];
         printk(KERN_INFO " %5d %5X %5X %016llX %04X %3X %016llX\n",
-                0, tx_ring->next_to_use, tx_ring->next_to_clean,
-                (unsigned long long)buffer_info->dma,
-                buffer_info->length,
-                buffer_info->next_to_watch,
-                (unsigned long long)buffer_info->time_stamp);
+               0, tx_ring->next_to_use, tx_ring->next_to_clean,
+               (unsigned long long)buffer_info->dma,
+               buffer_info->length,
+               buffer_info->next_to_watch,
+               (unsigned long long)buffer_info->time_stamp);
 
-        /* Print TX Rings */
+        /* Print Tx Ring */
         if (!netif_msg_tx_done(adapter))
                 goto rx_ring_summary;
 
-        dev_info(&adapter->pdev->dev, "TX Rings Dump\n");
+        dev_info(&adapter->pdev->dev, "Tx Ring Dump\n");
 
         /* Transmit Descriptor Formats - DEXT[29] is 0 (Legacy) or 1 (Extended)
          *
@@ -263,22 +268,22 @@ static void e1000e_dump(struct e1000_adapter *adapter)
          *   63       48 47     40 39  36 35    32 31     24 23  20 19        0
          */
         printk(KERN_INFO "Tl[desc]     [address 63:0  ] [SpeCssSCmCsLen]"
-                " [bi->dma       ] leng  ntw timestamp        bi->skb "
-                "<-- Legacy format\n");
+               " [bi->dma       ] leng  ntw timestamp        bi->skb "
+               "<-- Legacy format\n");
         printk(KERN_INFO "Tc[desc]     [Ce CoCsIpceCoS] [MssHlRSCm0Plen]"
-                " [bi->dma       ] leng  ntw timestamp        bi->skb "
-                "<-- Ext Context format\n");
+               " [bi->dma       ] leng  ntw timestamp        bi->skb "
+               "<-- Ext Context format\n");
         printk(KERN_INFO "Td[desc]     [address 63:0  ] [VlaPoRSCm1Dlen]"
-                " [bi->dma       ] leng  ntw timestamp        bi->skb "
-                "<-- Ext Data format\n");
+               " [bi->dma       ] leng  ntw timestamp        bi->skb "
+               "<-- Ext Data format\n");
         for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
                 tx_desc = E1000_TX_DESC(*tx_ring, i);
                 buffer_info = &tx_ring->buffer_info[i];
                 u0 = (struct my_u0 *)tx_desc;
                 printk(KERN_INFO "T%c[0x%03X]    %016llX %016llX %016llX "
-                        "%04X  %3X %016llX %p",
-                       (!(le64_to_cpu(u0->b) & (1<<29)) ? 'l' :
-                        ((le64_to_cpu(u0->b) & (1<<20)) ? 'd' : 'c')), i,
+                       "%04X  %3X %016llX %p",
+                       (!(le64_to_cpu(u0->b) & (1 << 29)) ? 'l' :
+                        ((le64_to_cpu(u0->b) & (1 << 20)) ? 'd' : 'c')), i,
                        (unsigned long long)le64_to_cpu(u0->a),
                        (unsigned long long)le64_to_cpu(u0->b),
                        (unsigned long long)buffer_info->dma,
@@ -296,22 +301,22 @@ static void e1000e_dump(struct e1000_adapter *adapter)
 
                 if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
                         print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,
-                                        16, 1, phys_to_virt(buffer_info->dma),
-                                        buffer_info->length, true);
+                                       16, 1, phys_to_virt(buffer_info->dma),
+                                       buffer_info->length, true);
         }
 
-        /* Print RX Rings Summary */
+        /* Print Rx Ring Summary */
 rx_ring_summary:
-        dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
+        dev_info(&adapter->pdev->dev, "Rx Ring Summary\n");
         printk(KERN_INFO "Queue [NTU] [NTC]\n");
         printk(KERN_INFO " %5d %5X %5X\n", 0,
-                rx_ring->next_to_use, rx_ring->next_to_clean);
+               rx_ring->next_to_use, rx_ring->next_to_clean);
 
-        /* Print RX Rings */
+        /* Print Rx Ring */
         if (!netif_msg_rx_status(adapter))
                 goto exit;
 
-        dev_info(&adapter->pdev->dev, "RX Rings Dump\n");
+        dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
         switch (adapter->rx_ps_pages) {
         case 1:
         case 2:
@@ -329,7 +334,7 @@ rx_ring_summary:
                  *    +-----------------------------------------------------+
                  */
                 printk(KERN_INFO "R  [desc]      [buffer 0 63:0 ] "
-                        "[buffer 1 63:0 ] "
+                       "[buffer 1 63:0 ] "
                        "[buffer 2 63:0 ] [buffer 3 63:0 ] [bi->dma       ] "
                        "[bi->skb] <-- Ext Pkt Split format\n");
                 /* [Extended] Receive Descriptor (Write-Back) Format
@@ -344,7 +349,7 @@ rx_ring_summary:
                  *   63       48 47    32 31            20 19               0
                  */
                 printk(KERN_INFO "RWB[desc]      [ck ipid mrqhsh] "
-                        "[vl   l0 ee  es] "
+                       "[vl   l0 ee  es] "
                        "[ l3  l2  l1 hs] [reserved      ] ---------------- "
                        "[bi->skb] <-- Ext Rx Write-Back format\n");
                 for (i = 0; i < rx_ring->count; i++) {
@@ -352,26 +357,26 @@ rx_ring_summary:
                         rx_desc_ps = E1000_RX_DESC_PS(*rx_ring, i);
                         u1 = (struct my_u1 *)rx_desc_ps;
                         staterr =
-                                le32_to_cpu(rx_desc_ps->wb.middle.status_error);
+                            le32_to_cpu(rx_desc_ps->wb.middle.status_error);
                         if (staterr & E1000_RXD_STAT_DD) {
                                 /* Descriptor Done */
                                 printk(KERN_INFO "RWB[0x%03X]     %016llX "
-                                        "%016llX %016llX %016llX "
-                                        "---------------- %p", i,
-                                        (unsigned long long)le64_to_cpu(u1->a),
-                                        (unsigned long long)le64_to_cpu(u1->b),
-                                        (unsigned long long)le64_to_cpu(u1->c),
-                                        (unsigned long long)le64_to_cpu(u1->d),
-                                        buffer_info->skb);
+                                       "%016llX %016llX %016llX "
+                                       "---------------- %p", i,
+                                       (unsigned long long)le64_to_cpu(u1->a),
+                                       (unsigned long long)le64_to_cpu(u1->b),
+                                       (unsigned long long)le64_to_cpu(u1->c),
+                                       (unsigned long long)le64_to_cpu(u1->d),
+                                       buffer_info->skb);
                         } else {
                                 printk(KERN_INFO "R  [0x%03X]     %016llX "
-                                        "%016llX %016llX %016llX %016llX %p", i,
-                                        (unsigned long long)le64_to_cpu(u1->a),
-                                        (unsigned long long)le64_to_cpu(u1->b),
-                                        (unsigned long long)le64_to_cpu(u1->c),
-                                        (unsigned long long)le64_to_cpu(u1->d),
-                                        (unsigned long long)buffer_info->dma,
-                                        buffer_info->skb);
+                                       "%016llX %016llX %016llX %016llX %p", i,
+                                       (unsigned long long)le64_to_cpu(u1->a),
+                                       (unsigned long long)le64_to_cpu(u1->b),
+                                       (unsigned long long)le64_to_cpu(u1->c),
+                                       (unsigned long long)le64_to_cpu(u1->d),
+                                       (unsigned long long)buffer_info->dma,
+                                       buffer_info->skb);
 
                                 if (netif_msg_pktdata(adapter))
                                         print_hex_dump(KERN_INFO, "",
@@ -400,18 +405,18 @@ rx_ring_summary:
                  * 63       48 47    40 39      32 31         16 15      0
                  */
                 printk(KERN_INFO "Rl[desc]     [address 63:0  ] "
-                        "[vl er S cks ln] [bi->dma       ] [bi->skb] "
-                        "<-- Legacy format\n");
+                       "[vl er S cks ln] [bi->dma       ] [bi->skb] "
+                       "<-- Legacy format\n");
                 for (i = 0; rx_ring->desc && (i < rx_ring->count); i++) {
                         rx_desc = E1000_RX_DESC(*rx_ring, i);
                         buffer_info = &rx_ring->buffer_info[i];
                         u0 = (struct my_u0 *)rx_desc;
                         printk(KERN_INFO "Rl[0x%03X]    %016llX %016llX "
-                                "%016llX %p", i,
-                                (unsigned long long)le64_to_cpu(u0->a),
-                                (unsigned long long)le64_to_cpu(u0->b),
-                                (unsigned long long)buffer_info->dma,
-                                buffer_info->skb);
+                               "%016llX %p", i,
+                               (unsigned long long)le64_to_cpu(u0->a),
+                               (unsigned long long)le64_to_cpu(u0->b),
+                               (unsigned long long)buffer_info->dma,
+                               buffer_info->skb);
                         if (i == rx_ring->next_to_use)
                                 printk(KERN_CONT " NTU\n");
                         else if (i == rx_ring->next_to_clean)
@@ -421,9 +426,10 @@ rx_ring_summary:
 
                         if (netif_msg_pktdata(adapter))
                                 print_hex_dump(KERN_INFO, "",
-                                        DUMP_PREFIX_ADDRESS,
-                                        16, 1, phys_to_virt(buffer_info->dma),
-                                        adapter->rx_buffer_len, true);
+                                               DUMP_PREFIX_ADDRESS,
+                                               16, 1,
+                                               phys_to_virt(buffer_info->dma),
+                                               adapter->rx_buffer_len, true);
                 }
         }
 
@@ -450,8 +456,7 @@ static int e1000_desc_unused(struct e1000_ring *ring)
  * @skb: pointer to sk_buff to be indicated to stack
  **/
 static void e1000_receive_skb(struct e1000_adapter *adapter,
-                              struct net_device *netdev,
-                              struct sk_buff *skb,
+                              struct net_device *netdev, struct sk_buff *skb,
                               u8 status, __le16 vlan)
 {
         skb->protocol = eth_type_trans(skb, netdev);
@@ -464,7 +469,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
 }
 
 /**
- * e1000_rx_checksum - Receive Checksum Offload for 82543
+ * e1000_rx_checksum - Receive Checksum Offload
  * @adapter:     board private structure
  * @status_err:  receive descriptor status and error fields
  * @csum:       receive descriptor csum field
@@ -548,7 +553,7 @@ map_skb:
                                                   adapter->rx_buffer_len,
                                                   DMA_FROM_DEVICE);
                 if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                        dev_err(&pdev->dev, "RX DMA map failed\n");
+                        dev_err(&pdev->dev, "Rx DMA map failed\n");
                         adapter->rx_dma_failed++;
                         break;
                 }
@@ -601,7 +606,8 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                         ps_page = &buffer_info->ps_pages[j];
                         if (j >= adapter->rx_ps_pages) {
                                 /* all unused desc entries get hw null ptr */
-                                rx_desc->read.buffer_addr[j+1] = ~cpu_to_le64(0);
+                                rx_desc->read.buffer_addr[j + 1] =
+                                    ~cpu_to_le64(0);
                                 continue;
                         }
                         if (!ps_page->page) {
@@ -617,7 +623,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                                 if (dma_mapping_error(&pdev->dev,
                                                       ps_page->dma)) {
                                         dev_err(&adapter->pdev->dev,
-                                          "RX DMA page map failed\n");
+                                                "Rx DMA page map failed\n");
                                         adapter->rx_dma_failed++;
                                         goto no_buffers;
                                 }
@@ -627,8 +633,8 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                          * didn't change because each write-back
                          * erases this info.
                          */
-                        rx_desc->read.buffer_addr[j+1] =
-                             cpu_to_le64(ps_page->dma);
+                        rx_desc->read.buffer_addr[j + 1] =
+                            cpu_to_le64(ps_page->dma);
                 }
 
                 skb = netdev_alloc_skb_ip_align(netdev,
@@ -644,7 +650,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                                                   adapter->rx_ps_bsize0,
                                                   DMA_FROM_DEVICE);
                 if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
-                        dev_err(&pdev->dev, "RX DMA map failed\n");
+                        dev_err(&pdev->dev, "Rx DMA map failed\n");
                         adapter->rx_dma_failed++;
                         /* cleanup skb */
                         dev_kfree_skb_any(skb);
@@ -662,7 +668,7 @@ static void e1000_alloc_rx_buffers_ps(struct e1000_adapter *adapter,
                          * such as IA-64).
                          */
                         wmb();
-                        writel(i<<1, adapter->hw.hw_addr + rx_ring->tail);
+                        writel(i << 1, adapter->hw.hw_addr + rx_ring->tail);
                 }
 
                 i++;
@@ -1106,11 +1112,10 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
                 cleaned = 1;
                 cleaned_count++;
                 dma_unmap_single(&pdev->dev, buffer_info->dma,
-                                 adapter->rx_ps_bsize0,
-                                 DMA_FROM_DEVICE);
+                                 adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
                 buffer_info->dma = 0;
 
-                /* see !EOP comment in other rx routine */
+                /* see !EOP comment in other Rx routine */
                 if (!(staterr & E1000_RXD_STAT_EOP))
                         adapter->flags2 |= FLAG2_IS_DISCARDING;
 
@@ -2610,7 +2615,7 @@ static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
 }
 
 /**
- * e1000_configure_tx - Configure 8254x Transmit Unit after Reset
+ * e1000_configure_tx - Configure Transmit Unit after Reset
  * @adapter: board private structure
  *
  * Configure the Tx unit of the MAC after a reset.
@@ -2663,7 +2668,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
                  * hthresh = 1 ==> prefetch when one or more available
                  * pthresh = 0x1f ==> prefetch if internal cache 31 or less
                  * BEWARE: this seems to work but should be considered first if
-                 * there are tx hangs or other tx related bugs
+                 * there are Tx hangs or other Tx related bugs
                  */
                 txdctl |= E1000_TXDCTL_DMA_BURST_ENABLE;
                 ew32(TXDCTL(0), txdctl);
@@ -2877,7 +2882,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
         if (adapter->rx_ps_pages) {
                 /* this is a 32 byte descriptor */
                 rdlen = rx_ring->count *
-                        sizeof(union e1000_rx_desc_packet_split);
+                    sizeof(union e1000_rx_desc_packet_split);
                 adapter->clean_rx = e1000_clean_rx_irq_ps;
                 adapter->alloc_rx_buf = e1000_alloc_rx_buffers_ps;
         } else if (adapter->netdev->mtu > ETH_FRAME_LEN + ETH_FCS_LEN) {
@@ -2900,7 +2905,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                 /*
                  * set the writeback threshold (only takes effect if the RDTR
                  * is set). set GRAN=1 and write back up to 0x4 worth, and
-                 * enable prefetching of 0x20 rx descriptors
+                 * enable prefetching of 0x20 Rx descriptors
                  * granularity = 01
                  * wthresh = 04,
                  * hthresh = 04,
@@ -2981,12 +2986,10 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
                          * excessive C-state transition latencies result in
                          * dropped transactions.
                          */
-                        pm_qos_update_request(
-                                &adapter->netdev->pm_qos_req, 55);
+                        pm_qos_update_request(&adapter->netdev->pm_qos_req, 55);
                 } else {
-                        pm_qos_update_request(
-                                &adapter->netdev->pm_qos_req,
-                                PM_QOS_DEFAULT_VALUE);
+                        pm_qos_update_request(&adapter->netdev->pm_qos_req,
+                                              PM_QOS_DEFAULT_VALUE);
                 }
         }
 
@@ -3152,7 +3155,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                 /* lower 16 bits has Rx packet buffer allocation size in KB */
                 pba &= 0xffff;
                 /*
-                 * the Tx fifo also stores 16 bytes of information about the tx
+                 * the Tx fifo also stores 16 bytes of information about the Tx
                  * but don't include ethernet FCS because hardware appends it
                  */
                 min_tx_space = (adapter->max_frame_size +
@@ -3175,7 +3178,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                         pba -= min_tx_space - tx_space;
 
                         /*
-                         * if short on Rx space, Rx wins and must trump tx
+                         * if short on Rx space, Rx wins and must trump Tx
                          * adjustment or use Early Receive if available
                          */
                         if ((pba < min_rx_space) &&
@@ -4039,11 +4042,11 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
                adapter->netdev->name,
                adapter->link_speed,
                (adapter->link_duplex == FULL_DUPLEX) ?
-                                "Full Duplex" : "Half Duplex",
+               "Full Duplex" : "Half Duplex",
                ((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE)) ?
-                                "RX/TX" :
-               ((ctrl & E1000_CTRL_RFCE) ? "RX" :
-               ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));
+               "Rx/Tx" :
+               ((ctrl & E1000_CTRL_RFCE) ? "Rx" :
+                ((ctrl & E1000_CTRL_TFCE) ? "Tx" : "None")));
 }
 
 static bool e1000e_has_link(struct e1000_adapter *adapter)
@@ -4306,7 +4309,6 @@ link_up:
                          * to get done, so reset controller to flush Tx.
                          * (Do the reset outside of interrupt context).
                          */
-                        adapter->tx_timeout_count++;
                         schedule_work(&adapter->reset_task);
                         /* return immediately since reset is imminent */
                         return;
@@ -4338,7 +4340,7 @@ link_up:
         /* Force detection of hung controller every watchdog period */
         adapter->detect_tx_hung = 1;
 
-        /* flush partial descriptors to memory before detecting tx hang */
+        /* flush partial descriptors to memory before detecting Tx hang */
         if (adapter->flags2 & FLAG2_DMA_BURST) {
                 ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
                 ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
@@ -4529,7 +4531,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                 buffer_info->next_to_watch = i;
                 buffer_info->dma = dma_map_single(&pdev->dev,
                                                   skb->data + offset,
-                                                  size, DMA_TO_DEVICE);
+                                                  size, DMA_TO_DEVICE);
                 buffer_info->mapped_as_page = false;
                 if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                         goto dma_error;
@@ -4576,7 +4578,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                 }
         }
 
-        segs = skb_shinfo(skb)->gso_segs ?: 1;
+        segs = skb_shinfo(skb)->gso_segs ? : 1;
         /* multiply data chunks by size of headers */
         bytecount = ((segs - 1) * skb_headlen(skb)) + skb->len;
 
@@ -4588,13 +4590,13 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
         return count;
 
 dma_error:
-        dev_err(&pdev->dev, "TX DMA map failed\n");
+        dev_err(&pdev->dev, "Tx DMA map failed\n");
         buffer_info->dma = 0;
         if (count)
                 count--;
 
         while (count--) {
-                if (i==0)
+                if (i == 0)
                         i += tx_ring->count;
                 i--;
                 buffer_info = &tx_ring->buffer_info[i];
@@ -6193,7 +6195,7 @@ static int __init e1000_init_module(void)
         int ret;
         pr_info("Intel(R) PRO/1000 Network Driver - %s\n",
                 e1000e_driver_version);
-        pr_info("Copyright (c) 1999 - 2010 Intel Corporation.\n");
+        pr_info("Copyright(c) 1999 - 2011 Intel Corporation.\n");
         ret = pci_register_driver(&e1000_driver);
 
         return ret;
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index a9612b0e4bca..4dd9b63273f6 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -62,10 +62,9 @@ MODULE_PARM_DESC(copybreak,
         module_param_array_named(X, X, int, &num_##X, 0);       \
         MODULE_PARM_DESC(X, desc);
 
-
 /*
  * Transmit Interrupt Delay in units of 1.024 microseconds
- * Tx interrupt delay needs to typically be set to something non zero
+ * Tx interrupt delay needs to typically be set to something non-zero
  *
  * Valid Range: 0-65535
  */
@@ -112,6 +111,7 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");
 #define DEFAULT_ITR 3
 #define MAX_ITR 100000
 #define MIN_ITR 100
+
 /* IntMode (Interrupt Mode)
  *
  * Valid Range: 0 - 2
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 00f89e8a9fa0..6bea051b134b 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -640,7 +640,7 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
         s32 ret_val;
         u16 phy_data;
 
-        /* Enable CRS on TX. This must be set for half-duplex operation. */
+        /* Enable CRS on Tx. This must be set for half-duplex operation. */
         ret_val = e1e_rphy(hw, I82577_CFG_REG, &phy_data);
         if (ret_val)
                 goto out;
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 112c5aa9af7f..907b05a1c659 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -812,7 +812,7 @@ static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME ": reading TSV at addr:0x%04x\n",
                          endptr + 1);
-        enc28j60_mem_read(priv, endptr + 1, sizeof(tsv), tsv);
+        enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv);
 }
 
 static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6de4675016b5..5ed8f9f9419f 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -434,7 +434,6 @@ static void gfar_init_mac(struct net_device *ndev)
 static struct net_device_stats *gfar_get_stats(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
-        struct netdev_queue *txq;
         unsigned long rx_packets = 0, rx_bytes = 0, rx_dropped = 0;
         unsigned long tx_packets = 0, tx_bytes = 0;
         int i = 0;
@@ -450,9 +449,8 @@ static struct net_device_stats *gfar_get_stats(struct net_device *dev)
         dev->stats.rx_dropped = rx_dropped;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
-                txq = netdev_get_tx_queue(dev, i);
-                tx_bytes += txq->tx_bytes;
-                tx_packets += txq->tx_packets;
+                tx_bytes += priv->tx_queue[i]->stats.tx_bytes;
+                tx_packets += priv->tx_queue[i]->stats.tx_packets;
         }
 
         dev->stats.tx_bytes = tx_bytes;
@@ -1922,7 +1920,7 @@ int startup_gfar(struct net_device *ndev)
                 if (err) {
                         for (j = 0; j < i; j++)
                                 free_grp_irqs(&priv->gfargrp[j]);
-                                goto irq_fail;
+                        goto irq_fail;
                 }
         }
 
@@ -2109,8 +2107,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         /* Update transmit stats */
-        txq->tx_bytes += skb->len;
-        txq->tx_packets ++;
+        tx_queue->stats.tx_bytes += skb->len;
+        tx_queue->stats.tx_packets++;
 
         txbdp = txbdp_start = tx_queue->cur_tx;
         lstatus = txbdp->lstatus;
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 68984eb88ae0..54de4135e932 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -907,12 +907,21 @@ enum {
         MQ_MG_MODE
 };
 
+/*
+ * Per TX queue stats
+ */
+struct tx_q_stats {
+        unsigned long tx_packets;
+        unsigned long tx_bytes;
+};
+
 /**
  *      struct gfar_priv_tx_q - per tx queue structure
  *      @txlock: per queue tx spin lock
  *      @tx_skbuff:skb pointers
  *      @skb_curtx: to be used skb pointer
  *      @skb_dirtytx:the last used skb pointer
+ *      @stats: bytes/packets stats
  *      @qindex: index of this queue
  *      @dev: back pointer to the dev structure
  *      @grp: back pointer to the group to which this queue belongs
@@ -934,6 +943,7 @@ struct gfar_priv_tx_q {
         struct  txbd8 *tx_bd_base;
         struct  txbd8 *cur_tx;
         struct  txbd8 *dirty_tx;
+        struct tx_q_stats stats;
         struct  net_device *dev;
         struct gfar_priv_grp *grp;
         u16     skb_curtx;
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index 27d6960ce09e..fdb0333f5cb6 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1,7 +1,7 @@
 /*
  * Aeroflex Gaisler GRETH 10/100/1G Ethernet MAC.
  *
- * 2005-2009 (c) Aeroflex Gaisler AB
+ * 2005-2010 (c) Aeroflex Gaisler AB
  *
  * This driver supports GRETH 10/100 and GRETH 10/100/1G Ethernet MACs
  * available in the GRLIB VHDL IP core library.
@@ -356,6 +356,8 @@ static int greth_open(struct net_device *dev)
                 dev_dbg(&dev->dev, " starting queue\n");
         netif_start_queue(dev);
 
+        GRETH_REGSAVE(greth->regs->status, 0xFF);
+
         napi_enable(&greth->napi);
 
         greth_enable_irqs(greth);
@@ -371,7 +373,9 @@ static int greth_close(struct net_device *dev)
 
         napi_disable(&greth->napi);
 
+        greth_disable_irqs(greth);
         greth_disable_tx(greth);
+        greth_disable_rx(greth);
 
         netif_stop_queue(dev);
 
@@ -388,12 +392,20 @@ greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct greth_private *greth = netdev_priv(dev);
         struct greth_bd *bdp;
         int err = NETDEV_TX_OK;
-        u32 status, dma_addr;
+        u32 status, dma_addr, ctrl;
+        unsigned long flags;
 
-        bdp = greth->tx_bd_base + greth->tx_next;
+        /* Clean TX Ring */
+        greth_clean_tx(greth->netdev);
 
         if (unlikely(greth->tx_free <= 0)) {
+                spin_lock_irqsave(&greth->devlock, flags);/*save from poll/irq*/
+                ctrl = GRETH_REGLOAD(greth->regs->control);
+                /* Enable TX IRQ only if not already in poll() routine */
+                if (ctrl & GRETH_RXI)
+                        GRETH_REGSAVE(greth->regs->control, ctrl | GRETH_TXI);
                 netif_stop_queue(dev);
+                spin_unlock_irqrestore(&greth->devlock, flags);
                 return NETDEV_TX_BUSY;
         }
 
@@ -406,13 +418,14 @@ greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto out;
         }
 
+        bdp = greth->tx_bd_base + greth->tx_next;
         dma_addr = greth_read_bd(&bdp->addr);
 
         memcpy((unsigned char *) phys_to_virt(dma_addr), skb->data, skb->len);
 
         dma_sync_single_for_device(greth->dev, dma_addr, skb->len, DMA_TO_DEVICE);
 
-        status = GRETH_BD_EN | (skb->len & GRETH_BD_LEN);
+        status = GRETH_BD_EN | GRETH_BD_IE | (skb->len & GRETH_BD_LEN);
 
         /* Wrap around descriptor ring */
         if (greth->tx_next == GRETH_TXBD_NUM_MASK) {
@@ -422,22 +435,11 @@ greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         greth->tx_next = NEXT_TX(greth->tx_next);
         greth->tx_free--;
 
-        /* No more descriptors */
-        if (unlikely(greth->tx_free == 0)) {
-
-                /* Free transmitted descriptors */
-                greth_clean_tx(dev);
-
-                /* If nothing was cleaned, stop queue & wait for irq */
-                if (unlikely(greth->tx_free == 0)) {
-                        status |= GRETH_BD_IE;
-                        netif_stop_queue(dev);
-                }
-        }
-
         /* Write descriptor control word and enable transmission */
         greth_write_bd(&bdp->stat, status);
+        spin_lock_irqsave(&greth->devlock, flags); /*save from poll/irq*/
         greth_enable_tx(greth);
+        spin_unlock_irqrestore(&greth->devlock, flags);
 
 out:
         dev_kfree_skb(skb);
@@ -450,13 +452,23 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
 {
         struct greth_private *greth = netdev_priv(dev);
         struct greth_bd *bdp;
-        u32 status = 0, dma_addr;
+        u32 status = 0, dma_addr, ctrl;
         int curr_tx, nr_frags, i, err = NETDEV_TX_OK;
+        unsigned long flags;
 
         nr_frags = skb_shinfo(skb)->nr_frags;
 
+        /* Clean TX Ring */
+        greth_clean_tx_gbit(dev);
+
         if (greth->tx_free < nr_frags + 1) {
+                spin_lock_irqsave(&greth->devlock, flags);/*save from poll/irq*/
+                ctrl = GRETH_REGLOAD(greth->regs->control);
+                /* Enable TX IRQ only if not already in poll() routine */
+                if (ctrl & GRETH_RXI)
+                        GRETH_REGSAVE(greth->regs->control, ctrl | GRETH_TXI);
                 netif_stop_queue(dev);
+                spin_unlock_irqrestore(&greth->devlock, flags);
                 err = NETDEV_TX_BUSY;
                 goto out;
         }
@@ -499,7 +511,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
                 greth->tx_skbuff[curr_tx] = NULL;
                 bdp = greth->tx_bd_base + curr_tx;
 
-                status = GRETH_TXBD_CSALL;
+                status = GRETH_TXBD_CSALL | GRETH_BD_EN;
                 status |= frag->size & GRETH_BD_LEN;
 
                 /* Wrap around descriptor ring */
@@ -509,14 +521,8 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
                 /* More fragments left */
                 if (i < nr_frags - 1)
                         status |= GRETH_TXBD_MORE;
-
-                /* ... last fragment, check if out of descriptors  */
-                else if (greth->tx_free - nr_frags - 1 < (MAX_SKB_FRAGS + 1)) {
-
-                        /* Enable interrupts and stop queue */
-                        status |= GRETH_BD_IE;
-                        netif_stop_queue(dev);
-                }
+                else
+                        status |= GRETH_BD_IE; /* enable IRQ on last fragment */
 
                 greth_write_bd(&bdp->stat, status);
 
@@ -536,26 +542,29 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
 
         wmb();
 
-        /* Enable the descriptors that we configured ...  */
-        for (i = 0; i < nr_frags + 1; i++) {
-                bdp = greth->tx_bd_base + greth->tx_next;
-                greth_write_bd(&bdp->stat, greth_read_bd(&bdp->stat) | GRETH_BD_EN);
-                greth->tx_next = NEXT_TX(greth->tx_next);
-                greth->tx_free--;
-        }
+        /* Enable the descriptor chain by enabling the first descriptor */
+        bdp = greth->tx_bd_base + greth->tx_next;
+        greth_write_bd(&bdp->stat, greth_read_bd(&bdp->stat) | GRETH_BD_EN);
+        greth->tx_next = curr_tx;
+        greth->tx_free -= nr_frags + 1;
 
+        wmb();
+
+        spin_lock_irqsave(&greth->devlock, flags); /*save from poll/irq*/
         greth_enable_tx(greth);
+        spin_unlock_irqrestore(&greth->devlock, flags);
 
         return NETDEV_TX_OK;
 
 frag_map_error:
-        /* Unmap SKB mappings that succeeded */
+        /* Unmap SKB mappings that succeeded and disable descriptor */
         for (i = 0; greth->tx_next + i != curr_tx; i++) {
                 bdp = greth->tx_bd_base + greth->tx_next + i;
                 dma_unmap_single(greth->dev,
                                  greth_read_bd(&bdp->addr),
                                  greth_read_bd(&bdp->stat) & GRETH_BD_LEN,
                                  DMA_TO_DEVICE);
+                greth_write_bd(&bdp->stat, 0);
         }
 map_error:
         if (net_ratelimit())
@@ -565,12 +574,11 @@ out:
         return err;
 }
 
-
 static irqreturn_t greth_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
         struct greth_private *greth;
-        u32 status;
+        u32 status, ctrl;
         irqreturn_t retval = IRQ_NONE;
 
         greth = netdev_priv(dev);
@@ -580,13 +588,15 @@ static irqreturn_t greth_interrupt(int irq, void *dev_id)
         /* Get the interrupt events that caused us to be here. */
         status = GRETH_REGLOAD(greth->regs->status);
 
-        /* Handle rx and tx interrupts through poll */
-        if (status & (GRETH_INT_RX | GRETH_INT_TX)) {
-
-                /* Clear interrupt status */
-                GRETH_REGORIN(greth->regs->status,
-                              status & (GRETH_INT_RX | GRETH_INT_TX));
+        /* Must see if interrupts are enabled also, INT_TX|INT_RX flags may be
+         * set regardless of whether IRQ is enabled or not. Especially
+         * important when shared IRQ.
+         */
+        ctrl = GRETH_REGLOAD(greth->regs->control);
 
+        /* Handle rx and tx interrupts through poll */
+        if (((status & (GRETH_INT_RE | GRETH_INT_RX)) && (ctrl & GRETH_RXI)) ||
+            ((status & (GRETH_INT_TE | GRETH_INT_TX)) && (ctrl & GRETH_TXI))) {
                 retval = IRQ_HANDLED;
 
                 /* Disable interrupts and schedule poll() */
@@ -610,6 +620,8 @@ static void greth_clean_tx(struct net_device *dev)
 
         while (1) {
                 bdp = greth->tx_bd_base + greth->tx_last;
+                GRETH_REGSAVE(greth->regs->status, GRETH_INT_TE | GRETH_INT_TX);
+                mb();
                 stat = greth_read_bd(&bdp->stat);
 
                 if (unlikely(stat & GRETH_BD_EN))
@@ -670,7 +682,10 @@ static void greth_clean_tx_gbit(struct net_device *dev)
 
                 /* We only clean fully completed SKBs */
                 bdp_last_frag = greth->tx_bd_base + SKIP_TX(greth->tx_last, nr_frags);
-                stat = bdp_last_frag->stat;
+
+                GRETH_REGSAVE(greth->regs->status, GRETH_INT_TE | GRETH_INT_TX);
+                mb();
+                stat = greth_read_bd(&bdp_last_frag->stat);
 
                 if (stat & GRETH_BD_EN)
                         break;
@@ -702,21 +717,9 @@ static void greth_clean_tx_gbit(struct net_device *dev)
                 greth->tx_free += nr_frags+1;
                 dev_kfree_skb(skb);
         }
-        if (greth->tx_free > (MAX_SKB_FRAGS + 1)) {
-                netif_wake_queue(dev);
-        }
-}
 
-static int greth_pending_packets(struct greth_private *greth)
-{
-        struct greth_bd *bdp;
-        u32 status;
-        bdp = greth->rx_bd_base + greth->rx_cur;
-        status = greth_read_bd(&bdp->stat);
-        if (status & GRETH_BD_EN)
-                return 0;
-        else
-                return 1;
+        if (netif_queue_stopped(dev) && (greth->tx_free > (MAX_SKB_FRAGS+1)))
+                netif_wake_queue(dev);
 }
 
 static int greth_rx(struct net_device *dev, int limit)
@@ -727,20 +730,24 @@ static int greth_rx(struct net_device *dev, int limit)
         int pkt_len;
         int bad, count;
         u32 status, dma_addr;
+        unsigned long flags;
 
         greth = netdev_priv(dev);
 
         for (count = 0; count < limit; ++count) {
 
                 bdp = greth->rx_bd_base + greth->rx_cur;
+                GRETH_REGSAVE(greth->regs->status, GRETH_INT_RE | GRETH_INT_RX);
+                mb();
                 status = greth_read_bd(&bdp->stat);
-                dma_addr = greth_read_bd(&bdp->addr);
-                bad = 0;
 
                 if (unlikely(status & GRETH_BD_EN)) {
                         break;
                 }
 
+                dma_addr = greth_read_bd(&bdp->addr);
+                bad = 0;
+
                 /* Check status for errors. */
                 if (unlikely(status & GRETH_RXBD_STATUS)) {
                         if (status & GRETH_RXBD_ERR_FT) {
@@ -802,7 +809,9 @@ static int greth_rx(struct net_device *dev, int limit)
 
                 dma_sync_single_for_device(greth->dev, dma_addr, MAX_FRAME_SIZE, DMA_FROM_DEVICE);
 
+                spin_lock_irqsave(&greth->devlock, flags); /* save from XMIT */
                 greth_enable_rx(greth);
+                spin_unlock_irqrestore(&greth->devlock, flags);
 
                 greth->rx_cur = NEXT_RX(greth->rx_cur);
         }
@@ -836,6 +845,7 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
         int pkt_len;
         int bad, count = 0;
         u32 status, dma_addr;
+        unsigned long flags;
 
         greth = netdev_priv(dev);
 
@@ -843,6 +853,8 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
 
                 bdp = greth->rx_bd_base + greth->rx_cur;
                 skb = greth->rx_skbuff[greth->rx_cur];
+                GRETH_REGSAVE(greth->regs->status, GRETH_INT_RE | GRETH_INT_RX);
+                mb();
                 status = greth_read_bd(&bdp->stat);
                 bad = 0;
 
@@ -865,10 +877,9 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
                         }
                 }
 
-                /* Allocate new skb to replace current */
-                newskb = netdev_alloc_skb(dev, MAX_FRAME_SIZE + NET_IP_ALIGN);
-
-                if (!bad && newskb) {
+                /* Allocate new skb to replace current, not needed if the
+                 * current skb can be reused */
+                if (!bad && (newskb=netdev_alloc_skb(dev, MAX_FRAME_SIZE + NET_IP_ALIGN))) {
                         skb_reserve(newskb, NET_IP_ALIGN);
 
                         dma_addr = dma_map_single(greth->dev,
@@ -905,11 +916,22 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
                                 if (net_ratelimit())
                                         dev_warn(greth->dev, "Could not create DMA mapping, dropping packet\n");
                                 dev_kfree_skb(newskb);
+                                /* reusing current skb, so it is a drop */
                                 dev->stats.rx_dropped++;
                         }
+                } else if (bad) {
+                        /* Bad Frame transfer, the skb is reused */
+                        dev->stats.rx_dropped++;
                 } else {
+                        /* Failed Allocating a new skb. This is rather stupid
+                         * but the current "filled" skb is reused, as if
+                         * transfer failure. One could argue that RX descriptor
+                         * table handling should be divided into cleaning and
+                         * filling as the TX part of the driver
+                         */
                         if (net_ratelimit())
                                 dev_warn(greth->dev, "Could not allocate SKB, dropping packet\n");
+                        /* reusing current skb, so it is a drop */
                         dev->stats.rx_dropped++;
                 }
 
@@ -920,7 +942,9 @@ static int greth_rx_gbit(struct net_device *dev, int limit)
 
                 wmb();
                 greth_write_bd(&bdp->stat, status);
+                spin_lock_irqsave(&greth->devlock, flags);
                 greth_enable_rx(greth);
+                spin_unlock_irqrestore(&greth->devlock, flags);
                 greth->rx_cur = NEXT_RX(greth->rx_cur);
         }
 
@@ -932,15 +956,18 @@ static int greth_poll(struct napi_struct *napi, int budget)
 {
         struct greth_private *greth;
         int work_done = 0;
+        unsigned long flags;
+        u32 mask, ctrl;
         greth = container_of(napi, struct greth_private, napi);
 
-        if (greth->gbit_mac) {
-                greth_clean_tx_gbit(greth->netdev);
-        } else {
-                greth_clean_tx(greth->netdev);
+restart_txrx_poll:
+        if (netif_queue_stopped(greth->netdev)) {
+                if (greth->gbit_mac)
+                        greth_clean_tx_gbit(greth->netdev);
+                else
+                        greth_clean_tx(greth->netdev);
         }
 
-restart_poll:
         if (greth->gbit_mac) {
                 work_done += greth_rx_gbit(greth->netdev, budget - work_done);
         } else {
@@ -949,15 +976,29 @@ restart_poll:
 
         if (work_done < budget) {
 
-                napi_complete(napi);
+                spin_lock_irqsave(&greth->devlock, flags);
+
+                ctrl = GRETH_REGLOAD(greth->regs->control);
+                if (netif_queue_stopped(greth->netdev)) {
+                        GRETH_REGSAVE(greth->regs->control,
+                                        ctrl | GRETH_TXI | GRETH_RXI);
+                        mask = GRETH_INT_RX | GRETH_INT_RE |
+                               GRETH_INT_TX | GRETH_INT_TE;
+                } else {
+                        GRETH_REGSAVE(greth->regs->control, ctrl | GRETH_RXI);
+                        mask = GRETH_INT_RX | GRETH_INT_RE;
+                }
 
-                if (greth_pending_packets(greth)) {
-                        napi_reschedule(napi);
-                        goto restart_poll;
+                if (GRETH_REGLOAD(greth->regs->status) & mask) {
+                        GRETH_REGSAVE(greth->regs->control, ctrl);
+                        spin_unlock_irqrestore(&greth->devlock, flags);
+                        goto restart_txrx_poll;
+                } else {
+                        __napi_complete(napi);
+                        spin_unlock_irqrestore(&greth->devlock, flags);
                 }
         }
 
-        greth_enable_irqs(greth);
         return work_done;
 }
 
@@ -1152,11 +1193,11 @@ static const struct ethtool_ops greth_ethtool_ops = {
 };
 
 static struct net_device_ops greth_netdev_ops = {
-        .ndo_open = greth_open,
-        .ndo_stop = greth_close,
-        .ndo_start_xmit = greth_start_xmit,
-        .ndo_set_mac_address = greth_set_mac_add,
-        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_open               = greth_open,
+        .ndo_stop               = greth_close,
+        .ndo_start_xmit         = greth_start_xmit,
+        .ndo_set_mac_address    = greth_set_mac_add,
+        .ndo_validate_addr      = eth_validate_addr,
 };
 
 static inline int wait_for_mdio(struct greth_private *greth)
@@ -1217,29 +1258,26 @@ static void greth_link_change(struct net_device *dev)
         struct greth_private *greth = netdev_priv(dev);
         struct phy_device *phydev = greth->phy;
         unsigned long flags;
-
         int status_change = 0;
+        u32 ctrl;
 
         spin_lock_irqsave(&greth->devlock, flags);
 
         if (phydev->link) {
 
                 if ((greth->speed != phydev->speed) || (greth->duplex != phydev->duplex)) {
-
-                        GRETH_REGANDIN(greth->regs->control,
-                                       ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB));
+                        ctrl = GRETH_REGLOAD(greth->regs->control) &
+                               ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB);
 
                         if (phydev->duplex)
-                                GRETH_REGORIN(greth->regs->control, GRETH_CTRL_FD);
-
-                        if (phydev->speed == SPEED_100) {
-
-                                GRETH_REGORIN(greth->regs->control, GRETH_CTRL_SP);
-                        }
+                                ctrl |= GRETH_CTRL_FD;
 
+                        if (phydev->speed == SPEED_100)
+                                ctrl |= GRETH_CTRL_SP;
                         else if (phydev->speed == SPEED_1000)
-                                GRETH_REGORIN(greth->regs->control, GRETH_CTRL_GB);
+                                ctrl |= GRETH_CTRL_GB;
 
+                        GRETH_REGSAVE(greth->regs->control, ctrl);
                         greth->speed = phydev->speed;
                         greth->duplex = phydev->duplex;
                         status_change = 1;
@@ -1600,6 +1638,9 @@ static struct of_device_id greth_of_match[] = {
         {
          .name = "GAISLER_ETHMAC",
          },
+        {
+         .name = "01_01d",
+         },
         {},
 };
 
diff --git a/drivers/net/greth.h b/drivers/net/greth.h
index 03ad903cd676..be0f2062bd14 100644
--- a/drivers/net/greth.h
+++ b/drivers/net/greth.h
@@ -23,6 +23,7 @@
 #define GRETH_BD_LEN 0x7FF
 
 #define GRETH_TXEN 0x1
+#define GRETH_INT_TE 0x2
 #define GRETH_INT_TX 0x8
 #define GRETH_TXI 0x4
 #define GRETH_TXBD_STATUS 0x0001C000
@@ -35,6 +36,7 @@
 #define GRETH_TXBD_ERR_UE 0x4000
 #define GRETH_TXBD_ERR_AL 0x8000
 
+#define GRETH_INT_RE         0x1
 #define GRETH_INT_RX         0x4
 #define GRETH_RXEN           0x2
 #define GRETH_RXI            0x8
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 9e3f4f54281d..4488bd581eca 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -635,7 +635,7 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         ret = sh_irda_set_baudrate(self, speed);
         if (ret < 0)
-                return ret;
+                goto sh_irda_hard_xmit_end;
 
         self->tx_buff.len = 0;
         if (skb->len) {
@@ -652,11 +652,21 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 
                 sh_irda_write(self, IRTFLR, self->tx_buff.len);
                 sh_irda_write(self, IRTCTR, ARMOD | TE);
-        }
+        } else
+                goto sh_irda_hard_xmit_end;
 
         dev_kfree_skb(skb);
 
         return 0;
+
+sh_irda_hard_xmit_end:
+        sh_irda_set_baudrate(self, 9600);
+        netif_wake_queue(self->ndev);
+        sh_irda_rcv_ctrl(self, 1);
+        dev_kfree_skb(skb);
+
+        return ret;
+
 }
 
 static int sh_irda_ioctl(struct net_device *ndev, struct ifreq *ifreq, int cmd)
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index d5ede2df3e42..ebbda7d15254 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1370,6 +1370,9 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
                 hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
 
                 hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
+
+                /*  clear VMDq pool/queue selection for RAR 0 */
+                hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);
         }
         hw->addr_ctrl.overflow_promisc = 0;
 
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 6342d4859790..8753980668c7 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -165,7 +165,7 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         unsigned int thisoff = 0;
         unsigned int thislen = 0;
         u32 fcbuff, fcdmarw, fcfltrw;
-        dma_addr_t addr;
+        dma_addr_t addr = 0;
 
         if (!netdev || !sgl)
                 return 0;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index a060610a42db..fbae703b46d7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -52,7 +52,7 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                               "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "3.0.12-k2"
+#define DRV_VERSION "3.2.9-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
 
@@ -3176,9 +3176,16 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
         u32 mhadd, hlreg0;
 
         /* Decide whether to use packet split mode or not */
+        /* On by default */
+        adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+
         /* Do not use packet split if we're in SR-IOV Mode */
-        if (!adapter->num_vfs)
-                adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+        if (adapter->num_vfs)
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+
+        /* Disable packet split due to 82599 erratum #45 */
+        if (hw->mac.type == ixgbe_mac_82599EB)
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
 
         /* Set the RX buffer length according to the mode */
         if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
@@ -4863,16 +4870,13 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
 {
         int q_idx, num_q_vectors;
         struct ixgbe_q_vector *q_vector;
-        int napi_vectors;
         int (*poll)(struct napi_struct *, int);
 
         if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                 num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-                napi_vectors = adapter->num_rx_queues;
                 poll = &ixgbe_clean_rxtx_many;
         } else {
                 num_q_vectors = 1;
-                napi_vectors = 1;
                 poll = &ixgbe_poll;
         }
 
@@ -6667,8 +6671,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                           struct ixgbe_adapter *adapter,
                           struct ixgbe_ring *tx_ring)
 {
-        struct net_device *netdev = tx_ring->netdev;
-        struct netdev_queue *txq;
         unsigned int first;
         unsigned int tx_flags = 0;
         u8 hdr_len = 0;
@@ -6765,9 +6767,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                 /* add the ATR filter if ATR is on */
                 if (test_bit(__IXGBE_TX_FDIR_INIT_DONE, &tx_ring->state))
                         ixgbe_atr(tx_ring, skb, tx_flags, protocol);
-                txq = netdev_get_tx_queue(netdev, tx_ring->queue_index);
-                txq->tx_bytes += skb->len;
-                txq->tx_packets++;
                 ixgbe_tx_queue(tx_ring, tx_flags, count, skb->len, hdr_len);
                 ixgbe_maybe_stop_tx(tx_ring, DESC_NEEDED);
 
@@ -6925,8 +6924,6 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int i;
 
-        /* accurate rx/tx bytes/packets stats */
-        dev_txq_stats_fold(netdev, stats);
         rcu_read_lock();
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 struct ixgbe_ring *ring = ACCESS_ONCE(adapter->rx_ring[i]);
@@ -6943,6 +6940,22 @@ static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device *netdev,
                         stats->rx_bytes   += bytes;
                 }
         }
+
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                struct ixgbe_ring *ring = ACCESS_ONCE(adapter->tx_ring[i]);
+                u64 bytes, packets;
+                unsigned int start;
+
+                if (ring) {
+                        do {
+                                start = u64_stats_fetch_begin_bh(&ring->syncp);
+                                packets = ring->stats.packets;
+                                bytes   = ring->stats.bytes;
+                        } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                        stats->tx_packets += packets;
+                        stats->tx_bytes   += bytes;
+                }
+        }
         rcu_read_unlock();
         /* following stats updated by ixgbe_watchdog_task() */
         stats->multicast        = netdev->stats.multicast;
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 47b15738b009..187b3a16ec1f 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -110,12 +110,10 @@ static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
         return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
 }
 
-
 static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
 {
         u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
         vmolr |= (IXGBE_VMOLR_ROMPE |
-                  IXGBE_VMOLR_ROPE |
                   IXGBE_VMOLR_BAM);
         if (aupe)
                 vmolr |= IXGBE_VMOLR_AUPE;
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
index 3a8923993ce3..f2518b01067d 100644
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
@@ -133,17 +133,17 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
         }
 
         ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
+        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | reset_bit));
         IXGBE_WRITE_FLUSH(hw);
 
         /* Poll for reset bit to self-clear indicating reset is complete */
         for (i = 0; i < 10; i++) {
                 udelay(1);
                 ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-                if (!(ctrl & IXGBE_CTRL_RST))
+                if (!(ctrl & reset_bit))
                         break;
         }
-        if (ctrl & IXGBE_CTRL_RST) {
+        if (ctrl & reset_bit) {
                 status = IXGBE_ERR_RESET_FAILED;
                 hw_dbg(hw, "Reset polling failed to complete.\n");
         }
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 21845affea13..5933621ac3ff 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -585,7 +585,7 @@ err:
         rcu_read_lock_bh();
         vlan = rcu_dereference(q->vlan);
         if (vlan)
-                netdev_get_tx_queue(vlan->dev, 0)->tx_dropped++;
+                vlan->dev->stats.tx_dropped++;
         rcu_read_unlock_bh();
 
         return err;
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/mlx4/catas.c
index 68aaa42d0ced..32f947154c33 100644
--- a/drivers/net/mlx4/catas.c
+++ b/drivers/net/mlx4/catas.c
@@ -113,7 +113,7 @@ static void catas_reset(struct work_struct *work)
 void mlx4_start_catas_poll(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
-        unsigned long addr;
+        phys_addr_t addr;
 
         INIT_LIST_HEAD(&priv->catas_err.list);
         init_timer(&priv->catas_err.timer);
@@ -124,8 +124,8 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev)
 
         priv->catas_err.map = ioremap(addr, priv->fw.catas_size * 4);
         if (!priv->catas_err.map) {
-                mlx4_warn(dev, "Failed to map internal error buffer at 0x%lx\n",
-                          addr);
+                mlx4_warn(dev, "Failed to map internal error buffer at 0x%llx\n",
+                          (unsigned long long) addr);
                 return;
         }
 
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index f6e0d40cd876..1ff6ca6466ed 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -202,7 +202,8 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
         if (mlx4_uar_alloc(dev, &mdev->priv_uar))
                 goto err_pd;
 
-        mdev->uar_map = ioremap(mdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        mdev->uar_map = ioremap((phys_addr_t) mdev->priv_uar.pfn << PAGE_SHIFT,
+                                PAGE_SIZE);
         if (!mdev->uar_map)
                 goto err_uar;
         spin_lock_init(&mdev->uar_lock);
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 782f11d8fa71..2765a3ce9c24 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -829,7 +829,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                 goto err_uar_table_free;
         }
 
-        priv->kar = ioremap(priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+        priv->kar = ioremap((phys_addr_t) priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
         if (!priv->kar) {
                 mlx4_err(dev, "Couldn't map kernel access region, "
                          "aborting.\n");
@@ -1286,6 +1286,21 @@ static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {
         { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/
         { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */
         { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */
+        { PCI_VDEVICE(MELLANOX, 0x1002) }, /* MT25400 Family [ConnectX-2 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1003) }, /* MT27500 Family [ConnectX-3] */
+        { PCI_VDEVICE(MELLANOX, 0x1004) }, /* MT27500 Family [ConnectX-3 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1005) }, /* MT27510 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1006) }, /* MT27511 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1007) }, /* MT27520 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1008) }, /* MT27521 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1009) }, /* MT27530 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100a) }, /* MT27531 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100b) }, /* MT27540 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100c) }, /* MT27541 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100d) }, /* MT27550 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100e) }, /* MT27551 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100f) }, /* MT27560 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1010) }, /* MT27561 Family */
         { 0, }
 };
 
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index c4f88b7ef7b6..79cf42db2ea9 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -95,7 +95,8 @@ static int mlx4_MGID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
  * 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,
+                    u8 *gid, enum mlx4_protocol protocol,
+                    struct mlx4_cmd_mailbox *mgm_mailbox,
                     u16 *hash, int *prev, int *index)
 {
         struct mlx4_cmd_mailbox *mailbox;
@@ -134,7 +135,8 @@ static int find_mgm(struct mlx4_dev *dev,
                         return err;
                 }
 
-                if (!memcmp(mgm->gid, gid, 16))
+                if (!memcmp(mgm->gid, gid, 16) &&
+                    be32_to_cpu(mgm->members_count) >> 30 == protocol)
                         return err;
 
                 *prev = *index;
@@ -146,7 +148,7 @@ static int find_mgm(struct mlx4_dev *dev,
 }
 
 int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          int block_mcast_loopback)
+                          int block_mcast_loopback, enum mlx4_protocol protocol)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cmd_mailbox *mailbox;
@@ -165,7 +167,7 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
         mutex_lock(&priv->mcg_table.mutex);
 
-        err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
+        err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
@@ -187,7 +189,7 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                 memcpy(mgm->gid, gid, 16);
         }
 
-        members_count = be32_to_cpu(mgm->members_count);
+        members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
         if (members_count == MLX4_QP_PER_MGM) {
                 mlx4_err(dev, "MGM at index %x is full.\n", index);
                 err = -ENOMEM;
@@ -207,7 +209,7 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         else
                 mgm->qp[members_count++] = cpu_to_be32(qp->qpn & MGM_QPN_MASK);
 
-        mgm->members_count       = cpu_to_be32(members_count);
+        mgm->members_count = cpu_to_be32(members_count | (u32) protocol << 30);
 
         err = mlx4_WRITE_MCG(dev, index, mailbox);
         if (err)
@@ -242,7 +244,8 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
 
-int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
+int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          enum mlx4_protocol protocol)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cmd_mailbox *mailbox;
@@ -260,7 +263,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
 
         mutex_lock(&priv->mcg_table.mutex);
 
-        err = find_mgm(dev, gid, mailbox, &hash, &prev, &index);
+        err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
@@ -270,7 +273,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
                 goto out;
         }
 
-        members_count = be32_to_cpu(mgm->members_count);
+        members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
         for (loc = -1, i = 0; i < members_count; ++i)
                 if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qp->qpn)
                         loc = i;
@@ -282,7 +285,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
         }
 
 
-        mgm->members_count = cpu_to_be32(--members_count);
+        mgm->members_count = cpu_to_be32(--members_count | (u32) protocol << 30);
         mgm->qp[loc]       = mgm->qp[i - 1];
         mgm->qp[i - 1]     = 0;
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index a37fcf11ab36..ea5cfe2c3a04 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3403,9 +3403,7 @@ static int myri10ge_resume(struct pci_dev *pdev)
                 return -EIO;
         }
 
-        status = pci_restore_state(pdev);
-        if (status)
-                return status;
+        pci_restore_state(pdev);
 
         status = pci_enable_device(pdev);
         if (status) {
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 2541321bad82..9fb59d3f9c92 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -4489,6 +4489,9 @@ static int niu_alloc_channels(struct niu *np)
 {
         struct niu_parent *parent = np->parent;
         int first_rx_channel, first_tx_channel;
+        int num_rx_rings, num_tx_rings;
+        struct rx_ring_info *rx_rings;
+        struct tx_ring_info *tx_rings;
         int i, port, err;
 
         port = np->port;
@@ -4498,18 +4501,21 @@ static int niu_alloc_channels(struct niu *np)
                 first_tx_channel += parent->txchan_per_port[i];
         }
 
-        np->num_rx_rings = parent->rxchan_per_port[port];
-        np->num_tx_rings = parent->txchan_per_port[port];
+        num_rx_rings = parent->rxchan_per_port[port];
+        num_tx_rings = parent->txchan_per_port[port];
 
-        netif_set_real_num_rx_queues(np->dev, np->num_rx_rings);
-        netif_set_real_num_tx_queues(np->dev, np->num_tx_rings);
-
-        np->rx_rings = kcalloc(np->num_rx_rings, sizeof(struct rx_ring_info),
-                               GFP_KERNEL);
+        rx_rings = kcalloc(num_rx_rings, sizeof(struct rx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->rx_rings)
+        if (!rx_rings)
                 goto out_err;
 
+        np->num_rx_rings = num_rx_rings;
+        smp_wmb();
+        np->rx_rings = rx_rings;
+
+        netif_set_real_num_rx_queues(np->dev, num_rx_rings);
+
         for (i = 0; i < np->num_rx_rings; i++) {
                 struct rx_ring_info *rp = &np->rx_rings[i];
 
@@ -4538,12 +4544,18 @@ static int niu_alloc_channels(struct niu *np)
                         return err;
         }
 
-        np->tx_rings = kcalloc(np->num_tx_rings, sizeof(struct tx_ring_info),
-                               GFP_KERNEL);
+        tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->tx_rings)
+        if (!tx_rings)
                 goto out_err;
 
+        np->num_tx_rings = num_tx_rings;
+        smp_wmb();
+        np->tx_rings = tx_rings;
+
+        netif_set_real_num_tx_queues(np->dev, num_tx_rings);
+
         for (i = 0; i < np->num_tx_rings; i++) {
                 struct tx_ring_info *rp = &np->tx_rings[i];
 
@@ -6246,11 +6258,17 @@ static void niu_sync_mac_stats(struct niu *np)
 static void niu_get_rx_stats(struct niu *np)
 {
         unsigned long pkts, dropped, errors, bytes;
+        struct rx_ring_info *rx_rings;
         int i;
 
         pkts = dropped = errors = bytes = 0;
+
+        rx_rings = ACCESS_ONCE(np->rx_rings);
+        if (!rx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_rx_rings; i++) {
-                struct rx_ring_info *rp = &np->rx_rings[i];
+                struct rx_ring_info *rp = &rx_rings[i];
 
                 niu_sync_rx_discard_stats(np, rp, 0);
 
@@ -6259,6 +6277,8 @@ static void niu_get_rx_stats(struct niu *np)
                 dropped += rp->rx_dropped;
                 errors += rp->rx_errors;
         }
+
+no_rings:
         np->dev->stats.rx_packets = pkts;
         np->dev->stats.rx_bytes = bytes;
         np->dev->stats.rx_dropped = dropped;
@@ -6268,16 +6288,24 @@ static void niu_get_rx_stats(struct niu *np)
 static void niu_get_tx_stats(struct niu *np)
 {
         unsigned long pkts, errors, bytes;
+        struct tx_ring_info *tx_rings;
         int i;
 
         pkts = errors = bytes = 0;
+
+        tx_rings = ACCESS_ONCE(np->tx_rings);
+        if (!tx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_tx_rings; i++) {
-                struct tx_ring_info *rp = &np->tx_rings[i];
+                struct tx_ring_info *rp = &tx_rings[i];
 
                 pkts += rp->tx_packets;
                 bytes += rp->tx_bytes;
                 errors += rp->tx_errors;
         }
+
+no_rings:
         np->dev->stats.tx_packets = pkts;
         np->dev->stats.tx_bytes = bytes;
         np->dev->stats.tx_errors = errors;
@@ -6287,9 +6315,10 @@ static struct net_device_stats *niu_get_stats(struct net_device *dev)
 {
         struct niu *np = netdev_priv(dev);
 
-        niu_get_rx_stats(np);
-        niu_get_tx_stats(np);
-
+        if (netif_running(dev)) {
+                niu_get_rx_stats(np);
+                niu_get_tx_stats(np);
+        }
         return &dev->stats;
 }
 
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 84134c766f3a..a41b2cf4d917 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1988,12 +1988,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
         }
 
         ndev = alloc_etherdev(sizeof(struct ns83820));
-        dev = PRIV(ndev);
-
         err = -ENOMEM;
-        if (!dev)
+        if (!ndev)
                 goto out;
 
+        dev = PRIV(ndev);
         dev->ndev = ndev;
 
         spin_lock_init(&dev->rx_info.lock);
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index d7355306a738..4c9a7d4f3fca 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -519,7 +519,9 @@ static void pch_gbe_reset_task(struct work_struct *work)
         struct pch_gbe_adapter *adapter;
         adapter = container_of(work, struct pch_gbe_adapter, reset_task);
 
+        rtnl_lock();
         pch_gbe_reinit_locked(adapter);
+        rtnl_unlock();
 }
 
 /**
@@ -528,14 +530,8 @@ static void pch_gbe_reset_task(struct work_struct *work)
  */
 void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
-
-        rtnl_lock();
-        if (netif_running(netdev)) {
-                pch_gbe_down(adapter);
-                pch_gbe_up(adapter);
-        }
-        rtnl_unlock();
+        pch_gbe_down(adapter);
+        pch_gbe_up(adapter);
 }
 
 /**
@@ -2247,7 +2243,7 @@ static void pch_gbe_remove(struct pci_dev *pdev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct pch_gbe_adapter *adapter = netdev_priv(netdev);
 
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
         unregister_netdev(netdev);
 
         pch_gbe_hal_phy_hw_reset(&adapter->hw);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 1f42f6ac8551..d3cb77205863 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1488,12 +1488,10 @@ static void ei_rx_overrun(struct net_device *dev)
     
         /* 
          * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
-         * Early datasheets said to poll the reset bit, but now they say that
-         * it "is not a reliable indicator and subsequently should be ignored."
-         * We wait at least 10ms.
+         * We wait at least 2ms.
          */
 
-        mdelay(10);
+        mdelay(2);
 
         /*
          * Reset RBCR[01] back to zero as per magic incantation.
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bb8645ab247c..59ccf0c5c610 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -554,6 +554,8 @@ struct rtl8169_private {
         struct mii_if_info mii;
         struct rtl8169_counters counters;
         u32 saved_wolopts;
+
+        const struct firmware *fw;
 };
 
 MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
@@ -971,7 +973,8 @@ static void __rtl8169_check_link_status(struct net_device *dev,
                 if (pm)
                         pm_request_resume(&tp->pci_dev->dev);
                 netif_carrier_on(dev);
-                netif_info(tp, ifup, dev, "link up\n");
+                if (net_ratelimit())
+                        netif_info(tp, ifup, dev, "link up\n");
         } else {
                 netif_carrier_off(dev);
                 netif_info(tp, ifdown, dev, "link down\n");
@@ -1766,6 +1769,29 @@ rtl_phy_write_fw(struct rtl8169_private *tp, const struct firmware *fw)
         }
 }
 
+static void rtl_release_firmware(struct rtl8169_private *tp)
+{
+        release_firmware(tp->fw);
+        tp->fw = NULL;
+}
+
+static int rtl_apply_firmware(struct rtl8169_private *tp, const char *fw_name)
+{
+        const struct firmware **fw = &tp->fw;
+        int rc = !*fw;
+
+        if (rc) {
+                rc = request_firmware(fw, fw_name, &tp->pci_dev->dev);
+                if (rc < 0)
+                        goto out;
+        }
+
+        /* TODO: release firmware once rtl_phy_write_fw signals failures. */
+        rtl_phy_write_fw(tp, *fw);
+out:
+        return rc;
+}
+
 static void rtl8169s_hw_phy_config(struct rtl8169_private *tp)
 {
         static const struct phy_reg phy_reg_init[] = {
@@ -2139,7 +2165,6 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
                 { 0x0d, 0xf880 }
         };
         void __iomem *ioaddr = tp->mmio_addr;
-        const struct firmware *fw;
 
         rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
 
@@ -2203,11 +2228,8 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
 
         rtl_writephy(tp, 0x1f, 0x0005);
         rtl_writephy(tp, 0x05, 0x001b);
-        if (rtl_readphy(tp, 0x06) == 0xbf00 &&
-            request_firmware(&fw, FIRMWARE_8168D_1, &tp->pci_dev->dev) == 0) {
-                rtl_phy_write_fw(tp, fw);
-                release_firmware(fw);
-        } else {
+        if ((rtl_readphy(tp, 0x06) != 0xbf00) ||
+            (rtl_apply_firmware(tp, FIRMWARE_8168D_1) < 0)) {
                 netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
         }
 
@@ -2257,7 +2279,6 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
                 { 0x0d, 0xf880 }
         };
         void __iomem *ioaddr = tp->mmio_addr;
-        const struct firmware *fw;
 
         rtl_writephy_batch(tp, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0));
 
@@ -2312,11 +2333,8 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
 
         rtl_writephy(tp, 0x1f, 0x0005);
         rtl_writephy(tp, 0x05, 0x001b);
-        if (rtl_readphy(tp, 0x06) == 0xb300 &&
-            request_firmware(&fw, FIRMWARE_8168D_2, &tp->pci_dev->dev) == 0) {
-                rtl_phy_write_fw(tp, fw);
-                release_firmware(fw);
-        } else {
+        if ((rtl_readphy(tp, 0x06) != 0xb300) ||
+            (rtl_apply_firmware(tp, FIRMWARE_8168D_2) < 0)) {
                 netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
         }
 
@@ -3200,6 +3218,8 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
 
         cancel_delayed_work_sync(&tp->task);
 
+        rtl_release_firmware(tp);
+
         unregister_netdev(dev);
 
         if (pci_dev_run_wake(pdev))
@@ -3738,7 +3758,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
         RTL_W16(IntrMitigate, 0x5151);
 
         /* Work around for RxFIFO overflow. */
-        if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+        if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+            tp->mac_version == RTL_GIGA_MAC_VER_22) {
                 tp->intr_event |= RxFIFOOver | PCSTimeout;
                 tp->intr_event &= ~RxOverflow;
         }
@@ -4620,12 +4641,33 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                         break;
                 }
 
-                /* Work around for rx fifo overflow */
-                if (unlikely(status & RxFIFOOver) &&
-                (tp->mac_version == RTL_GIGA_MAC_VER_11)) {
-                        netif_stop_queue(dev);
-                        rtl8169_tx_timeout(dev);
-                        break;
+                if (unlikely(status & RxFIFOOver)) {
+                        switch (tp->mac_version) {
+                        /* Work around for rx fifo overflow */
+                        case RTL_GIGA_MAC_VER_11:
+                        case RTL_GIGA_MAC_VER_22:
+                        case RTL_GIGA_MAC_VER_26:
+                                netif_stop_queue(dev);
+                                rtl8169_tx_timeout(dev);
+                                goto done;
+                        /* Testers needed. */
+                        case RTL_GIGA_MAC_VER_17:
+                        case RTL_GIGA_MAC_VER_19:
+                        case RTL_GIGA_MAC_VER_20:
+                        case RTL_GIGA_MAC_VER_21:
+                        case RTL_GIGA_MAC_VER_23:
+                        case RTL_GIGA_MAC_VER_24:
+                        case RTL_GIGA_MAC_VER_27:
+                        case RTL_GIGA_MAC_VER_28:
+                        /* Experimental science. Pktgen proof. */
+                        case RTL_GIGA_MAC_VER_12:
+                        case RTL_GIGA_MAC_VER_25:
+                                if (status == RxFIFOOver)
+                                        goto done;
+                                break;
+                        default:
+                                break;
+                        }
                 }
 
                 if (unlikely(status & SYSErr)) {
@@ -4661,7 +4703,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                         (status & RxFIFOOver) ? (status | RxOverflow) : status);
                 status = RTL_R16(IntrStatus);
         }
-
+done:
         return IRQ_RETVAL(handled);
 }
 
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 711449c6e675..002bac743843 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1153,6 +1153,9 @@ static int efx_wanted_channels(void)
         int count;
         int cpu;
 
+        if (rss_cpus)
+                return rss_cpus;
+
         if (unlikely(!zalloc_cpumask_var(&core_mask, GFP_KERNEL))) {
                 printk(KERN_WARNING
                        "sfc: RSS disabled due to allocation failure\n");
@@ -1266,27 +1269,18 @@ static void efx_remove_interrupts(struct efx_nic *efx)
         efx->legacy_irq = 0;
 }
 
-struct efx_tx_queue *
-efx_get_tx_queue(struct efx_nic *efx, unsigned index, unsigned type)
-{
-        unsigned tx_channel_offset =
-                separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;
-        EFX_BUG_ON_PARANOID(index >= efx->n_tx_channels ||
-                            type >= EFX_TXQ_TYPES);
-        return &efx->channel[tx_channel_offset + index]->tx_queue[type];
-}
-
 static void efx_set_channels(struct efx_nic *efx)
 {
         struct efx_channel *channel;
         struct efx_tx_queue *tx_queue;
-        unsigned tx_channel_offset =
+
+        efx->tx_channel_offset =
                 separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;
 
         /* Channel pointers were set in efx_init_struct() but we now
          * need to clear them for TX queues in any RX-only channels. */
         efx_for_each_channel(channel, efx) {
-                if (channel->channel - tx_channel_offset >=
+                if (channel->channel - efx->tx_channel_offset >=
                     efx->n_tx_channels) {
                         efx_for_each_channel_tx_queue(tx_queue, channel)
                                 tx_queue->channel = NULL;
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 70e4f7dcce81..61ddd2c6e750 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1107,22 +1107,9 @@ static int __falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
 
         /* Restore PCI configuration if needed */
         if (method == RESET_TYPE_WORLD) {
-                if (efx_nic_is_dual_func(efx)) {
-                        rc = pci_restore_state(nic_data->pci_dev2);
-                        if (rc) {
-                                netif_err(efx, drv, efx->net_dev,
-                                          "failed to restore PCI config for "
-                                          "the secondary function\n");
-                                goto fail3;
-                        }
-                }
-                rc = pci_restore_state(efx->pci_dev);
-                if (rc) {
-                        netif_err(efx, drv, efx->net_dev,
-                                  "failed to restore PCI config for the "
-                                  "primary function\n");
-                        goto fail4;
-                }
+                if (efx_nic_is_dual_func(efx))
+                        pci_restore_state(nic_data->pci_dev2);
+                pci_restore_state(efx->pci_dev);
                 netif_dbg(efx, drv, efx->net_dev,
                           "successfully restored PCI config\n");
         }
@@ -1133,7 +1120,7 @@ static int __falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
                 rc = -ETIMEDOUT;
                 netif_err(efx, hw, efx->net_dev,
                           "timed out waiting for hardware reset\n");
-                goto fail5;
+                goto fail3;
         }
         netif_dbg(efx, hw, efx->net_dev, "hardware reset complete\n");
 
@@ -1141,11 +1128,9 @@ static int __falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
 
         /* pci_save_state() and pci_restore_state() MUST be called in pairs */
 fail2:
-fail3:
         pci_restore_state(efx->pci_dev);
 fail1:
-fail4:
-fail5:
+fail3:
         return rc;
 }
 
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index bdce66ddf93a..28df8665256a 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -735,6 +735,7 @@ struct efx_nic {
         unsigned next_buffer_table;
         unsigned n_channels;
         unsigned n_rx_channels;
+        unsigned tx_channel_offset;
         unsigned n_tx_channels;
         unsigned int rx_buffer_len;
         unsigned int rx_buffer_order;
@@ -929,8 +930,13 @@ efx_get_channel(struct efx_nic *efx, unsigned index)
              _channel = (_channel->channel + 1 < (_efx)->n_channels) ?  \
                      (_efx)->channel[_channel->channel + 1] : NULL)
 
-extern struct efx_tx_queue *
-efx_get_tx_queue(struct efx_nic *efx, unsigned index, unsigned type);
+static inline struct efx_tx_queue *
+efx_get_tx_queue(struct efx_nic *efx, unsigned index, unsigned type)
+{
+        EFX_BUG_ON_PARANOID(index >= efx->n_tx_channels ||
+                            type >= EFX_TXQ_TYPES);
+        return &efx->channel[efx->tx_channel_offset + index]->tx_queue[type];
+}
 
 static inline struct efx_tx_queue *
 efx_channel_get_tx_queue(struct efx_channel *channel, unsigned type)
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5976d1d51df1..640e368ebeee 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1777,6 +1777,7 @@ static int sis900_rx(struct net_device *net_dev)
                                               "cur_rx:%4.4d, dirty_rx:%4.4d\n",
                                               net_dev->name, sis_priv->cur_rx,
                                               sis_priv->dirty_rx);
+                                dev_kfree_skb(skb);
                                 break;
                         }
 
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7841a8f69998..93b32d366611 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -60,12 +60,6 @@
 #define BAR_0   0
 #define BAR_2   2
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define TG3_VLAN_TAG_USED 1
-#else
-#define TG3_VLAN_TAG_USED 0
-#endif
-
 #include "tg3.h"
 
 #define DRV_MODULE_NAME         "tg3"
@@ -134,9 +128,6 @@
                                  TG3_TX_RING_SIZE)
 #define NEXT_TX(N)              (((N) + 1) & (TG3_TX_RING_SIZE - 1))
 
-#define TG3_RX_DMA_ALIGN                16
-#define TG3_RX_HEADROOM                 ALIGN(VLAN_HLEN, TG3_RX_DMA_ALIGN)
-
 #define TG3_DMA_BYTE_ENAB               64
 
 #define TG3_RX_STD_DMA_SZ               1536
@@ -4722,8 +4713,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 struct sk_buff *skb;
                 dma_addr_t dma_addr;
                 u32 opaque_key, desc_idx, *post_ptr;
-                bool hw_vlan __maybe_unused = false;
-                u16 vtag __maybe_unused = 0;
 
                 desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
                 opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
@@ -4782,12 +4771,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                         tg3_recycle_rx(tnapi, tpr, opaque_key,
                                        desc_idx, *post_ptr);
 
-                        copy_skb = netdev_alloc_skb(tp->dev, len + VLAN_HLEN +
+                        copy_skb = netdev_alloc_skb(tp->dev, len +
                                                     TG3_RAW_IP_ALIGN);
                         if (copy_skb == NULL)
                                 goto drop_it_no_recycle;
 
-                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN + VLAN_HLEN);
+                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN);
                         skb_put(copy_skb, len);
                         pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
                         skb_copy_from_linear_data(skb, copy_skb->data, len);
@@ -4814,30 +4803,11 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 }
 
                 if (desc->type_flags & RXD_FLAG_VLAN &&
-                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG)) {
-                        vtag = desc->err_vlan & RXD_VLAN_MASK;
-#if TG3_VLAN_TAG_USED
-                        if (tp->vlgrp)
-                                hw_vlan = true;
-                        else
-#endif
-                        {
-                                struct vlan_ethhdr *ve = (struct vlan_ethhdr *)
-                                                    __skb_push(skb, VLAN_HLEN);
-
-                                memmove(ve, skb->data + VLAN_HLEN,
-                                        ETH_ALEN * 2);
-                                ve->h_vlan_proto = htons(ETH_P_8021Q);
-                                ve->h_vlan_TCI = htons(vtag);
-                        }
-                }
+                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG))
+                        __vlan_hwaccel_put_tag(skb,
+                                               desc->err_vlan & RXD_VLAN_MASK);
 
-#if TG3_VLAN_TAG_USED
-                if (hw_vlan)
-                        vlan_gro_receive(&tnapi->napi, tp->vlgrp, vtag, skb);
-                else
-#endif
-                        napi_gro_receive(&tnapi->napi, skb);
+                napi_gro_receive(&tnapi->napi, skb);
 
                 received++;
                 budget--;
@@ -5740,11 +5710,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
         }
 
-#if TG3_VLAN_TAG_USED
         if (vlan_tx_tag_present(skb))
                 base_flags |= (TXD_FLAG_VLAN |
                                (vlan_tx_tag_get(skb) << 16));
-#endif
 
         len = skb_headlen(skb);
 
@@ -5986,11 +5954,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                         }
                 }
         }
-#if TG3_VLAN_TAG_USED
+
         if (vlan_tx_tag_present(skb))
                 base_flags |= (TXD_FLAG_VLAN |
                                (vlan_tx_tag_get(skb) << 16));
-#endif
 
         if ((tp->tg3_flags3 & TG3_FLG3_USE_JUMBO_BDFLAG) &&
             !mss && skb->len > VLAN_ETH_FRAME_LEN)
@@ -9532,17 +9499,10 @@ static void __tg3_set_rx_mode(struct net_device *dev)
         rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
                                   RX_MODE_KEEP_VLAN_TAG);
 
+#if !defined(CONFIG_VLAN_8021Q) && !defined(CONFIG_VLAN_8021Q_MODULE)
         /* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
          * flag clear.
          */
-#if TG3_VLAN_TAG_USED
-        if (!tp->vlgrp &&
-            !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
-                rx_mode |= RX_MODE_KEEP_VLAN_TAG;
-#else
-        /* By definition, VLAN is disabled always in this
-         * case.
-         */
         if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
                 rx_mode |= RX_MODE_KEEP_VLAN_TAG;
 #endif
@@ -11230,31 +11190,6 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return -EOPNOTSUPP;
 }
 
-#if TG3_VLAN_TAG_USED
-static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-        struct tg3 *tp = netdev_priv(dev);
-
-        if (!netif_running(dev)) {
-                tp->vlgrp = grp;
-                return;
-        }
-
-        tg3_netif_stop(tp);
-
-        tg3_full_lock(tp, 0);
-
-        tp->vlgrp = grp;
-
-        /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
-        __tg3_set_rx_mode(dev);
-
-        tg3_netif_start(tp);
-
-        tg3_full_unlock(tp);
-}
-#endif
-
 static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
 {
         struct tg3 *tp = netdev_priv(dev);
@@ -13066,9 +13001,7 @@ static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
 
 static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
 {
-#if TG3_VLAN_TAG_USED
         dev->vlan_features |= flags;
-#endif
 }
 
 static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
@@ -13861,11 +13794,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         else
                 tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
 
-        tp->rx_offset = NET_IP_ALIGN + TG3_RX_HEADROOM;
+        tp->rx_offset = NET_IP_ALIGN;
         tp->rx_copy_thresh = TG3_RX_COPY_THRESHOLD;
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
             (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
-                tp->rx_offset -= NET_IP_ALIGN;
+                tp->rx_offset = 0;
 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
                 tp->rx_copy_thresh = ~(u16)0;
 #endif
@@ -14629,9 +14562,6 @@ static const struct net_device_ops tg3_netdev_ops = {
         .ndo_do_ioctl           = tg3_ioctl,
         .ndo_tx_timeout         = tg3_tx_timeout,
         .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14648,9 +14578,6 @@ static const struct net_device_ops tg3_netdev_ops_dma_bug = {
         .ndo_do_ioctl           = tg3_ioctl,
         .ndo_tx_timeout         = tg3_tx_timeout,
         .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14700,9 +14627,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-#if TG3_VLAN_TAG_USED
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
 
         tp = netdev_priv(dev);
         tp->pdev = pdev;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d62c8d937c82..f528243e1a4f 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2808,9 +2808,6 @@ struct tg3 {
         u32                             rx_std_max_post;
         u32                             rx_offset;
         u32                             rx_pkt_map_sz;
-#if TG3_VLAN_TAG_USED
-        struct vlan_group               *vlgrp;
-#endif
 
 
         /* begin "everything else" cacheline(s) section */
diff --git a/drivers/net/tile/tilepro.c b/drivers/net/tile/tilepro.c
index 0e6bac5ec65b..7cb301da7474 100644
--- a/drivers/net/tile/tilepro.c
+++ b/drivers/net/tile/tilepro.c
@@ -142,14 +142,6 @@
 MODULE_AUTHOR("Tilera");
 MODULE_LICENSE("GPL");
 
-
-#define IS_MULTICAST(mac_addr) \
-        (((u8 *)(mac_addr))[0] & 0x01)
-
-#define IS_BROADCAST(mac_addr) \
-        (((u16 *)(mac_addr))[0] == 0xffff)
-
-
 /*
  * Queue of incoming packets for a specific cpu and device.
  *
@@ -795,7 +787,7 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
                 /*
                  * FIXME: Implement HW multicast filter.
                  */
-                if (!IS_MULTICAST(buf) && !IS_BROADCAST(buf)) {
+                if (is_unicast_ether_addr(buf)) {
                         /* Filter packets not for our address. */
                         const u8 *mine = dev->dev_addr;
                         filter = compare_ether_addr(mine, buf);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 73a3e0d93237..715e7b47e7e9 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -2032,7 +2032,7 @@ static void ucc_geth_set_multi(struct net_device *dev)
                         netdev_for_each_mc_addr(ha, dev) {
                                 /* Only support group multicast for now.
                                  */
-                                if (!(ha->addr[0] & 1))
+                                if (!is_multicast_ether_addr(ha->addr))
                                         continue;
 
                                 /* Ask CPM to run CRC and set bit in
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 593c104ab199..7113168473cf 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1,7 +1,7 @@
 /*
  * cdc_ncm.c
  *
- * Copyright (C) ST-Ericsson 2010
+ * Copyright (C) ST-Ericsson 2010-2011
  * Contact: Alexey Orishko <alexey.orishko@stericsson.com>
  * Original author: Hans Petter Selasky <hans.petter.selasky@stericsson.com>
  *
@@ -54,7 +54,7 @@
 #include <linux/usb/usbnet.h>
 #include <linux/usb/cdc.h>
 
-#define DRIVER_VERSION                          "30-Nov-2010"
+#define DRIVER_VERSION                          "7-Feb-2011"
 
 /* CDC NCM subclass 3.2.1 */
 #define USB_CDC_NCM_NDP16_LENGTH_MIN            0x10
@@ -77,6 +77,9 @@
  */
 #define CDC_NCM_DPT_DATAGRAMS_MAX               32
 
+/* Maximum amount of IN datagrams in NTB */
+#define CDC_NCM_DPT_DATAGRAMS_IN_MAX            0 /* unlimited */
+
 /* Restart the timer, if amount of datagrams is less than given value */
 #define CDC_NCM_RESTART_TIMER_DATAGRAM_CNT      3
 
@@ -85,11 +88,6 @@
         (sizeof(struct usb_cdc_ncm_nth16) + sizeof(struct usb_cdc_ncm_ndp16) + \
         (CDC_NCM_DPT_DATAGRAMS_MAX + 1) * sizeof(struct usb_cdc_ncm_dpe16))
 
-struct connection_speed_change {
-        __le32  USBitRate; /* holds 3GPP downlink value, bits per second */
-        __le32  DSBitRate; /* holds 3GPP uplink value, bits per second */
-} __attribute__ ((packed));
-
 struct cdc_ncm_data {
         struct usb_cdc_ncm_nth16 nth16;
         struct usb_cdc_ncm_ndp16 ndp16;
@@ -198,10 +196,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 {
         struct usb_cdc_notification req;
         u32 val;
-        __le16 max_datagram_size;
         u8 flags;
         u8 iface_no;
         int err;
+        u16 ntb_fmt_supported;
 
         iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;
 
@@ -223,6 +221,9 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
         ctx->tx_remainder = le16_to_cpu(ctx->ncm_parm.wNdpOutPayloadRemainder);
         ctx->tx_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutDivisor);
         ctx->tx_ndp_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutAlignment);
+        /* devices prior to NCM Errata shall set this field to zero */
+        ctx->tx_max_datagrams = le16_to_cpu(ctx->ncm_parm.wNtbOutMaxDatagrams);
+        ntb_fmt_supported = le16_to_cpu(ctx->ncm_parm.bmNtbFormatsSupported);
 
         if (ctx->func_desc != NULL)
                 flags = ctx->func_desc->bmNetworkCapabilities;
@@ -231,22 +232,58 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 
         pr_debug("dwNtbInMaxSize=%u dwNtbOutMaxSize=%u "
                  "wNdpOutPayloadRemainder=%u wNdpOutDivisor=%u "
-                 "wNdpOutAlignment=%u flags=0x%x\n",
+                 "wNdpOutAlignment=%u wNtbOutMaxDatagrams=%u flags=0x%x\n",
                  ctx->rx_max, ctx->tx_max, ctx->tx_remainder, ctx->tx_modulus,
-                 ctx->tx_ndp_modulus, flags);
+                 ctx->tx_ndp_modulus, ctx->tx_max_datagrams, flags);
 
-        /* max count of tx datagrams without terminating NULL entry */
-        ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
+        /* max count of tx datagrams */
+        if ((ctx->tx_max_datagrams == 0) ||
+                        (ctx->tx_max_datagrams > CDC_NCM_DPT_DATAGRAMS_MAX))
+                ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
 
         /* verify maximum size of received NTB in bytes */
-        if ((ctx->rx_max <
-            (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
-            (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX)) {
+        if (ctx->rx_max < USB_CDC_NCM_NTB_MIN_IN_SIZE) {
+                pr_debug("Using min receive length=%d\n",
+                                                USB_CDC_NCM_NTB_MIN_IN_SIZE);
+                ctx->rx_max = USB_CDC_NCM_NTB_MIN_IN_SIZE;
+        }
+
+        if (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX) {
                 pr_debug("Using default maximum receive length=%d\n",
                                                 CDC_NCM_NTB_MAX_SIZE_RX);
                 ctx->rx_max = CDC_NCM_NTB_MAX_SIZE_RX;
         }
 
+        /* inform device about NTB input size changes */
+        if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_NTB_INPUT_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+
+                if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
+                        struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
+
+                        req.wLength = 8;
+                        ndp_in_sz.dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+                        ndp_in_sz.wNtbInMaxDatagrams =
+                                        cpu_to_le16(CDC_NCM_DPT_DATAGRAMS_MAX);
+                        ndp_in_sz.wReserved = 0;
+                        err = cdc_ncm_do_request(ctx, &req, &ndp_in_sz, 0, NULL,
+                                                                        1000);
+                } else {
+                        __le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+
+                        req.wLength = 4;
+                        err = cdc_ncm_do_request(ctx, &req, &dwNtbInMaxSize, 0,
+                                                                NULL, 1000);
+                }
+
+                if (err)
+                        pr_debug("Setting NTB Input Size failed\n");
+        }
+
         /* verify maximum size of transmitted NTB in bytes */
         if ((ctx->tx_max <
             (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
@@ -297,47 +334,84 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
         /* additional configuration */
 
         /* set CRC Mode */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_SET_CRC_MODE;
-        req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = 0;
-
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
-        if (err)
-                pr_debug("Setting CRC mode off failed\n");
+        if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_CRC_MODE;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = 0;
+
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting CRC mode off failed\n");
+        }
 
-        /* set NTB format */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
-        req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = 0;
+        /* set NTB format, if both formats are supported */
+        if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = 0;
+
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting NTB format to 16-bit failed\n");
+        }
 
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
-        if (err)
-                pr_debug("Setting NTB format to 16-bit failed\n");
+        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
 
         /* set Max Datagram Size (MTU) */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
-        req.wValue = 0;
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = cpu_to_le16(2);
+        if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
+                __le16 max_datagram_size;
+                u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
+
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = cpu_to_le16(2);
+
+                err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL,
+                                                                        1000);
+                if (err) {
+                        pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
+                                                CDC_NCM_MIN_DATAGRAM_SIZE);
+                } else {
+                        ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        /* Check Eth descriptor value */
+                        if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) {
+                                if (ctx->max_datagram_size > eth_max_sz)
+                                        ctx->max_datagram_size = eth_max_sz;
+                        } else {
+                                if (ctx->max_datagram_size >
+                                                CDC_NCM_MAX_DATAGRAM_SIZE)
+                                        ctx->max_datagram_size =
+                                                CDC_NCM_MAX_DATAGRAM_SIZE;
+                        }
 
-        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL, 1000);
-        if (err) {
-                pr_debug(" GET_MAX_DATAGRAM_SIZE failed, using size=%u\n",
-                         CDC_NCM_MIN_DATAGRAM_SIZE);
-                /* use default */
-                ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-        } else {
-                ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
+                                ctx->max_datagram_size =
+                                        CDC_NCM_MIN_DATAGRAM_SIZE;
+
+                        /* if value changed, update device */
+                        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                        req.bNotificationType = USB_CDC_SET_MAX_DATAGRAM_SIZE;
+                        req.wValue = 0;
+                        req.wIndex = cpu_to_le16(iface_no);
+                        req.wLength = 2;
+                        max_datagram_size = cpu_to_le16(ctx->max_datagram_size);
+
+                        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size,
+                                                                0, NULL, 1000);
+                        if (err)
+                                pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
+                }
 
-                if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-                else if (ctx->max_datagram_size > CDC_NCM_MAX_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MAX_DATAGRAM_SIZE;
         }
 
         if (ctx->netdev->mtu != (ctx->max_datagram_size - ETH_HLEN))
@@ -466,19 +540,13 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
 
                         ctx->ether_desc =
                                         (const struct usb_cdc_ether_desc *)buf;
-
                         dev->hard_mtu =
                                 le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
 
-                        if (dev->hard_mtu <
-                            (CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN))
-                                dev->hard_mtu =
-                                        CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN;
-
-                        else if (dev->hard_mtu >
-                                 (CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN))
-                                dev->hard_mtu =
-                                        CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN;
+                        if (dev->hard_mtu < CDC_NCM_MIN_DATAGRAM_SIZE)
+                                dev->hard_mtu = CDC_NCM_MIN_DATAGRAM_SIZE;
+                        else if (dev->hard_mtu > CDC_NCM_MAX_DATAGRAM_SIZE)
+                                dev->hard_mtu = CDC_NCM_MAX_DATAGRAM_SIZE;
                         break;
 
                 case USB_CDC_NCM_TYPE:
@@ -628,13 +696,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
         u32 offset;
         u32 last_offset;
         u16 n = 0;
-        u8 timeout = 0;
+        u8 ready2send = 0;
 
         /* if there is a remaining skb, it gets priority */
         if (skb != NULL)
                 swap(skb, ctx->tx_rem_skb);
         else
-                timeout = 1;
+                ready2send = 1;
 
         /*
          * +----------------+
@@ -682,9 +750,10 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
 
         for (; n < ctx->tx_max_datagrams; n++) {
                 /* check if end of transmit buffer is reached */
-                if (offset >= ctx->tx_max)
+                if (offset >= ctx->tx_max) {
+                        ready2send = 1;
                         break;
-
+                }
                 /* compute maximum buffer size */
                 rem = ctx->tx_max - offset;
 
@@ -711,9 +780,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                 }
                                 ctx->tx_rem_skb = skb;
                                 skb = NULL;
-
-                                /* loop one more time */
-                                timeout = 1;
+                                ready2send = 1;
                         }
                         break;
                 }
@@ -756,7 +823,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                 ctx->tx_curr_last_offset = last_offset;
                 goto exit_no_skb;
 
-        } else if ((n < ctx->tx_max_datagrams) && (timeout == 0)) {
+        } else if ((n < ctx->tx_max_datagrams) && (ready2send == 0)) {
                 /* wait for more frames */
                 /* push variables */
                 ctx->tx_curr_skb = skb_out;
@@ -813,7 +880,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                         cpu_to_le16(sizeof(ctx->tx_ncm.nth16));
         ctx->tx_ncm.nth16.wSequence = cpu_to_le16(ctx->tx_seq);
         ctx->tx_ncm.nth16.wBlockLength = cpu_to_le16(last_offset);
-        ctx->tx_ncm.nth16.wFpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
+        ctx->tx_ncm.nth16.wNdpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
                                                         ctx->tx_ndp_modulus);
 
         memcpy(skb_out->data, &(ctx->tx_ncm.nth16), sizeof(ctx->tx_ncm.nth16));
@@ -825,13 +892,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
         rem = sizeof(ctx->tx_ncm.ndp16) + ((ctx->tx_curr_frame_num + 1) *
                                         sizeof(struct usb_cdc_ncm_dpe16));
         ctx->tx_ncm.ndp16.wLength = cpu_to_le16(rem);
-        ctx->tx_ncm.ndp16.wNextFpIndex = 0; /* reserved */
+        ctx->tx_ncm.ndp16.wNextNdpIndex = 0; /* reserved */
 
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex,
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex,
                                                 &(ctx->tx_ncm.ndp16),
                                                 sizeof(ctx->tx_ncm.ndp16));
 
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex +
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex +
                                         sizeof(ctx->tx_ncm.ndp16),
                                         &(ctx->tx_ncm.dpe16),
                                         (ctx->tx_curr_frame_num + 1) *
@@ -868,15 +935,19 @@ static void cdc_ncm_tx_timeout(unsigned long arg)
         if (ctx->tx_timer_pending != 0) {
                 ctx->tx_timer_pending--;
                 restart = 1;
-        } else
+        } else {
                 restart = 0;
+        }
 
         spin_unlock(&ctx->mtx);
 
-        if (restart)
+        if (restart) {
+                spin_lock(&ctx->mtx);
                 cdc_ncm_tx_timeout_start(ctx);
-        else if (ctx->netdev != NULL)
+                spin_unlock(&ctx->mtx);
+        } else if (ctx->netdev != NULL) {
                 usbnet_start_xmit(NULL, ctx->netdev);
+        }
 }
 
 static struct sk_buff *
@@ -900,7 +971,6 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
         skb_out = cdc_ncm_fill_tx_frame(ctx, skb);
         if (ctx->tx_curr_skb != NULL)
                 need_timer = 1;
-        spin_unlock(&ctx->mtx);
 
         /* Start timer, if there is a remaining skb */
         if (need_timer)
@@ -908,6 +978,8 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
 
         if (skb_out)
                 dev->net->stats.tx_packets += ctx->tx_curr_frame_num;
+
+        spin_unlock(&ctx->mtx);
         return skb_out;
 
 error:
@@ -956,7 +1028,7 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                 goto error;
         }
 
-        temp = le16_to_cpu(ctx->rx_ncm.nth16.wFpIndex);
+        temp = le16_to_cpu(ctx->rx_ncm.nth16.wNdpIndex);
         if ((temp + sizeof(ctx->rx_ncm.ndp16)) > actlen) {
                 pr_debug("invalid DPT16 index\n");
                 goto error;
@@ -1020,14 +1092,16 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                 if (((offset + temp) > actlen) ||
                     (temp > CDC_NCM_MAX_DATAGRAM_SIZE) || (temp < ETH_HLEN)) {
                         pr_debug("invalid frame detected (ignored)"
-                                "offset[%u]=%u, length=%u, skb=%p\n",
-                                                        x, offset, temp, skb);
+                                        "offset[%u]=%u, length=%u, skb=%p\n",
+                                        x, offset, temp, skb_in);
                         if (!x)
                                 goto error;
                         break;
 
                 } else {
                         skb = skb_clone(skb_in, GFP_ATOMIC);
+                        if (!skb)
+                                goto error;
                         skb->len = temp;
                         skb->data = ((u8 *)skb_in->data) + offset;
                         skb_set_tail_pointer(skb, temp);
@@ -1041,10 +1115,10 @@ error:
 
 static void
 cdc_ncm_speed_change(struct cdc_ncm_ctx *ctx,
-                     struct connection_speed_change *data)
+                     struct usb_cdc_speed_change *data)
 {
-        uint32_t rx_speed = le32_to_cpu(data->USBitRate);
-        uint32_t tx_speed = le32_to_cpu(data->DSBitRate);
+        uint32_t rx_speed = le32_to_cpu(data->DLBitRRate);
+        uint32_t tx_speed = le32_to_cpu(data->ULBitRate);
 
         /*
          * Currently the USB-NET API does not support reporting the actual
@@ -1085,7 +1159,7 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
         /* test for split data in 8-byte chunks */
         if (test_and_clear_bit(EVENT_STS_SPLIT, &dev->flags)) {
                 cdc_ncm_speed_change(ctx,
-                      (struct connection_speed_change *)urb->transfer_buffer);
+                      (struct usb_cdc_speed_change *)urb->transfer_buffer);
                 return;
         }
 
@@ -1113,12 +1187,12 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
                 break;
 
         case USB_CDC_NOTIFY_SPEED_CHANGE:
-                if (urb->actual_length <
-                    (sizeof(*event) + sizeof(struct connection_speed_change)))
+                if (urb->actual_length < (sizeof(*event) +
+                                        sizeof(struct usb_cdc_speed_change)))
                         set_bit(EVENT_STS_SPLIT, &dev->flags);
                 else
                         cdc_ncm_speed_change(ctx,
-                                (struct connection_speed_change *) &event[1]);
+                                (struct usb_cdc_speed_change *) &event[1]);
                 break;
 
         default:
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 5e98643a4a21..7dc84971f26f 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -406,6 +406,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
 
         if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
                 err("Firmware too big: %zu", fw->size);
+                release_firmware(fw);
                 return -ENOSPC;
         }
         data_len = fw->size;
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 90a23e410d1b..82dba5aaf423 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -446,6 +446,20 @@ static void skb_recv_done(struct virtqueue *rvq)
         }
 }
 
+static void virtnet_napi_enable(struct virtnet_info *vi)
+{
+        napi_enable(&vi->napi);
+
+        /* If all buffers were filled by other side before we napi_enabled, we
+         * won't get another interrupt, so process any outstanding packets
+         * now.  virtnet_poll wants re-enable the queue, so we disable here.
+         * We synchronize against interrupts via NAPI_STATE_SCHED */
+        if (napi_schedule_prep(&vi->napi)) {
+                virtqueue_disable_cb(vi->rvq);
+                __napi_schedule(&vi->napi);
+        }
+}
+
 static void refill_work(struct work_struct *work)
 {
         struct virtnet_info *vi;
@@ -454,7 +468,7 @@ static void refill_work(struct work_struct *work)
         vi = container_of(work, struct virtnet_info, refill.work);
         napi_disable(&vi->napi);
         still_empty = !try_fill_recv(vi, GFP_KERNEL);
-        napi_enable(&vi->napi);
+        virtnet_napi_enable(vi);
 
         /* In theory, this can happen: if we don't get any buffers in
          * we will *never* try to fill again. */
@@ -638,16 +652,7 @@ static int virtnet_open(struct net_device *dev)
 {
         struct virtnet_info *vi = netdev_priv(dev);
 
-        napi_enable(&vi->napi);
-
-        /* If all buffers were filled by other side before we napi_enabled, we
-         * won't get another interrupt, so process any outstanding packets
-         * now.  virtnet_poll wants re-enable the queue, so we disable here.
-         * We synchronize against interrupts via NAPI_STATE_SCHED */
-        if (napi_schedule_prep(&vi->napi)) {
-                virtqueue_disable_cb(vi->rvq);
-                __napi_schedule(&vi->napi);
-        }
+        virtnet_napi_enable(vi);
         return 0;
 }
 
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d143e8b72b5b..cc14b4a75048 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -48,6 +48,9 @@ static atomic_t devices_found;
 static int enable_mq = 1;
 static int irq_share_mode;
 
+static void
+vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
+
 /*
  *    Enable/Disable the given intr
  */
@@ -139,9 +142,13 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
         u32 ret;
         int i;
+        unsigned long flags;
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
         ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
+
         adapter->link_speed = ret >> 16;
         if (ret & 1) { /* Link is up. */
                 printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
@@ -183,8 +190,10 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 
         /* Check if there is an error on xmit/recv queues */
         if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
+                spin_lock(&adapter->cmd_lock);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_GET_QUEUE_STATUS);
+                spin_unlock(&adapter->cmd_lock);
 
                 for (i = 0; i < adapter->num_tx_queues; i++)
                         if (adapter->tqd_start[i].status.stopped)
@@ -804,30 +813,25 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                                    skb_transport_header(skb))->doff * 4;
                 ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
         } else {
-                unsigned int pull_size;
-
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
 
                         if (ctx->ipv4) {
                                 struct iphdr *iph = (struct iphdr *)
                                                     skb_network_header(skb);
-                                if (iph->protocol == IPPROTO_TCP) {
-                                        pull_size = ctx->eth_ip_hdr_size +
-                                                    sizeof(struct tcphdr);
-
-                                        if (unlikely(!pskb_may_pull(skb,
-                                                                pull_size))) {
-                                                goto err;
-                                        }
+                                if (iph->protocol == IPPROTO_TCP)
                                         ctx->l4_hdr_size = ((struct tcphdr *)
                                            skb_transport_header(skb))->doff * 4;
-                                } else if (iph->protocol == IPPROTO_UDP) {
+                                else if (iph->protocol == IPPROTO_UDP)
+                                        /*
+                                         * Use tcp header size so that bytes to
+                                         * be copied are more than required by
+                                         * the device.
+                                         */
                                         ctx->l4_hdr_size =
-                                                        sizeof(struct udphdr);
-                                } else {
+                                                        sizeof(struct tcphdr);
+                                else
                                         ctx->l4_hdr_size = 0;
-                                }
                         } else {
                                 /* for simplicity, don't copy L4 headers */
                                 ctx->l4_hdr_size = 0;
@@ -1859,18 +1863,14 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         struct Vmxnet3_DriverShared *shared = adapter->shared;
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         if (grp) {
                 /* add vlan rx stripping. */
                 if (adapter->netdev->features & NETIF_F_HW_VLAN_RX) {
                         int i;
-                        struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
                         adapter->vlan_grp = grp;
 
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
                         /*
                          *  Clear entire vfTable; then enable untagged pkts.
                          *  Note: setting one entry in vfTable to non-zero turns
@@ -1880,8 +1880,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                 vfTable[i] = 0;
 
                         VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 } else {
                         printk(KERN_ERR "%s: vlan_rx_register when device has "
                                "no NETIF_F_HW_VLAN_RX\n", netdev->name);
@@ -1900,13 +1902,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                  */
                                 vfTable[i] = 0;
                         }
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 }
         }
 }
@@ -1939,10 +1938,13 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -1951,10 +1953,13 @@ vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         VMXNET3_CLEAR_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -1985,6 +1990,7 @@ static void
 vmxnet3_set_mc(struct net_device *netdev)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
         struct Vmxnet3_RxFilterConf *rxConf =
                                         &adapter->shared->devRead.rxFilterConf;
         u8 *new_table = NULL;
@@ -2020,6 +2026,7 @@ vmxnet3_set_mc(struct net_device *netdev)
                 rxConf->mfTablePA = 0;
         }
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         if (new_mode != rxConf->rxMode) {
                 rxConf->rxMode = cpu_to_le32(new_mode);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
@@ -2028,6 +2035,7 @@ vmxnet3_set_mc(struct net_device *netdev)
 
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_MAC_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         kfree(new_table);
 }
@@ -2080,10 +2088,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                 devRead->misc.uptFeatures |= UPT1_F_LRO;
                 devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS);
         }
-        if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX) &&
-            adapter->vlan_grp) {
+        if (adapter->netdev->features & NETIF_F_HW_VLAN_RX)
                 devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-        }
 
         devRead->misc.mtu = cpu_to_le32(adapter->netdev->mtu);
         devRead->misc.queueDescPA = cpu_to_le64(adapter->queue_desc_pa);
@@ -2168,6 +2174,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
         /* rx filter settings */
         devRead->rxFilterConf.rxMode = 0;
         vmxnet3_restore_vlan(adapter);
+        vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
+
         /* the rest are already zeroed */
 }
 
@@ -2177,6 +2185,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
 {
         int err, i;
         u32 ret;
+        unsigned long flags;
 
         dev_dbg(&adapter->netdev->dev, "%s: skb_buf_size %d, rx_buf_per_pkt %d,"
                 " ring sizes %u %u %u\n", adapter->netdev->name,
@@ -2206,9 +2215,11 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
                                adapter->shared_pa));
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, VMXNET3_GET_ADDR_HI(
                                adapter->shared_pa));
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_ACTIVATE_DEV);
         ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         if (ret != 0) {
                 printk(KERN_ERR "Failed to activate dev %s: error %u\n",
@@ -2255,7 +2266,10 @@ rq_err:
 void
 vmxnet3_reset_dev(struct vmxnet3_adapter *adapter)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -2263,12 +2277,15 @@ int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter)
 {
         int i;
+        unsigned long flags;
         if (test_and_set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state))
                 return 0;
 
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_QUIESCE_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         vmxnet3_disable_all_intrs(adapter);
 
         for (i = 0; i < adapter->num_rx_queues; i++)
@@ -2426,7 +2443,7 @@ vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter)
         sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
         ring0_size = adapter->rx_queue[0].rx_ring[0].size;
         ring0_size = (ring0_size + sz - 1) / sz * sz;
-        ring0_size = min_t(u32, rq->rx_ring[0].size, VMXNET3_RX_RING_MAX_SIZE /
+        ring0_size = min_t(u32, ring0_size, VMXNET3_RX_RING_MAX_SIZE /
                            sz * sz);
         ring1_size = adapter->rx_queue[0].rx_ring[1].size;
         comp_size = ring0_size + ring1_size;
@@ -2695,7 +2712,7 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
                         break;
                 } else {
                         /* If fails to enable required number of MSI-x vectors
-                         * try enabling 3 of them. One each for rx, tx and event
+                         * try enabling minimum number of vectors required.
                          */
                         vectors = vector_threshold;
                         printk(KERN_ERR "Failed to enable %d MSI-X for %s, try"
@@ -2718,9 +2735,11 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
         u32 cfg;
 
         /* intr settings */
+        spin_lock(&adapter->cmd_lock);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_GET_CONF_INTR);
         cfg = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock(&adapter->cmd_lock);
         adapter->intr.type = cfg & 0x3;
         adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
@@ -2755,7 +2774,7 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                  */
                 if (err == VMXNET3_LINUX_MIN_MSIX_VECT) {
                         if (adapter->share_intr != VMXNET3_INTR_BUDDYSHARE
-                            || adapter->num_rx_queues != 2) {
+                            || adapter->num_rx_queues != 1) {
                                 adapter->share_intr = VMXNET3_INTR_TXSHARE;
                                 printk(KERN_ERR "Number of rx queues : 1\n");
                                 adapter->num_rx_queues = 1;
@@ -2905,6 +2924,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         adapter->netdev = netdev;
         adapter->pdev = pdev;
 
+        spin_lock_init(&adapter->cmd_lock);
         adapter->shared = pci_alloc_consistent(adapter->pdev,
                           sizeof(struct Vmxnet3_DriverShared),
                           &adapter->shared_pa);
@@ -3108,11 +3128,15 @@ vmxnet3_suspend(struct device *device)
         u8 *arpreq;
         struct in_device *in_dev;
         struct in_ifaddr *ifa;
+        unsigned long flags;
         int i = 0;
 
         if (!netif_running(netdev))
                 return 0;
 
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_disable(&adapter->rx_queue[i].napi);
+
         vmxnet3_disable_all_intrs(adapter);
         vmxnet3_free_irqs(adapter);
         vmxnet3_free_intr_resources(adapter);
@@ -3188,8 +3212,10 @@ skip_arp:
         adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le64(virt_to_phys(
                                                                  pmConf));
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         pci_save_state(pdev);
         pci_enable_wake(pdev, pci_choose_state(pdev, PMSG_SUSPEND),
@@ -3204,7 +3230,8 @@ skip_arp:
 static int
 vmxnet3_resume(struct device *device)
 {
-        int err;
+        int err, i = 0;
+        unsigned long flags;
         struct pci_dev *pdev = to_pci_dev(device);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -3232,10 +3259,14 @@ vmxnet3_resume(struct device *device)
 
         pci_enable_wake(pdev, PCI_D0, 0);
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         vmxnet3_alloc_intr_resources(adapter);
         vmxnet3_request_irqs(adapter);
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_enable(&adapter->rx_queue[i].napi);
         vmxnet3_enable_all_intrs(adapter);
 
         return 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 8e17fc8a7fe7..81254be85b92 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -45,6 +45,7 @@ static int
 vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
 
         if (adapter->rxcsum != val) {
                 adapter->rxcsum = val;
@@ -56,8 +57,10 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
                                 adapter->shared->devRead.misc.uptFeatures &=
                                 ~UPT1_F_RXCSUM;
 
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_FEATURE);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 }
         }
         return 0;
@@ -68,76 +71,78 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_dev_stats[] = {
         /* description,         offset */
-        { "TSO pkts tx",        offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
-        { "TSO bytes tx",       offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
-        { "ucast pkts tx",      offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
-        { "ucast bytes tx",     offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
-        { "mcast pkts tx",      offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
-        { "mcast bytes tx",     offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
-        { "bcast pkts tx",      offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
-        { "bcast bytes tx",     offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
-        { "pkts tx err",        offsetof(struct UPT1_TxStats, pktsTxError) },
-        { "pkts tx discard",    offsetof(struct UPT1_TxStats, pktsTxDiscard) },
+        { "Tx Queue#",        0 },
+        { "  TSO pkts tx",      offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
+        { "  TSO bytes tx",     offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
+        { "  ucast pkts tx",    offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
+        { "  ucast bytes tx",   offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
+        { "  mcast pkts tx",    offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
+        { "  mcast bytes tx",   offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
+        { "  bcast pkts tx",    offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
+        { "  bcast bytes tx",   offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
+        { "  pkts tx err",      offsetof(struct UPT1_TxStats, pktsTxError) },
+        { "  pkts tx discard",  offsetof(struct UPT1_TxStats, pktsTxDiscard) },
 };
 
 /* per tq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_driver_stats[] = {
         /* description,         offset */
-        {"drv dropped tx total", offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_total) },
-        { "   too many frags",  offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_too_many_frags) },
-        { "   giant hdr",       offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_oversized_hdr) },
-        { "   hdr err",         offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_hdr_inspect_err) },
-        { "   tso",             offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_tso) },
-        { "ring full",          offsetof(struct vmxnet3_tq_driver_stats,
-                                        tx_ring_full) },
-        { "pkts linearized",    offsetof(struct vmxnet3_tq_driver_stats,
-                                        linearized) },
-        { "hdr cloned",         offsetof(struct vmxnet3_tq_driver_stats,
-                                        copy_skb_header) },
-        { "giant hdr",          offsetof(struct vmxnet3_tq_driver_stats,
-                                        oversized_hdr) },
+        {"  drv dropped tx total",      offsetof(struct vmxnet3_tq_driver_stats,
+                                                 drop_total) },
+        { "     too many frags", offsetof(struct vmxnet3_tq_driver_stats,
+                                          drop_too_many_frags) },
+        { "     giant hdr",     offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_oversized_hdr) },
+        { "     hdr err",       offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_hdr_inspect_err) },
+        { "     tso",           offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_tso) },
+        { "  ring full",        offsetof(struct vmxnet3_tq_driver_stats,
+                                         tx_ring_full) },
+        { "  pkts linearized",  offsetof(struct vmxnet3_tq_driver_stats,
+                                         linearized) },
+        { "  hdr cloned",       offsetof(struct vmxnet3_tq_driver_stats,
+                                         copy_skb_header) },
+        { "  giant hdr",        offsetof(struct vmxnet3_tq_driver_stats,
+                                         oversized_hdr) },
 };
 
 /* per rq stats maintained by the device */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_dev_stats[] = {
-        { "LRO pkts rx",        offsetof(struct UPT1_RxStats, LROPktsRxOK) },
-        { "LRO byte rx",        offsetof(struct UPT1_RxStats, LROBytesRxOK) },
-        { "ucast pkts rx",      offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
-        { "ucast bytes rx",     offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
-        { "mcast pkts rx",      offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
-        { "mcast bytes rx",     offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
-        { "bcast pkts rx",      offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
-        { "bcast bytes rx",     offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
-        { "pkts rx out of buf", offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
-        { "pkts rx err",        offsetof(struct UPT1_RxStats, pktsRxError) },
+        { "Rx Queue#",        0 },
+        { "  LRO pkts rx",      offsetof(struct UPT1_RxStats, LROPktsRxOK) },
+        { "  LRO byte rx",      offsetof(struct UPT1_RxStats, LROBytesRxOK) },
+        { "  ucast pkts rx",    offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
+        { "  ucast bytes rx",   offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
+        { "  mcast pkts rx",    offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
+        { "  mcast bytes rx",   offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
+        { "  bcast pkts rx",    offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
+        { "  bcast bytes rx",   offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
+        { "  pkts rx OOB",      offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
+        { "  pkts rx err",      offsetof(struct UPT1_RxStats, pktsRxError) },
 };
 
 /* per rq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_driver_stats[] = {
         /* description,         offset */
-        { "drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
-                                           drop_total) },
-        { "   err",            offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_err) },
-        { "   fcs",            offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_fcs) },
-        { "rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
-                                        rx_buf_alloc_failure) },
+        { "  drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
+                                             drop_total) },
+        { "     err",           offsetof(struct vmxnet3_rq_driver_stats,
+                                         drop_err) },
+        { "     fcs",           offsetof(struct vmxnet3_rq_driver_stats,
+                                         drop_fcs) },
+        { "  rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
+                                          rx_buf_alloc_failure) },
 };
 
 /* gloabl stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_global_stats[] = {
         /* description,         offset */
-        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
+        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
                                          tx_timeout_count) }
 };
 
@@ -151,12 +156,15 @@ vmxnet3_get_stats(struct net_device *netdev)
         struct UPT1_TxStats *devTxStats;
         struct UPT1_RxStats *devRxStats;
         struct net_device_stats *net_stats = &netdev->stats;
+        unsigned long flags;
         int i;
 
         adapter = netdev_priv(netdev);
 
         /* Collect the dev stats into the shared area */
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         memset(net_stats, 0, sizeof(*net_stats));
         for (i = 0; i < adapter->num_tx_queues; i++) {
@@ -193,12 +201,15 @@ vmxnet3_get_stats(struct net_device *netdev)
 static int
 vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 {
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         switch (sset) {
         case ETH_SS_STATS:
-                return ARRAY_SIZE(vmxnet3_tq_dev_stats) +
-                        ARRAY_SIZE(vmxnet3_tq_driver_stats) +
-                        ARRAY_SIZE(vmxnet3_rq_dev_stats) +
-                        ARRAY_SIZE(vmxnet3_rq_driver_stats) +
+                return (ARRAY_SIZE(vmxnet3_tq_dev_stats) +
+                        ARRAY_SIZE(vmxnet3_tq_driver_stats)) *
+                       adapter->num_tx_queues +
+                       (ARRAY_SIZE(vmxnet3_rq_dev_stats) +
+                        ARRAY_SIZE(vmxnet3_rq_driver_stats)) *
+                       adapter->num_rx_queues +
                         ARRAY_SIZE(vmxnet3_global_stats);
         default:
                 return -EOPNOTSUPP;
@@ -206,10 +217,16 @@ vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 }
 
 
+/* Should be multiple of 4 */
+#define NUM_TX_REGS     8
+#define NUM_RX_REGS     12
+
 static int
 vmxnet3_get_regs_len(struct net_device *netdev)
 {
-        return 20 * sizeof(u32);
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        return (adapter->num_tx_queues * NUM_TX_REGS * sizeof(u32) +
+                adapter->num_rx_queues * NUM_RX_REGS * sizeof(u32));
 }
 
 
@@ -240,29 +257,37 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 static void
 vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
 {
+         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         if (stringset == ETH_SS_STATS) {
-                int i;
-
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-                        memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
-                }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
-                        memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
-                }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-                        memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
+                int i, j;
+                for (j = 0; j < adapter->num_tx_queues; j++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
+                                memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats);
+                             i++) {
+                                memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
                 }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
-                        memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
+
+                for (j = 0; j < adapter->num_rx_queues; j++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
+                                memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats);
+                             i++) {
+                                memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
                 }
+
                 for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
                         memcpy(buf, vmxnet3_global_stats[i].desc,
                                 ETH_GSTRING_LEN);
@@ -277,6 +302,7 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
         u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
+        unsigned long flags;
 
         if (data & ~ETH_FLAG_LRO)
                 return -EOPNOTSUPP;
@@ -292,8 +318,10 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
                 else
                         adapter->shared->devRead.misc.uptFeatures &=
                                                         ~UPT1_F_LRO;
+                spin_lock_irqsave(&adapter->cmd_lock, flags);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_UPDATE_FEATURE);
+                spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         }
         return 0;
 }
@@ -303,30 +331,41 @@ vmxnet3_get_ethtool_stats(struct net_device *netdev,
                           struct ethtool_stats *stats, u64  *buf)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
         u8 *base;
         int i;
         int j = 0;
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         /* this does assume each counter is 64-bit wide */
-/* TODO change this for multiple queues */
-
-        base = (u8 *)&adapter->tqd_start[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_tq_dev_stats[i].offset);
-
-        base = (u8 *)&adapter->tx_queue[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_tq_driver_stats[i].offset);
-
-        base = (u8 *)&adapter->rqd_start[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_rq_dev_stats[i].offset);
+        for (j = 0; j < adapter->num_tx_queues; j++) {
+                base = (u8 *)&adapter->tqd_start[j].stats;
+                *buf++ = (u64)j;
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_tq_dev_stats[i].offset);
+
+                base = (u8 *)&adapter->tx_queue[j].stats;
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_tq_driver_stats[i].offset);
+        }
 
-        base = (u8 *)&adapter->rx_queue[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_rq_driver_stats[i].offset);
+        for (j = 0; j < adapter->num_tx_queues; j++) {
+                base = (u8 *)&adapter->rqd_start[j].stats;
+                *buf++ = (u64) j;
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_dev_stats[i].offset);
+
+                base = (u8 *)&adapter->rx_queue[j].stats;
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_driver_stats[i].offset);
+        }
 
         base = (u8 *)adapter;
         for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++)
@@ -339,7 +378,7 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *buf = p;
-        int i = 0;
+        int i = 0, j = 0;
 
         memset(p, 0, vmxnet3_get_regs_len(netdev));
 
@@ -348,31 +387,35 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
         /* Update vmxnet3_get_regs_len if we want to dump more registers */
 
         /* make each ring use multiple of 16 bytes */
-/* TODO change this for multiple queues */
-        buf[0] = adapter->tx_queue[i].tx_ring.next2fill;
-        buf[1] = adapter->tx_queue[i].tx_ring.next2comp;
-        buf[2] = adapter->tx_queue[i].tx_ring.gen;
-        buf[3] = 0;
-
-        buf[4] = adapter->tx_queue[i].comp_ring.next2proc;
-        buf[5] = adapter->tx_queue[i].comp_ring.gen;
-        buf[6] = adapter->tx_queue[i].stopped;
-        buf[7] = 0;
-
-        buf[8] = adapter->rx_queue[i].rx_ring[0].next2fill;
-        buf[9] = adapter->rx_queue[i].rx_ring[0].next2comp;
-        buf[10] = adapter->rx_queue[i].rx_ring[0].gen;
-        buf[11] = 0;
-
-        buf[12] = adapter->rx_queue[i].rx_ring[1].next2fill;
-        buf[13] = adapter->rx_queue[i].rx_ring[1].next2comp;
-        buf[14] = adapter->rx_queue[i].rx_ring[1].gen;
-        buf[15] = 0;
-
-        buf[16] = adapter->rx_queue[i].comp_ring.next2proc;
-        buf[17] = adapter->rx_queue[i].comp_ring.gen;
-        buf[18] = 0;
-        buf[19] = 0;
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2fill;
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2comp;
+                buf[j++] = adapter->tx_queue[i].tx_ring.gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->tx_queue[i].comp_ring.next2proc;
+                buf[j++] = adapter->tx_queue[i].comp_ring.gen;
+                buf[j++] = adapter->tx_queue[i].stopped;
+                buf[j++] = 0;
+        }
+
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2fill;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2fill;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->rx_queue[i].comp_ring.next2proc;
+                buf[j++] = adapter->rx_queue[i].comp_ring.gen;
+                buf[j++] = 0;
+                buf[j++] = 0;
+        }
+
 }
 
 
@@ -574,6 +617,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
                       const struct ethtool_rxfh_indir *p)
 {
         unsigned int i;
+        unsigned long flags;
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         struct UPT1_RSSConf *rssConf = adapter->rss_conf;
 
@@ -592,8 +636,10 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
         for (i = 0; i < rssConf->indTableSize; i++)
                 rssConf->indTable[i] = p->ring_index[i];
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_RSSIDT);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         return 0;
 
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 7fadeed37f03..fb5d245ac878 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -68,10 +68,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.0.16.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.0.25.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01001000
+#define VMXNET3_DRIVER_VERSION_NUM      0x01001900
 
 #if defined(CONFIG_PCI_MSI)
         /* RSS only makes sense if MSI-X is supported. */
@@ -289,7 +289,7 @@ struct vmxnet3_rx_queue {
 
 #define VMXNET3_LINUX_MAX_MSIX_VECT     (VMXNET3_DEVICE_MAX_TX_QUEUES + \
                                          VMXNET3_DEVICE_MAX_RX_QUEUES + 1)
-#define VMXNET3_LINUX_MIN_MSIX_VECT     3    /* 1 for each : tx, rx and event */
+#define VMXNET3_LINUX_MIN_MSIX_VECT     2 /* 1 for tx-rx pair and 1 for event */
 
 
 struct vmxnet3_intr {
@@ -317,6 +317,7 @@ struct vmxnet3_adapter {
         struct vmxnet3_rx_queue         rx_queue[VMXNET3_DEVICE_MAX_RX_QUEUES];
         struct vlan_group               *vlan_grp;
         struct vmxnet3_intr             intr;
+        spinlock_t                      cmd_lock;
         struct Vmxnet3_DriverShared     *shared;
         struct Vmxnet3_PMConf           *pm_conf;
         struct Vmxnet3_TxQueueDesc      *tqd_start;     /* all tx queue desc */
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 01c05f53e2f9..228d4f7a58af 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -3690,7 +3690,7 @@ __vxge_hw_vpath_rts_table_get(struct __vxge_hw_vpath_handle *vp,
         if (status != VXGE_HW_OK)
                 goto exit;
 
-        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) ||
+        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) &&
             (rts_table !=
              VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT))
                 *data1 = 0;
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 1ac9b568f1b0..c81a6512c683 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -4120,6 +4120,7 @@ int vxge_fw_upgrade(struct vxgedev *vdev, char *fw_name, int override)
                "hotplug event.\n");
 
 out:
+        release_firmware(fw);
         return ret;
 }
 
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 019a74d533a6..09ae4ef0fd51 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2294,6 +2294,8 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
         int i;
         bool needreset = false;
 
+        mutex_lock(&sc->lock);
+
         for (i = 0; i < ARRAY_SIZE(sc->txqs); i++) {
                 if (sc->txqs[i].setup) {
                         txq = &sc->txqs[i];
@@ -2321,6 +2323,8 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
                 ath5k_reset(sc, NULL, true);
         }
 
+        mutex_unlock(&sc->lock);
+
         ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
                 msecs_to_jiffies(ATH5K_TX_COMPLETE_POLL_INT));
 }
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index 0064be7ce5c9..21091c26a9a5 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -838,9 +838,9 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah)
         for (i = 0; i < qmax; i++) {
                 err = ath5k_hw_stop_tx_dma(ah, i);
                 /* -EINVAL -> queue inactive */
-                if (err != -EINVAL)
+                if (err && err != -EINVAL)
                         return err;
         }
 
-        return err;
+        return 0;
 }
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index e5f2b96a4c63..a702817daf72 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -86,7 +86,7 @@ int ath5k_hw_get_frame_duration(struct ath5k_hw *ah,
         if (!ah->ah_bwmode) {
                 dur = ieee80211_generic_frame_duration(sc->hw,
                                                 NULL, len, rate);
-                return dur;
+                return le16_to_cpu(dur);
         }
 
         bitrate = rate->bitrate;
@@ -265,8 +265,6 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah)
                  * what rate we should choose to TX ACKs. */
                 tx_time = ath5k_hw_get_frame_duration(ah, 10, rate);
 
-                tx_time = le16_to_cpu(tx_time);
-
                 ath5k_hw_reg_write(ah, tx_time, reg);
 
                 if (!(rate->flags & IEEE80211_RATE_SHORT_PREAMBLE))
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 01880aa13e36..5e300bd3d264 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -679,10 +679,6 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,
 
         /* Do NF cal only at longer intervals */
         if (longcal || nfcal_pending) {
-                /* Do periodic PAOffset Cal */
-                ar9002_hw_pa_cal(ah, false);
-                ar9002_hw_olc_temp_compensation(ah);
-
                 /*
                  * Get the value from the previous NF cal and update
                  * history buffer.
@@ -697,8 +693,12 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah,
                         ath9k_hw_loadnf(ah, ah->curchan);
                 }
 
-                if (longcal)
+                if (longcal) {
                         ath9k_hw_start_nfcal(ah, false);
+                        /* Do periodic PAOffset Cal */
+                        ar9002_hw_pa_cal(ah, false);
+                        ar9002_hw_olc_temp_compensation(ah);
+                }
         }
 
         return iscaldone;
@@ -954,6 +954,9 @@ static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
                                 &adc_dc_cal_multi_sample;
                 }
                 ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
+
+                if (AR_SREV_9287(ah))
+                        ah->supp_cals &= ~ADC_GAIN_CAL;
         }
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index f8a7771faee2..f44c84ab5dce 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -426,9 +426,8 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,
                 }
 
                 /* WAR for ASPM system hang */
-                if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) {
+                if (AR_SREV_9285(ah) || AR_SREV_9287(ah))
                         val |= (AR_WA_BIT6 | AR_WA_BIT7);
-                }
 
                 if (AR_SREV_9285E_20(ah))
                         val |= AR_WA_BIT23;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 81f9cf294dec..9ecca93392e8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -1842,7 +1842,7 @@ static const u32 ar9300_2p2_soc_preamble[][2] = {
 
 static const u32 ar9300PciePhy_pll_on_clkreq_disable_L1_2p2[][2] = {
         /* Addr      allmodes  */
-        {0x00004040, 0x08212e5e},
+        {0x00004040, 0x0821265e},
         {0x00004040, 0x0008003b},
         {0x00004044, 0x00000000},
 };
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 6137634e46ca..06fb2c850535 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -146,8 +146,8 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                 /* Sleep Setting */
 
                 INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                                ar9300PciePhy_clkreq_enable_L1_2p2,
-                                ARRAY_SIZE(ar9300PciePhy_clkreq_enable_L1_2p2),
+                                ar9300PciePhy_pll_on_clkreq_disable_L1_2p2,
+                                ARRAY_SIZE(ar9300PciePhy_pll_on_clkreq_disable_L1_2p2),
                                 2);
 
                 /* Fast clock modal settings */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 3681caf54282..23838e37d45f 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -218,6 +218,7 @@ struct ath_frame_info {
 struct ath_buf_state {
         u8 bf_type;
         u8 bfs_paprd;
+        unsigned long bfs_paprd_timestamp;
         enum ath9k_internal_frame_type bfs_ftype;
 };
 
@@ -593,7 +594,6 @@ struct ath_softc {
         struct work_struct paprd_work;
         struct work_struct hw_check_work;
         struct completion paprd_complete;
-        bool paprd_pending;
 
         u32 intrstatus;
         u32 sc_flags; /* SC_OP_* */
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 088f141f2006..749a93608664 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -226,6 +226,10 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
             eep->baseEepHeader.pwdclkind == 0)
                 ah->need_an_top2_fixup = 1;
 
+        if ((common->bus_ops->ath_bus_type == ATH_USB) &&
+            (AR_SREV_9280(ah)))
+                eep->modalHeader[0].xpaBiasLvl = 0;
+
         return 0;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index a099b3e87ed3..780ac5eac501 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -78,7 +78,7 @@ struct tx_frame_hdr {
         u8 node_idx;
         u8 vif_idx;
         u8 tidno;
-        u32 flags; /* ATH9K_HTC_TX_* */
+        __be32 flags; /* ATH9K_HTC_TX_* */
         u8 key_type;
         u8 keyix;
         u8 reserved[26];
@@ -433,6 +433,7 @@ void ath9k_htc_txep(void *priv, struct sk_buff *skb, enum htc_endpoint_id ep_id,
 void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,
                         enum htc_endpoint_id ep_id, bool txok);
 
+int ath9k_htc_update_cap_target(struct ath9k_htc_priv *priv);
 void ath9k_htc_station_work(struct work_struct *work);
 void ath9k_htc_aggr_work(struct work_struct *work);
 void ath9k_ani_work(struct work_struct *work);;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 38433f9bfe59..0352f0994caa 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -142,9 +142,6 @@ static void ath9k_deinit_priv(struct ath9k_htc_priv *priv)
 {
         ath9k_htc_exit_debug(priv->ah);
         ath9k_hw_deinit(priv->ah);
-        tasklet_kill(&priv->swba_tasklet);
-        tasklet_kill(&priv->rx_tasklet);
-        tasklet_kill(&priv->tx_tasklet);
         kfree(priv->ah);
         priv->ah = NULL;
 }
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 845b4c938d16..6bb59958f71e 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -301,6 +301,16 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv)
 
         priv->nstations++;
 
+        /*
+         * Set chainmask etc. on the target.
+         */
+        ret = ath9k_htc_update_cap_target(priv);
+        if (ret)
+                ath_dbg(common, ATH_DBG_CONFIG,
+                        "Failed to update capability in target\n");
+
+        priv->ah->is_monitoring = true;
+
         return 0;
 
 err_vif:
@@ -328,6 +338,7 @@ static int ath9k_htc_remove_monitor_interface(struct ath9k_htc_priv *priv)
         }
 
         priv->nstations--;
+        priv->ah->is_monitoring = false;
 
         return 0;
 }
@@ -419,7 +430,7 @@ static int ath9k_htc_remove_station(struct ath9k_htc_priv *priv,
         return 0;
 }
 
-static int ath9k_htc_update_cap_target(struct ath9k_htc_priv *priv)
+int ath9k_htc_update_cap_target(struct ath9k_htc_priv *priv)
 {
         struct ath9k_htc_cap_target tcap;
         int ret;
@@ -1014,12 +1025,6 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
         int ret = 0;
         u8 cmd_rsp;
 
-        /* Cancel all the running timers/work .. */
-        cancel_work_sync(&priv->fatal_work);
-        cancel_work_sync(&priv->ps_work);
-        cancel_delayed_work_sync(&priv->ath9k_led_blink_work);
-        ath9k_led_stop_brightness(priv);
-
         mutex_lock(&priv->mutex);
 
         if (priv->op_flags & OP_INVALID) {
@@ -1033,8 +1038,23 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
         WMI_CMD(WMI_DISABLE_INTR_CMDID);
         WMI_CMD(WMI_DRAIN_TXQ_ALL_CMDID);
         WMI_CMD(WMI_STOP_RECV_CMDID);
+
+        tasklet_kill(&priv->swba_tasklet);
+        tasklet_kill(&priv->rx_tasklet);
+        tasklet_kill(&priv->tx_tasklet);
+
         skb_queue_purge(&priv->tx_queue);
 
+        mutex_unlock(&priv->mutex);
+
+        /* Cancel all the running timers/work .. */
+        cancel_work_sync(&priv->fatal_work);
+        cancel_work_sync(&priv->ps_work);
+        cancel_delayed_work_sync(&priv->ath9k_led_blink_work);
+        ath9k_led_stop_brightness(priv);
+
+        mutex_lock(&priv->mutex);
+
         /* Remove monitor interface here */
         if (ah->opmode == NL80211_IFTYPE_MONITOR) {
                 if (ath9k_htc_remove_monitor_interface(priv))
@@ -1186,6 +1206,20 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                 }
         }
 
+        /*
+         * Monitor interface should be added before
+         * IEEE80211_CONF_CHANGE_CHANNEL is handled.
+         */
+        if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
+                if (conf->flags & IEEE80211_CONF_MONITOR) {
+                        if (ath9k_htc_add_monitor_interface(priv))
+                                ath_err(common, "Failed to set monitor mode\n");
+                        else
+                                ath_dbg(common, ATH_DBG_CONFIG,
+                                        "HW opmode set to Monitor mode\n");
+                }
+        }
+
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
                 int pos = curchan->hw_value;
@@ -1221,16 +1255,6 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                 ath_update_txpow(priv);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
-                if (conf->flags & IEEE80211_CONF_MONITOR) {
-                        if (ath9k_htc_add_monitor_interface(priv))
-                                ath_err(common, "Failed to set monitor mode\n");
-                        else
-                                ath_dbg(common, ATH_DBG_CONFIG,
-                                        "HW opmode set to Monitor mode\n");
-                }
-        }
-
         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
                 mutex_lock(&priv->htc_pm_lock);
                 if (!priv->ps_idle) {
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 33f36029fa4f..7a5ffca21958 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -113,6 +113,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
 
         if (ieee80211_is_data(fc)) {
                 struct tx_frame_hdr tx_hdr;
+                u32 flags = 0;
                 u8 *qc;
 
                 memset(&tx_hdr, 0, sizeof(struct tx_frame_hdr));
@@ -136,13 +137,14 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
                 /* Check for RTS protection */
                 if (priv->hw->wiphy->rts_threshold != (u32) -1)
                         if (skb->len > priv->hw->wiphy->rts_threshold)
-                                tx_hdr.flags |= ATH9K_HTC_TX_RTSCTS;
+                                flags |= ATH9K_HTC_TX_RTSCTS;
 
                 /* CTS-to-self */
-                if (!(tx_hdr.flags & ATH9K_HTC_TX_RTSCTS) &&
+                if (!(flags & ATH9K_HTC_TX_RTSCTS) &&
                     (priv->op_flags & OP_PROTECT_ENABLE))
-                        tx_hdr.flags |= ATH9K_HTC_TX_CTSONLY;
+                        flags |= ATH9K_HTC_TX_CTSONLY;
 
+                tx_hdr.flags = cpu_to_be32(flags);
                 tx_hdr.key_type = ath9k_cmn_get_hw_crypto_keytype(skb);
                 if (tx_hdr.key_type == ATH9K_KEY_TYPE_CLEAR)
                         tx_hdr.keyix = (u8) ATH9K_TXKEYIX_INVALID;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index fde978665e07..9f01e50d5cda 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -369,6 +369,9 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
         else
                 ah->config.ht_enable = 0;
 
+        /* PAPRD needs some more work to be enabled */
+        ah->config.paprd_disable = 1;
+
         ah->config.rx_intr_mitigation = true;
         ah->config.pcieSerDesWrite = true;
 
@@ -436,9 +439,10 @@ static int ath9k_hw_init_macaddr(struct ath_hw *ah)
 
 static int ath9k_hw_post_init(struct ath_hw *ah)
 {
+        struct ath_common *common = ath9k_hw_common(ah);
         int ecode;
 
-        if (!AR_SREV_9271(ah)) {
+        if (common->bus_ops->ath_bus_type != ATH_USB) {
                 if (!ath9k_hw_chip_test(ah))
                         return -ENODEV;
         }
@@ -1213,7 +1217,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ah->txchainmask = common->tx_chainmask;
         ah->rxchainmask = common->rx_chainmask;
 
-        if (!ah->chip_fullsleep) {
+        if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
                 ath9k_hw_abortpcurecv(ah);
                 if (!ath9k_hw_stopdmarecv(ah)) {
                         ath_dbg(common, ATH_DBG_XMIT,
@@ -1932,7 +1936,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->rx_status_len = sizeof(struct ar9003_rxs);
                 pCap->tx_desc_len = sizeof(struct ar9003_txc);
                 pCap->txs_len = sizeof(struct ar9003_txs);
-                if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
+                if (!ah->config.paprd_disable &&
+                    ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
                         pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
         } else {
                 pCap->tx_desc_len = sizeof(struct ath_desc);
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 5a3dfec45e96..ea9fde670646 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -225,6 +225,7 @@ struct ath9k_ops_config {
         u32 pcie_waen;
         u8 analog_shiftreg;
         u8 ht_enable;
+        u8 paprd_disable;
         u32 ofdm_trig_low;
         u32 ofdm_trig_high;
         u32 cck_trig_high;
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 767d8b86f1e1..087a6a95edd5 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -598,8 +598,6 @@ err_btcoex:
 err_queues:
         ath9k_hw_deinit(ah);
 err_hw:
-        tasklet_kill(&sc->intr_tq);
-        tasklet_kill(&sc->bcon_tasklet);
 
         kfree(ah);
         sc->sc_ah = NULL;
@@ -807,9 +805,6 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 
         ath9k_hw_deinit(sc->sc_ah);
 
-        tasklet_kill(&sc->intr_tq);
-        tasklet_kill(&sc->bcon_tasklet);
-
         kfree(sc->sc_ah);
         sc->sc_ah = NULL;
 }
@@ -824,6 +819,8 @@ void ath9k_deinit_device(struct ath_softc *sc)
         wiphy_rfkill_stop_polling(sc->hw->wiphy);
         ath_deinit_leds(sc);
 
+        ath9k_ps_restore(sc);
+
         for (i = 0; i < sc->num_sec_wiphy; i++) {
                 struct ath_wiphy *aphy = sc->sec_wiphy[i];
                 if (aphy == NULL)
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index f90a6ca94a76..da5c64597c1f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -325,6 +325,8 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
 {
         struct ieee80211_hw *hw = sc->hw;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
         struct ath_tx_control txctl;
         int time_left;
 
@@ -340,14 +342,16 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
         tx_info->control.rates[1].idx = -1;
 
         init_completion(&sc->paprd_complete);
-        sc->paprd_pending = true;
         txctl.paprd = BIT(chain);
-        if (ath_tx_start(hw, skb, &txctl) != 0)
+
+        if (ath_tx_start(hw, skb, &txctl) != 0) {
+                ath_dbg(common, ATH_DBG_XMIT, "PAPRD TX failed\n");
+                dev_kfree_skb_any(skb);
                 return false;
+        }
 
         time_left = wait_for_completion_timeout(&sc->paprd_complete,
                         msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
-        sc->paprd_pending = false;
 
         if (!time_left)
                 ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_CALIBRATE,
@@ -592,14 +596,12 @@ void ath9k_tasklet(unsigned long data)
         u32 status = sc->intrstatus;
         u32 rxmask;
 
-        ath9k_ps_wakeup(sc);
-
         if (status & ATH9K_INT_FATAL) {
                 ath_reset(sc, true);
-                ath9k_ps_restore(sc);
                 return;
         }
 
+        ath9k_ps_wakeup(sc);
         spin_lock(&sc->sc_pcu_lock);
 
         if (!ath9k_hw_check_alive(ah))
@@ -955,8 +957,6 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
 
         spin_unlock_bh(&sc->sc_pcu_lock);
         ath9k_ps_restore(sc);
-
-        ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);
 }
 
 int ath_reset(struct ath_softc *sc, bool retry_tx)
@@ -969,6 +969,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
         /* Stop ANI */
         del_timer_sync(&common->ani.timer);
 
+        ath9k_ps_wakeup(sc);
         spin_lock_bh(&sc->sc_pcu_lock);
 
         ieee80211_stop_queues(hw);
@@ -1015,6 +1016,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
 
         /* Start ANI */
         ath_start_ani(common);
+        ath9k_ps_restore(sc);
 
         return r;
 }
@@ -1309,6 +1311,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         spin_lock_bh(&sc->sc_pcu_lock);
 
+        /* prevent tasklets to enable interrupts once we disable them */
+        ah->imask &= ~ATH9K_INT_GLOBAL;
+
         /* make sure h/w will not generate any interrupt
          * before setting the invalid flag. */
         ath9k_hw_disable_interrupts(ah);
@@ -1326,6 +1331,12 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         spin_unlock_bh(&sc->sc_pcu_lock);
 
+        /* we can now sync irq and kill any running tasklets, since we already
+         * disabled interrupts and not holding a spin lock */
+        synchronize_irq(sc->irq);
+        tasklet_kill(&sc->intr_tq);
+        tasklet_kill(&sc->bcon_tasklet);
+
         ath9k_ps_restore(sc);
 
         sc->ps_idle = true;
@@ -1701,7 +1712,9 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 skip_chan_change:
         if (changed & IEEE80211_CONF_CHANGE_POWER) {
                 sc->config.txpowlimit = 2 * conf->power_level;
+                ath9k_ps_wakeup(sc);
                 ath_update_txpow(sc);
+                ath9k_ps_restore(sc);
         }
 
         spin_lock_bh(&sc->wiphy_lock);
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 332d1feb5c18..07b7804aec5b 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1725,6 +1725,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
                         ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc,
                                                    bf->bf_state.bfs_paprd);
 
+                if (txctl->paprd)
+                        bf->bf_state.bfs_paprd_timestamp = jiffies;
+
                 ath_tx_send_normal(sc, txctl->txq, tid, &bf_head);
         }
 
@@ -1886,7 +1889,9 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
         bf->bf_buf_addr = 0;
 
         if (bf->bf_state.bfs_paprd) {
-                if (!sc->paprd_pending)
+                if (time_after(jiffies,
+                                bf->bf_state.bfs_paprd_timestamp +
+                                msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))
                         dev_kfree_skb_any(skb);
                 else
                         complete(&sc->paprd_complete);
@@ -2113,9 +2118,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work)
         if (needreset) {
                 ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
                         "tx hung, resetting the chip\n");
-                ath9k_ps_wakeup(sc);
                 ath_reset(sc, true);
-                ath9k_ps_restore(sc);
         }
 
         ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 939a0e96ed1f..84866a4b8350 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -564,7 +564,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
         cam = ieee80211_check_tim(tim_ie, tim_len, ar->common.curaid);
 
         /* 2. Maybe the AP wants to send multicast/broadcast data? */
-        cam = !!(tim_ie->bitmap_ctrl & 0x01);
+        cam |= !!(tim_ie->bitmap_ctrl & 0x01);
 
         if (!cam) {
                 /* back to low-power land. */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index bd8a4134edeb..2176edede39b 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -518,22 +518,21 @@ static int prism2_config(struct pcmcia_device *link)
         hw_priv->link = link;
 
         /*
-         * Make sure the IRQ handler cannot proceed until at least
-         * dev->base_addr is initialized.
+         * We enable IRQ here, but IRQ handler will not proceed
+         * until dev->base_addr is set below. This protect us from
+         * receive interrupts when driver is not initialized.
          */
-        spin_lock_irqsave(&local->irq_init_lock, flags);
-
         ret = pcmcia_request_irq(link, prism2_interrupt);
         if (ret)
-                goto failed_unlock;
+                goto failed;
 
         ret = pcmcia_enable_device(link);
         if (ret)
-                goto failed_unlock;
+                goto failed;
 
+        spin_lock_irqsave(&local->irq_init_lock, flags);
         dev->irq = link->irq;
         dev->base_addr = link->resource[0]->start;
-
         spin_unlock_irqrestore(&local->irq_init_lock, flags);
 
         local->shutdown = 0;
@@ -546,8 +545,6 @@ static int prism2_config(struct pcmcia_device *link)
 
         return ret;
 
- failed_unlock:
-        spin_unlock_irqrestore(&local->irq_init_lock, flags);
  failed:
         kfree(hw_priv);
         prism2_release((u_long)link);
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 8d6ed5f6f46f..ae438ed80c2f 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -1973,6 +1973,13 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
 
         inta = ipw_read32(priv, IPW_INTA_RW);
         inta_mask = ipw_read32(priv, IPW_INTA_MASK_R);
+
+        if (inta == 0xFFFFFFFF) {
+                /* Hardware disappeared */
+                IPW_WARNING("TASKLET INTA == 0xFFFFFFFF\n");
+                /* Only handle the cached INTA values */
+                inta = 0;
+        }
         inta &= (IPW_INTA_MASK_ALL & inta_mask);
 
         /* Add any cached INTA values that need to be handled */
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 3f1e5f1bf847..91a9f5253469 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2624,6 +2624,7 @@ struct iwl_cfg iwl4965_agn_cfg = {
         .fw_name_pre = IWL4965_FW_PRE,
         .ucode_api_max = IWL4965_UCODE_API_MAX,
         .ucode_api_min = IWL4965_UCODE_API_MIN,
+        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_ABC,
         .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index af505bcd7ae0..ef36aff1bb43 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -681,6 +681,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,                          \
         .ucode_api_max = IWL6050_UCODE_API_MAX,                 \
         .ucode_api_min = IWL6050_UCODE_API_MIN,                 \
+        .valid_tx_ant = ANT_AB,         /* .cfg overwrite */    \
+        .valid_rx_ant = ANT_AB,         /* .cfg overwrite */    \
         .ops = &iwl6050_ops,                                    \
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
index 97906dd442e6..27b5a3eec9dc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
@@ -152,11 +152,14 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
 
         eeprom_sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
 
-        priv->cfg->sku = ((eeprom_sku & EEPROM_SKU_CAP_BAND_SELECTION) >>
+        if (!priv->cfg->sku) {
+                /* not using sku overwrite */
+                priv->cfg->sku =
+                        ((eeprom_sku & EEPROM_SKU_CAP_BAND_SELECTION) >>
                         EEPROM_SKU_CAP_BAND_POS);
-        if (eeprom_sku & EEPROM_SKU_CAP_11N_ENABLE)
-                priv->cfg->sku |= IWL_SKU_N;
-
+                if (eeprom_sku & EEPROM_SKU_CAP_11N_ENABLE)
+                        priv->cfg->sku |= IWL_SKU_N;
+        }
         if (!priv->cfg->sku) {
                 IWL_ERR(priv, "Invalid device sku\n");
                 return -EINVAL;
@@ -168,7 +171,7 @@ int iwl_eeprom_check_sku(struct iwl_priv *priv)
                 /* not using .cfg overwrite */
                 radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
                 priv->cfg->valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
-                priv->cfg->valid_rx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
+                priv->cfg->valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
                 if (!priv->cfg->valid_tx_ant || !priv->cfg->valid_rx_ant) {
                         IWL_ERR(priv, "Invalid chain (0X%x, 0X%x)\n",
                                 priv->cfg->valid_tx_ant,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 36335b1b54d4..c1cfd9952e52 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1157,6 +1157,9 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
         /* only Re-enable if disabled by irq */
         if (test_bit(STATUS_INT_ENABLED, &priv->status))
                 iwl_enable_interrupts(priv);
+        /* Re-enable RF_KILL if it occurred */
+        else if (handled & CSR_INT_BIT_RF_KILL)
+                iwl_enable_rfkill_int(priv);
 
 #ifdef CONFIG_IWLWIFI_DEBUG
         if (iwl_get_debug_level(priv) & (IWL_DL_ISR)) {
@@ -1371,6 +1374,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
         /* only Re-enable if disabled by irq */
         if (test_bit(STATUS_INT_ENABLED, &priv->status))
                 iwl_enable_interrupts(priv);
+        /* Re-enable RF_KILL if it occurred */
+        else if (handled & CSR_INT_BIT_RF_KILL)
+                iwl_enable_rfkill_int(priv);
 }
 
 /* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index 13a69ebf2a94..5091d77e02ce 100644
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -126,6 +126,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
         ndev = alloc_netdev_mq(0, "wlan%d", ether_setup, IWM_TX_QUEUES);
         if (!ndev) {
                 dev_err(dev, "no memory for network device instance\n");
+                ret = -ENOMEM;
                 goto out_priv;
         }
 
@@ -138,6 +139,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
                                     GFP_KERNEL);
         if (!iwm->umac_profile) {
                 dev_err(dev, "Couldn't alloc memory for profile\n");
+                ret = -ENOMEM;
                 goto out_profile;
         }
 
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 76b2318a7dc7..f618b9623e5a 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -618,7 +618,7 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb,
         else
                 *burst_possible = false;
 
-        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
+        if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
                 *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
 
         if (info->flags & IEEE80211_TX_CTL_PSPOLL_RESPONSE)
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index f0e1eb72befc..be0ff78c1b16 100644
--- a/drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c
@@ -58,6 +58,7 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
 
         if (!fw || !fw->size || !fw->data) {
                 ERROR(rt2x00dev, "Failed to read Firmware.\n");
+                release_firmware(fw);
                 return -ENOENT;
         }
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 73631c6fbb30..ace0b668c04e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -363,12 +363,12 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
         struct rt2x00_dev *rt2x00dev = hw->priv;
 
         if (pci_set_power_state(pci_dev, PCI_D0) ||
-            pci_enable_device(pci_dev) ||
-            pci_restore_state(pci_dev)) {
+            pci_enable_device(pci_dev)) {
                 ERROR(rt2x00dev, "Failed to resume device.\n");
                 return -EIO;
         }
 
+        pci_restore_state(pci_dev);
         return rt2x00lib_resume(rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_resume);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 0b4e8590cbb7..029be3c6c030 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2446,6 +2446,7 @@ static struct usb_device_id rt73usb_device_table[] = {
         { USB_DEVICE(0x04bb, 0x093d), USB_DEVICE_DATA(&rt73usb_ops) },
         { USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt73usb_ops) },
         { USB_DEVICE(0x148f, 0x2671), USB_DEVICE_DATA(&rt73usb_ops) },
+        { USB_DEVICE(0x0812, 0x3101), USB_DEVICE_DATA(&rt73usb_ops) },
         /* Qcom */
         { USB_DEVICE(0x18e8, 0x6196), USB_DEVICE_DATA(&rt73usb_ops) },
         { USB_DEVICE(0x18e8, 0x6229), USB_DEVICE_DATA(&rt73usb_ops) },
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index b8433f3a9bc2..62876cd5c41a 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -726,9 +726,9 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
 }
 
 static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
-                                u8 efuse_data, u8 offset, int *bcontinual,
-                                u8 *write_state, struct pgpkt_struct target_pkt,
-                                int *repeat_times, int *bresult, u8 word_en)
+                        u8 efuse_data, u8 offset, int *bcontinual,
+                        u8 *write_state, struct pgpkt_struct *target_pkt,
+                        int *repeat_times, int *bresult, u8 word_en)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct pgpkt_struct tmp_pkt;
@@ -744,8 +744,8 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
         tmp_pkt.word_en = tmp_header & 0x0F;
         tmp_word_cnts = efuse_calculate_word_cnts(tmp_pkt.word_en);
 
-        if (tmp_pkt.offset != target_pkt.offset) {
-                efuse_addr = efuse_addr + (tmp_word_cnts * 2) + 1;
+        if (tmp_pkt.offset != target_pkt->offset) {
+                *efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;
                 *write_state = PG_STATE_HEADER;
         } else {
                 for (tmpindex = 0; tmpindex < (tmp_word_cnts * 2); tmpindex++) {
@@ -756,23 +756,23 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                 }
 
                 if (bdataempty == false) {
-                        efuse_addr = efuse_addr + (tmp_word_cnts * 2) + 1;
+                        *efuse_addr = *efuse_addr + (tmp_word_cnts * 2) + 1;
                         *write_state = PG_STATE_HEADER;
                 } else {
                         match_word_en = 0x0F;
-                        if (!((target_pkt.word_en & BIT(0)) |
+                        if (!((target_pkt->word_en & BIT(0)) |
                              (tmp_pkt.word_en & BIT(0))))
                                 match_word_en &= (~BIT(0));
 
-                        if (!((target_pkt.word_en & BIT(1)) |
+                        if (!((target_pkt->word_en & BIT(1)) |
                              (tmp_pkt.word_en & BIT(1))))
                                 match_word_en &= (~BIT(1));
 
-                        if (!((target_pkt.word_en & BIT(2)) |
+                        if (!((target_pkt->word_en & BIT(2)) |
                              (tmp_pkt.word_en & BIT(2))))
                                 match_word_en &= (~BIT(2));
 
-                        if (!((target_pkt.word_en & BIT(3)) |
+                        if (!((target_pkt->word_en & BIT(3)) |
                              (tmp_pkt.word_en & BIT(3))))
                                 match_word_en &= (~BIT(3));
 
@@ -780,7 +780,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                                 badworden = efuse_word_enable_data_write(
                                                             hw, *efuse_addr + 1,
                                                             tmp_pkt.word_en,
-                                                            target_pkt.data);
+                                                            target_pkt->data);
 
                                 if (0x0F != (badworden & 0x0F)) {
                                         u8 reorg_offset = offset;
@@ -791,26 +791,26 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                                 }
 
                                 tmp_word_en = 0x0F;
-                                if ((target_pkt.word_en & BIT(0)) ^
+                                if ((target_pkt->word_en & BIT(0)) ^
                                     (match_word_en & BIT(0)))
                                         tmp_word_en &= (~BIT(0));
 
-                                if ((target_pkt.word_en & BIT(1)) ^
+                                if ((target_pkt->word_en & BIT(1)) ^
                                     (match_word_en & BIT(1)))
                                         tmp_word_en &= (~BIT(1));
 
-                                if ((target_pkt.word_en & BIT(2)) ^
+                                if ((target_pkt->word_en & BIT(2)) ^
                                         (match_word_en & BIT(2)))
                                         tmp_word_en &= (~BIT(2));
 
-                                if ((target_pkt.word_en & BIT(3)) ^
+                                if ((target_pkt->word_en & BIT(3)) ^
                                     (match_word_en & BIT(3)))
                                         tmp_word_en &= (~BIT(3));
 
                                 if ((tmp_word_en & 0x0F) != 0x0F) {
                                         *efuse_addr = efuse_get_current_size(hw);
-                                        target_pkt.offset = offset;
-                                        target_pkt.word_en = tmp_word_en;
+                                        target_pkt->offset = offset;
+                                        target_pkt->word_en = tmp_word_en;
                                 } else
                                         *bcontinual = false;
                                 *write_state = PG_STATE_HEADER;
@@ -821,8 +821,8 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                                 }
                         } else {
                                 *efuse_addr += (2 * tmp_word_cnts) + 1;
-                                target_pkt.offset = offset;
-                                target_pkt.word_en = word_en;
+                                target_pkt->offset = offset;
+                                target_pkt->word_en = word_en;
                                 *write_state = PG_STATE_HEADER;
                         }
                 }
@@ -938,7 +938,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                                 efuse_write_data_case1(hw, &efuse_addr,
                                                        efuse_data, offset,
                                                        &bcontinual,
-                                                       &write_state, target_pkt,
+                                                       &write_state, &target_pkt,
                                                        &repeat_times, &bresult,
                                                        word_en);
                         else
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 0fa36aa6701a..1758d4463247 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -619,6 +619,13 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                                         struct sk_buff *uskb = NULL;
                                         u8 *pdata;
                                         uskb = dev_alloc_skb(skb->len + 128);
+                                        if (!uskb) {
+                                                RT_TRACE(rtlpriv,
+                                                        (COMP_INTR | COMP_RECV),
+                                                        DBG_EMERG,
+                                                        ("can't alloc rx skb\n"));
+                                                goto done;
+                                        }
                                         memcpy(IEEE80211_SKB_RXCB(uskb),
                                                         &rx_status,
                                                         sizeof(rx_status));
@@ -641,7 +648,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                         new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
                         if (unlikely(!new_skb)) {
                                 RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
-                                         DBG_DMESG,
+                                         DBG_EMERG,
                                          ("can't alloc skb for rx\n"));
                                 goto done;
                         }
@@ -1066,9 +1073,9 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                         struct sk_buff *skb =
                             dev_alloc_skb(rtlpci->rxbuffersize);
                         u32 bufferaddress;
-                        entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];
                         if (!skb)
                                 return 0;
+                        entry = &rtlpci->rx_ring[rx_queue_idx].desc[i];
 
                         /*skb->dev = dev; */
 
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index 012e1a4016fe..40372bac9482 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -1039,6 +1039,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changed & BSS_CHANGED_BEACON) {
                 beacon = ieee80211_beacon_get(hw, vif);
+                if (!beacon)
+                        goto out_sleep;
+
                 ret = wl1251_cmd_template_set(wl, CMD_BEACON, beacon->data,
                                               beacon->len);
 
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
index 46714910f98c..7145ea543783 100644
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -110,9 +110,8 @@ static void wl1271_spi_reset(struct wl1271 *wl)
         spi_message_add_tail(&t, &m);
 
         spi_sync(wl_to_spi(wl), &m);
-        kfree(cmd);
-
         wl1271_dump(DEBUG_SPI, "spi reset -> ", cmd, WSPI_INIT_CMD_LEN);
+        kfree(cmd);
 }
 
 static void wl1271_spi_init(struct wl1271 *wl)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 546de5749824..da1f12120346 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -120,6 +120,9 @@ struct netfront_info {
         unsigned long rx_pfn_array[NET_RX_RING_SIZE];
         struct multicall_entry rx_mcl[NET_RX_RING_SIZE+1];
         struct mmu_update rx_mmu[NET_RX_RING_SIZE];
+
+        /* Statistics */
+        int rx_gso_checksum_fixup;
 };
 
 struct netfront_rx_info {
@@ -770,11 +773,29 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np,
         return cons;
 }
 
-static int skb_checksum_setup(struct sk_buff *skb)
+static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
 {
         struct iphdr *iph;
         unsigned char *th;
         int err = -EPROTO;
+        int recalculate_partial_csum = 0;
+
+        /*
+         * A GSO SKB must be CHECKSUM_PARTIAL. However some buggy
+         * peers can fail to set NETRXF_csum_blank when sending a GSO
+         * frame. In this case force the SKB to CHECKSUM_PARTIAL and
+         * recalculate the partial checksum.
+         */
+        if (skb->ip_summed != CHECKSUM_PARTIAL && skb_is_gso(skb)) {
+                struct netfront_info *np = netdev_priv(dev);
+                np->rx_gso_checksum_fixup++;
+                skb->ip_summed = CHECKSUM_PARTIAL;
+                recalculate_partial_csum = 1;
+        }
+
+        /* A non-CHECKSUM_PARTIAL SKB does not require setup. */
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                return 0;
 
         if (skb->protocol != htons(ETH_P_IP))
                 goto out;
@@ -788,9 +809,23 @@ static int skb_checksum_setup(struct sk_buff *skb)
         switch (iph->protocol) {
         case IPPROTO_TCP:
                 skb->csum_offset = offsetof(struct tcphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct tcphdr *tcph = (struct tcphdr *)th;
+                        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_TCP, 0);
+                }
                 break;
         case IPPROTO_UDP:
                 skb->csum_offset = offsetof(struct udphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct udphdr *udph = (struct udphdr *)th;
+                        udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_UDP, 0);
+                }
                 break;
         default:
                 if (net_ratelimit())
@@ -829,13 +864,11 @@ static int handle_incoming_queue(struct net_device *dev,
                 /* Ethernet work: Delayed to here as it peeks the header. */
                 skb->protocol = eth_type_trans(skb, dev);
 
-                if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        if (skb_checksum_setup(skb)) {
-                                kfree_skb(skb);
-                                packets_dropped++;
-                                dev->stats.rx_errors++;
-                                continue;
-                        }
+                if (checksum_setup(dev, skb)) {
+                        kfree_skb(skb);
+                        packets_dropped++;
+                        dev->stats.rx_errors++;
+                        continue;
                 }
 
                 dev->stats.rx_packets++;
@@ -1632,12 +1665,59 @@ static void netback_changed(struct xenbus_device *dev,
         }
 }
 
+static const struct xennet_stat {
+        char name[ETH_GSTRING_LEN];
+        u16 offset;
+} xennet_stats[] = {
+        {
+                "rx_gso_checksum_fixup",
+                offsetof(struct netfront_info, rx_gso_checksum_fixup)
+        },
+};
+
+static int xennet_get_sset_count(struct net_device *dev, int string_set)
+{
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(xennet_stats);
+        default:
+                return -EINVAL;
+        }
+}
+
+static void xennet_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 * data)
+{
+        void *np = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                data[i] = *(int *)(np + xennet_stats[i].offset);
+}
+
+static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)
+{
+        int i;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                        memcpy(data + i * ETH_GSTRING_LEN,
+                               xennet_stats[i].name, ETH_GSTRING_LEN);
+                break;
+        }
+}
+
 static const struct ethtool_ops xennet_ethtool_ops =
 {
         .set_tx_csum = ethtool_op_set_tx_csum,
         .set_sg = xennet_set_sg,
         .set_tso = xennet_set_tso,
         .get_link = ethtool_op_get_link,
+
+        .get_sset_count = xennet_get_sset_count,
+        .get_ethtool_stats = xennet_get_ethtool_stats,
+        .get_strings = xennet_get_strings,
 };
 
 #ifdef CONFIG_SYSFS
diff --git a/drivers/nfc/pn544.c b/drivers/nfc/pn544.c
index 401c44b6eadb..bae647264dd6 100644
--- a/drivers/nfc/pn544.c
+++ b/drivers/nfc/pn544.c
@@ -69,7 +69,7 @@ struct pn544_info {
         struct mutex read_mutex; /* Serialize read_irq access */
         struct mutex mutex; /* Serialize info struct access */
         u8 *buf;
-        unsigned int buflen;
+        size_t buflen;
 };
 
 static const char reg_vdd_io[]  = "Vdd_IO";
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c787c3d95c60..af824e7e0367 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -692,12 +692,6 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
         return 1;
 }
 
-static void *__init early_device_tree_alloc(u64 size, u64 align)
-{
-        unsigned long mem = early_init_dt_alloc_memory_arch(size, align);
-        return __va(mem);
-}
-
 /**
  * unflatten_device_tree - create tree of device_nodes from flat blob
  *
@@ -709,7 +703,7 @@ static void *__init early_device_tree_alloc(u64 size, u64 align)
 void __init unflatten_device_tree(void)
 {
         __unflatten_device_tree(initial_boot_params, &allnodes,
-                                early_device_tree_alloc);
+                                early_init_dt_alloc_memory_arch);
 
         /* Get pointer to OF "/chosen" node for use everywhere */
         of_chosen = of_find_node_by_path("/chosen");
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index a2d9d1e59260..a848e02e6be3 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -678,7 +678,7 @@ void parport_unregister_device(struct pardevice *dev)
 
         /* Make sure we haven't left any pointers around in the wait
          * list. */
-        spin_lock (&port->waitlist_lock);
+        spin_lock_irq(&port->waitlist_lock);
         if (dev->waitprev || dev->waitnext || port->waithead == dev) {
                 if (dev->waitprev)
                         dev->waitprev->waitnext = dev->waitnext;
@@ -689,7 +689,7 @@ void parport_unregister_device(struct pardevice *dev)
                 else
                         port->waittail = dev->waitprev;
         }
-        spin_unlock (&port->waitlist_lock);
+        spin_unlock_irq(&port->waitlist_lock);
 
         kfree(dev->state);
         kfree(dev);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 7c24dcef2989..44b0aeee83e5 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -168,8 +168,9 @@ static u32 __msix_mask_irq(struct msi_desc *desc, u32 flag)
         u32 mask_bits = desc->masked;
         unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
                                                 PCI_MSIX_ENTRY_VECTOR_CTRL;
-        mask_bits &= ~1;
-        mask_bits |= flag;
+        mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;
+        if (flag)
+                mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT;
         writel(mask_bits, desc->mask_base + offset);
 
         return mask_bits;
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index feff3bee6fe5..65c42f80f23e 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -6,12 +6,6 @@
 #ifndef MSI_H
 #define MSI_H
 
-#define PCI_MSIX_ENTRY_SIZE             16
-#define  PCI_MSIX_ENTRY_LOWER_ADDR      0
-#define  PCI_MSIX_ENTRY_UPPER_ADDR      4
-#define  PCI_MSIX_ENTRY_DATA            8
-#define  PCI_MSIX_ENTRY_VECTOR_CTRL     12
-
 #define msi_control_reg(base)           (base + PCI_MSI_FLAGS)
 #define msi_lower_address_reg(base)     (base + PCI_MSI_ADDRESS_LO)
 #define msi_upper_address_reg(base)     (base + PCI_MSI_ADDRESS_HI)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 24e19c594e57..6fe0772e0e7d 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -46,9 +46,9 @@ static void pci_acpi_wake_dev(acpi_handle handle, u32 event, void *context)
         struct pci_dev *pci_dev = context;
 
         if (event == ACPI_NOTIFY_DEVICE_WAKE && pci_dev) {
+                pci_wakeup_event(pci_dev);
                 pci_check_pme_status(pci_dev);
                 pm_runtime_resume(&pci_dev->dev);
-                pci_wakeup_event(pci_dev);
                 if (pci_dev->subordinate)
                         pci_pme_wakeup_bus(pci_dev->subordinate);
         }
@@ -399,6 +399,7 @@ static int __init acpi_pci_init(void)
 
         if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {
                 printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");
+                pcie_clear_aspm();
                 pcie_no_aspm();
         }
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 8a6f797de8e5..88246dd46452 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -338,7 +338,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
 }
 
 /**
- * __pci_device_probe()
+ * __pci_device_probe - check if a driver wants to claim a specific PCI device
  * @drv: driver to call to check if it wants the PCI device
  * @pci_dev: PCI device being probed
  * 
@@ -449,7 +449,8 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev)
                         return error;
         }
 
-        return pci_restore_state(pci_dev);
+        pci_restore_state(pci_dev);
+        return 0;
 }
 
 static void pci_pm_default_resume_early(struct pci_dev *pci_dev)
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
index f7b68ca6cc98..775e933c2225 100644
--- a/drivers/pci/pci-stub.c
+++ b/drivers/pci/pci-stub.c
@@ -47,6 +47,10 @@ static int __init pci_stub_init(void)
         if (rc)
                 return rc;
 
+        /* no ids passed actually */
+        if (ids[0] == '\0')
+                return 0;
+
         /* add ids specified in the module parameter */
         p = ids;
         while ((id = strsep(&p, ","))) {
@@ -54,6 +58,9 @@ static int __init pci_stub_init(void)
                         subdevice = PCI_ANY_ID, class=0, class_mask=0;
                 int fields;
 
+                if (!strlen(id))
+                        continue;
+
                 fields = sscanf(id, "%x:%x:%x:%x:%x:%x",
                                 &vendor, &device, &subvendor, &subdevice,
                                 &class, &class_mask);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 63d5042f2079..8ecaac983923 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1149,7 +1149,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                 sysfs_bin_attr_init(attr);
                 attr->size = rom_size;
                 attr->attr.name = "rom";
-                attr->attr.mode = S_IRUSR;
+                attr->attr.mode = S_IRUSR | S_IWUSR;
                 attr->read = pci_read_rom;
                 attr->write = pci_write_rom;
                 retval = sysfs_create_bin_file(&pdev->dev.kobj, attr);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 710c8a29be0d..b714d787bddd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -937,14 +937,13 @@ pci_save_state(struct pci_dev *dev)
  * pci_restore_state - Restore the saved state of a PCI device
  * @dev: - PCI device that we're dealing with
  */
-int 
-pci_restore_state(struct pci_dev *dev)
+void pci_restore_state(struct pci_dev *dev)
 {
         int i;
         u32 val;
 
         if (!dev->state_saved)
-                return 0;
+                return;
 
         /* PCI Express register must be restored first */
         pci_restore_pcie_state(dev);
@@ -968,8 +967,6 @@ pci_restore_state(struct pci_dev *dev)
         pci_restore_iov_state(dev);
 
         dev->state_saved = false;
-
-        return 0;
 }
 
 static int do_pci_enable_device(struct pci_dev *dev, int bars)
@@ -1300,22 +1297,6 @@ bool pci_check_pme_status(struct pci_dev *dev)
         return ret;
 }
 
-/*
- * Time to wait before the system can be put into a sleep state after reporting
- * a wakeup event signaled by a PCI device.
- */
-#define PCI_WAKEUP_COOLDOWN     100
-
-/**
- * pci_wakeup_event - Report a wakeup event related to a given PCI device.
- * @dev: Device to report the wakeup event for.
- */
-void pci_wakeup_event(struct pci_dev *dev)
-{
-        if (device_may_wakeup(&dev->dev))
-                pm_wakeup_event(&dev->dev, PCI_WAKEUP_COOLDOWN);
-}
-
 /**
  * pci_pme_wakeup - Wake up a PCI device if its PME Status bit is set.
  * @dev: Device to handle.
@@ -1327,8 +1308,8 @@ void pci_wakeup_event(struct pci_dev *dev)
 static int pci_pme_wakeup(struct pci_dev *dev, void *ign)
 {
         if (pci_check_pme_status(dev)) {
-                pm_request_resume(&dev->dev);
                 pci_wakeup_event(dev);
+                pm_request_resume(&dev->dev);
         }
         return 0;
 }
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 7d33f6673868..f69d6e0fda75 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -74,6 +74,12 @@ extern void pci_pm_init(struct pci_dev *dev);
 extern void platform_pci_wakeup_init(struct pci_dev *dev);
 extern void pci_allocate_cap_save_buffers(struct pci_dev *dev);
 
+static inline void pci_wakeup_event(struct pci_dev *dev)
+{
+        /* Wait 100 ms before the system can be put into a sleep state. */
+        pm_wakeup_event(&dev->dev, 100);
+}
+
 static inline bool pci_is_bridge(struct pci_dev *pci_dev)
 {
         return !!(pci_dev->subordinate);
@@ -140,14 +146,6 @@ static inline void pci_no_msi(void) { }
 static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
 #endif
 
-#ifdef CONFIG_PCIEAER
-void pci_no_aer(void);
-bool pci_aer_available(void);
-#else
-static inline void pci_no_aer(void) { }
-static inline bool pci_aer_available(void) { return false; }
-#endif
-
 static inline int pci_no_d1d2(struct pci_dev *dev)
 {
         unsigned int parent_dstates = 0;
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index dda70981b7a6..dc29348264c6 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -31,7 +31,7 @@ source "drivers/pci/pcie/aer/Kconfig"
 # PCI Express ASPM
 #
 config PCIEASPM
-        bool "PCI Express ASPM control" if EMBEDDED
+        bool "PCI Express ASPM control" if EXPERT
         depends on PCI && PCIEPORTBUS
         default y
         help
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 2b2b6508efde..58ad7917553c 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index 9656e3060412..80c11d131499 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -132,7 +132,6 @@ static inline int aer_osc_setup(struct pcie_device *pciedev)
 
 #ifdef CONFIG_ACPI_APEI
 extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
-extern bool aer_acpi_firmware_first(void);
 #else
 static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
 {
@@ -140,8 +139,6 @@ static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
                 return pci_dev->__aer_firmware_first;
         return 0;
 }
-
-static inline bool aer_acpi_firmware_first(void) { return false; }
 #endif
 
 static inline void pcie_aer_force_firmware_first(struct pci_dev *pci_dev,
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 71222814c1ec..3188cd96b338 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -68,7 +68,7 @@ struct pcie_link_state {
         struct aspm_latency acceptable[8];
 };
 
-static int aspm_disabled, aspm_force;
+static int aspm_disabled, aspm_force, aspm_clear_state;
 static DEFINE_MUTEX(aspm_lock);
 static LIST_HEAD(link_list);
 
@@ -139,7 +139,7 @@ static void pcie_set_clkpm(struct pcie_link_state *link, int enable)
 {
         /* Don't enable Clock PM if the link is not Clock PM capable */
         if (!link->clkpm_capable && enable)
-                return;
+                enable = 0;
         /* Need nothing if the specified equals to current state */
         if (link->clkpm_enabled == enable)
                 return;
@@ -498,6 +498,10 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
         struct pci_dev *child;
         int pos;
         u32 reg32;
+
+        if (aspm_clear_state)
+                return -EINVAL;
+
         /*
          * Some functions in a slot might not all be PCIe functions,
          * very strange. Disable ASPM for the whole slot
@@ -563,12 +567,15 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)
         struct pcie_link_state *link;
         int blacklist = !!pcie_aspm_sanity_check(pdev);
 
-        if (aspm_disabled || !pci_is_pcie(pdev) || pdev->link_state)
+        if (!pci_is_pcie(pdev) || pdev->link_state)
                 return;
         if (pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT &&
             pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM)
                 return;
 
+        if (aspm_disabled && !aspm_clear_state)
+                return;
+
         /* VIA has a strange chipset, root port is under a bridge */
         if (pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT &&
             pdev->bus->self)
@@ -641,7 +648,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
         struct pci_dev *parent = pdev->bus->self;
         struct pcie_link_state *link, *root, *parent_link;
 
-        if (aspm_disabled || !pci_is_pcie(pdev) ||
+        if ((aspm_disabled && !aspm_clear_state) || !pci_is_pcie(pdev) ||
             !parent || !parent->link_state)
                 return;
         if ((parent->pcie_type != PCI_EXP_TYPE_ROOT_PORT) &&
@@ -899,6 +906,12 @@ static int __init pcie_aspm_disable(char *str)
 
 __setup("pcie_aspm=", pcie_aspm_disable);
 
+void pcie_clear_aspm(void)
+{
+        if (!aspm_force)
+                aspm_clear_state = 1;
+}
+
 void pcie_no_aspm(void)
 {
         if (!aspm_force)
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 2f3c90407227..0057344a3fcb 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -26,9 +26,6 @@
 #include "../pci.h"
 #include "portdrv.h"
 
-#define PCI_EXP_RTSTA_PME       0x10000 /* PME status */
-#define PCI_EXP_RTSTA_PENDING   0x20000 /* PME pending */
-
 /*
  * If this switch is set, MSI will not be used for PCIe PME signaling.  This
  * causes the PCIe port driver to use INTx interrupts only, but it turns out
@@ -74,22 +71,6 @@ void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable)
 }
 
 /**
- * pcie_pme_clear_status - Clear root port PME interrupt status.
- * @dev: PCIe root port or event collector.
- */
-static void pcie_pme_clear_status(struct pci_dev *dev)
-{
-        int rtsta_pos;
-        u32 rtsta;
-
-        rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
-
-        pci_read_config_dword(dev, rtsta_pos, &rtsta);
-        rtsta |= PCI_EXP_RTSTA_PME;
-        pci_write_config_dword(dev, rtsta_pos, rtsta);
-}
-
-/**
  * pcie_pme_walk_bus - Scan a PCI bus for devices asserting PME#.
  * @bus: PCI bus to scan.
  *
@@ -103,8 +84,8 @@ static bool pcie_pme_walk_bus(struct pci_bus *bus)
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 /* Skip PCIe devices in case we started from a root port. */
                 if (!pci_is_pcie(dev) && pci_check_pme_status(dev)) {
-                        pm_request_resume(&dev->dev);
                         pci_wakeup_event(dev);
+                        pm_request_resume(&dev->dev);
                         ret = true;
                 }
 
@@ -206,8 +187,8 @@ static void pcie_pme_handle_request(struct pci_dev *port, u16 req_id)
                 /* The device is there, but we have to check its PME status. */
                 found = pci_check_pme_status(dev);
                 if (found) {
-                        pm_request_resume(&dev->dev);
                         pci_wakeup_event(dev);
+                        pm_request_resume(&dev->dev);
                 }
                 pci_dev_put(dev);
         } else if (devfn) {
@@ -253,7 +234,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
                          * Clear PME status of the port.  If there are other
                          * pending PMEs, the status will be set again.
                          */
-                        pcie_pme_clear_status(port);
+                        pcie_clear_root_pme_status(port);
 
                         spin_unlock_irq(&data->lock);
                         pcie_pme_handle_request(port, rtsta & 0xffff);
@@ -378,7 +359,7 @@ static int pcie_pme_probe(struct pcie_device *srv)
 
         port = srv->port;
         pcie_pme_interrupt_enable(port, false);
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
 
         ret = request_irq(srv->irq, pcie_pme_irq, IRQF_SHARED, "PCIe PME", srv);
         if (ret) {
@@ -402,7 +383,7 @@ static int pcie_pme_suspend(struct pcie_device *srv)
 
         spin_lock_irq(&data->lock);
         pcie_pme_interrupt_enable(port, false);
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
         data->noirq = true;
         spin_unlock_irq(&data->lock);
 
@@ -422,7 +403,7 @@ static int pcie_pme_resume(struct pcie_device *srv)
 
         spin_lock_irq(&data->lock);
         data->noirq = false;
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
         pcie_pme_interrupt_enable(port, true);
         spin_unlock_irq(&data->lock);
 
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 7b5aba0a3291..bd00a01aef14 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -20,9 +20,6 @@
 
 #define get_descriptor_id(type, service) (((type - 4) << 4) | service)
 
-extern bool pcie_ports_disabled;
-extern bool pcie_ports_auto;
-
 extern struct bus_type pcie_port_bus_type;
 extern int pcie_port_device_register(struct pci_dev *dev);
 #ifdef CONFIG_PM
@@ -35,6 +32,8 @@ extern void pcie_port_bus_unregister(void);
 
 struct pci_dev;
 
+extern void pcie_clear_root_pme_status(struct pci_dev *dev);
+
 #ifdef CONFIG_PCIE_PME
 extern bool pcie_pme_msi_disabled;
 
diff --git a/drivers/pci/pcie/portdrv_acpi.c b/drivers/pci/pcie/portdrv_acpi.c
index 5982b6a63b89..a86b56e5f2f2 100644
--- a/drivers/pci/pcie/portdrv_acpi.c
+++ b/drivers/pci/pcie/portdrv_acpi.c
@@ -33,7 +33,7 @@
  */
 int pcie_port_acpi_setup(struct pci_dev *port, int *srv_mask)
 {
-        acpi_status status;
+        struct acpi_pci_root *root;
         acpi_handle handle;
         u32 flags;
 
@@ -44,26 +44,11 @@ int pcie_port_acpi_setup(struct pci_dev *port, int *srv_mask)
         if (!handle)
                 return -EINVAL;
 
-        flags = OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL
-                | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL
-                | OSC_PCI_EXPRESS_PME_CONTROL;
-
-        if (pci_aer_available()) {
-                if (aer_acpi_firmware_first())
-                        dev_dbg(&port->dev, "PCIe errors handled by BIOS.\n");
-                else
-                        flags |= OSC_PCI_EXPRESS_AER_CONTROL;
-        }
-
-        status = acpi_pci_osc_control_set(handle, &flags,
-                                        OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-        if (ACPI_FAILURE(status)) {
-                dev_dbg(&port->dev, "ACPI _OSC request failed (code %d)\n",
-                        status);
+        root = acpi_pci_find_root(handle);
+        if (!root)
                 return -ENODEV;
-        }
 
-        dev_info(&port->dev, "ACPI _OSC control granted for 0x%02x\n", flags);
+        flags = root->osc_control_set;
 
         *srv_mask = PCIE_PORT_SERVICE_VC;
         if (flags & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index a9c222d79ebc..5130d0d22390 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -241,17 +241,17 @@ static int get_port_device_capability(struct pci_dev *dev)
         int cap_mask;
         int err;
 
+        if (pcie_ports_disabled)
+                return 0;
+
         err = pcie_port_platform_notify(dev, &cap_mask);
-        if (pcie_ports_auto) {
-                if (err) {
-                        pcie_no_aspm();
-                        return 0;
-                }
-        } else {
+        if (!pcie_ports_auto) {
                 cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP
                                 | PCIE_PORT_SERVICE_VC;
                 if (pci_aer_available())
                         cap_mask |= PCIE_PORT_SERVICE_AER;
+        } else if (err) {
+                        return 0;
         }
 
         pos = pci_pcie_cap(dev);
@@ -349,15 +349,18 @@ int pcie_port_device_register(struct pci_dev *dev)
         int status, capabilities, i, nr_service;
         int irqs[PCIE_PORT_DEVICE_MAXSERVICES];
 
-        /* Get and check PCI Express port services */
-        capabilities = get_port_device_capability(dev);
-        if (!capabilities)
-                return -ENODEV;
-
         /* Enable PCI Express port device */
         status = pci_enable_device(dev);
         if (status)
                 return status;
+
+        /* Get and check PCI Express port services */
+        capabilities = get_port_device_capability(dev);
+        if (!capabilities) {
+                pcie_no_aspm();
+                return 0;
+        }
+
         pci_set_master(dev);
         /*
          * Initialize service irqs. Don't use service devices that
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index f9033e190fb6..e0610bda1dea 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -57,6 +57,22 @@ __setup("pcie_ports=", pcie_port_setup);
 
 /* global data */
 
+/**
+ * pcie_clear_root_pme_status - Clear root port PME interrupt status.
+ * @dev: PCIe root port or event collector.
+ */
+void pcie_clear_root_pme_status(struct pci_dev *dev)
+{
+        int rtsta_pos;
+        u32 rtsta;
+
+        rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
+
+        pci_read_config_dword(dev, rtsta_pos, &rtsta);
+        rtsta |= PCI_EXP_RTSTA_PME;
+        pci_write_config_dword(dev, rtsta_pos, rtsta);
+}
+
 static int pcie_portdrv_restore_config(struct pci_dev *dev)
 {
         int retval;
@@ -69,6 +85,20 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
+static int pcie_port_resume_noirq(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        /*
+         * Some BIOSes forget to clear Root PME Status bits after system wakeup
+         * which breaks ACPI-based runtime wakeup on PCI Express, so clear those
+         * bits now just in case (shouldn't hurt).
+         */
+        if(pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT)
+                pcie_clear_root_pme_status(pdev);
+        return 0;
+}
+
 static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .suspend        = pcie_port_device_suspend,
         .resume         = pcie_port_device_resume,
@@ -76,6 +106,7 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .thaw           = pcie_port_device_resume,
         .poweroff       = pcie_port_device_suspend,
         .restore        = pcie_port_device_resume,
+        .resume_noirq   = pcie_port_resume_noirq,
 };
 
 #define PCIE_PORTDRV_PM_OPS     (&pcie_portdrv_pm_ops)
@@ -327,10 +358,8 @@ static int __init pcie_portdrv_init(void)
 {
         int retval;
 
-        if (pcie_ports_disabled) {
-                pcie_no_aspm();
-                return -EACCES;
-        }
+        if (pcie_ports_disabled)
+                return pci_register_driver(&pcie_portdriver);
 
         dmi_check_system(pcie_portdrv_dmi_table);
 
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index de886f3dfd39..6e318ce41136 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -69,7 +69,7 @@ comment "PC-card bridges"
 config YENTA
         tristate "CardBus yenta-compatible bridge support"
         depends on PCI
-        select CARDBUS if !EMBEDDED
+        select CARDBUS if !EXPERT
         select PCCARD_NONSTATIC if PCMCIA != n
         ---help---
           This option enables support for CardBus host bridges.  Virtually
@@ -84,27 +84,27 @@ config YENTA
 
 config YENTA_O2
         default y
-        bool "Special initialization for O2Micro bridges" if EMBEDDED
+        bool "Special initialization for O2Micro bridges" if EXPERT
         depends on YENTA
 
 config YENTA_RICOH
         default y
-        bool "Special initialization for Ricoh bridges" if EMBEDDED
+        bool "Special initialization for Ricoh bridges" if EXPERT
         depends on YENTA
 
 config YENTA_TI
         default y
-        bool "Special initialization for TI and EnE bridges" if EMBEDDED
+        bool "Special initialization for TI and EnE bridges" if EXPERT
         depends on YENTA
 
 config YENTA_ENE_TUNE
         default y
-        bool "Auto-tune EnE bridges for CB cards" if EMBEDDED
+        bool "Auto-tune EnE bridges for CB cards" if EXPERT
         depends on YENTA_TI && CARDBUS
 
 config YENTA_TOSHIBA
         default y
-        bool "Special initialization for Toshiba ToPIC bridges" if EMBEDDED
+        bool "Special initialization for Toshiba ToPIC bridges" if EXPERT
         depends on YENTA
 
 config PD6729
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 19e92b2a7f7e..95e3b0948e9c 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
         if (error)
                 goto err_free_input_dev;
 
-        result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
+        result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
         if (result) {
                 printk(KERN_ERR "Error reading power state\n");
                 goto err_unregister_input_dev;
@@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
         if (error)
                 goto err_free_input_dev;
 
-        result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
+        result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state);
         if (result) {
                 printk(KERN_ERR "Error reading power state\n");
                 goto err_unregister_input_dev;
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 1752ef006d26..a91d510a798b 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -26,7 +26,6 @@
 #include <linux/sfi.h>
 #include <asm/mrst.h>
 #include <asm/intel_scu_ipc.h>
-#include <asm/mrst.h>
 
 /* IPC defines the following message types */
 #define IPCMSG_WATCHDOG_TIMER 0xF8 /* Set Kernel Watchdog Threshold */
@@ -161,7 +160,7 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
 {
         int i, nc, bytes, d;
         u32 offset = 0;
-        u32 err = 0;
+        int err;
         u8 cbuf[IPC_WWBUF_SIZE] = { };
         u32 *wbuf = (u32 *)&cbuf;
 
@@ -404,7 +403,7 @@ EXPORT_SYMBOL(intel_scu_ipc_update_register);
  */
 int intel_scu_ipc_simple_command(int cmd, int sub)
 {
-        u32 err = 0;
+        int err;
 
         mutex_lock(&ipclock);
         if (ipcdev.pdev == NULL) {
@@ -434,8 +433,7 @@ EXPORT_SYMBOL(intel_scu_ipc_simple_command);
 int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
                                                         u32 *out, int outlen)
 {
-        u32 err = 0;
-        int i = 0;
+        int i, err;
 
         mutex_lock(&ipclock);
         if (ipcdev.pdev == NULL) {
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel_scu_ipcutil.c
index ba3231d0819e..b93a03259c16 100644
--- a/drivers/platform/x86/intel_scu_ipcutil.c
+++ b/drivers/platform/x86/intel_scu_ipcutil.c
@@ -128,6 +128,6 @@ static void __exit ipc_module_exit(void)
 module_init(ipc_module_init);
 module_exit(ipc_module_exit);
 
-MODULE_LICENSE("GPL V2");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Utility driver for intel scu ipc");
 MODULE_AUTHOR("Sreedhara <sreedhara.ds@intel.com>");
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile
index 8de3775ec242..bfba893cb321 100644
--- a/drivers/pnp/Makefile
+++ b/drivers/pnp/Makefile
@@ -2,11 +2,13 @@
 # Makefile for the Linux Plug-and-Play Support.
 #
 
-obj-y           := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o
+obj-y           := pnp.o
+
+pnp-y           := core.o card.o driver.o resource.o manager.o support.o interface.o quirks.o
 
 obj-$(CONFIG_PNPACPI)           += pnpacpi/
 obj-$(CONFIG_PNPBIOS)           += pnpbios/
 obj-$(CONFIG_ISAPNP)            += isapnp/
 
 # pnp_system_init goes after pnpacpi/pnpbios init
-obj-y                           += system.o
+pnp-y                           += system.o
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 0f34d962fd3c..cb6ce42f8e77 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -220,10 +220,5 @@ subsys_initcall(pnp_init);
 int pnp_debug;
 
 #if defined(CONFIG_PNP_DEBUG_MESSAGES)
-static int __init pnp_debug_setup(char *__unused)
-{
-        pnp_debug = 1;
-        return 1;
-}
-__setup("pnp.debug", pnp_debug_setup);
+module_param_named(debug, pnp_debug, int, 0644);
 #endif
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d1dbb9df53fa..00e94032531a 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -189,8 +189,11 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
-        if (pnp_dev->protocol->resume)
-                pnp_dev->protocol->resume(pnp_dev);
+        if (pnp_dev->protocol->resume) {
+                error = pnp_dev->protocol->resume(pnp_dev);
+                if (error)
+                        return error;
+        }
 
         if (pnp_can_write(pnp_dev)) {
                 error = pnp_start_dev(pnp_dev);
diff --git a/drivers/pnp/isapnp/Makefile b/drivers/pnp/isapnp/Makefile
index cac18bbfb817..6e607aa33aa3 100644
--- a/drivers/pnp/isapnp/Makefile
+++ b/drivers/pnp/isapnp/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the kernel ISAPNP driver.
 #
+obj-y                   += pnp.o
+pnp-y                   := core.o compat.o
 
-isapnp-proc-$(CONFIG_PROC_FS) = proc.o
-
-obj-y := core.o compat.o $(isapnp-proc-y)
+pnp-$(CONFIG_PROC_FS)   += proc.o
diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile
index 905326fcca85..40c93da18252 100644
--- a/drivers/pnp/pnpacpi/Makefile
+++ b/drivers/pnp/pnpacpi/Makefile
@@ -1,5 +1,6 @@
 #
 # Makefile for the kernel PNPACPI driver.
 #
+obj-y += pnp.o
 
-obj-y := core.o rsparser.o
+pnp-y := core.o rsparser.o
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 57313f4658bc..ca84d5099ce7 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -81,12 +81,19 @@ static int pnpacpi_get_resources(struct pnp_dev *dev)
 
 static int pnpacpi_set_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         struct acpi_buffer buffer;
         int ret;
 
         pnp_dbg(&dev->dev, "set resources\n");
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
+
         ret = pnpacpi_build_resource_template(dev, &buffer);
         if (ret)
                 return ret;
@@ -105,12 +112,18 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
 
 static int pnpacpi_disable_resources(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
         int ret;
 
         dev_dbg(&dev->dev, "disable resources\n");
 
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
+
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
         ret = 0;
         if (acpi_bus_power_manageable(handle))
@@ -124,46 +137,74 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
 #ifdef CONFIG_ACPI_SLEEP
 static bool pnpacpi_can_wakeup(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return false;
+        }
 
         return acpi_bus_can_wakeup(handle);
 }
 
 static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
-        int power_state;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle;
+        int error = 0;
+
+        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return 0;
+        }
 
         if (device_can_wakeup(&dev->dev)) {
-                int rc = acpi_pm_device_sleep_wake(&dev->dev,
+                error = acpi_pm_device_sleep_wake(&dev->dev,
                                 device_may_wakeup(&dev->dev));
+                if (error)
+                        return error;
+        }
+
+        if (acpi_bus_power_manageable(handle)) {
+                int power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
+
+                if (power_state < 0)
+                        power_state = (state.event == PM_EVENT_ON) ?
+                                        ACPI_STATE_D0 : ACPI_STATE_D3;
 
-                if (rc)
-                        return rc;
+                /*
+                 * acpi_bus_set_power() often fails (keyboard port can't be
+                 * powered-down?), and in any case, our return value is ignored
+                 * by pnp_bus_suspend().  Hence we don't revert the wakeup
+                 * setting if the set_power fails.
+                 */
+                error = acpi_bus_set_power(handle, power_state);
         }
-        power_state = acpi_pm_device_sleep_state(&dev->dev, NULL);
-        if (power_state < 0)
-                power_state = (state.event == PM_EVENT_ON) ?
-                                ACPI_STATE_D0 : ACPI_STATE_D3;
-
-        /* acpi_bus_set_power() often fails (keyboard port can't be
-         * powered-down?), and in any case, our return value is ignored
-         * by pnp_bus_suspend().  Hence we don't revert the wakeup
-         * setting if the set_power fails.
-         */
-        return acpi_bus_set_power(handle, power_state);
+
+        return error;
 }
 
 static int pnpacpi_resume(struct pnp_dev *dev)
 {
-        struct acpi_device *acpi_dev = dev->data;
-        acpi_handle handle = acpi_dev->handle;
+        struct acpi_device *acpi_dev;
+        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        int error = 0;
+
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) {
+                dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__);
+                return -ENODEV;
+        }
 
         if (device_may_wakeup(&dev->dev))
                 acpi_pm_device_sleep_wake(&dev->dev, false);
-        return acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        if (acpi_bus_power_manageable(handle))
+                error = acpi_bus_set_power(handle, ACPI_STATE_D0);
+
+        return error;
 }
 #endif
 
diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile
index 3cd3ed760605..240b0ffb83ca 100644
--- a/drivers/pnp/pnpbios/Makefile
+++ b/drivers/pnp/pnpbios/Makefile
@@ -1,7 +1,8 @@
 #
 # Makefile for the kernel PNPBIOS driver.
 #
+obj-y := pnp.o
 
-pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o
+pnp-y := core.o bioscalls.o rsparser.o
 
-obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)
+pnp-$(CONFIG_PNPBIOS_PROC_FS) += proc.o
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 60d83d983a36..61bf5d724139 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -136,6 +136,16 @@ config BATTERY_MAX17040
           in handheld and portable equipment. The MAX17040 is configured
           to operate with a single lithium cell
 
+config BATTERY_MAX17042
+        tristate "Maxim MAX17042/8997/8966 Fuel Gauge"
+        depends on I2C
+        help
+          MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
+          in handheld and portable equipment. The MAX17042 is configured
+          to operate with a single lithium cell. MAX8997 and MAX8966 are
+          multi-function devices that include fuel gauages that are compatible
+          with MAX17042.
+
 config BATTERY_Z2
         tristate "Z2 battery driver"
         depends on I2C && MACH_ZIPIT2
@@ -185,4 +195,14 @@ config CHARGER_TWL4030
         help
           Say Y here to enable support for TWL4030 Battery Charge Interface.
 
+config CHARGER_GPIO
+        tristate "GPIO charger"
+        depends on GPIOLIB
+        help
+          Say Y to include support for chargers which report their online status
+          through a GPIO pin.
+
+          This driver can be build as a module. If so, the module will be
+          called gpio-charger.
+
 endif # POWER_SUPPLY
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index c75772eb157c..8385bfae8728 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_BATTERY_BQ20Z75)	+= bq20z75.o
 obj-$(CONFIG_BATTERY_BQ27x00)   += bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)    += da9030_battery.o
 obj-$(CONFIG_BATTERY_MAX17040)  += max17040_battery.o
+obj-$(CONFIG_BATTERY_MAX17042)  += max17042_battery.o
 obj-$(CONFIG_BATTERY_Z2)        += z2_battery.o
 obj-$(CONFIG_BATTERY_S3C_ADC)   += s3c_adc_battery.o
 obj-$(CONFIG_CHARGER_PCF50633)  += pcf50633-charger.o
@@ -32,3 +33,4 @@ obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
 obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o
 obj-$(CONFIG_CHARGER_ISP1704)   += isp1704_charger.o
 obj-$(CONFIG_CHARGER_TWL4030)   += twl4030_charger.o
+obj-$(CONFIG_CHARGER_GPIO)      += gpio-charger.o
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index 039f41ae217d..548d263b1ad0 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -295,7 +295,7 @@ static struct {
 static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state)
 {
         /* flush all pending status updates */
-        flush_scheduled_work();
+        flush_work_sync(&bat_work);
         return 0;
 }
 
@@ -362,7 +362,7 @@ err_psy_reg_bu:
 err_psy_reg_main:
 
         /* see comment in collie_bat_remove */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         i--;
 err_gpio:
@@ -382,12 +382,11 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
         power_supply_unregister(&collie_bat_main.psy);
 
         /*
-         * now flush all pending work.
-         * we won't get any more schedules, since all
-         * sources (isr and external_power_changed)
-         * are unregistered now.
+         * Now cancel the bat_work.  We won't get any more schedules,
+         * since all sources (isr and external_power_changed) are
+         * unregistered now.
          */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         for (i = ARRAY_SIZE(gpios) - 1; i >= 0; i--)
                 gpio_free(gpios[i].gpio);
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index e7f89785beef..e534290f3256 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -212,7 +212,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
         if (di->rem_capacity > 100)
                 di->rem_capacity = 100;
 
-        if (di->current_uA >= 100L)
+        if (di->current_uA < -100L)
                 di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * 36L)
                                         / (di->current_uA / 100L);
         else
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
new file mode 100644
index 000000000000..25b88ac1d44c
--- /dev/null
+++ b/drivers/power/gpio-charger.c
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *  Driver for chargers which report their online status through a GPIO pin
+ *
+ *  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 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/device.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+#include <linux/slab.h>
+
+#include <linux/power/gpio-charger.h>
+
+struct gpio_charger {
+        const struct gpio_charger_platform_data *pdata;
+        unsigned int irq;
+
+        struct power_supply charger;
+};
+
+static irqreturn_t gpio_charger_irq(int irq, void *devid)
+{
+        struct power_supply *charger = devid;
+
+        power_supply_changed(charger);
+
+        return IRQ_HANDLED;
+}
+
+static inline struct gpio_charger *psy_to_gpio_charger(struct power_supply *psy)
+{
+        return container_of(psy, struct gpio_charger, charger);
+}
+
+static int gpio_charger_get_property(struct power_supply *psy,
+                enum power_supply_property psp, union power_supply_propval *val)
+{
+        struct gpio_charger *gpio_charger = psy_to_gpio_charger(psy);
+        const struct gpio_charger_platform_data *pdata = gpio_charger->pdata;
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = gpio_get_value(pdata->gpio);
+                val->intval ^= pdata->gpio_active_low;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static enum power_supply_property gpio_charger_properties[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
+
+static int __devinit gpio_charger_probe(struct platform_device *pdev)
+{
+        const struct gpio_charger_platform_data *pdata = pdev->dev.platform_data;
+        struct gpio_charger *gpio_charger;
+        struct power_supply *charger;
+        int ret;
+        int irq;
+
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform data\n");
+                return -EINVAL;
+        }
+
+        if (!gpio_is_valid(pdata->gpio)) {
+                dev_err(&pdev->dev, "Invalid gpio pin\n");
+                return -EINVAL;
+        }
+
+        gpio_charger = kzalloc(sizeof(*gpio_charger), GFP_KERNEL);
+        if (!gpio_charger) {
+                dev_err(&pdev->dev, "Failed to alloc driver structure\n");
+                return -ENOMEM;
+        }
+
+        charger = &gpio_charger->charger;
+
+        charger->name = pdata->name ? pdata->name : "gpio-charger";
+        charger->type = pdata->type;
+        charger->properties = gpio_charger_properties;
+        charger->num_properties = ARRAY_SIZE(gpio_charger_properties);
+        charger->get_property = gpio_charger_get_property;
+        charger->supplied_to = pdata->supplied_to;
+        charger->num_supplicants = pdata->num_supplicants;
+
+        ret = gpio_request(pdata->gpio, dev_name(&pdev->dev));
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to request gpio pin: %d\n", ret);
+                goto err_free;
+        }
+        ret = gpio_direction_input(pdata->gpio);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to set gpio to input: %d\n", ret);
+                goto err_gpio_free;
+        }
+
+        gpio_charger->pdata = pdata;
+
+        ret = power_supply_register(&pdev->dev, charger);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register power supply: %d\n",
+                        ret);
+                goto err_gpio_free;
+        }
+
+        irq = gpio_to_irq(pdata->gpio);
+        if (irq > 0) {
+                ret = request_any_context_irq(irq, gpio_charger_irq,
+                                IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                dev_name(&pdev->dev), charger);
+                if (ret)
+                        dev_warn(&pdev->dev, "Failed to request irq: %d\n", ret);
+                else
+                        gpio_charger->irq = irq;
+        }
+
+        platform_set_drvdata(pdev, gpio_charger);
+
+        return 0;
+
+err_gpio_free:
+        gpio_free(pdata->gpio);
+err_free:
+        kfree(gpio_charger);
+        return ret;
+}
+
+static int __devexit gpio_charger_remove(struct platform_device *pdev)
+{
+        struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
+
+        if (gpio_charger->irq)
+                free_irq(gpio_charger->irq, &gpio_charger->charger);
+
+        power_supply_unregister(&gpio_charger->charger);
+
+        gpio_free(gpio_charger->pdata->gpio);
+
+        platform_set_drvdata(pdev, NULL);
+        kfree(gpio_charger);
+
+        return 0;
+}
+
+static struct platform_driver gpio_charger_driver = {
+        .probe = gpio_charger_probe,
+        .remove = __devexit_p(gpio_charger_remove),
+        .driver = {
+                .name = "gpio-charger",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init gpio_charger_init(void)
+{
+        return platform_driver_register(&gpio_charger_driver);
+}
+module_init(gpio_charger_init);
+
+static void __exit gpio_charger_exit(void)
+{
+        platform_driver_unregister(&gpio_charger_driver);
+}
+module_exit(gpio_charger_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Driver for chargers which report their online status through a GPIO");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:gpio-charger");
diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 36cf402c0677..bce3a01da2f0 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -765,7 +765,7 @@ static int __devexit platform_pmic_battery_remove(struct platform_device *pdev)
         power_supply_unregister(&pbi->usb);
         power_supply_unregister(&pbi->batt);
 
-        flush_scheduled_work();
+        cancel_work_sync(&pbi->handler);
         kfree(pbi);
         return 0;
 }
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 72512185f3e2..2ad9b14a5ce3 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -59,11 +59,61 @@ struct isp1704_charger {
         struct notifier_block   nb;
         struct work_struct      work;
 
-        char                    model[7];
+        /* properties */
+        char                    model[8];
         unsigned                present:1;
+        unsigned                online:1;
+        unsigned                current_max;
+
+        /* temp storage variables */
+        unsigned long           event;
+        unsigned                max_power;
 };
 
 /*
+ * Determine is the charging port DCP (dedicated charger) or CDP (Host/HUB
+ * chargers).
+ *
+ * REVISIT: The method is defined in Battery Charging Specification and is
+ * applicable to any ULPI transceiver. Nothing isp170x specific here.
+ */
+static inline int isp1704_charger_type(struct isp1704_charger *isp)
+{
+        u8 reg;
+        u8 func_ctrl;
+        u8 otg_ctrl;
+        int type = POWER_SUPPLY_TYPE_USB_DCP;
+
+        func_ctrl = otg_io_read(isp->otg, ULPI_FUNC_CTRL);
+        otg_ctrl = otg_io_read(isp->otg, ULPI_OTG_CTRL);
+
+        /* disable pulldowns */
+        reg = ULPI_OTG_CTRL_DM_PULLDOWN | ULPI_OTG_CTRL_DP_PULLDOWN;
+        otg_io_write(isp->otg, ULPI_CLR(ULPI_OTG_CTRL), reg);
+
+        /* full speed */
+        otg_io_write(isp->otg, ULPI_CLR(ULPI_FUNC_CTRL),
+                        ULPI_FUNC_CTRL_XCVRSEL_MASK);
+        otg_io_write(isp->otg, ULPI_SET(ULPI_FUNC_CTRL),
+                        ULPI_FUNC_CTRL_FULL_SPEED);
+
+        /* Enable strong pull-up on DP (1.5K) and reset */
+        reg = ULPI_FUNC_CTRL_TERMSELECT | ULPI_FUNC_CTRL_RESET;
+        otg_io_write(isp->otg, ULPI_SET(ULPI_FUNC_CTRL), reg);
+        usleep_range(1000, 2000);
+
+        reg = otg_io_read(isp->otg, ULPI_DEBUG);
+        if ((reg & 3) != 3)
+                type = POWER_SUPPLY_TYPE_USB_CDP;
+
+        /* recover original state */
+        otg_io_write(isp->otg, ULPI_FUNC_CTRL, func_ctrl);
+        otg_io_write(isp->otg, ULPI_OTG_CTRL, otg_ctrl);
+
+        return type;
+}
+
+/*
  * ISP1704 detects PS/2 adapters as charger. To make sure the detected charger
  * is actually a dedicated charger, the following steps need to be taken.
  */
@@ -127,16 +177,19 @@ static inline int isp1704_charger_verify(struct isp1704_charger *isp)
 static inline int isp1704_charger_detect(struct isp1704_charger *isp)
 {
         unsigned long   timeout;
-        u8              r;
+        u8              pwr_ctrl;
         int             ret = 0;
 
+        pwr_ctrl = otg_io_read(isp->otg, ISP1704_PWR_CTRL);
+
         /* set SW control bit in PWR_CTRL register */
         otg_io_write(isp->otg, ISP1704_PWR_CTRL,
                         ISP1704_PWR_CTRL_SWCTRL);
 
         /* enable manual charger detection */
-        r = (ISP1704_PWR_CTRL_SWCTRL | ISP1704_PWR_CTRL_DPVSRC_EN);
-        otg_io_write(isp->otg, ULPI_SET(ISP1704_PWR_CTRL), r);
+        otg_io_write(isp->otg, ULPI_SET(ISP1704_PWR_CTRL),
+                        ISP1704_PWR_CTRL_SWCTRL
+                        | ISP1704_PWR_CTRL_DPVSRC_EN);
         usleep_range(1000, 2000);
 
         timeout = jiffies + msecs_to_jiffies(300);
@@ -147,7 +200,10 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
                         ret = isp1704_charger_verify(isp);
                         break;
                 }
-        } while (!time_after(jiffies, timeout));
+        } while (!time_after(jiffies, timeout) && isp->online);
+
+        /* recover original state */
+        otg_io_write(isp->otg, ISP1704_PWR_CTRL, pwr_ctrl);
 
         return ret;
 }
@@ -155,52 +211,92 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
 static void isp1704_charger_work(struct work_struct *data)
 {
         int                     detect;
+        unsigned long           event;
+        unsigned                power;
         struct isp1704_charger  *isp =
                 container_of(data, struct isp1704_charger, work);
+        static DEFINE_MUTEX(lock);
 
-        /*
-         * FIXME Only supporting dedicated chargers even though isp1704 can
-         * detect HUB and HOST chargers. If the device has already been
-         * enumerated, the detection will break the connection.
-         */
-        if (isp->otg->state != OTG_STATE_B_IDLE)
-                return;
+        event = isp->event;
+        power = isp->max_power;
 
-        /* disable data pullups */
-        if (isp->otg->gadget)
-                usb_gadget_disconnect(isp->otg->gadget);
+        mutex_lock(&lock);
+
+        switch (event) {
+        case USB_EVENT_VBUS:
+                isp->online = true;
+
+                /* detect charger */
+                detect = isp1704_charger_detect(isp);
+
+                if (detect) {
+                        isp->present = detect;
+                        isp->psy.type = isp1704_charger_type(isp);
+                }
 
-        /* detect charger */
-        detect = isp1704_charger_detect(isp);
-        if (detect) {
-                isp->present = detect;
-                power_supply_changed(&isp->psy);
+                switch (isp->psy.type) {
+                case POWER_SUPPLY_TYPE_USB_DCP:
+                        isp->current_max = 1800;
+                        break;
+                case POWER_SUPPLY_TYPE_USB_CDP:
+                        /*
+                         * Only 500mA here or high speed chirp
+                         * handshaking may break
+                         */
+                        isp->current_max = 500;
+                        /* FALLTHROUGH */
+                case POWER_SUPPLY_TYPE_USB:
+                default:
+                        /* enable data pullups */
+                        if (isp->otg->gadget)
+                                usb_gadget_connect(isp->otg->gadget);
+                }
+                break;
+        case USB_EVENT_NONE:
+                isp->online = false;
+                isp->current_max = 0;
+                isp->present = 0;
+                isp->current_max = 0;
+                isp->psy.type = POWER_SUPPLY_TYPE_USB;
+
+                /*
+                 * Disable data pullups. We need to prevent the controller from
+                 * enumerating.
+                 *
+                 * FIXME: This is here to allow charger detection with Host/HUB
+                 * chargers. The pullups may be enabled elsewhere, so this can
+                 * not be the final solution.
+                 */
+                if (isp->otg->gadget)
+                        usb_gadget_disconnect(isp->otg->gadget);
+                break;
+        case USB_EVENT_ENUMERATED:
+                if (isp->present)
+                        isp->current_max = 1800;
+                else
+                        isp->current_max = power;
+                break;
+        default:
+                goto out;
         }
 
-        /* enable data pullups */
-        if (isp->otg->gadget)
-                usb_gadget_connect(isp->otg->gadget);
+        power_supply_changed(&isp->psy);
+out:
+        mutex_unlock(&lock);
 }
 
 static int isp1704_notifier_call(struct notifier_block *nb,
-                unsigned long event, void *unused)
+                unsigned long event, void *power)
 {
         struct isp1704_charger *isp =
                 container_of(nb, struct isp1704_charger, nb);
 
-        switch (event) {
-        case USB_EVENT_VBUS:
-                schedule_work(&isp->work);
-                break;
-        case USB_EVENT_NONE:
-                if (isp->present) {
-                        isp->present = 0;
-                        power_supply_changed(&isp->psy);
-                }
-                break;
-        default:
-                return NOTIFY_DONE;
-        }
+        isp->event = event;
+
+        if (power)
+                isp->max_power = *((unsigned *)power);
+
+        schedule_work(&isp->work);
 
         return NOTIFY_OK;
 }
@@ -216,6 +312,12 @@ static int isp1704_charger_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_PRESENT:
                 val->intval = isp->present;
                 break;
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = isp->online;
+                break;
+        case POWER_SUPPLY_PROP_CURRENT_MAX:
+                val->intval = isp->current_max;
+                break;
         case POWER_SUPPLY_PROP_MODEL_NAME:
                 val->strval = isp->model;
                 break;
@@ -230,6 +332,8 @@ static int isp1704_charger_get_property(struct power_supply *psy,
 
 static enum power_supply_property power_props[] = {
         POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_CURRENT_MAX,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
 };
@@ -287,13 +391,13 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
         if (!isp->otg)
                 goto fail0;
 
+        isp->dev = &pdev->dev;
+        platform_set_drvdata(pdev, isp);
+
         ret = isp1704_test_ulpi(isp);
         if (ret < 0)
                 goto fail1;
 
-        isp->dev = &pdev->dev;
-        platform_set_drvdata(pdev, isp);
-
         isp->psy.name           = "isp1704";
         isp->psy.type           = POWER_SUPPLY_TYPE_USB;
         isp->psy.properties     = power_props;
@@ -318,6 +422,23 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 
         dev_info(isp->dev, "registered with product id %s\n", isp->model);
 
+        /*
+         * Taking over the D+ pullup.
+         *
+         * FIXME: The device will be disconnected if it was already
+         * enumerated. The charger driver should be always loaded before any
+         * gadget is loaded.
+         */
+        if (isp->otg->gadget)
+                usb_gadget_disconnect(isp->otg->gadget);
+
+        /* Detect charger if VBUS is valid (the cable was already plugged). */
+        ret = otg_io_read(isp->otg, ULPI_USB_INT_STS);
+        if ((ret & ULPI_INT_VBUS_VALID) && !isp->otg->default_a) {
+                isp->event = USB_EVENT_VBUS;
+                schedule_work(&isp->work);
+        }
+
         return 0;
 fail2:
         power_supply_unregister(&isp->psy);
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index a8108a73593e..02414db6a94c 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <linux/delay.h>
 #include <linux/gpio.h>
@@ -47,6 +48,8 @@ struct jz_battery {
 
         struct power_supply battery;
         struct delayed_work work;
+
+        struct mutex lock;
 };
 
 static inline struct jz_battery *psy_to_jz_battery(struct power_supply *psy)
@@ -68,6 +71,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery)
         unsigned long val;
         long voltage;
 
+        mutex_lock(&battery->lock);
+
         INIT_COMPLETION(battery->read_completion);
 
         enable_irq(battery->irq);
@@ -91,6 +96,8 @@ static long jz_battery_read_voltage(struct jz_battery *battery)
         battery->cell->disable(battery->pdev);
         disable_irq(battery->irq);
 
+        mutex_unlock(&battery->lock);
+
         return voltage;
 }
 
@@ -240,6 +247,11 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
         struct jz_battery *jz_battery;
         struct power_supply *battery;
 
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform_data supplied\n");
+                return -ENXIO;
+        }
+
         jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL);
         if (!jz_battery) {
                 dev_err(&pdev->dev, "Failed to allocate driver structure\n");
@@ -291,6 +303,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
         jz_battery->pdev = pdev;
 
         init_completion(&jz_battery->read_completion);
+        mutex_init(&jz_battery->lock);
 
         INIT_DELAYED_WORK(&jz_battery->work, jz_battery_work);
 
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
new file mode 100644
index 000000000000..c5c8805156cb
--- /dev/null
+++ b/drivers/power/max17042_battery.c
@@ -0,0 +1,239 @@
+/*
+ * Fuel gauge driver for Maxim 17042 / 8966 / 8997
+ *  Note that Maxim 8966 and 8997 are mfd and this is its subdevice.
+ *
+ * Copyright (C) 2011 Samsung Electronics
+ * MyungJoo Ham <myungjoo.ham@samsung.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
+ *
+ * This driver is based on max17040_battery.c
+ */
+
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/mod_devicetable.h>
+#include <linux/power_supply.h>
+#include <linux/power/max17042_battery.h>
+
+enum max17042_register {
+        MAX17042_STATUS         = 0x00,
+        MAX17042_VALRT_Th       = 0x01,
+        MAX17042_TALRT_Th       = 0x02,
+        MAX17042_SALRT_Th       = 0x03,
+        MAX17042_AtRate         = 0x04,
+        MAX17042_RepCap         = 0x05,
+        MAX17042_RepSOC         = 0x06,
+        MAX17042_Age            = 0x07,
+        MAX17042_TEMP           = 0x08,
+        MAX17042_VCELL          = 0x09,
+        MAX17042_Current        = 0x0A,
+        MAX17042_AvgCurrent     = 0x0B,
+        MAX17042_Qresidual      = 0x0C,
+        MAX17042_SOC            = 0x0D,
+        MAX17042_AvSOC          = 0x0E,
+        MAX17042_RemCap         = 0x0F,
+        MAX17402_FullCAP        = 0x10,
+        MAX17042_TTE            = 0x11,
+        MAX17042_V_empty        = 0x12,
+
+        MAX17042_RSLOW          = 0x14,
+
+        MAX17042_AvgTA          = 0x16,
+        MAX17042_Cycles         = 0x17,
+        MAX17042_DesignCap      = 0x18,
+        MAX17042_AvgVCELL       = 0x19,
+        MAX17042_MinMaxTemp     = 0x1A,
+        MAX17042_MinMaxVolt     = 0x1B,
+        MAX17042_MinMaxCurr     = 0x1C,
+        MAX17042_CONFIG         = 0x1D,
+        MAX17042_ICHGTerm       = 0x1E,
+        MAX17042_AvCap          = 0x1F,
+        MAX17042_ManName        = 0x20,
+        MAX17042_DevName        = 0x21,
+        MAX17042_DevChem        = 0x22,
+
+        MAX17042_TempNom        = 0x24,
+        MAX17042_TempCold       = 0x25,
+        MAX17042_TempHot        = 0x26,
+        MAX17042_AIN            = 0x27,
+        MAX17042_LearnCFG       = 0x28,
+        MAX17042_SHFTCFG        = 0x29,
+        MAX17042_RelaxCFG       = 0x2A,
+        MAX17042_MiscCFG        = 0x2B,
+        MAX17042_TGAIN          = 0x2C,
+        MAx17042_TOFF           = 0x2D,
+        MAX17042_CGAIN          = 0x2E,
+        MAX17042_COFF           = 0x2F,
+
+        MAX17042_Q_empty        = 0x33,
+        MAX17042_T_empty        = 0x34,
+
+        MAX17042_RCOMP0         = 0x38,
+        MAX17042_TempCo         = 0x39,
+        MAX17042_Rx             = 0x3A,
+        MAX17042_T_empty0       = 0x3B,
+        MAX17042_TaskPeriod     = 0x3C,
+        MAX17042_FSTAT          = 0x3D,
+
+        MAX17042_SHDNTIMER      = 0x3F,
+
+        MAX17042_VFRemCap       = 0x4A,
+
+        MAX17042_QH             = 0x4D,
+        MAX17042_QL             = 0x4E,
+};
+
+struct max17042_chip {
+        struct i2c_client *client;
+        struct power_supply battery;
+        struct max17042_platform_data *pdata;
+};
+
+static int max17042_write_reg(struct i2c_client *client, u8 reg, u16 value)
+{
+        int ret = i2c_smbus_write_word_data(client, reg, value);
+
+        if (ret < 0)
+                dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+
+        return ret;
+}
+
+static int max17042_read_reg(struct i2c_client *client, u8 reg)
+{
+        int ret = i2c_smbus_read_word_data(client, reg);
+
+        if (ret < 0)
+                dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+
+        return ret;
+}
+
+static enum power_supply_property max17042_battery_props[] = {
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_CAPACITY,
+};
+
+static int max17042_get_property(struct power_supply *psy,
+                            enum power_supply_property psp,
+                            union power_supply_propval *val)
+{
+        struct max17042_chip *chip = container_of(psy,
+                                struct max17042_chip, battery);
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                val->intval = max17042_read_reg(chip->client,
+                                MAX17042_VCELL) * 83; /* 1000 / 12 = 83 */
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+                val->intval = max17042_read_reg(chip->client,
+                                MAX17042_AvgVCELL) * 83;
+                break;
+        case POWER_SUPPLY_PROP_CAPACITY:
+                val->intval = max17042_read_reg(chip->client,
+                                MAX17042_SOC) / 256;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int __devinit max17042_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
+        struct max17042_chip *chip;
+        int ret;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
+                return -EIO;
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (!chip)
+                return -ENOMEM;
+
+        chip->client = client;
+        chip->pdata = client->dev.platform_data;
+
+        i2c_set_clientdata(client, chip);
+
+        chip->battery.name              = "max17042_battery";
+        chip->battery.type              = POWER_SUPPLY_TYPE_BATTERY;
+        chip->battery.get_property      = max17042_get_property;
+        chip->battery.properties        = max17042_battery_props;
+        chip->battery.num_properties    = ARRAY_SIZE(max17042_battery_props);
+
+        ret = power_supply_register(&client->dev, &chip->battery);
+        if (ret) {
+                dev_err(&client->dev, "failed: power supply register\n");
+                i2c_set_clientdata(client, NULL);
+                kfree(chip);
+                return ret;
+        }
+
+        if (!chip->pdata->enable_current_sense) {
+                max17042_write_reg(client, MAX17042_CGAIN, 0x0000);
+                max17042_write_reg(client, MAX17042_MiscCFG, 0x0003);
+                max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);
+        }
+
+        return 0;
+}
+
+static int __devexit max17042_remove(struct i2c_client *client)
+{
+        struct max17042_chip *chip = i2c_get_clientdata(client);
+
+        power_supply_unregister(&chip->battery);
+        i2c_set_clientdata(client, NULL);
+        kfree(chip);
+        return 0;
+}
+
+static const struct i2c_device_id max17042_id[] = {
+        { "max17042", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, max17042_id);
+
+static struct i2c_driver max17042_i2c_driver = {
+        .driver = {
+                .name   = "max17042",
+        },
+        .probe          = max17042_probe,
+        .remove         = __devexit_p(max17042_remove),
+        .id_table       = max17042_id,
+};
+
+static int __init max17042_init(void)
+{
+        return i2c_add_driver(&max17042_i2c_driver);
+}
+module_init(max17042_init);
+
+static void __exit max17042_exit(void)
+{
+        i2c_del_driver(&max17042_i2c_driver);
+}
+module_exit(max17042_exit);
+
+MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
+MODULE_DESCRIPTION("MAX17042 Fuel Gauge");
+MODULE_LICENSE("GPL");
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 5bc1dcf7785e..0b0ff3a936a6 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -201,6 +201,72 @@ static int olpc_bat_get_tech(union power_supply_propval *val)
         return ret;
 }
 
+static int olpc_bat_get_charge_full_design(union power_supply_propval *val)
+{
+        uint8_t ec_byte;
+        union power_supply_propval tech;
+        int ret, mfr;
+
+        ret = olpc_bat_get_tech(&tech);
+        if (ret)
+                return ret;
+
+        ec_byte = BAT_ADDR_MFR_TYPE;
+        ret = olpc_ec_cmd(EC_BAT_EEPROM, &ec_byte, 1, &ec_byte, 1);
+        if (ret)
+                return ret;
+
+        mfr = ec_byte >> 4;
+
+        switch (tech.intval) {
+        case POWER_SUPPLY_TECHNOLOGY_NiMH:
+                switch (mfr) {
+                case 1: /* Gold Peak */
+                        val->intval = 3000000*.8;
+                        break;
+                default:
+                        return -EIO;
+                }
+                break;
+
+        case POWER_SUPPLY_TECHNOLOGY_LiFe:
+                switch (mfr) {
+                case 1: /* Gold Peak */
+                        val->intval = 2800000;
+                        break;
+                case 2: /* BYD */
+                        val->intval = 3100000;
+                        break;
+                default:
+                        return -EIO;
+                }
+                break;
+
+        default:
+                return -EIO;
+        }
+
+        return ret;
+}
+
+static int olpc_bat_get_charge_now(union power_supply_propval *val)
+{
+        uint8_t soc;
+        union power_supply_propval full;
+        int ret;
+
+        ret = olpc_ec_cmd(EC_BAT_SOC, NULL, 0, &soc, 1);
+        if (ret)
+                return ret;
+
+        ret = olpc_bat_get_charge_full_design(&full);
+        if (ret)
+                return ret;
+
+        val->intval = soc * (full.intval / 100);
+        return 0;
+}
+
 /*********************************************************************
  *              Battery properties
  *********************************************************************/
@@ -267,6 +333,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
                         return ret;
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
                 ret = olpc_ec_cmd(EC_BAT_VOLTAGE, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
@@ -274,6 +341,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 val->intval = (s16)be16_to_cpu(ec_word) * 9760L / 32;
                 break;
         case POWER_SUPPLY_PROP_CURRENT_AVG:
+        case POWER_SUPPLY_PROP_CURRENT_NOW:
                 ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
                         return ret;
@@ -294,6 +362,16 @@ static int olpc_bat_get_property(struct power_supply *psy,
                 else
                         val->intval = POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
                 break;
+        case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
+                ret = olpc_bat_get_charge_full_design(val);
+                if (ret)
+                        return ret;
+                break;
+        case POWER_SUPPLY_PROP_CHARGE_NOW:
+                ret = olpc_bat_get_charge_now(val);
+                if (ret)
+                        return ret;
+                break;
         case POWER_SUPPLY_PROP_TEMP:
                 ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2);
                 if (ret)
@@ -331,16 +409,20 @@ static int olpc_bat_get_property(struct power_supply *psy,
         return ret;
 }
 
-static enum power_supply_property olpc_bat_props[] = {
+static enum power_supply_property olpc_xo1_bat_props[] = {
         POWER_SUPPLY_PROP_STATUS,
         POWER_SUPPLY_PROP_CHARGE_TYPE,
         POWER_SUPPLY_PROP_PRESENT,
         POWER_SUPPLY_PROP_HEALTH,
         POWER_SUPPLY_PROP_TECHNOLOGY,
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
         POWER_SUPPLY_PROP_TEMP,
         POWER_SUPPLY_PROP_TEMP_AMBIENT,
         POWER_SUPPLY_PROP_MANUFACTURER,
@@ -348,6 +430,27 @@ static enum power_supply_property olpc_bat_props[] = {
         POWER_SUPPLY_PROP_CHARGE_COUNTER,
 };
 
+/* XO-1.5 does not have ambient temperature property */
+static enum power_supply_property olpc_xo15_bat_props[] = {
+        POWER_SUPPLY_PROP_STATUS,
+        POWER_SUPPLY_PROP_CHARGE_TYPE,
+        POWER_SUPPLY_PROP_PRESENT,
+        POWER_SUPPLY_PROP_HEALTH,
+        POWER_SUPPLY_PROP_TECHNOLOGY,
+        POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_VOLTAGE_NOW,
+        POWER_SUPPLY_PROP_CURRENT_AVG,
+        POWER_SUPPLY_PROP_CURRENT_NOW,
+        POWER_SUPPLY_PROP_CAPACITY,
+        POWER_SUPPLY_PROP_CAPACITY_LEVEL,
+        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+        POWER_SUPPLY_PROP_CHARGE_NOW,
+        POWER_SUPPLY_PROP_TEMP,
+        POWER_SUPPLY_PROP_MANUFACTURER,
+        POWER_SUPPLY_PROP_SERIAL_NUMBER,
+        POWER_SUPPLY_PROP_CHARGE_COUNTER,
+};
+
 /* EEPROM reading goes completely around the power_supply API, sadly */
 
 #define EEPROM_START    0x20
@@ -419,8 +522,6 @@ static struct device_attribute olpc_bat_error = {
 static struct platform_device *bat_pdev;
 
 static struct power_supply olpc_bat = {
-        .properties = olpc_bat_props,
-        .num_properties = ARRAY_SIZE(olpc_bat_props),
         .get_property = olpc_bat_get_property,
         .use_for_apm = 1,
 };
@@ -466,6 +567,13 @@ static int __init olpc_bat_init(void)
                 goto ac_failed;
 
         olpc_bat.name = bat_pdev->name;
+        if (olpc_board_at_least(olpc_board_pre(0xd0))) { /* XO-1.5 */
+                olpc_bat.properties = olpc_xo15_bat_props;
+                olpc_bat.num_properties = ARRAY_SIZE(olpc_xo15_bat_props);
+        } else { /* XO-1 */
+                olpc_bat.properties = olpc_xo1_bat_props;
+                olpc_bat.num_properties = ARRAY_SIZE(olpc_xo1_bat_props);
+        }
 
         ret = power_supply_register(&bat_pdev->dev, &olpc_bat);
         if (ret)
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 91606bb55318..970f7335d3a7 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -190,10 +190,10 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
         goto success;
 
 create_triggers_failed:
-        device_unregister(psy->dev);
+        device_del(dev);
 kobject_set_name_failed:
 device_add_failed:
-        kfree(dev);
+        put_device(dev);
 success:
         return rc;
 }
@@ -201,7 +201,7 @@ EXPORT_SYMBOL_GPL(power_supply_register);
 
 void power_supply_unregister(struct power_supply *psy)
 {
-        flush_scheduled_work();
+        cancel_work_sync(&psy->changed_work);
         power_supply_remove_triggers(psy);
         device_unregister(psy->dev);
 }
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index 4a8ae3935b3b..4255f2358b13 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -112,6 +112,13 @@ static int calc_full_volt(int volt_val, int cur_val, int impedance)
         return volt_val + cur_val * impedance / 1000;
 }
 
+static int charge_finished(struct s3c_adc_bat *bat)
+{
+        return bat->pdata->gpio_inverted ?
+                !gpio_get_value(bat->pdata->gpio_charge_finished) :
+                gpio_get_value(bat->pdata->gpio_charge_finished);
+}
+
 static int s3c_adc_bat_get_property(struct power_supply *psy,
                                     enum power_supply_property psp,
                                     union power_supply_propval *val)
@@ -140,7 +147,7 @@ static int s3c_adc_bat_get_property(struct power_supply *psy,
 
         if (bat->cable_plugged &&
                 ((bat->pdata->gpio_charge_finished < 0) ||
-                !gpio_get_value(bat->pdata->gpio_charge_finished))) {
+                !charge_finished(bat))) {
                 lut = bat->pdata->lut_acin;
                 lut_size = bat->pdata->lut_acin_cnt;
         }
@@ -236,8 +243,7 @@ static void s3c_adc_bat_work(struct work_struct *work)
                 }
         } else {
                 if ((bat->pdata->gpio_charge_finished >= 0) && is_plugged) {
-                        is_charged = gpio_get_value(
-                                main_bat.pdata->gpio_charge_finished);
+                        is_charged = charge_finished(&main_bat);
                         if (is_charged) {
                                 if (bat->pdata->disable_charger)
                                         bat->pdata->disable_charger();
diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c
index ee04936b2db5..53f0d3524fcd 100644
--- a/drivers/power/tosa_battery.c
+++ b/drivers/power/tosa_battery.c
@@ -332,7 +332,7 @@ static struct {
 static int tosa_bat_suspend(struct platform_device *dev, pm_message_t state)
 {
         /* flush all pending status updates */
-        flush_scheduled_work();
+        flush_work_sync(&bat_work);
         return 0;
 }
 
@@ -422,7 +422,7 @@ err_psy_reg_jacket:
 err_psy_reg_main:
 
         /* see comment in tosa_bat_remove */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         i--;
 err_gpio:
@@ -445,12 +445,11 @@ static int __devexit tosa_bat_remove(struct platform_device *dev)
         power_supply_unregister(&tosa_bat_main.psy);
 
         /*
-         * now flush all pending work.
-         * we won't get any more schedules, since all
-         * sources (isr and external_power_changed)
-         * are unregistered now.
+         * Now cancel the bat_work.  We won't get any more schedules,
+         * since all sources (isr and external_power_changed) are
+         * unregistered now.
          */
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
 
         for (i = ARRAY_SIZE(gpios) - 1; i >= 0; i--)
                 gpio_free(gpios[i].gpio);
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 5071d85ec12d..156559e56fa5 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -147,7 +147,7 @@ static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
 #ifdef CONFIG_PM
 static int wm97xx_bat_suspend(struct device *dev)
 {
-        flush_scheduled_work();
+        flush_work_sync(&bat_work);
         return 0;
 }
 
@@ -273,7 +273,7 @@ static int __devexit wm97xx_bat_remove(struct platform_device *dev)
                 free_irq(gpio_to_irq(pdata->charge_gpio), dev);
                 gpio_free(pdata->charge_gpio);
         }
-        flush_scheduled_work();
+        cancel_work_sync(&bat_work);
         power_supply_unregister(&bat_ps);
         kfree(prop);
         return 0;
diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c
index 85064a9f649e..e5ed52d71937 100644
--- a/drivers/power/z2_battery.c
+++ b/drivers/power/z2_battery.c
@@ -254,7 +254,7 @@ static int __devexit z2_batt_remove(struct i2c_client *client)
         struct z2_charger *charger = i2c_get_clientdata(client);
         struct z2_battery_info *info = charger->info;
 
-        flush_scheduled_work();
+        cancel_work_sync(&charger->bat_work);
         power_supply_unregister(&charger->batt_ps);
 
         kfree(charger->batt_ps.properties);
@@ -271,7 +271,9 @@ static int __devexit z2_batt_remove(struct i2c_client *client)
 #ifdef CONFIG_PM
 static int z2_batt_suspend(struct i2c_client *client, pm_message_t state)
 {
-        flush_scheduled_work();
+        struct z2_charger *charger = i2c_get_clientdata(client);
+
+        flush_work_sync(&charger->bat_work);
         return 0;
 }
 
diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
index 2728469d3884..82583b0ff82d 100644
--- a/drivers/pps/clients/pps-ktimer.c
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -46,8 +46,6 @@ static void pps_ktimer_event(unsigned long ptr)
         /* First of all we get the time stamp... */
         pps_get_ts(&ts);
 
-        dev_info(pps->dev, "PPS event at %lu\n", jiffies);
-
         pps_event(pps, &ts, PPS_CAPTUREASSERT, NULL);
 
         mod_timer(&ktimer, jiffies + HZ);
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index 32221efd9ca9..c571d6dd8f61 100644
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -163,7 +163,7 @@ static void parport_attach(struct parport *port)
         }
 
         device->pardev = parport_register_device(port, KBUILD_MODNAME,
-                        NULL, NULL, parport_irq, 0, device);
+                        NULL, NULL, parport_irq, PARPORT_FLAG_EXCL, device);
         if (!device->pardev) {
                 pr_err("couldn't register with %s\n", port->name);
                 goto err_free;
diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c
index 5c32f8dacf56..b93af3ebb5ba 100644
--- a/drivers/pps/generators/pps_gen_parport.c
+++ b/drivers/pps/generators/pps_gen_parport.c
@@ -198,7 +198,7 @@ static void parport_attach(struct parport *port)
         }
 
         device.pardev = parport_register_device(port, KBUILD_MODNAME,
-                        NULL, NULL, NULL, 0, &device);
+                        NULL, NULL, NULL, PARPORT_FLAG_EXCL, &device);
         if (!device.pardev) {
                 pr_err("couldn't register with %s\n", port->name);
                 return;
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 467e82bd0929..a50391b6ba2a 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -943,6 +943,8 @@ static int rio_enum_complete(struct rio_mport *port)
  * @port: Master port to send transactions
  * @destid: Current destination ID in network
  * @hopcount: Number of hops into the network
+ * @prev: previous rio_dev
+ * @prev_port: previous port number
  *
  * Recursively discovers a RIO network.  Transactions are sent via the
  * master port passed in @port.
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 7568df6122ab..0ec49ca527a8 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -424,6 +424,9 @@ static int max8998_set_voltage_buck(struct regulator_dev *rdev,
                                 }
                         }
 
+                        if (pdata->buck_voltage_lock)
+                                return -EINVAL;
+
                         /* no predefine regulator found */
                         max8998->buck1_idx = (buck1_last_val % 2) + 2;
                         dev_dbg(max8998->dev, "max8998->buck1_idx:%d\n",
@@ -451,18 +454,26 @@ buck1_exit:
                         "BUCK2, i:%d buck2_vol1:%d, buck2_vol2:%d\n"
                         , i, max8998->buck2_vol[0], max8998->buck2_vol[1]);
                 if (gpio_is_valid(pdata->buck2_set3)) {
-                        if (max8998->buck2_vol[0] == i) {
-                                max8998->buck1_idx = 0;
-                                buck2_gpio_set(pdata->buck2_set3, 0);
-                        } else {
-                                max8998->buck1_idx = 1;
-                                ret = max8998_get_voltage_register(rdev, &reg,
-                                                                   &shift,
-                                                                   &mask);
-                                ret = max8998_write_reg(i2c, reg, i);
-                                max8998->buck2_vol[1] = i;
-                                buck2_gpio_set(pdata->buck2_set3, 1);
+
+                        /* check if requested voltage */
+                        /* value is already defined */
+                        for (j = 0; j < ARRAY_SIZE(max8998->buck2_vol); j++) {
+                                if (max8998->buck2_vol[j] == i) {
+                                        max8998->buck2_idx = j;
+                                        buck2_gpio_set(pdata->buck2_set3, j);
+                                        goto buck2_exit;
+                                }
                         }
+
+                        if (pdata->buck_voltage_lock)
+                                return -EINVAL;
+
+                        max8998_get_voltage_register(rdev,
+                                        &reg, &shift, &mask);
+                        ret = max8998_write_reg(i2c, reg, i);
+                        max8998->buck2_vol[max8998->buck2_idx] = i;
+                        buck2_gpio_set(pdata->buck2_set3, max8998->buck2_idx);
+buck2_exit:
                         dev_dbg(max8998->dev, "%s: SET3:%d\n", i2c->name,
                                 gpio_get_value(pdata->buck2_set3));
                 } else {
@@ -707,6 +718,9 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, max8998);
         i2c = max8998->iodev->i2c;
 
+        max8998->buck1_idx = pdata->buck1_default_idx;
+        max8998->buck2_idx = pdata->buck2_default_idx;
+
         /* NOTE: */
         /* For unused GPIO NOT marked as -1 (thereof equal to 0)  WARN_ON */
         /* will be displayed */
@@ -739,23 +753,46 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       != (pdata->buck1_max_voltage1 / 1000))
+                       < (pdata->buck1_voltage1 / 1000))
                         i++;
-                printk(KERN_ERR "i:%d, buck1_idx:%d\n", i, max8998->buck1_idx);
                 max8998->buck1_vol[0] = i;
                 ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE1, i);
+                if (ret)
+                        return ret;
 
                 /* Set predefined value for BUCK1 register 2 */
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       != (pdata->buck1_max_voltage2 / 1000))
+                       < (pdata->buck1_voltage2 / 1000))
                         i++;
 
                 max8998->buck1_vol[1] = i;
-                printk(KERN_ERR "i:%d, buck1_idx:%d\n", i, max8998->buck1_idx);
-                ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE2, i)
-                        + ret;
+                ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE2, i);
+                if (ret)
+                        return ret;
+
+                /* Set predefined value for BUCK1 register 3 */
+                i = 0;
+                while (buck12_voltage_map_desc.min +
+                       buck12_voltage_map_desc.step*i
+                       < (pdata->buck1_voltage3 / 1000))
+                        i++;
+
+                max8998->buck1_vol[2] = i;
+                ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE3, i);
+                if (ret)
+                        return ret;
+
+                /* Set predefined value for BUCK1 register 4 */
+                i = 0;
+                while (buck12_voltage_map_desc.min +
+                       buck12_voltage_map_desc.step*i
+                       < (pdata->buck1_voltage4 / 1000))
+                        i++;
+
+                max8998->buck1_vol[3] = i;
+                ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE4, i);
                 if (ret)
                         return ret;
 
@@ -772,18 +809,28 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
                 gpio_direction_output(pdata->buck2_set3,
                                       max8998->buck2_idx & 0x1);
 
-                /* BUCK2 - set preset default voltage value to buck2_vol[0] */
+                /* BUCK2 register 1 */
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       != (pdata->buck2_max_voltage / 1000))
+                       < (pdata->buck2_voltage1 / 1000))
                         i++;
-                printk(KERN_ERR "i:%d, buck2_idx:%d\n", i, max8998->buck2_idx);
                 max8998->buck2_vol[0] = i;
                 ret = max8998_write_reg(i2c, MAX8998_REG_BUCK2_VOLTAGE1, i);
                 if (ret)
                         return ret;
 
+                /* BUCK2 register 2 */
+                i = 0;
+                while (buck12_voltage_map_desc.min +
+                       buck12_voltage_map_desc.step*i
+                       < (pdata->buck2_voltage2 / 1000))
+                        i++;
+                printk(KERN_ERR "i2:%d, buck2_idx:%d\n", i, max8998->buck2_idx);
+                max8998->buck2_vol[1] = i;
+                ret = max8998_write_reg(i2c, MAX8998_REG_BUCK2_VOLTAGE2, i);
+                if (ret)
+                        return ret;
         }
 
         for (i = 0; i < pdata->num_regulators; i++) {
@@ -835,6 +882,12 @@ static int __devexit max8998_pmic_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct platform_device_id max8998_pmic_id[] = {
+        { "max8998-pmic", TYPE_MAX8998 },
+        { "lp3974-pmic", TYPE_LP3974 },
+        { }
+};
+
 static struct platform_driver max8998_pmic_driver = {
         .driver = {
                 .name = "max8998-pmic",
@@ -842,6 +895,7 @@ static struct platform_driver max8998_pmic_driver = {
         },
         .probe = max8998_pmic_probe,
         .remove = __devexit_p(max8998_pmic_remove),
+        .id_table = max8998_pmic_id,
 };
 
 static int __init max8998_pmic_init(void)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 4941cade319f..cdd97192dc69 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -97,18 +97,6 @@ config RTC_INTF_DEV
 
           If unsure, say Y.
 
-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 underlying rtc chip
-          driver does not expose RTC_UIE ioctls. Those requests generate
-          once-per-second update interrupts, used for synchronization.
-
-          The emulation code will read the time from the hardware
-          clock several times per second, please enable this option
-          only if you know that you really need it.
-
 config RTC_DRV_TEST
         tristate "Test driver/device"
         help
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 9583cbcc6b79..c404b61386bf 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -143,6 +143,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->id = id;
         rtc->ops = ops;
         rtc->owner = owner;
+        rtc->irq_freq = 1;
         rtc->max_user_freq = 64;
         rtc->dev.parent = dev;
         rtc->dev.class = rtc_class;
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 90384b9f6b2c..a0c01967244d 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -16,6 +16,9 @@
 #include <linux/log2.h>
 #include <linux/workqueue.h>
 
+static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer);
+static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer);
+
 static int __rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm)
 {
         int err;
@@ -120,12 +123,18 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         err = mutex_lock_interruptible(&rtc->ops_lock);
         if (err)
                 return err;
-        alarm->enabled = rtc->aie_timer.enabled;
-        if (alarm->enabled)
+        if (rtc->ops == NULL)
+                err = -ENODEV;
+        else if (!rtc->ops->read_alarm)
+                err = -EINVAL;
+        else {
+                memset(alarm, 0, sizeof(struct rtc_wkalrm));
+                alarm->enabled = rtc->aie_timer.enabled;
                 alarm->time = rtc_ktime_to_tm(rtc->aie_timer.node.expires);
+        }
         mutex_unlock(&rtc->ops_lock);
 
-        return 0;
+        return err;
 }
 EXPORT_SYMBOL_GPL(rtc_read_alarm);
 
@@ -175,16 +184,14 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
                 return err;
         if (rtc->aie_timer.enabled) {
                 rtc_timer_remove(rtc, &rtc->aie_timer);
-                rtc->aie_timer.enabled = 0;
         }
         rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);
         rtc->aie_timer.period = ktime_set(0, 0);
         if (alarm->enabled) {
-                rtc->aie_timer.enabled = 1;
-                rtc_timer_enqueue(rtc, &rtc->aie_timer);
+                err = rtc_timer_enqueue(rtc, &rtc->aie_timer);
         }
         mutex_unlock(&rtc->ops_lock);
-        return 0;
+        return err;
 }
 EXPORT_SYMBOL_GPL(rtc_set_alarm);
 
@@ -195,15 +202,15 @@ int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled)
                 return err;
 
         if (rtc->aie_timer.enabled != enabled) {
-                if (enabled) {
-                        rtc->aie_timer.enabled = 1;
-                        rtc_timer_enqueue(rtc, &rtc->aie_timer);
-                } else {
+                if (enabled)
+                        err = rtc_timer_enqueue(rtc, &rtc->aie_timer);
+                else
                         rtc_timer_remove(rtc, &rtc->aie_timer);
-                        rtc->aie_timer.enabled = 0;
-                }
         }
 
+        if (err)
+                return err;
+
         if (!rtc->ops)
                 err = -ENODEV;
         else if (!rtc->ops->alarm_irq_enable)
@@ -235,12 +242,9 @@ int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled)
                 now = rtc_tm_to_ktime(tm);
                 rtc->uie_rtctimer.node.expires = ktime_add(now, onesec);
                 rtc->uie_rtctimer.period = ktime_set(1, 0);
-                rtc->uie_rtctimer.enabled = 1;
-                rtc_timer_enqueue(rtc, &rtc->uie_rtctimer);
-        } else {
+                err = rtc_timer_enqueue(rtc, &rtc->uie_rtctimer);
+        } else
                 rtc_timer_remove(rtc, &rtc->uie_rtctimer);
-                rtc->uie_rtctimer.enabled = 0;
-        }
 
 out:
         mutex_unlock(&rtc->ops_lock);
@@ -460,6 +464,9 @@ int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)
         int err = 0;
         unsigned long flags;
 
+        if (freq <= 0)
+                return -EINVAL;
+
         spin_lock_irqsave(&rtc->irq_task_lock, flags);
         if (rtc->irq_task != NULL && task == NULL)
                 err = -EBUSY;
@@ -488,10 +495,13 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_freq);
  * Enqueues a timer onto the rtc devices timerqueue and sets
  * the next alarm event appropriately.
  *
+ * Sets the enabled bit on the added timer.
+ *
  * Must hold ops_lock for proper serialization of timerqueue
  */
-void rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
+static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
 {
+        timer->enabled = 1;
         timerqueue_add(&rtc->timerqueue, &timer->node);
         if (&timer->node == timerqueue_getnext(&rtc->timerqueue)) {
                 struct rtc_wkalrm alarm;
@@ -501,7 +511,13 @@ void rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
                 err = __rtc_set_alarm(rtc, &alarm);
                 if (err == -ETIME)
                         schedule_work(&rtc->irqwork);
+                else if (err) {
+                        timerqueue_del(&rtc->timerqueue, &timer->node);
+                        timer->enabled = 0;
+                        return err;
+                }
         }
+        return 0;
 }
 
 /**
@@ -512,13 +528,15 @@ void rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
  * Removes a timer onto the rtc devices timerqueue and sets
  * the next alarm event appropriately.
  *
+ * Clears the enabled bit on the removed timer.
+ *
  * Must hold ops_lock for proper serialization of timerqueue
  */
-void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer)
+static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer)
 {
         struct timerqueue_node *next = timerqueue_getnext(&rtc->timerqueue);
         timerqueue_del(&rtc->timerqueue, &timer->node);
-
+        timer->enabled = 0;
         if (next == &timer->node) {
                 struct rtc_wkalrm alarm;
                 int err;
@@ -626,8 +644,7 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer,
         timer->node.expires = expires;
         timer->period = period;
 
-        timer->enabled = 1;
-        rtc_timer_enqueue(rtc, timer);
+        ret = rtc_timer_enqueue(rtc, timer);
 
         mutex_unlock(&rtc->ops_lock);
         return ret;
@@ -645,7 +662,6 @@ int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer* timer)
         mutex_lock(&rtc->ops_lock);
         if (timer->enabled)
                 rtc_timer_remove(rtc, timer);
-        timer->enabled = 0;
         mutex_unlock(&rtc->ops_lock);
         return ret;
 }
diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index f22dee35f330..3f7bc6b9fefa 100644
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/max8998.h>
 #include <linux/mfd/max8998-private.h>
+#include <linux/delay.h>
 
 #define MAX8998_RTC_SEC                 0x00
 #define MAX8998_RTC_MIN                 0x01
@@ -73,6 +74,7 @@ struct max8998_rtc_info {
         struct i2c_client       *rtc;
         struct rtc_device       *rtc_dev;
         int irq;
+        bool lp3974_bug_workaround;
 };
 
 static void max8998_data_to_tm(u8 *data, struct rtc_time *tm)
@@ -124,10 +126,16 @@ static int max8998_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         struct max8998_rtc_info *info = dev_get_drvdata(dev);
         u8 data[8];
+        int ret;
 
         max8998_tm_to_data(tm, data);
 
-        return max8998_bulk_write(info->rtc, MAX8998_RTC_SEC, 8, data);
+        ret = max8998_bulk_write(info->rtc, MAX8998_RTC_SEC, 8, data);
+
+        if (info->lp3974_bug_workaround)
+                msleep(2000);
+
+        return ret;
 }
 
 static int max8998_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
@@ -163,12 +171,29 @@ static int max8998_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int max8998_rtc_stop_alarm(struct max8998_rtc_info *info)
 {
-        return max8998_write_reg(info->rtc, MAX8998_ALARM0_CONF, 0);
+        int ret = max8998_write_reg(info->rtc, MAX8998_ALARM0_CONF, 0);
+
+        if (info->lp3974_bug_workaround)
+                msleep(2000);
+
+        return ret;
 }
 
 static int max8998_rtc_start_alarm(struct max8998_rtc_info *info)
 {
-        return max8998_write_reg(info->rtc, MAX8998_ALARM0_CONF, 0x77);
+        int ret;
+        u8 alarm0_conf = 0x77;
+
+        /* LP3974 with delay bug chips has rtc alarm bugs with "MONTH" field */
+        if (info->lp3974_bug_workaround)
+                alarm0_conf = 0x57;
+
+        ret = max8998_write_reg(info->rtc, MAX8998_ALARM0_CONF, alarm0_conf);
+
+        if (info->lp3974_bug_workaround)
+                msleep(2000);
+
+        return ret;
 }
 
 static int max8998_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
@@ -187,10 +212,13 @@ static int max8998_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         if (ret < 0)
                 return ret;
 
+        if (info->lp3974_bug_workaround)
+                msleep(2000);
+
         if (alrm->enabled)
-                return max8998_rtc_start_alarm(info);
+                ret = max8998_rtc_start_alarm(info);
 
-        return 0;
+        return ret;
 }
 
 static int max8998_rtc_alarm_irq_enable(struct device *dev,
@@ -224,6 +252,7 @@ static const struct rtc_class_ops max8998_rtc_ops = {
 static int __devinit max8998_rtc_probe(struct platform_device *pdev)
 {
         struct max8998_dev *max8998 = dev_get_drvdata(pdev->dev.parent);
+        struct max8998_platform_data *pdata = dev_get_platdata(max8998->dev);
         struct max8998_rtc_info *info;
         int ret;
 
@@ -249,10 +278,18 @@ static int __devinit max8998_rtc_probe(struct platform_device *pdev)
 
         ret = request_threaded_irq(info->irq, NULL, max8998_rtc_alarm_irq, 0,
                         "rtc-alarm0", info);
+
         if (ret < 0)
                 dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
                         info->irq, ret);
 
+        dev_info(&pdev->dev, "RTC CHIP NAME: %s\n", pdev->id_entry->name);
+        if (pdata->rtc_delay) {
+                info->lp3974_bug_workaround = true;
+                dev_warn(&pdev->dev, "LP3974 with RTC REGERR option."
+                                " RTC updates will be extremely slow.\n");
+        }
+
         return 0;
 
 out_rtc:
@@ -273,6 +310,12 @@ static int __devexit max8998_rtc_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct platform_device_id max8998_rtc_id[] = {
+        { "max8998-rtc", TYPE_MAX8998 },
+        { "lp3974-rtc", TYPE_LP3974 },
+        { }
+};
+
 static struct platform_driver max8998_rtc_driver = {
         .driver         = {
                 .name   = "max8998-rtc",
@@ -280,6 +323,7 @@ static struct platform_driver max8998_rtc_driver = {
         },
         .probe          = max8998_rtc_probe,
         .remove         = __devexit_p(max8998_rtc_remove),
+        .id_table       = max8998_rtc_id,
 };
 
 static int __init max8998_rtc_init(void)
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index c086fc30a84c..242bbf86c74a 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -81,12 +81,16 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
 
 static int rtc_proc_open(struct inode *inode, struct file *file)
 {
+        int ret;
         struct rtc_device *rtc = PDE(inode)->data;
 
         if (!try_module_get(THIS_MODULE))
                 return -ENODEV;
 
-        return single_open(file, rtc_proc_show, rtc);
+        ret = single_open(file, rtc_proc_show, rtc);
+        if (ret)
+                module_put(THIS_MODULE);
+        return ret;
 }
 
 static int rtc_proc_release(struct inode *inode, struct file *file)
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 4155805dcdff..2b771f18d1ad 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -319,6 +319,9 @@ void dasd_alias_disconnect_device_from_lcu(struct dasd_device *device)
 
         private = (struct dasd_eckd_private *) device->private;
         lcu = private->lcu;
+        /* nothing to do if already disconnected */
+        if (!lcu)
+                return;
         device->discipline->get_uid(device, &uid);
         spin_lock_irqsave(&lcu->lock, flags);
         list_del_init(&device->alias_list);
@@ -680,6 +683,9 @@ int dasd_alias_remove_device(struct dasd_device *device)
 
         private = (struct dasd_eckd_private *) device->private;
         lcu = private->lcu;
+        /* nothing to do if already removed */
+        if (!lcu)
+                return 0;
         spin_lock_irqsave(&lcu->lock, flags);
         _remove_device_from_lcu(lcu, device);
         spin_unlock_irqrestore(&lcu->lock, flags);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e8391b89eff4..b7eaff9ca19e 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1835,6 +1835,7 @@ static void __ccw_device_pm_restore(struct ccw_device *cdev)
          * available again. Kick re-detection.
          */
         cdev->private->flags.resuming = 1;
+        cdev->private->path_new_mask = LPM_ANYPATH;
         css_schedule_eval(sch->schid);
         spin_unlock_irq(sch->lock);
         css_complete_work();
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index e9fff2b9bce2..5640c89cd9de 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -476,7 +476,7 @@ static inline void inbound_primed(struct qdio_q *q, int count)
 static int get_inbound_buffer_frontier(struct qdio_q *q)
 {
         int count, stop;
-        unsigned char state;
+        unsigned char state = 0;
 
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -643,7 +643,7 @@ void qdio_inbound_processing(unsigned long data)
 static int get_outbound_buffer_frontier(struct qdio_q *q)
 {
         int count, stop;
-        unsigned char state;
+        unsigned char state = 0;
 
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 65ebee0a3266..b6a6356d09b3 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -565,7 +565,7 @@ static int netiucv_callback_connreq(struct iucv_path *path,
         struct iucv_event ev;
         int rc;
 
-        if (memcmp(iucvMagic, ipuser, sizeof(ipuser)))
+        if (memcmp(iucvMagic, ipuser, 16))
                 /* ipuser must match iucvMagic. */
                 return -EINVAL;
         rc = -EINVAL;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 29f848bfc12f..019ae58ab913 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -988,16 +988,30 @@ static void qeth_get_channel_path_desc(struct qeth_card *card)
         chp_dsc = (struct channelPath_dsc *)ccw_device_get_chp_desc(ccwdev, 0);
         if (chp_dsc != NULL) {
                 /* CHPP field bit 6 == 1 -> single queue */
-                if ((chp_dsc->chpp & 0x02) == 0x02)
+                if ((chp_dsc->chpp & 0x02) == 0x02) {
+                        if ((atomic_read(&card->qdio.state) !=
+                                QETH_QDIO_UNINITIALIZED) &&
+                            (card->qdio.no_out_queues == 4))
+                                /* change from 4 to 1 outbound queues */
+                                qeth_free_qdio_buffers(card);
                         card->qdio.no_out_queues = 1;
+                        if (card->qdio.default_out_queue != 0)
+                                dev_info(&card->gdev->dev,
+                                        "Priority Queueing not supported\n");
+                        card->qdio.default_out_queue = 0;
+                } else {
+                        if ((atomic_read(&card->qdio.state) !=
+                                QETH_QDIO_UNINITIALIZED) &&
+                            (card->qdio.no_out_queues == 1)) {
+                                /* change from 1 to 4 outbound queues */
+                                qeth_free_qdio_buffers(card);
+                                card->qdio.default_out_queue = 2;
+                        }
+                        card->qdio.no_out_queues = 4;
+                }
                 card->info.func_level = 0x4100 + chp_dsc->desc;
                 kfree(chp_dsc);
         }
-        if (card->qdio.no_out_queues == 1) {
-                card->qdio.default_out_queue = 0;
-                dev_info(&card->gdev->dev,
-                        "Priority Queueing not supported\n");
-        }
         QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card->qdio.no_out_queues);
         QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card->info.func_level);
         return;
@@ -1832,33 +1846,6 @@ static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card)
         }
 }
 
-static inline int qeth_get_max_mtu_for_card(int cardtype)
-{
-        switch (cardtype) {
-
-        case QETH_CARD_TYPE_UNKNOWN:
-        case QETH_CARD_TYPE_OSD:
-        case QETH_CARD_TYPE_OSN:
-        case QETH_CARD_TYPE_OSM:
-        case QETH_CARD_TYPE_OSX:
-                return 61440;
-        case QETH_CARD_TYPE_IQD:
-                return 57344;
-        default:
-                return 1500;
-        }
-}
-
-static inline int qeth_get_mtu_out_of_mpc(int cardtype)
-{
-        switch (cardtype) {
-        case QETH_CARD_TYPE_IQD:
-                return 1;
-        default:
-                return 0;
-        }
-}
-
 static inline int qeth_get_mtu_outof_framesize(int framesize)
 {
         switch (framesize) {
@@ -1881,10 +1868,9 @@ static inline int qeth_mtu_is_valid(struct qeth_card *card, int mtu)
         case QETH_CARD_TYPE_OSD:
         case QETH_CARD_TYPE_OSM:
         case QETH_CARD_TYPE_OSX:
-                return ((mtu >= 576) && (mtu <= 61440));
         case QETH_CARD_TYPE_IQD:
                 return ((mtu >= 576) &&
-                        (mtu <= card->info.max_mtu + 4096 - 32));
+                        (mtu <= card->info.max_mtu));
         case QETH_CARD_TYPE_OSN:
         case QETH_CARD_TYPE_UNKNOWN:
         default:
@@ -1907,7 +1893,7 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,
         memcpy(&card->token.ulp_filter_r,
                QETH_ULP_ENABLE_RESP_FILTER_TOKEN(iob->data),
                QETH_MPC_TOKEN_LENGTH);
-        if (qeth_get_mtu_out_of_mpc(card->info.type)) {
+        if (card->info.type == QETH_CARD_TYPE_IQD) {
                 memcpy(&framesize, QETH_ULP_ENABLE_RESP_MAX_MTU(iob->data), 2);
                 mtu = qeth_get_mtu_outof_framesize(framesize);
                 if (!mtu) {
@@ -1915,12 +1901,21 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,
                         QETH_DBF_TEXT_(SETUP, 2, "  rc%d", iob->rc);
                         return 0;
                 }
-                card->info.max_mtu = mtu;
+                if (card->info.initial_mtu && (card->info.initial_mtu != mtu)) {
+                        /* frame size has changed */
+                        if (card->dev &&
+                            ((card->dev->mtu == card->info.initial_mtu) ||
+                             (card->dev->mtu > mtu)))
+                                card->dev->mtu = mtu;
+                        qeth_free_qdio_buffers(card);
+                }
                 card->info.initial_mtu = mtu;
+                card->info.max_mtu = mtu;
                 card->qdio.in_buf_size = mtu + 2 * PAGE_SIZE;
         } else {
                 card->info.initial_mtu = qeth_get_initial_mtu_for_card(card);
-                card->info.max_mtu = qeth_get_max_mtu_for_card(card->info.type);
+                card->info.max_mtu = *(__u16 *)QETH_ULP_ENABLE_RESP_MAX_MTU(
+                        iob->data);
                 card->qdio.in_buf_size = QETH_IN_BUF_SIZE_DEFAULT;
         }
 
@@ -3775,6 +3770,47 @@ static inline int qeth_get_qdio_q_format(struct qeth_card *card)
         }
 }
 
+static void qeth_determine_capabilities(struct qeth_card *card)
+{
+        int rc;
+        int length;
+        char *prcd;
+        struct ccw_device *ddev;
+        int ddev_offline = 0;
+
+        QETH_DBF_TEXT(SETUP, 2, "detcapab");
+        ddev = CARD_DDEV(card);
+        if (!ddev->online) {
+                ddev_offline = 1;
+                rc = ccw_device_set_online(ddev);
+                if (rc) {
+                        QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);
+                        goto out;
+                }
+        }
+
+        rc = qeth_read_conf_data(card, (void **) &prcd, &length);
+        if (rc) {
+                QETH_DBF_MESSAGE(2, "%s qeth_read_conf_data returned %i\n",
+                        dev_name(&card->gdev->dev), rc);
+                QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);
+                goto out_offline;
+        }
+        qeth_configure_unitaddr(card, prcd);
+        qeth_configure_blkt_default(card, prcd);
+        kfree(prcd);
+
+        rc = qdio_get_ssqd_desc(ddev, &card->ssqd);
+        if (rc)
+                QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
+
+out_offline:
+        if (ddev_offline == 1)
+                ccw_device_set_offline(ddev);
+out:
+        return;
+}
+
 static int qeth_qdio_establish(struct qeth_card *card)
 {
         struct qdio_initialize init_data;
@@ -3905,6 +3941,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
 
         QETH_DBF_TEXT(SETUP, 2, "hrdsetup");
         atomic_set(&card->force_alloc_skb, 0);
+        qeth_get_channel_path_desc(card);
 retry:
         if (retries)
                 QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
@@ -3933,6 +3970,7 @@ retriable:
                 else
                         goto retry;
         }
+        qeth_determine_capabilities(card);
         qeth_init_tokens(card);
         qeth_init_func_level(card);
         rc = qeth_idx_activate_channel(&card->read, qeth_idx_read_cb);
@@ -4202,41 +4240,6 @@ void qeth_core_free_discipline(struct qeth_card *card)
         card->discipline.ccwgdriver = NULL;
 }
 
-static void qeth_determine_capabilities(struct qeth_card *card)
-{
-        int rc;
-        int length;
-        char *prcd;
-
-        QETH_DBF_TEXT(SETUP, 2, "detcapab");
-        rc = ccw_device_set_online(CARD_DDEV(card));
-        if (rc) {
-                QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);
-                goto out;
-        }
-
-
-        rc = qeth_read_conf_data(card, (void **) &prcd, &length);
-        if (rc) {
-                QETH_DBF_MESSAGE(2, "%s qeth_read_conf_data returned %i\n",
-                        dev_name(&card->gdev->dev), rc);
-                QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);
-                goto out_offline;
-        }
-        qeth_configure_unitaddr(card, prcd);
-        qeth_configure_blkt_default(card, prcd);
-        kfree(prcd);
-
-        rc = qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);
-        if (rc)
-                QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
-
-out_offline:
-        ccw_device_set_offline(CARD_DDEV(card));
-out:
-        return;
-}
-
 static int qeth_core_probe_device(struct ccwgroup_device *gdev)
 {
         struct qeth_card *card;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 7a7a1b664781..ada0fe782373 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -573,13 +573,13 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 case IPA_RC_L2_DUP_LAYER3_MAC:
                         dev_warn(&card->gdev->dev,
                                 "MAC address %pM already exists\n",
-                                card->dev->dev_addr);
+                                cmd->data.setdelmac.mac);
                         break;
                 case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:
                 case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:
                         dev_warn(&card->gdev->dev,
                                 "MAC address %pM is not authorized\n",
-                                card->dev->dev_addr);
+                                cmd->data.setdelmac.mac);
                         break;
                 default:
                         break;
@@ -831,12 +831,14 @@ tx_drop:
         return NETDEV_TX_OK;
 }
 
-static int qeth_l2_open(struct net_device *dev)
+static int __qeth_l2_open(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
         int rc = 0;
 
         QETH_CARD_TEXT(card, 4, "qethopen");
+        if (card->state == CARD_STATE_UP)
+                return rc;
         if (card->state != CARD_STATE_SOFTSETUP)
                 return -ENODEV;
 
@@ -857,6 +859,18 @@ static int qeth_l2_open(struct net_device *dev)
         return rc;
 }
 
+static int qeth_l2_open(struct net_device *dev)
+{
+        struct qeth_card *card = dev->ml_priv;
+
+        QETH_CARD_TEXT(card, 5, "qethope_");
+        if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
+                QETH_CARD_TEXT(card, 3, "openREC");
+                return -ERESTARTSYS;
+        }
+        return __qeth_l2_open(dev);
+}
+
 static int qeth_l2_stop(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
@@ -1046,7 +1060,7 @@ contin:
         if (recover_flag == CARD_STATE_RECOVER) {
                 if (recovery_mode &&
                     card->info.type != QETH_CARD_TYPE_OSN) {
-                        qeth_l2_open(card->dev);
+                        __qeth_l2_open(card->dev);
                 } else {
                         rtnl_lock();
                         dev_open(card->dev);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index e227e465bfc4..d09b0c44fc3d 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2998,7 +2998,9 @@ static inline void qeth_l3_hdr_csum(struct qeth_card *card,
          */
         if (iph->protocol == IPPROTO_UDP)
                 hdr->hdr.l3.ext_flags |= QETH_HDR_EXT_UDP;
-        hdr->hdr.l3.ext_flags |= QETH_HDR_EXT_CSUM_TRANSP_REQ;
+        hdr->hdr.l3.ext_flags |= QETH_HDR_EXT_CSUM_TRANSP_REQ |
+                QETH_HDR_EXT_CSUM_HDR_REQ;
+        iph->check = 0;
         if (card->options.performance_stats)
                 card->perf_stats.tx_csum++;
 }
@@ -3240,12 +3242,14 @@ tx_drop:
         return NETDEV_TX_OK;
 }
 
-static int qeth_l3_open(struct net_device *dev)
+static int __qeth_l3_open(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
         int rc = 0;
 
         QETH_CARD_TEXT(card, 4, "qethopen");
+        if (card->state == CARD_STATE_UP)
+                return rc;
         if (card->state != CARD_STATE_SOFTSETUP)
                 return -ENODEV;
         card->data.state = CH_STATE_UP;
@@ -3260,6 +3264,18 @@ static int qeth_l3_open(struct net_device *dev)
         return rc;
 }
 
+static int qeth_l3_open(struct net_device *dev)
+{
+        struct qeth_card *card = dev->ml_priv;
+
+        QETH_CARD_TEXT(card, 5, "qethope_");
+        if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
+                QETH_CARD_TEXT(card, 3, "openREC");
+                return -ERESTARTSYS;
+        }
+        return __qeth_l3_open(dev);
+}
+
 static int qeth_l3_stop(struct net_device *dev)
 {
         struct qeth_card *card = dev->ml_priv;
@@ -3564,7 +3580,7 @@ contin:
                 netif_carrier_off(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
                 if (recovery_mode)
-                        qeth_l3_open(card->dev);
+                        __qeth_l3_open(card->dev);
                 else {
                         rtnl_lock();
                         dev_open(card->dev);
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 65e1cf104943..207b7d742443 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -60,7 +60,7 @@ static struct iucv_handler smsg_handler = {
 static int smsg_path_pending(struct iucv_path *path, u8 ipvmid[8],
                              u8 ipuser[16])
 {
-        if (strncmp(ipvmid, "*MSG    ", sizeof(ipvmid)) != 0)
+        if (strncmp(ipvmid, "*MSG    ", 8) != 0)
                 return -EINVAL;
         /* Path pending from *MSG. */
         return iucv_path_accept(path, &smsg_handler, "SMSGIUCV        ", NULL);
diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
index 475c31ae985c..77b26f5b9c33 100644
--- a/drivers/scsi/arcmsr/arcmsr.h
+++ b/drivers/scsi/arcmsr/arcmsr.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **        O.S   : Linux
 **   FILE NAME  : arcmsr.h
-**        BY    : Erich Chen
+**        BY    : Nick Cheng
 **   Description: SCSI RAID Device Driver for
 **                ARECA RAID Host adapter
 *******************************************************************************
@@ -46,8 +46,12 @@
 struct device_attribute;
 /*The limit of outstanding scsi command that firmware can handle*/
 #define ARCMSR_MAX_OUTSTANDING_CMD                                              256
-#define ARCMSR_MAX_FREECCB_NUM                                                  320
-#define ARCMSR_DRIVER_VERSION                "Driver Version 1.20.00.15 2010/02/02"
+#ifdef CONFIG_XEN
+        #define ARCMSR_MAX_FREECCB_NUM  160
+#else
+        #define ARCMSR_MAX_FREECCB_NUM  320
+#endif
+#define ARCMSR_DRIVER_VERSION                "Driver Version 1.20.00.15 2010/08/05"
 #define ARCMSR_SCSI_INITIATOR_ID                                                255
 #define ARCMSR_MAX_XFER_SECTORS                                                 512
 #define ARCMSR_MAX_XFER_SECTORS_B                                               4096
@@ -60,7 +64,6 @@ struct device_attribute;
 #define ARCMSR_MAX_HBB_POSTQUEUE                                                264
 #define ARCMSR_MAX_XFER_LEN                                                     0x26000 /* 152K */
 #define ARCMSR_CDB_SG_PAGE_LENGTH                                               256 
-#define SCSI_CMD_ARECA_SPECIFIC                                         0xE1
 #ifndef PCI_DEVICE_ID_ARECA_1880
 #define PCI_DEVICE_ID_ARECA_1880 0x1880
  #endif
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index a4e04c50c436..acdae33de521 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -2,7 +2,7 @@
 *******************************************************************************
 **        O.S   : Linux
 **   FILE NAME  : arcmsr_attr.c
-**        BY    : Erich Chen
+**        BY    : Nick Cheng
 **   Description: attributes exported to sysfs and device host
 *******************************************************************************
 ** Copyright (C) 2002 - 2005, Areca Technology Corporation All rights reserved
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 1cadcd6b7da6..984bd527c6c9 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -2,7 +2,7 @@
 *******************************************************************************
 **        O.S   : Linux
 **   FILE NAME  : arcmsr_hba.c
-**        BY    : Erich Chen
+**        BY    : Nick Cheng
 **   Description: SCSI RAID Device Driver for
 **                ARECA RAID Host adapter
 *******************************************************************************
@@ -76,7 +76,7 @@ MODULE_DESCRIPTION("ARECA (ARC11xx/12xx/16xx/1880) SATA/SAS RAID Host Bus Adapte
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(ARCMSR_DRIVER_VERSION);
 static int sleeptime = 10;
-static int retrycount = 30;
+static int retrycount = 12;
 wait_queue_head_t wait_q;
 static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
                                         struct scsi_cmnd *cmd);
@@ -187,7 +187,6 @@ int arcmsr_sleep_for_bus_reset(struct scsi_cmnd *cmd)
                 if (isleep > 0) {
                         msleep(isleep*1000);
                 }
-                printk(KERN_NOTICE "wake-up\n");
                 return 0;
 }
 
@@ -921,7 +920,6 @@ static void arcmsr_report_ccb_state(struct AdapterControlBlock *acb,
 }
 
 static void arcmsr_drain_donequeue(struct AdapterControlBlock *acb, struct CommandControlBlock *pCCB, bool error)
-
 {
         int id, lun;
         if ((pCCB->acb != acb) || (pCCB->startdone != ARCMSR_CCB_START)) {
@@ -948,7 +946,7 @@ static void arcmsr_drain_donequeue(struct AdapterControlBlock *acb, struct Comma
                                 , pCCB->startdone
                                 , atomic_read(&acb->ccboutstandingcount));
                   return;
-                }
+        }
         arcmsr_report_ccb_state(acb, pCCB, error);
 }
 
@@ -981,7 +979,7 @@ static void arcmsr_done4abort_postqueue(struct AdapterControlBlock *acb)
         case ACB_ADAPTER_TYPE_B: {
                 struct MessageUnit_B *reg = acb->pmuB;
                 /*clear all outbound posted Q*/
-                writel(ARCMSR_DOORBELL_INT_CLEAR_PATTERN, &reg->iop2drv_doorbell); /* clear doorbell interrupt */
+                writel(ARCMSR_DOORBELL_INT_CLEAR_PATTERN, reg->iop2drv_doorbell); /* clear doorbell interrupt */
                 for (i = 0; i < ARCMSR_MAX_HBB_POSTQUEUE; i++) {
                         if ((flag_ccb = readl(&reg->done_qbuffer[i])) != 0) {
                                 writel(0, &reg->done_qbuffer[i]);
@@ -1511,7 +1509,6 @@ static void arcmsr_hba_postqueue_isr(struct AdapterControlBlock *acb)
                 arcmsr_drain_donequeue(acb, pCCB, error);
         }
 }
-
 static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb)
 {
         uint32_t index;
@@ -2106,10 +2103,6 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,
         if (atomic_read(&acb->ccboutstandingcount) >=
                         ARCMSR_MAX_OUTSTANDING_CMD)
                 return SCSI_MLQUEUE_HOST_BUSY;
-        if ((scsicmd == SCSI_CMD_ARECA_SPECIFIC)) {
-                printk(KERN_NOTICE "Receiveing SCSI_CMD_ARECA_SPECIFIC command..\n");
-                return 0;
-        }
         ccb = arcmsr_get_freeccb(acb);
         if (!ccb)
                 return SCSI_MLQUEUE_HOST_BUSY;
@@ -2393,6 +2386,7 @@ static int arcmsr_polling_hbb_ccbdone(struct AdapterControlBlock *acb,
         int index, rtn;
         bool error;
         polling_hbb_ccb_retry:
+
         poll_count++;
         /* clear doorbell interrupt */
         writel(ARCMSR_DOORBELL_INT_CLEAR_PATTERN, reg->iop2drv_doorbell);
@@ -2663,6 +2657,7 @@ static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb)
 {
         struct MessageUnit_A __iomem *reg = acb->pmuA;
         if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){
+                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                 return;
         } else {
                 acb->fw_flag = FW_NORMAL;
@@ -2670,8 +2665,10 @@ static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb)
                         atomic_set(&acb->rq_map_token, 16);
                 }
                 atomic_set(&acb->ante_token_value, atomic_read(&acb->rq_map_token));
-                if (atomic_dec_and_test(&acb->rq_map_token))
+                if (atomic_dec_and_test(&acb->rq_map_token)) {
+                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                         return;
+                }
                 writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0);
                 mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
         }
@@ -2682,15 +2679,18 @@ static void arcmsr_request_hbb_device_map(struct AdapterControlBlock *acb)
 {
         struct MessageUnit_B __iomem *reg = acb->pmuB;
         if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){
+                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                 return;
         } else {
                 acb->fw_flag = FW_NORMAL;
                 if (atomic_read(&acb->ante_token_value) == atomic_read(&acb->rq_map_token)) {
-                        atomic_set(&acb->rq_map_token,16);
+                        atomic_set(&acb->rq_map_token, 16);
                 }
                 atomic_set(&acb->ante_token_value, atomic_read(&acb->rq_map_token));
-                if(atomic_dec_and_test(&acb->rq_map_token))
+                if (atomic_dec_and_test(&acb->rq_map_token)) {
+                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                         return;
+                }
                 writel(ARCMSR_MESSAGE_GET_CONFIG, reg->drv2iop_doorbell);
                 mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
         }
@@ -2701,6 +2701,7 @@ static void arcmsr_request_hbc_device_map(struct AdapterControlBlock *acb)
 {
         struct MessageUnit_C __iomem *reg = acb->pmuC;
         if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0) || ((acb->acb_flags & ACB_F_ABORT) != 0)) {
+                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                 return;
         } else {
                 acb->fw_flag = FW_NORMAL;
@@ -2708,8 +2709,10 @@ static void arcmsr_request_hbc_device_map(struct AdapterControlBlock *acb)
                         atomic_set(&acb->rq_map_token, 16);
                 }
                 atomic_set(&acb->ante_token_value, atomic_read(&acb->rq_map_token));
-                if (atomic_dec_and_test(&acb->rq_map_token))
+                if (atomic_dec_and_test(&acb->rq_map_token)) {
+                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                         return;
+                }
                 writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0);
                 writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);
                 mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
@@ -2897,6 +2900,8 @@ static uint8_t arcmsr_iop_reset(struct AdapterControlBlock *acb)
         uint32_t intmask_org;
         uint8_t rtnval = 0x00;
         int i = 0;
+        unsigned long flags;
+
         if (atomic_read(&acb->ccboutstandingcount) != 0) {
                 /* disable all outbound interrupt */
                 intmask_org = arcmsr_disable_outbound_ints(acb);
@@ -2907,7 +2912,12 @@ static uint8_t arcmsr_iop_reset(struct AdapterControlBlock *acb)
                 for (i = 0; i < ARCMSR_MAX_FREECCB_NUM; i++) {
                         ccb = acb->pccb_pool[i];
                         if (ccb->startdone == ARCMSR_CCB_START) {
-                                arcmsr_ccb_complete(ccb);
+                                scsi_dma_unmap(ccb->pcmd);
+                                ccb->startdone = ARCMSR_CCB_DONE;
+                                ccb->ccb_flags = 0;
+                                spin_lock_irqsave(&acb->ccblist_lock, flags);
+                                list_add_tail(&ccb->list, &acb->ccb_free_list);
+                                spin_unlock_irqrestore(&acb->ccblist_lock, flags);
                         }
                 }
                 atomic_set(&acb->ccboutstandingcount, 0);
@@ -2920,8 +2930,7 @@ static uint8_t arcmsr_iop_reset(struct AdapterControlBlock *acb)
 
 static int arcmsr_bus_reset(struct scsi_cmnd *cmd)
 {
-        struct AdapterControlBlock *acb =
-                (struct AdapterControlBlock *)cmd->device->host->hostdata;
+        struct AdapterControlBlock *acb;
         uint32_t intmask_org, outbound_doorbell;
         int retry_count = 0;
         int rtn = FAILED;
@@ -2971,31 +2980,16 @@ sleep_again:
                                 atomic_set(&acb->rq_map_token, 16);
                                 atomic_set(&acb->ante_token_value, 16);
                                 acb->fw_flag = FW_NORMAL;
-                                init_timer(&acb->eternal_timer);
-                                acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6*HZ);
-                                acb->eternal_timer.data = (unsigned long) acb;
-                                acb->eternal_timer.function = &arcmsr_request_device_map;
-                                add_timer(&acb->eternal_timer);
+                                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                                 acb->acb_flags &= ~ACB_F_BUS_RESET;
                                 rtn = SUCCESS;
                                 printk(KERN_ERR "arcmsr: scsi  bus reset eh returns with success\n");
                         } else {
                                 acb->acb_flags &= ~ACB_F_BUS_RESET;
-                                if (atomic_read(&acb->rq_map_token) == 0) {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        init_timer(&acb->eternal_timer);
-                                                acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6*HZ);
-                                        acb->eternal_timer.data = (unsigned long) acb;
-                                        acb->eternal_timer.function = &arcmsr_request_device_map;
-                                        add_timer(&acb->eternal_timer);
-                                } else {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6*HZ));
-                                }
+                                atomic_set(&acb->rq_map_token, 16);
+                                atomic_set(&acb->ante_token_value, 16);
+                                acb->fw_flag = FW_NORMAL;
+                                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6*HZ));
                                 rtn = SUCCESS;
                         }
                         break;
@@ -3007,21 +3001,10 @@ sleep_again:
                                 rtn = FAILED;
                         } else {
                                 acb->acb_flags &= ~ACB_F_BUS_RESET;
-                                if (atomic_read(&acb->rq_map_token) == 0) {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        init_timer(&acb->eternal_timer);
-                                                acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6*HZ);
-                                        acb->eternal_timer.data = (unsigned long) acb;
-                                        acb->eternal_timer.function = &arcmsr_request_device_map;
-                                        add_timer(&acb->eternal_timer);
-                                } else {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6*HZ));
-                                }
+                                atomic_set(&acb->rq_map_token, 16);
+                                atomic_set(&acb->ante_token_value, 16);
+                                acb->fw_flag = FW_NORMAL;
+                                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                                 rtn = SUCCESS;
                         }
                         break;
@@ -3067,31 +3050,16 @@ sleep:
                                 atomic_set(&acb->rq_map_token, 16);
                                 atomic_set(&acb->ante_token_value, 16);
                                 acb->fw_flag = FW_NORMAL;
-                                init_timer(&acb->eternal_timer);
-                                acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6 * HZ);
-                                acb->eternal_timer.data = (unsigned long) acb;
-                                acb->eternal_timer.function = &arcmsr_request_device_map;
-                                add_timer(&acb->eternal_timer);
+                                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6 * HZ));
                                 acb->acb_flags &= ~ACB_F_BUS_RESET;
                                 rtn = SUCCESS;
                                 printk(KERN_ERR "arcmsr: scsi bus reset eh returns with success\n");
                         } else {
                                 acb->acb_flags &= ~ACB_F_BUS_RESET;
-                                if (atomic_read(&acb->rq_map_token) == 0) {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        init_timer(&acb->eternal_timer);
-                                                acb->eternal_timer.expires = jiffies + msecs_to_jiffies(6*HZ);
-                                        acb->eternal_timer.data = (unsigned long) acb;
-                                        acb->eternal_timer.function = &arcmsr_request_device_map;
-                                        add_timer(&acb->eternal_timer);
-                                } else {
-                                        atomic_set(&acb->rq_map_token, 16);
-                                        atomic_set(&acb->ante_token_value, 16);
-                                        acb->fw_flag = FW_NORMAL;
-                                        mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6*HZ));
-                                }
+                                atomic_set(&acb->rq_map_token, 16);
+                                atomic_set(&acb->ante_token_value, 16);
+                                acb->fw_flag = FW_NORMAL;
+                                mod_timer(&acb->eternal_timer, jiffies + msecs_to_jiffies(6*HZ));
                                 rtn = SUCCESS;
                         }
                         break;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d3c5905b22ec..9c5c8be72231 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7515,16 +7515,10 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
 {
         struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
         volatile u32 int_reg;
-        int rc;
 
         ENTER;
         ioa_cfg->pdev->state_saved = true;
-        rc = pci_restore_state(ioa_cfg->pdev);
-
-        if (rc != PCIBIOS_SUCCESSFUL) {
-                ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
-                return IPR_RC_JOB_CONTINUE;
-        }
+        pci_restore_state(ioa_cfg->pdev);
 
         if (ipr_set_pcix_cmd_reg(ioa_cfg)) {
                 ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 5815cbeb27a6..9a7aaf5f1311 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -646,6 +646,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
 
         spin_lock_irqsave(shost->host_lock, flags);
         list_splice_init(&shost->eh_cmd_q, &eh_work_q);
+        shost->host_eh_scheduled = 0;
         spin_unlock_irqrestore(shost->host_lock, flags);
 
         SAS_DPRINTK("Enter %s\n", __func__);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index b2a817055b8b..9ead0399808a 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -2176,9 +2176,9 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
                 /* adjust hba_queue_depth, reply_free_queue_depth,
                  * and queue_size
                  */
-                ioc->hba_queue_depth -= queue_diff;
-                ioc->reply_free_queue_depth -= queue_diff;
-                queue_size -= queue_diff;
+                ioc->hba_queue_depth -= (queue_diff / 2);
+                ioc->reply_free_queue_depth -= (queue_diff / 2);
+                queue_size = facts->MaxReplyDescriptorPostQueueDepth;
         }
         ioc->reply_post_queue_depth = queue_size;
 
@@ -3941,6 +3941,8 @@ mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc)
 static void
 _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
 {
+        mpt2sas_scsih_reset_handler(ioc, reset_phase);
+        mpt2sas_ctl_reset_handler(ioc, reset_phase);
         switch (reset_phase) {
         case MPT2_IOC_PRE_RESET:
                 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
@@ -3971,8 +3973,6 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
                     "MPT2_IOC_DONE_RESET\n", ioc->name, __func__));
                 break;
         }
-        mpt2sas_scsih_reset_handler(ioc, reset_phase);
-        mpt2sas_ctl_reset_handler(ioc, reset_phase);
 }
 
 /**
@@ -4026,6 +4026,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
 {
         int r;
         unsigned long flags;
+        u8 pe_complete = ioc->wait_for_port_enable_to_complete;
 
         dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
             __func__));
@@ -4068,6 +4069,14 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
         if (r)
                 goto out;
         _base_reset_handler(ioc, MPT2_IOC_AFTER_RESET);
+
+        /* If this hard reset is called while port enable is active, then
+         * there is no reason to call make_ioc_operational
+         */
+        if (pe_complete) {
+                r = -EFAULT;
+                goto out;
+        }
         r = _base_make_ioc_operational(ioc, sleep_flag);
         if (!r)
                 _base_reset_handler(ioc, MPT2_IOC_DONE_RESET);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index eda347c57979..5ded3db6e316 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -819,7 +819,7 @@ _scsih_is_end_device(u32 device_info)
 }
 
 /**
- * mptscsih_get_scsi_lookup - returns scmd entry
+ * _scsih_scsi_lookup_get - returns scmd entry
  * @ioc: per adapter object
  * @smid: system request message index
  *
@@ -832,6 +832,28 @@ _scsih_scsi_lookup_get(struct MPT2SAS_ADAPTER *ioc, u16 smid)
 }
 
 /**
+ * _scsih_scsi_lookup_get_clear - returns scmd entry
+ * @ioc: per adapter object
+ * @smid: system request message index
+ *
+ * Returns the smid stored scmd pointer.
+ * Then will derefrence the stored scmd pointer.
+ */
+static inline struct scsi_cmnd *
+_scsih_scsi_lookup_get_clear(struct MPT2SAS_ADAPTER *ioc, u16 smid)
+{
+        unsigned long flags;
+        struct scsi_cmnd *scmd;
+
+        spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
+        scmd = ioc->scsi_lookup[smid - 1].scmd;
+        ioc->scsi_lookup[smid - 1].scmd = NULL;
+        spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
+
+        return scmd;
+}
+
+/**
  * _scsih_scsi_lookup_find_by_scmd - scmd lookup
  * @ioc: per adapter object
  * @smid: system request message index
@@ -2981,9 +3003,6 @@ _scsih_check_topo_delete_events(struct MPT2SAS_ADAPTER *ioc,
         u16 handle;
 
         for (i = 0 ; i < event_data->NumEntries; i++) {
-                if (event_data->PHY[i].PhyStatus &
-                    MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT)
-                        continue;
                 handle = le16_to_cpu(event_data->PHY[i].AttachedDevHandle);
                 if (!handle)
                         continue;
@@ -3210,7 +3229,7 @@ _scsih_flush_running_cmds(struct MPT2SAS_ADAPTER *ioc)
         u16 count = 0;
 
         for (smid = 1; smid <= ioc->scsiio_depth; smid++) {
-                scmd = _scsih_scsi_lookup_get(ioc, smid);
+                scmd = _scsih_scsi_lookup_get_clear(ioc, smid);
                 if (!scmd)
                         continue;
                 count++;
@@ -3804,7 +3823,7 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
         u32 response_code = 0;
 
         mpi_reply = mpt2sas_base_get_reply_virt_addr(ioc, reply);
-        scmd = _scsih_scsi_lookup_get(ioc, smid);
+        scmd = _scsih_scsi_lookup_get_clear(ioc, smid);
         if (scmd == NULL)
                 return 1;
 
@@ -5005,6 +5024,12 @@ _scsih_sas_device_status_change_event(struct MPT2SAS_ADAPTER *ioc,
                      event_data);
 #endif
 
+        /* In MPI Revision K (0xC), the internal device reset complete was
+         * implemented, so avoid setting tm_busy flag for older firmware.
+         */
+        if ((ioc->facts.HeaderVersion >> 8) < 0xC)
+                return;
+
         if (event_data->ReasonCode !=
             MPI2_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET &&
            event_data->ReasonCode !=
@@ -5099,6 +5124,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
     struct fw_event_work *fw_event)
 {
         struct scsi_cmnd *scmd;
+        struct scsi_device *sdev;
         u16 smid, handle;
         u32 lun;
         struct MPT2SAS_DEVICE *sas_device_priv_data;
@@ -5109,12 +5135,17 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
         Mpi2EventDataSasBroadcastPrimitive_t *event_data = fw_event->event_data;
 #endif
         u16 ioc_status;
+        unsigned long flags;
+        int r;
+
         dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primative: "
             "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum,
             event_data->PortWidth));
         dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
             __func__));
 
+        spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
+        ioc->broadcast_aen_busy = 0;
         termination_count = 0;
         query_count = 0;
         mpi_reply = ioc->tm_cmds.reply;
@@ -5122,7 +5153,8 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
                 scmd = _scsih_scsi_lookup_get(ioc, smid);
                 if (!scmd)
                         continue;
-                sas_device_priv_data = scmd->device->hostdata;
+                sdev = scmd->device;
+                sas_device_priv_data = sdev->hostdata;
                 if (!sas_device_priv_data || !sas_device_priv_data->sas_target)
                         continue;
                  /* skip hidden raid components */
@@ -5138,6 +5170,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
                 lun = sas_device_priv_data->lun;
                 query_count++;
 
+                spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
                 mpt2sas_scsih_issue_tm(ioc, handle, 0, 0, lun,
                     MPI2_SCSITASKMGMT_TASKTYPE_QUERY_TASK, smid, 30, NULL);
                 ioc->tm_cmds.status = MPT2_CMD_NOT_USED;
@@ -5147,14 +5180,20 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
                     (mpi_reply->ResponseCode ==
                      MPI2_SCSITASKMGMT_RSP_TM_SUCCEEDED ||
                      mpi_reply->ResponseCode ==
-                     MPI2_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC))
+                     MPI2_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC)) {
+                        spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
                         continue;
-
-                mpt2sas_scsih_issue_tm(ioc, handle, 0, 0, lun,
-                    MPI2_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET, 0, 30, NULL);
+                }
+                r = mpt2sas_scsih_issue_tm(ioc, handle, sdev->channel, sdev->id,
+                    sdev->lun, MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK, smid, 30,
+                    scmd);
+                if (r == FAILED)
+                        sdev_printk(KERN_WARNING, sdev, "task abort: FAILED "
+                            "scmd(%p)\n", scmd);
                 termination_count += le32_to_cpu(mpi_reply->TerminationCount);
+                spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
         }
-        ioc->broadcast_aen_busy = 0;
+        spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
 
         dtmprintk(ioc, printk(MPT2SAS_INFO_FMT
             "%s - exit, query_count = %d termination_count = %d\n",
@@ -6626,6 +6665,7 @@ _scsih_remove(struct pci_dev *pdev)
                 destroy_workqueue(wq);
 
         /* release all the volumes */
+        _scsih_ir_shutdown(ioc);
         list_for_each_entry_safe(raid_device, next, &ioc->raid_device_list,
             list) {
                 if (raid_device->starget) {
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 300d59f389da..321cf3ae8630 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -2228,12 +2228,7 @@ static void pmcraid_ioa_reset(struct pmcraid_cmd *cmd)
                 /* Once either bist or pci reset is done, restore PCI config
                  * space. If this fails, proceed with hard reset again
                  */
-                if (pci_restore_state(pinstance->pdev)) {
-                        pmcraid_info("config-space error resetting again\n");
-                        pinstance->ioa_state = IOA_STATE_IN_RESET_ALERT;
-                        pmcraid_reset_alert(cmd);
-                        break;
-                }
+                pci_restore_state(pinstance->pdev);
 
                 /* fail all pending commands */
                 pmcraid_fail_outstanding_cmds(pinstance);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b65e65aa07eb..e56730214c05 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -990,30 +990,51 @@ out:
 
 static void set_media_not_present(struct scsi_disk *sdkp)
 {
-        sdkp->media_present = 0;
-        sdkp->capacity = 0;
-        sdkp->device->changed = 1;
+        if (sdkp->media_present)
+                sdkp->device->changed = 1;
+
+        if (sdkp->device->removable) {
+                sdkp->media_present = 0;
+                sdkp->capacity = 0;
+        }
+}
+
+static int media_not_present(struct scsi_disk *sdkp,
+                             struct scsi_sense_hdr *sshdr)
+{
+        if (!scsi_sense_valid(sshdr))
+                return 0;
+
+        /* not invoked for commands that could return deferred errors */
+        switch (sshdr->sense_key) {
+        case UNIT_ATTENTION:
+        case NOT_READY:
+                /* medium not present */
+                if (sshdr->asc == 0x3A) {
+                        set_media_not_present(sdkp);
+                        return 1;
+                }
+        }
+        return 0;
 }
 
 /**
- *      sd_media_changed - check if our medium changed
- *      @disk: kernel device descriptor 
+ *      sd_check_events - check media events
+ *      @disk: kernel device descriptor
+ *      @clearing: disk events currently being cleared
  *
- *      Returns 0 if not applicable or no change; 1 if change
+ *      Returns mask of DISK_EVENT_*.
  *
  *      Note: this function is invoked from the block subsystem.
  **/
-static int sd_media_changed(struct gendisk *disk)
+static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
 {
         struct scsi_disk *sdkp = scsi_disk(disk);
         struct scsi_device *sdp = sdkp->device;
         struct scsi_sense_hdr *sshdr = NULL;
         int retval;
 
-        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_media_changed\n"));
-
-        if (!sdp->removable)
-                return 0;
+        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n"));
 
         /*
          * If the device is offline, don't send any commands - just pretend as
@@ -1043,40 +1064,32 @@ static int sd_media_changed(struct gendisk *disk)
                                               sshdr);
         }
 
-        if (retval) {
+        /* failed to execute TUR, assume media not present */
+        if (host_byte(retval)) {
                 set_media_not_present(sdkp);
                 goto out;
         }
 
+        if (media_not_present(sdkp, sshdr))
+                goto out;
+
         /*
          * For removable scsi disk we have to recognise the presence
-         * of a disk in the drive. This is kept in the struct scsi_disk
-         * struct and tested at open !  Daniel Roche (dan@lectra.fr)
+         * of a disk in the drive.
          */
+        if (!sdkp->media_present)
+                sdp->changed = 1;
         sdkp->media_present = 1;
-
 out:
         /*
-         * Report a media change under the following conditions:
-         *
-         *      Medium is present now and wasn't present before.
-         *      Medium wasn't present before and is present now.
-         *      Medium was present at all times, but it changed while
-         *              we weren't looking (sdp->changed is set).
+         * sdp->changed is set under the following conditions:
          *
-         * If there was no medium before and there is no medium now then
-         * don't report a change, even if a medium was inserted and removed
-         * while we weren't looking.
+         *      Medium present state has changed in either direction.
+         *      Device has indicated UNIT_ATTENTION.
          */
-        retval = (sdkp->media_present != sdkp->previous_state ||
-                        (sdkp->media_present && sdp->changed));
-        if (retval)
-                sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL);
-        sdkp->previous_state = sdkp->media_present;
-
-        /* sdp->changed indicates medium was changed or is not present */
-        sdp->changed = !sdkp->media_present;
         kfree(sshdr);
+        retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
+        sdp->changed = 0;
         return retval;
 }
 
@@ -1169,7 +1182,7 @@ static const struct block_device_operations sd_fops = {
 #ifdef CONFIG_COMPAT
         .compat_ioctl           = sd_compat_ioctl,
 #endif
-        .media_changed          = sd_media_changed,
+        .check_events           = sd_check_events,
         .revalidate_disk        = sd_revalidate_disk,
         .unlock_native_capacity = sd_unlock_native_capacity,
 };
@@ -1312,23 +1325,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
         return good_bytes;
 }
 
-static int media_not_present(struct scsi_disk *sdkp,
-                             struct scsi_sense_hdr *sshdr)
-{
-
-        if (!scsi_sense_valid(sshdr))
-                return 0;
-        /* not invoked for commands that could return deferred errors */
-        if (sshdr->sense_key != NOT_READY &&
-            sshdr->sense_key != UNIT_ATTENTION)
-                return 0;
-        if (sshdr->asc != 0x3A) /* medium not present */
-                return 0;
-
-        set_media_not_present(sdkp);
-        return 1;
-}
-
 /*
  * spinup disk - called only in sd_revalidate_disk()
  */
@@ -1503,7 +1499,7 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,
          */
         if (sdp->removable &&
             sense_valid && sshdr->sense_key == NOT_READY)
-                sdp->changed = 1;
+                set_media_not_present(sdkp);
 
         /*
          * We used to set media_present to 0 here to indicate no media
@@ -2389,8 +2385,10 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
 
         gd->driverfs_dev = &sdp->sdev_gendev;
         gd->flags = GENHD_FL_EXT_DEVT;
-        if (sdp->removable)
+        if (sdp->removable) {
                 gd->flags |= GENHD_FL_REMOVABLE;
+                gd->events |= DISK_EVENT_MEDIA_CHANGE;
+        }
 
         add_disk(gd);
         sd_dif_config_host(sdkp);
@@ -2472,7 +2470,6 @@ static int sd_probe(struct device *dev)
         sdkp->disk = gd;
         sdkp->index = index;
         atomic_set(&sdkp->openers, 0);
-        sdkp->previous_state = 1;
 
         if (!sdp->request_queue->rq_timeout) {
                 if (sdp->type != TYPE_MOD)
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 55488faf0815..c9d8f6ca49e2 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -55,7 +55,6 @@ struct scsi_disk {
         u8              media_present;
         u8              write_prot;
         u8              protection_type;/* Data Integrity Field */
-        unsigned        previous_state : 1;
         unsigned        ATO : 1;        /* state of disk ATO bit */
         unsigned        WCE : 1;        /* state of disk WCE bit */
         unsigned        RCD : 1;        /* state of disk RCD bit, unused */
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index be6baf8ad704..aefadc6a1607 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -249,10 +249,6 @@ skip_tur:
                 cd->device->changed = 0;
         }
 
-        /* for backward compatibility */
-        if (events & DISK_EVENT_MEDIA_CHANGE)
-                sdev_evt_send_simple(cd->device, SDEV_EVT_MEDIA_CHANGE,
-                                     GFP_KERNEL);
         return events;
 }
 
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index ceba593dc84f..04113e5304a0 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -101,7 +101,7 @@ static void __iomem * __ref sfi_map_memory(u64 phys, u32 size)
                 return NULL;
 
         if (sfi_use_ioremap)
-                return ioremap(phys, size);
+                return ioremap_cache(phys, size);
         else
                 return early_ioremap(phys, size);
 }
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c
index de885a0f917a..f33e2dd97934 100644
--- a/drivers/sh/intc/chip.c
+++ b/drivers/sh/intc/chip.c
@@ -173,7 +173,8 @@ int intc_set_priority(unsigned int irq, unsigned int prio)
         return 0;
 }
 
-#define VALID(x) (x | 0x80)
+#define SENSE_VALID_FLAG 0x80
+#define VALID(x) (x | SENSE_VALID_FLAG)
 
 static unsigned char intc_irq_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
         [IRQ_TYPE_EDGE_FALLING] = VALID(0),
@@ -201,7 +202,8 @@ static int intc_set_type(struct irq_data *data, unsigned int type)
         ihp = intc_find_irq(d->sense, d->nr_sense, irq);
         if (ihp) {
                 addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
+                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
+                                                    value & ~SENSE_VALID_FLAG);
         }
 
         return 0;
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 1906840c1113..bb233a9cbad2 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -53,6 +53,14 @@ if SPI_MASTER
 
 comment "SPI Master Controller Drivers"
 
+config SPI_ATH79
+        tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
+        depends on ATH79 && GENERIC_GPIO
+        select SPI_BITBANG
+        help
+          This enables support for the SPI controller present on the
+          Atheros AR71XX/AR724X/AR913X SoCs.
+
 config SPI_ATMEL
         tristate "Atmel SPI Controller"
         depends on (ARCH_AT91 || AVR32)
@@ -156,10 +164,10 @@ config SPI_IMX_VER_0_4
         def_bool y if ARCH_MX31
 
 config SPI_IMX_VER_0_7
-        def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51
+        def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
 
 config SPI_IMX_VER_2_3
-        def_bool y if ARCH_MX51
+        def_bool y if ARCH_MX51 || ARCH_MX53
 
 config SPI_IMX
         tristate "Freescale i.MX SPI controllers"
@@ -310,8 +318,8 @@ config SPI_S3C24XX_GPIO
 
 config SPI_S3C64XX
         tristate "Samsung S3C64XX series type SPI"
-        depends on ARCH_S3C64XX && EXPERIMENTAL
-        select S3C64XX_DMA
+        depends on (ARCH_S3C64XX || ARCH_S5P64X0)
+        select S3C64XX_DMA if ARCH_S3C64XX
         help
           SPI driver for Samsung S3C64XX and newer SoCs.
 
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 3a42463c92a4..86d1b5f9bbd9 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SPI_MASTER)		+= spi.o
 
 # SPI master controller drivers (bus)
 obj-$(CONFIG_SPI_ATMEL)                 += atmel_spi.o
+obj-$(CONFIG_SPI_ATH79)                 += ath79_spi.o
 obj-$(CONFIG_SPI_BFIN)                  += spi_bfin5xx.o
 obj-$(CONFIG_SPI_BITBANG)               += spi_bitbang.o
 obj-$(CONFIG_SPI_AU1550)                += au1550_spi.o
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index a2a5921c730a..71a1219a995d 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -1795,7 +1795,7 @@ static int pl022_setup(struct spi_device *spi)
 {
         struct pl022_config_chip const *chip_info;
         struct chip_data *chip;
-        struct ssp_clock_params clk_freq;
+        struct ssp_clock_params clk_freq = {0, };
         int status = 0;
         struct pl022 *pl022 = spi_master_get_devdata(spi->master);
         unsigned int bits = spi->bits_per_word;
diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c
new file mode 100644
index 000000000000..fcff810ea3b0
--- /dev/null
+++ b/drivers/spi/ath79_spi.c
@@ -0,0 +1,292 @@
+/*
+ * SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs
+ *
+ * Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
+ *
+ * This driver has been based on the spi-gpio.c:
+ *      Copyright (C) 2006,2008 David Brownell
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_bitbang.h>
+#include <linux/bitops.h>
+#include <linux/gpio.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <asm/mach-ath79/ath79_spi_platform.h>
+
+#define DRV_NAME        "ath79-spi"
+
+struct ath79_spi {
+        struct spi_bitbang      bitbang;
+        u32                     ioc_base;
+        u32                     reg_ctrl;
+        void __iomem            *base;
+};
+
+static inline u32 ath79_spi_rr(struct ath79_spi *sp, unsigned reg)
+{
+        return ioread32(sp->base + reg);
+}
+
+static inline void ath79_spi_wr(struct ath79_spi *sp, unsigned reg, u32 val)
+{
+        iowrite32(val, sp->base + reg);
+}
+
+static inline struct ath79_spi *ath79_spidev_to_sp(struct spi_device *spi)
+{
+        return spi_master_get_devdata(spi->master);
+}
+
+static void ath79_spi_chipselect(struct spi_device *spi, int is_active)
+{
+        struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+        int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;
+
+        if (is_active) {
+                /* set initial clock polarity */
+                if (spi->mode & SPI_CPOL)
+                        sp->ioc_base |= AR71XX_SPI_IOC_CLK;
+                else
+                        sp->ioc_base &= ~AR71XX_SPI_IOC_CLK;
+
+                ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+        }
+
+        if (spi->chip_select) {
+                struct ath79_spi_controller_data *cdata = spi->controller_data;
+
+                /* SPI is normally active-low */
+                gpio_set_value(cdata->gpio, cs_high);
+        } else {
+                if (cs_high)
+                        sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+                else
+                        sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+
+                ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+        }
+
+}
+
+static int ath79_spi_setup_cs(struct spi_device *spi)
+{
+        struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+        struct ath79_spi_controller_data *cdata;
+
+        cdata = spi->controller_data;
+        if (spi->chip_select && !cdata)
+                return -EINVAL;
+
+        /* enable GPIO mode */
+        ath79_spi_wr(sp, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
+
+        /* save CTRL register */
+        sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);
+        sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);
+
+        /* TODO: setup speed? */
+        ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);
+
+        if (spi->chip_select) {
+                int status = 0;
+
+                status = gpio_request(cdata->gpio, dev_name(&spi->dev));
+                if (status)
+                        return status;
+
+                status = gpio_direction_output(cdata->gpio,
+                                               spi->mode & SPI_CS_HIGH);
+                if (status) {
+                        gpio_free(cdata->gpio);
+                        return status;
+                }
+        } else {
+                if (spi->mode & SPI_CS_HIGH)
+                        sp->ioc_base |= AR71XX_SPI_IOC_CS0;
+                else
+                        sp->ioc_base &= ~AR71XX_SPI_IOC_CS0;
+                ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);
+        }
+
+        return 0;
+}
+
+static void ath79_spi_cleanup_cs(struct spi_device *spi)
+{
+        struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+
+        if (spi->chip_select) {
+                struct ath79_spi_controller_data *cdata = spi->controller_data;
+                gpio_free(cdata->gpio);
+        }
+
+        /* restore CTRL register */
+        ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, sp->reg_ctrl);
+        /* disable GPIO mode */
+        ath79_spi_wr(sp, AR71XX_SPI_REG_FS, 0);
+}
+
+static int ath79_spi_setup(struct spi_device *spi)
+{
+        int status = 0;
+
+        if (spi->bits_per_word > 32)
+                return -EINVAL;
+
+        if (!spi->controller_state) {
+                status = ath79_spi_setup_cs(spi);
+                if (status)
+                        return status;
+        }
+
+        status = spi_bitbang_setup(spi);
+        if (status && !spi->controller_state)
+                ath79_spi_cleanup_cs(spi);
+
+        return status;
+}
+
+static void ath79_spi_cleanup(struct spi_device *spi)
+{
+        ath79_spi_cleanup_cs(spi);
+        spi_bitbang_cleanup(spi);
+}
+
+static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
+                               u32 word, u8 bits)
+{
+        struct ath79_spi *sp = ath79_spidev_to_sp(spi);
+        u32 ioc = sp->ioc_base;
+
+        /* clock starts at inactive polarity */
+        for (word <<= (32 - bits); likely(bits); bits--) {
+                u32 out;
+
+                if (word & (1 << 31))
+                        out = ioc | AR71XX_SPI_IOC_DO;
+                else
+                        out = ioc & ~AR71XX_SPI_IOC_DO;
+
+                /* setup MSB (to slave) on trailing edge */
+                ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out);
+                ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, out | AR71XX_SPI_IOC_CLK);
+
+                word <<= 1;
+        }
+
+        return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
+}
+
+static __devinit int ath79_spi_probe(struct platform_device *pdev)
+{
+        struct spi_master *master;
+        struct ath79_spi *sp;
+        struct ath79_spi_platform_data *pdata;
+        struct resource *r;
+        int ret;
+
+        master = spi_alloc_master(&pdev->dev, sizeof(*sp));
+        if (master == NULL) {
+                dev_err(&pdev->dev, "failed to allocate spi master\n");
+                return -ENOMEM;
+        }
+
+        sp = spi_master_get_devdata(master);
+        platform_set_drvdata(pdev, sp);
+
+        pdata = pdev->dev.platform_data;
+
+        master->setup = ath79_spi_setup;
+        master->cleanup = ath79_spi_cleanup;
+        if (pdata) {
+                master->bus_num = pdata->bus_num;
+                master->num_chipselect = pdata->num_chipselect;
+        } else {
+                master->bus_num = -1;
+                master->num_chipselect = 1;
+        }
+
+        sp->bitbang.master = spi_master_get(master);
+        sp->bitbang.chipselect = ath79_spi_chipselect;
+        sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;
+        sp->bitbang.setup_transfer = spi_bitbang_setup_transfer;
+        sp->bitbang.flags = SPI_CS_HIGH;
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (r == NULL) {
+                ret = -ENOENT;
+                goto err_put_master;
+        }
+
+        sp->base = ioremap(r->start, r->end - r->start + 1);
+        if (!sp->base) {
+                ret = -ENXIO;
+                goto err_put_master;
+        }
+
+        ret = spi_bitbang_start(&sp->bitbang);
+        if (ret)
+                goto err_unmap;
+
+        return 0;
+
+err_unmap:
+        iounmap(sp->base);
+err_put_master:
+        platform_set_drvdata(pdev, NULL);
+        spi_master_put(sp->bitbang.master);
+
+        return ret;
+}
+
+static __devexit int ath79_spi_remove(struct platform_device *pdev)
+{
+        struct ath79_spi *sp = platform_get_drvdata(pdev);
+
+        spi_bitbang_stop(&sp->bitbang);
+        iounmap(sp->base);
+        platform_set_drvdata(pdev, NULL);
+        spi_master_put(sp->bitbang.master);
+
+        return 0;
+}
+
+static struct platform_driver ath79_spi_driver = {
+        .probe          = ath79_spi_probe,
+        .remove         = __devexit_p(ath79_spi_remove),
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+
+static __init int ath79_spi_init(void)
+{
+        return platform_driver_register(&ath79_spi_driver);
+}
+module_init(ath79_spi_init);
+
+static __exit void ath79_spi_exit(void)
+{
+        platform_driver_unregister(&ath79_spi_driver);
+}
+module_exit(ath79_spi_exit);
+
+MODULE_DESCRIPTION("SPI controller driver for Atheros AR71XX/AR724X/AR913X");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
index db35bd9c1b24..2fa012c109bc 100644
--- a/drivers/spi/dw_spi_mmio.c
+++ b/drivers/spi/dw_spi_mmio.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
         }
 
         dwsmmio->clk = clk_get(&pdev->dev, NULL);
-        if (!dwsmmio->clk) {
-                ret = -ENODEV;
+        if (IS_ERR(dwsmmio->clk)) {
+                ret = PTR_ERR(dwsmmio->clk);
                 goto err_irq;
         }
         clk_enable(dwsmmio->clk);
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 9469564e6888..1cf9d5faabf4 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -743,6 +743,12 @@ static struct platform_device_id spi_imx_devtype[] = {
                 .name = "imx51-ecspi",
                 .driver_data = SPI_IMX_VER_2_3,
         }, {
+                .name = "imx53-cspi",
+                .driver_data = SPI_IMX_VER_0_7,
+        }, {
+                .name = "imx53-ecspi",
+                .driver_data = SPI_IMX_VER_2_3,
+        }, {
                 /* sentinel */
         }
 };
diff --git a/drivers/spi/spi_sh_msiof.c b/drivers/spi/spi_sh_msiof.c
index d93b66743ba7..2c665fceaac7 100644
--- a/drivers/spi/spi_sh_msiof.c
+++ b/drivers/spi/spi_sh_msiof.c
@@ -509,9 +509,11 @@ static int sh_msiof_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
         bytes_done = 0;
 
         while (bytes_done < t->len) {
+                void *rx_buf = t->rx_buf ? t->rx_buf + bytes_done : NULL;
+                const void *tx_buf = t->tx_buf ? t->tx_buf + bytes_done : NULL;
                 n = sh_msiof_spi_txrx_once(p, tx_fifo, rx_fifo,
-                                           t->tx_buf + bytes_done,
-                                           t->rx_buf + bytes_done,
+                                           tx_buf,
+                                           rx_buf,
                                            words, bits);
                 if (n < 0)
                         break;
@@ -635,7 +637,7 @@ static int sh_msiof_spi_remove(struct platform_device *pdev)
         ret = spi_bitbang_stop(&p->bitbang);
         if (!ret) {
                 pm_runtime_disable(&pdev->dev);
-                free_irq(platform_get_irq(pdev, 0), sh_msiof_spi_irq);
+                free_irq(platform_get_irq(pdev, 0), p);
                 iounmap(p->mapbase);
                 clk_put(p->clk);
                 spi_master_put(p->bitbang.master);
diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index bb7df02a5472..891e5909038c 100644
--- a/drivers/spi/spi_tegra.c
+++ b/drivers/spi/spi_tegra.c
@@ -513,7 +513,7 @@ static int __init spi_tegra_probe(struct platform_device *pdev)
         }
 
         tspi->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR_OR_NULL(tspi->clk)) {
+        if (IS_ERR(tspi->clk)) {
                 dev_err(&pdev->dev, "can not get clock\n");
                 ret = PTR_ERR(tspi->clk);
                 goto err2;
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 2d8cc455dbc7..42cdaa9a4d8a 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -82,7 +82,7 @@ config SSB_SDIOHOST
 
 config SSB_SILENT
         bool "No SSB kernel messages"
-        depends on SSB && EMBEDDED
+        depends on SSB && EXPERT
         help
           This option turns off all Sonics Silicon Backplane printks.
           Note that you won't be able to identify problems, once
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index c7345dbf43fa..f8533795ee7f 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -733,7 +733,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
 
         /* Fetch the vendor specific tuples. */
         res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
-                                ssb_pcmcia_do_get_invariants, sprom);
+                                ssb_pcmcia_do_get_invariants, iv);
         if ((res == 0) || (res == -ENOSPC))
                 return 0;
 
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 5a0985d4ce15..29884c00c4d5 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -420,6 +420,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
                         bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
                         break;
+                case SSB_DEV_ETHERNET:
+                        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                                if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
+                                    (bus->host_pci->device & 0xFF00) == 0x4300) {
+                                        /* This is a dangling ethernet core on a
+                                         * wireless device. Ignore it. */
+                                        continue;
+                                }
+                        }
+                        break;
                 default:
                         break;
                 }
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 0e298dba9fc8..29b8ab44ea47 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -360,8 +360,8 @@ int PSSendOps(void *arg)
                 status = 1;
                 goto complete;
         }
-        len = (firmware->size > MAX_BDADDR_FORMAT_LENGTH)? MAX_BDADDR_FORMAT_LENGTH: firmware->size;
-        memcpy(config_bdaddr, firmware->data,len);
+        len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);
+        memcpy(config_bdaddr, firmware->data, len);
         config_bdaddr[len] = '\0';
         write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);
         A_RELEASE_FIRMWARE(firmware);
diff --git a/drivers/staging/autofs/dirhash.c b/drivers/staging/autofs/dirhash.c
index d3f42c8325f7..a08bd7355035 100644
--- a/drivers/staging/autofs/dirhash.c
+++ b/drivers/staging/autofs/dirhash.c
@@ -88,14 +88,13 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,
                 }
                 path.mnt = mnt;
                 path_get(&path);
-                if (!follow_down(&path)) {
+                if (!follow_down_one(&path)) {
                         path_put(&path);
                         DPRINTK(("autofs: not expirable\
                         (not a mounted directory): %s\n", ent->name));
                         continue;
                 }
-                while (d_mountpoint(path.dentry) && follow_down(&path))
-                        ;
+                follow_down(&path, false);  // TODO: need to check error
                 umount_ok = may_umount(path.mnt);
                 path_put(&path);
 
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 8ce4536e6e28..feade9451b2e 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -359,12 +359,11 @@ static VOID PruneQueue(PMINI_ADAPTER Adapter, INT iIndex)
 
                 if(PacketToDrop)
                 {
-                        struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iIndex);
                         if (netif_msg_tx_err(Adapter))
                                 pr_info(PFX "%s: tx queue %d overlimit\n", 
                                         Adapter->dev->name, iIndex);
 
-                        txq->tx_dropped++;
+                        netstats->tx_dropped++;
 
                         DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue,
                                                 Adapter->PackInfo[iIndex].LastTxQueue);
@@ -404,7 +403,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
 //      down(&Adapter->data_packet_queue_lock);
         for(iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++)
         {
-                struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, iQIndex);
+                struct net_device_stats *netstats = &Adapter->dev->stats;
 
                 spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock);
                 while(Adapter->PackInfo[iQIndex].FirstTxQueue)
@@ -413,7 +412,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter)
                         if(PacketToDrop)
                         {
                                 uiTotalPacketLength = PacketToDrop->len;
-                                txq->tx_dropped++;
+                                netstats->tx_dropped++;
                         }
                         else
                                 uiTotalPacketLength = 0;
diff --git a/drivers/staging/bcm/Transmit.c b/drivers/staging/bcm/Transmit.c
index 0f7000960d50..d5e4a7404f71 100644
--- a/drivers/staging/bcm/Transmit.c
+++ b/drivers/staging/bcm/Transmit.c
@@ -157,11 +157,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter,  struct sk_buff *Packet, USHORT Vcid)
         }
         else
         {
-                struct netdev_queue *txq = netdev_get_tx_queue(Adapter->dev, QueueIndex);
+                struct net_device_stats *netstats = &Adapter->dev->stats;
                 Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength;
 
-                txq->tx_bytes += Leader.PLength;
-                ++txq->tx_packets;
+                netstats->tx_bytes += Leader.PLength;
+                ++netstats->tx_packets;
 
                 Adapter->PackInfo[QueueIndex].uiCurrentTokenCount -= Leader.PLength << 3;
                 Adapter->PackInfo[QueueIndex].uiSentBytes += (Packet->len);
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index bdd629d72a75..cd8392badff0 100644
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -209,11 +209,8 @@ static void wl_ops_stop(struct ieee80211_hw *hw)
         struct wl_info *wl = hw->priv;
         ASSERT(wl);
         WL_LOCK(wl);
-        wl_down(wl);
         ieee80211_stop_queues(hw);
         WL_UNLOCK(wl);
-
-        return;
 }
 
 static int
@@ -246,7 +243,14 @@ wl_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 static void
 wl_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
-        return;
+        struct wl_info *wl;
+
+        wl = HW_TO_WL(hw);
+
+        /* put driver in down state */
+        WL_LOCK(wl);
+        wl_down(wl);
+        WL_UNLOCK(wl);
 }
 
 static int
@@ -259,9 +263,7 @@ ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
         switch (type) {
         case NL80211_CHAN_HT20:
         case NL80211_CHAN_NO_HT:
-                WL_LOCK(wl);
                 err = wlc_set(wl->wlc, WLC_SET_CHANNEL, chan->hw_value);
-                WL_UNLOCK(wl);
                 break;
         case NL80211_CHAN_HT40MINUS:
         case NL80211_CHAN_HT40PLUS:
@@ -281,6 +283,7 @@ static int wl_ops_config(struct ieee80211_hw *hw, u32 changed)
         int err = 0;
         int new_int;
 
+        WL_LOCK(wl);
         if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
                 WL_NONE("%s: Setting listen interval to %d\n",
                         __func__, conf->listen_interval);
@@ -337,6 +340,7 @@ static int wl_ops_config(struct ieee80211_hw *hw, u32 changed)
         }
 
  config_out:
+        WL_UNLOCK(wl);
         return err;
 }
 
@@ -455,13 +459,21 @@ wl_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)
 
 static void wl_ops_sw_scan_start(struct ieee80211_hw *hw)
 {
+        struct wl_info *wl = hw->priv;
         WL_NONE("Scan Start\n");
+        WL_LOCK(wl);
+        wlc_scan_start(wl->wlc);
+        WL_UNLOCK(wl);
         return;
 }
 
 static void wl_ops_sw_scan_complete(struct ieee80211_hw *hw)
 {
+        struct wl_info *wl = hw->priv;
         WL_NONE("Scan Complete\n");
+        WL_LOCK(wl);
+        wlc_scan_stop(wl->wlc);
+        WL_UNLOCK(wl);
         return;
 }
 
@@ -779,7 +791,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
         wl_found++;
         return wl;
 
- fail:
+fail:
         wl_free(wl);
 fail1:
         return NULL;
@@ -1090,7 +1102,6 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         return 0;
 }
 
-#ifdef LINUXSTA_PS
 static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct wl_info *wl;
@@ -1105,11 +1116,12 @@ static int wl_suspend(struct pci_dev *pdev, pm_message_t state)
                 return -ENODEV;
         }
 
+        /* only need to flag hw is down for proper resume */
         WL_LOCK(wl);
-        wl_down(wl);
         wl->pub->hw_up = false;
         WL_UNLOCK(wl);
-        pci_save_state(pdev, wl->pci_psstate);
+
+        pci_save_state(pdev);
         pci_disable_device(pdev);
         return pci_set_power_state(pdev, PCI_D3hot);
 }
@@ -1133,7 +1145,7 @@ static int wl_resume(struct pci_dev *pdev)
         if (err)
                 return err;
 
-        pci_restore_state(pdev, wl->pci_psstate);
+        pci_restore_state(pdev);
 
         err = pci_enable_device(pdev);
         if (err)
@@ -1145,13 +1157,12 @@ static int wl_resume(struct pci_dev *pdev)
         if ((val & 0x0000ff00) != 0)
                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
-        WL_LOCK(wl);
-        err = wl_up(wl);
-        WL_UNLOCK(wl);
-
+        /*
+        *  done. driver will be put in up state
+        *  in wl_ops_add_interface() call.
+        */
         return err;
 }
-#endif                          /* LINUXSTA_PS */
 
 static void wl_remove(struct pci_dev *pdev)
 {
@@ -1184,14 +1195,12 @@ static void wl_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver wl_pci_driver = {
- .name  = "brcm80211",
- .probe = wl_pci_probe,
-#ifdef LINUXSTA_PS
- .suspend = wl_suspend,
- .resume  = wl_resume,
-#endif                          /* LINUXSTA_PS */
- .remove   = __devexit_p(wl_remove),
- .id_table = wl_id_table,
+        .name = "brcm80211",
+        .probe = wl_pci_probe,
+        .suspend = wl_suspend,
+        .resume = wl_resume,
+        .remove = __devexit_p(wl_remove),
+        .id_table = wl_id_table,
 };
 
 /**
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 1d5d01ac0a9b..e37e8058e2b8 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -5126,7 +5126,6 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
         fifo = prio2fifo[prio];
 
         ASSERT((uint) skb_headroom(sdu) >= TXOFF);
-        ASSERT(!(sdu->cloned));
         ASSERT(!(sdu->next));
         ASSERT(!(sdu->prev));
         ASSERT(fifo < NFIFO);
@@ -8462,3 +8461,16 @@ static void wlc_txq_free(struct wlc_info *wlc, struct osl_info *osh,
 
         kfree(qi);
 }
+
+/*
+ * Flag 'scan in progress' to withold dynamic phy calibration
+ */
+void wlc_scan_start(struct wlc_info *wlc)
+{
+        wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, true);
+}
+
+void wlc_scan_stop(struct wlc_info *wlc)
+{
+        wlc_phy_hold_upd(wlc->band->pi, PHY_HOLD_FOR_SCAN, false);
+}
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 146a6904a39b..aff413001b70 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -570,6 +570,8 @@ extern void wlc_enable_mac(struct wlc_info *wlc);
 extern u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate);
 extern u32 wlc_get_rspec_history(struct wlc_bsscfg *cfg);
 extern u32 wlc_get_current_highest_rate(struct wlc_bsscfg *cfg);
+extern void wlc_scan_start(struct wlc_info *wlc);
+extern void wlc_scan_stop(struct wlc_info *wlc);
 
 static inline int wlc_iovar_getuint(struct wlc_info *wlc, const char *name,
                                     uint *arg)
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index aad47326d6dc..1502d80f6f78 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -439,6 +439,7 @@ config COMEDI_NI_AT_AO
 config COMEDI_NI_ATMIO
         tristate "NI AT-MIO E series ISA-PNP card support"
         depends on ISAPNP && COMEDI_NI_TIO && COMEDI_NI_COMMON
+        select COMEDI_8255
         default N
         ---help---
           Enable support for National Instruments AT-MIO E series cards
@@ -1040,6 +1041,8 @@ config COMEDI_NI_PCIDIO
 config COMEDI_NI_PCIMIO
         tristate "NI PCI-MIO-E series and M series support"
         depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
+        select COMEDI_8255
+        select COMEDI_FC
         default N
         ---help---
           Enable support for National Instruments PCI-MIO-E series and M series
@@ -1164,6 +1167,7 @@ config COMEDI_NI_LABPC_CS
 config COMEDI_NI_MIO_CS
         tristate "NI DAQCard E series PCMCIA support"
         depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
+        select COMEDI_8255
         select COMEDI_FC
         default N
         ---help---
@@ -1268,7 +1272,6 @@ config COMEDI_MITE
 config COMEDI_NI_TIO
         tristate "NI general purpose counter support"
         depends on COMEDI_MITE
-        select COMEDI_8255
         default N
         ---help---
           Enable support for National Instruments general purpose counters.
diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index cd25b241cc1f..fd274e9c7b78 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -61,8 +61,6 @@
 #define PCI_DAQ_SIZE            4096
 #define PCI_DAQ_SIZE_660X       8192
 
-MODULE_LICENSE("GPL");
-
 struct mite_struct *mite_devices;
 EXPORT_SYMBOL(mite_devices);
 
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 14e716e99a5c..54741c9e1af5 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -527,3 +527,7 @@ static void __exit driver_ni6527_cleanup_module(void)
 
 module_init(driver_ni6527_init_module);
 module_exit(driver_ni6527_cleanup_module);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index 8b8e2aaf77fb..403fc0997d37 100644
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -871,3 +871,7 @@ static void __exit driver_ni_65xx_cleanup_module(void)
 
 module_init(driver_ni_65xx_init_module);
 module_exit(driver_ni_65xx_cleanup_module);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 6612b085c4ef..ca2aeaa9449c 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1421,3 +1421,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
         };
         return 0;
 }
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index e9f034efdc6f..d8d91f90060e 100644
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -384,3 +384,7 @@ static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot)
         mite_list_devices();
         return -EIO;
 }
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 4d1868d04bac..0728c3c0cb0e 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -575,7 +575,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
         /* grab our IRQ */
         if (irq) {
                 isr_flags = 0;
-                if (thisboard->bustype == pci_bustype)
+                if (thisboard->bustype == pci_bustype
+                    || thisboard->bustype == pcmcia_bustype)
                         isr_flags |= IRQF_SHARED;
                 if (request_irq(irq, labpc_interrupt, isr_flags,
                                 driver_labpc.driver_name, dev)) {
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 84a15c34e484..005d2fe86ee4 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1354,3 +1354,7 @@ static void __exit driver_pcidio_cleanup_module(void)
 
 module_init(driver_pcidio_init_module);
 module_exit(driver_pcidio_cleanup_module);
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 23a381247285..9148abdad074 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1853,3 +1853,7 @@ static int pcimio_dio_change(struct comedi_device *dev,
 
         return 0;
 }
+
+MODULE_AUTHOR("Comedi http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index b3d05fcfe6d2..4fb809485d9e 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -368,6 +368,7 @@ static int blkvsc_probe(struct device *device)
                 blkdev->gd->first_minor = 0;
         blkdev->gd->fops = &block_ops;
         blkdev->gd->private_data = blkdev;
+        blkdev->gd->driverfs_dev = &(blkdev->device_ctx->device);
         sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum);
 
         blkvsc_do_inquiry(blkdev);
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index df9cd131e953..0edbe7483a4c 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -1279,7 +1279,7 @@ static void netvsc_channel_cb(void *context)
         /* ASSERT(device); */
 
         packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
-                         GFP_KERNEL);
+                         GFP_ATOMIC);
         if (!packet)
                 return;
         buffer = packet;
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 0147b407512c..b41c9640b72d 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -236,6 +236,7 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
         if (status == 1) {
                 netif_carrier_on(net);
                 netif_wake_queue(net);
+                netif_notify_peers(net);
         } else {
                 netif_carrier_off(net);
                 netif_stop_queue(net);
@@ -358,7 +359,6 @@ static int netvsc_probe(struct device *device)
 
         /* Set initial state */
         netif_carrier_off(net);
-        netif_stop_queue(net);
 
         net_device_ctx = netdev_priv(net);
         net_device_ctx->device_ctx = device_ctx;
diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index deb68c8a6e18..b8b54da67c63 100644
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -68,7 +68,7 @@ static ssize_t ad7476_show_scale(struct device *dev,
         /* Corresponds to Vref / 2^(bits) */
         unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
 
-        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
 }
 static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7476_show_scale, NULL, 0);
 
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index 685908995d49..5d85efab658c 100644
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -68,7 +68,7 @@ static ssize_t ad7887_show_scale(struct device *dev,
         /* Corresponds to Vref / 2^(bits) */
         unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
 
-        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
 }
 static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7887_show_scale, NULL, 0);
 
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 6309d521a864..89ccf375a188 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -432,7 +432,7 @@ static ssize_t ad799x_show_scale(struct device *dev,
         /* Corresponds to Vref / 2^(bits) */
         unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
 
-        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
 }
 
 static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad799x_show_scale, NULL, 0);
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c
index e3387cd31145..0f87ecac82fc 100644
--- a/drivers/staging/iio/dac/ad5446.c
+++ b/drivers/staging/iio/dac/ad5446.c
@@ -87,7 +87,7 @@ static ssize_t ad5446_show_scale(struct device *dev,
         /* Corresponds to Vref / 2^(bits) */
         unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits;
 
-        return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
+        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
 }
 static IIO_DEVICE_ATTR(out_scale, S_IRUGO, ad5446_show_scale, NULL, 0);
 
diff --git a/drivers/staging/intel_sst/intelmid_v2_control.c b/drivers/staging/intel_sst/intelmid_v2_control.c
index e38e89df6e84..e2f6d6a3c850 100644
--- a/drivers/staging/intel_sst/intelmid_v2_control.c
+++ b/drivers/staging/intel_sst/intelmid_v2_control.c
@@ -874,7 +874,10 @@ static int nc_set_selected_input_dev(u8 value)
                 sc_access[3].reg_addr = 0x109;
                 sc_access[3].mask = MASK6;
                 sc_access[3].value = 0x00;
-                num_val = 4;
+                sc_access[4].reg_addr = 0x104;
+                sc_access[4].value = 0x3C;
+                sc_access[4].mask = 0xff;
+                num_val = 5;
                 break;
         default:
                 return -EINVAL;
diff --git a/drivers/staging/lirc/TODO.lirc_zilog b/drivers/staging/lirc/TODO.lirc_zilog
index 6aa312df4018..2d0263f07937 100644
--- a/drivers/staging/lirc/TODO.lirc_zilog
+++ b/drivers/staging/lirc/TODO.lirc_zilog
@@ -1,13 +1,37 @@
-The binding between hdpvr and lirc_zilog is currently disabled,
+1. Both ir-kbd-i2c and lirc_zilog provide support for RX events.
+The 'tx_only' lirc_zilog module parameter will allow ir-kbd-i2c
+and lirc_zilog to coexist in the kernel, if the user requires such a set-up.
+However the IR unit will not work well without coordination between the
+two modules.  A shared mutex, for transceiver access locking, needs to be
+supplied by bridge drivers, in struct IR_i2_init_data, to both ir-kbd-i2c
+and lirc_zilog, before they will coexist usefully.  This should be fixed
+before moving out of staging.
+
+2. References and locking need careful examination.  For cx18 and ivtv PCI
+cards, which are not easily "hot unplugged", the imperfect state of reference
+counting and locking is acceptable if not correct.  For USB connected units
+like HD PVR, PVR USB2, HVR-1900, and HVR1950, the likelyhood of an Ooops on
+unplug is probably great.  Proper reference counting and locking needs to be
+implemented before this module is moved out of staging.
+
+3. The binding between hdpvr and lirc_zilog is currently disabled,
 due to an OOPS reported a few years ago when both the hdpvr and cx18
 drivers were loaded in his system. More details can be seen at:
         http://www.mail-archive.com/linux-media@vger.kernel.org/msg09163.html
 More tests need to be done, in order to fix the reported issue.
 
-There's a conflict between ir-kbd-i2c: Both provide support for RX events.
-Such conflict needs to be fixed, before moving it out of staging.
+4. In addition to providing a shared mutex for transceiver access
+locking, bridge drivers, if able, should provide a chip reset() callback
+to lirc_zilog via struct IR_i2c_init_data.  cx18 and ivtv already have routines
+to perform Z8 chip resets via GPIO manipulations.  This will allow lirc_zilog
+to bring the chip back to normal when it hangs, in the same places the
+original lirc_pvr150 driver code does.  This is not strictly needed, so it
+is not required to move lirc_zilog out of staging.
+
+5. Both lirc_zilog and ir-kbd-i2c support the Zilog Z8 for IR, as programmed
+and installed on Hauppauge products.  When working on either module, developers
+must consider at least the following bridge drivers which mention an IR Rx unit
+at address 0x71 (indicative of a Z8):
 
-The way I2C probe works, it will try to register the driver twice, one
-for RX and another for TX. The logic needs to be fixed to avoid such
-issue.
+        ivtv cx18 hdpvr pvrusb2 bt8xx cx88 saa7134
 
diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/lirc/lirc_imon.c
index 0da6b9518af9..235cab0eb087 100644
--- a/drivers/staging/lirc/lirc_imon.c
+++ b/drivers/staging/lirc/lirc_imon.c
@@ -447,6 +447,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
 
 exit:
         mutex_unlock(&context->ctx_lock);
+        kfree(data_buf);
 
         return (!retval) ? n_bytes : retval;
 }
diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c
index 929ae5795467..5938616f3e8f 100644
--- a/drivers/staging/lirc/lirc_it87.c
+++ b/drivers/staging/lirc/lirc_it87.c
@@ -232,6 +232,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
                 i++;
         }
         terminate_send(tx_buf[i - 1]);
+        kfree(tx_buf);
         return n;
 }
 
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
index dfd2c447e67d..3a9c09881b2b 100644
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/lirc/lirc_parallel.c
@@ -376,6 +376,7 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
         unsigned long flags;
         int counttimer;
         int *wbuf;
+        ssize_t ret;
 
         if (!is_claimed)
                 return -EBUSY;
@@ -393,8 +394,10 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
         if (timer == 0) {
                 /* try again if device is ready */
                 timer = init_lirc_timer();
-                if (timer == 0)
-                        return -EIO;
+                if (timer == 0) {
+                        ret = -EIO;
+                        goto out;
+                }
         }
 
         /* adjust values from usecs */
@@ -420,7 +423,8 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
                         if (check_pselecd && (in(1) & LP_PSELECD)) {
                                 lirc_off();
                                 local_irq_restore(flags);
-                                return -EIO;
+                                ret = -EIO;
+                                goto out;
                         }
                 } while (counttimer < wbuf[i]);
                 i++;
@@ -436,7 +440,8 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
                         level = newlevel;
                         if (check_pselecd && (in(1) & LP_PSELECD)) {
                                 local_irq_restore(flags);
-                                return -EIO;
+                                ret = -EIO;
+                                goto out;
                         }
                 } while (counttimer < wbuf[i]);
                 i++;
@@ -445,7 +450,11 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
 #else
         /* place code that handles write without external timer here */
 #endif
-        return n;
+        ret = n;
+out:
+        kfree(wbuf);
+
+        return ret;
 }
 
 static unsigned int lirc_poll(struct file *file, poll_table *wait)
diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/lirc/lirc_sasem.c
index 998485ebdbce..925eabe14854 100644
--- a/drivers/staging/lirc/lirc_sasem.c
+++ b/drivers/staging/lirc/lirc_sasem.c
@@ -448,6 +448,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
 exit:
 
         mutex_unlock(&context->ctx_lock);
+        kfree(data_buf);
 
         return (!retval) ? n_bytes : retval;
 }
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 9bcf149c4260..1c3099b388e0 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -966,7 +966,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
         if (n % sizeof(int) || count % 2 == 0)
                 return -EINVAL;
         wbuf = memdup_user(buf, n);
-        if (PTR_ERR(wbuf))
+        if (IS_ERR(wbuf))
                 return PTR_ERR(wbuf);
         spin_lock_irqsave(&hardware[type].lock, flags);
         if (type == LIRC_IRDEO) {
@@ -981,6 +981,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
         }
         off();
         spin_unlock_irqrestore(&hardware[type].lock, flags);
+        kfree(wbuf);
         return n;
 }
 
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
index c553ab626238..76be7b8c6209 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@ -330,6 +330,7 @@ static ssize_t lirc_write(struct file *file, const char *buf, size_t n,
         /* enable receiver */
         Ser2UTCR3 = UTCR3_RXE|UTCR3_RIE;
 #endif
+        kfree(tx_buf);
         return count;
 }
 
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index ad29bb1275ab..0aad0d7a74a3 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -20,6 +20,9 @@
  *
  * parts are cut&pasted from the lirc_i2c.c driver
  *
+ * Numerous changes updating lirc_zilog.c in kernel 2.6.38 and later are
+ * Copyright (C) 2011 Andy Walls <awalls@md.metrocast.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
@@ -60,38 +63,44 @@
 #include <media/lirc_dev.h>
 #include <media/lirc.h>
 
-struct IR {
-        struct lirc_driver l;
-
-        /* Device info */
-        struct mutex ir_lock;
-        int open;
-        bool is_hdpvr;
-
+struct IR_rx {
         /* RX device */
-        struct i2c_client c_rx;
-        int have_rx;
+        struct i2c_client *c;
 
         /* RX device buffer & lock */
         struct lirc_buffer buf;
         struct mutex buf_lock;
 
         /* RX polling thread data */
-        struct completion *t_notify;
-        struct completion *t_notify2;
-        int shutdown;
         struct task_struct *task;
 
         /* RX read data */
         unsigned char b[3];
+        bool hdpvr_data_fmt;
+};
 
+struct IR_tx {
         /* TX device */
-        struct i2c_client c_tx;
+        struct i2c_client *c;
+
+        /* TX additional actions needed */
         int need_boot;
-        int have_tx;
+        bool post_tx_ready_poll;
+};
+
+struct IR {
+        struct lirc_driver l;
+
+        struct mutex ir_lock;
+        int open;
+
+        struct i2c_adapter *adapter;
+        struct IR_rx *rx;
+        struct IR_tx *tx;
 };
 
 /* Minor -> data mapping */
+static struct mutex ir_devices_lock;
 static struct IR *ir_devices[MAX_IRCTL_DEVICES];
 
 /* Block size for IR transmitter */
@@ -124,14 +133,11 @@ static struct mutex tx_data_lock;
 #define zilog_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, \
                                         ## args)
 #define zilog_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
-
-#define ZILOG_HAUPPAUGE_IR_RX_NAME "Zilog/Hauppauge IR RX"
-#define ZILOG_HAUPPAUGE_IR_TX_NAME "Zilog/Hauppauge IR TX"
+#define zilog_info(s, args...) printk(KERN_INFO KBUILD_MODNAME ": " s, ## args)
 
 /* module parameters */
 static int debug;       /* debug output */
-static int disable_rx;  /* disable RX device */
-static int disable_tx;  /* disable TX device */
+static int tx_only;     /* only handle the IR Tx function */
 static int minor = -1;  /* minor number */
 
 #define dprintk(fmt, args...)                                           \
@@ -150,8 +156,12 @@ static int add_to_buf(struct IR *ir)
         int ret;
         int failures = 0;
         unsigned char sendbuf[1] = { 0 };
+        struct IR_rx *rx = ir->rx;
 
-        if (lirc_buffer_full(&ir->buf)) {
+        if (rx == NULL)
+                return -ENXIO;
+
+        if (lirc_buffer_full(&rx->buf)) {
                 dprintk("buffer overflow\n");
                 return -EOVERFLOW;
         }
@@ -161,17 +171,25 @@ static int add_to_buf(struct IR *ir)
          * data and we have space
          */
         do {
+                if (kthread_should_stop())
+                        return -ENODATA;
+
                 /*
                  * Lock i2c bus for the duration.  RX/TX chips interfere so
                  * this is worth it
                  */
                 mutex_lock(&ir->ir_lock);
 
+                if (kthread_should_stop()) {
+                        mutex_unlock(&ir->ir_lock);
+                        return -ENODATA;
+                }
+
                 /*
                  * Send random "poll command" (?)  Windows driver does this
                  * and it is a good point to detect chip failure.
                  */
-                ret = i2c_master_send(&ir->c_rx, sendbuf, 1);
+                ret = i2c_master_send(rx->c, sendbuf, 1);
                 if (ret != 1) {
                         zilog_error("i2c_master_send failed with %d\n", ret);
                         if (failures >= 3) {
@@ -186,45 +204,53 @@ static int add_to_buf(struct IR *ir)
                                     "trying reset\n");
 
                         set_current_state(TASK_UNINTERRUPTIBLE);
+                        if (kthread_should_stop()) {
+                                mutex_unlock(&ir->ir_lock);
+                                return -ENODATA;
+                        }
                         schedule_timeout((100 * HZ + 999) / 1000);
-                        ir->need_boot = 1;
+                        ir->tx->need_boot = 1;
 
                         ++failures;
                         mutex_unlock(&ir->ir_lock);
                         continue;
                 }
 
-                ret = i2c_master_recv(&ir->c_rx, keybuf, sizeof(keybuf));
+                if (kthread_should_stop()) {
+                        mutex_unlock(&ir->ir_lock);
+                        return -ENODATA;
+                }
+                ret = i2c_master_recv(rx->c, keybuf, sizeof(keybuf));
                 mutex_unlock(&ir->ir_lock);
                 if (ret != sizeof(keybuf)) {
                         zilog_error("i2c_master_recv failed with %d -- "
                                     "keeping last read buffer\n", ret);
                 } else {
-                        ir->b[0] = keybuf[3];
-                        ir->b[1] = keybuf[4];
-                        ir->b[2] = keybuf[5];
-                        dprintk("key (0x%02x/0x%02x)\n", ir->b[0], ir->b[1]);
+                        rx->b[0] = keybuf[3];
+                        rx->b[1] = keybuf[4];
+                        rx->b[2] = keybuf[5];
+                        dprintk("key (0x%02x/0x%02x)\n", rx->b[0], rx->b[1]);
                 }
 
                 /* key pressed ? */
-                if (ir->is_hdpvr) {
+                if (rx->hdpvr_data_fmt) {
                         if (got_data && (keybuf[0] == 0x80))
                                 return 0;
                         else if (got_data && (keybuf[0] == 0x00))
                                 return -ENODATA;
-                } else if ((ir->b[0] & 0x80) == 0)
+                } else if ((rx->b[0] & 0x80) == 0)
                         return got_data ? 0 : -ENODATA;
 
                 /* look what we have */
-                code = (((__u16)ir->b[0] & 0x7f) << 6) | (ir->b[1] >> 2);
+                code = (((__u16)rx->b[0] & 0x7f) << 6) | (rx->b[1] >> 2);
 
                 codes[0] = (code >> 8) & 0xff;
                 codes[1] = code & 0xff;
 
                 /* return it */
-                lirc_buffer_write(&ir->buf, codes);
+                lirc_buffer_write(&rx->buf, codes);
                 ++got_data;
-        } while (!lirc_buffer_full(&ir->buf));
+        } while (!lirc_buffer_full(&rx->buf));
 
         return 0;
 }
@@ -242,46 +268,35 @@ static int add_to_buf(struct IR *ir)
 static int lirc_thread(void *arg)
 {
         struct IR *ir = arg;
-
-        if (ir->t_notify != NULL)
-                complete(ir->t_notify);
+        struct IR_rx *rx = ir->rx;
 
         dprintk("poll thread started\n");
 
-        do {
-                if (ir->open) {
-                        set_current_state(TASK_INTERRUPTIBLE);
+        while (!kthread_should_stop()) {
+                set_current_state(TASK_INTERRUPTIBLE);
 
-                        /*
-                         * This is ~113*2 + 24 + jitter (2*repeat gap +
-                         * code length).  We use this interval as the chip
-                         * resets every time you poll it (bad!).  This is
-                         * therefore just sufficient to catch all of the
-                         * button presses.  It makes the remote much more
-                         * responsive.  You can see the difference by
-                         * running irw and holding down a button.  With
-                         * 100ms, the old polling interval, you'll notice
-                         * breaks in the repeat sequence corresponding to
-                         * lost keypresses.
-                         */
-                        schedule_timeout((260 * HZ) / 1000);
-                        if (ir->shutdown)
-                                break;
-                        if (!add_to_buf(ir))
-                                wake_up_interruptible(&ir->buf.wait_poll);
-                } else {
-                        /* if device not opened so we can sleep half a second */
-                        set_current_state(TASK_INTERRUPTIBLE);
+                /* if device not opened, we can sleep half a second */
+                if (!ir->open) {
                         schedule_timeout(HZ/2);
+                        continue;
                 }
-        } while (!ir->shutdown);
-
-        if (ir->t_notify2 != NULL)
-                wait_for_completion(ir->t_notify2);
 
-        ir->task = NULL;
-        if (ir->t_notify != NULL)
-                complete(ir->t_notify);
+                /*
+                 * This is ~113*2 + 24 + jitter (2*repeat gap + code length).
+                 * We use this interval as the chip resets every time you poll
+                 * it (bad!).  This is therefore just sufficient to catch all
+                 * of the button presses.  It makes the remote much more
+                 * responsive.  You can see the difference by running irw and
+                 * holding down a button.  With 100ms, the old polling
+                 * interval, you'll notice breaks in the repeat sequence
+                 * corresponding to lost keypresses.
+                 */
+                schedule_timeout((260 * HZ) / 1000);
+                if (kthread_should_stop())
+                        break;
+                if (!add_to_buf(ir))
+                        wake_up_interruptible(&rx->buf.wait_poll);
+        }
 
         dprintk("poll thread ended\n");
         return 0;
@@ -299,10 +314,10 @@ static int set_use_inc(void *data)
          * this is completely broken code. lirc_unregister_driver()
          * must be possible even when the device is open
          */
-        if (ir->c_rx.addr)
-                i2c_use_client(&ir->c_rx);
-        if (ir->c_tx.addr)
-                i2c_use_client(&ir->c_tx);
+        if (ir->rx != NULL)
+                i2c_use_client(ir->rx->c);
+        if (ir->tx != NULL)
+                i2c_use_client(ir->tx->c);
 
         return 0;
 }
@@ -311,10 +326,10 @@ static void set_use_dec(void *data)
 {
         struct IR *ir = data;
 
-        if (ir->c_rx.addr)
-                i2c_release_client(&ir->c_rx);
-        if (ir->c_tx.addr)
-                i2c_release_client(&ir->c_tx);
+        if (ir->rx)
+                i2c_release_client(ir->rx->c);
+        if (ir->tx)
+                i2c_release_client(ir->tx->c);
         if (ir->l.owner != NULL)
                 module_put(ir->l.owner);
 }
@@ -453,7 +468,7 @@ corrupt:
 }
 
 /* send a block of data to the IR TX device */
-static int send_data_block(struct IR *ir, unsigned char *data_block)
+static int send_data_block(struct IR_tx *tx, unsigned char *data_block)
 {
         int i, j, ret;
         unsigned char buf[5];
@@ -467,7 +482,7 @@ static int send_data_block(struct IR *ir, unsigned char *data_block)
                         buf[1 + j] = data_block[i + j];
                 dprintk("%02x %02x %02x %02x %02x",
                         buf[0], buf[1], buf[2], buf[3], buf[4]);
-                ret = i2c_master_send(&ir->c_tx, buf, tosend + 1);
+                ret = i2c_master_send(tx->c, buf, tosend + 1);
                 if (ret != tosend + 1) {
                         zilog_error("i2c_master_send failed with %d\n", ret);
                         return ret < 0 ? ret : -EFAULT;
@@ -478,38 +493,50 @@ static int send_data_block(struct IR *ir, unsigned char *data_block)
 }
 
 /* send boot data to the IR TX device */
-static int send_boot_data(struct IR *ir)
+static int send_boot_data(struct IR_tx *tx)
 {
-        int ret;
+        int ret, i;
         unsigned char buf[4];
 
         /* send the boot block */
-        ret = send_data_block(ir, tx_data->boot_data);
+        ret = send_data_block(tx, tx_data->boot_data);
         if (ret != 0)
                 return ret;
 
-        /* kick it off? */
+        /* Hit the go button to activate the new boot data */
         buf[0] = 0x00;
         buf[1] = 0x20;
-        ret = i2c_master_send(&ir->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
-        ret = i2c_master_send(&ir->c_tx, buf, 1);
+
+        /*
+         * Wait for zilog to settle after hitting go post boot block upload.
+         * Without this delay, the HD-PVR and HVR-1950 both return an -EIO
+         * upon attempting to get firmware revision, and tx probe thus fails.
+         */
+        for (i = 0; i < 10; i++) {
+                ret = i2c_master_send(tx->c, buf, 1);
+                if (ret == 1)
+                        break;
+                udelay(100);
+        }
+
         if (ret != 1) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
 
         /* Here comes the firmware version... (hopefully) */
-        ret = i2c_master_recv(&ir->c_tx, buf, 4);
+        ret = i2c_master_recv(tx->c, buf, 4);
         if (ret != 4) {
                 zilog_error("i2c_master_recv failed with %d\n", ret);
                 return 0;
         }
-        if (buf[0] != 0x80) {
-                zilog_error("unexpected IR TX response: %02x\n", buf[0]);
+        if ((buf[0] != 0x80) && (buf[0] != 0xa0)) {
+                zilog_error("unexpected IR TX init response: %02x\n", buf[0]);
                 return 0;
         }
         zilog_notify("Zilog/Hauppauge IR blaster firmware version "
@@ -543,7 +570,7 @@ static void fw_unload(void)
 }
 
 /* load "firmware" for the IR TX device */
-static int fw_load(struct IR *ir)
+static int fw_load(struct IR_tx *tx)
 {
         int ret;
         unsigned int i;
@@ -558,7 +585,7 @@ static int fw_load(struct IR *ir)
         }
 
         /* Request codeset data file */
-        ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", &ir->c_tx.dev);
+        ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", &tx->c->dev);
         if (ret != 0) {
                 zilog_error("firmware haup-ir-blaster.bin not available "
                             "(%d)\n", ret);
@@ -685,20 +712,20 @@ out:
 }
 
 /* initialise the IR TX device */
-static int tx_init(struct IR *ir)
+static int tx_init(struct IR_tx *tx)
 {
         int ret;
 
         /* Load 'firmware' */
-        ret = fw_load(ir);
+        ret = fw_load(tx);
         if (ret != 0)
                 return ret;
 
         /* Send boot block */
-        ret = send_boot_data(ir);
+        ret = send_boot_data(tx);
         if (ret != 0)
                 return ret;
-        ir->need_boot = 0;
+        tx->need_boot = 0;
 
         /* Looks good */
         return 0;
@@ -714,20 +741,20 @@ static loff_t lseek(struct file *filep, loff_t offset, int orig)
 static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 {
         struct IR *ir = filep->private_data;
-        unsigned char buf[ir->buf.chunk_size];
+        struct IR_rx *rx = ir->rx;
         int ret = 0, written = 0;
         DECLARE_WAITQUEUE(wait, current);
 
         dprintk("read called\n");
-        if (ir->c_rx.addr == 0)
+        if (rx == NULL)
                 return -ENODEV;
 
-        if (mutex_lock_interruptible(&ir->buf_lock))
+        if (mutex_lock_interruptible(&rx->buf_lock))
                 return -ERESTARTSYS;
 
-        if (n % ir->buf.chunk_size) {
+        if (n % rx->buf.chunk_size) {
                 dprintk("read result = -EINVAL\n");
-                mutex_unlock(&ir->buf_lock);
+                mutex_unlock(&rx->buf_lock);
                 return -EINVAL;
         }
 
@@ -736,7 +763,7 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
          * to avoid losing scan code (in case when queue is awaken somewhere
          * between while condition checking and scheduling)
          */
-        add_wait_queue(&ir->buf.wait_poll, &wait);
+        add_wait_queue(&rx->buf.wait_poll, &wait);
         set_current_state(TASK_INTERRUPTIBLE);
 
         /*
@@ -744,7 +771,7 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
          * mode and 'copy_to_user' is happy, wait for data.
          */
         while (written < n && ret == 0) {
-                if (lirc_buffer_empty(&ir->buf)) {
+                if (lirc_buffer_empty(&rx->buf)) {
                         /*
                          * According to the read(2) man page, 'written' can be
                          * returned as less than 'n', instead of blocking
@@ -764,16 +791,17 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
                         schedule();
                         set_current_state(TASK_INTERRUPTIBLE);
                 } else {
-                        lirc_buffer_read(&ir->buf, buf);
+                        unsigned char buf[rx->buf.chunk_size];
+                        lirc_buffer_read(&rx->buf, buf);
                         ret = copy_to_user((void *)outbuf+written, buf,
-                                           ir->buf.chunk_size);
-                        written += ir->buf.chunk_size;
+                                           rx->buf.chunk_size);
+                        written += rx->buf.chunk_size;
                 }
         }
 
-        remove_wait_queue(&ir->buf.wait_poll, &wait);
+        remove_wait_queue(&rx->buf.wait_poll, &wait);
         set_current_state(TASK_RUNNING);
-        mutex_unlock(&ir->buf_lock);
+        mutex_unlock(&rx->buf_lock);
 
         dprintk("read result = %s (%d)\n",
                 ret ? "-EFAULT" : "OK", ret);
@@ -782,7 +810,7 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 }
 
 /* send a keypress to the IR TX device */
-static int send_code(struct IR *ir, unsigned int code, unsigned int key)
+static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
 {
         unsigned char data_block[TX_BLOCK_SIZE];
         unsigned char buf[2];
@@ -799,26 +827,34 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
                 return ret;
 
         /* Send the data block */
-        ret = send_data_block(ir, data_block);
+        ret = send_data_block(tx, data_block);
         if (ret != 0)
                 return ret;
 
         /* Send data block length? */
         buf[0] = 0x00;
         buf[1] = 0x40;
-        ret = i2c_master_send(&ir->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
-        ret = i2c_master_send(&ir->c_tx, buf, 1);
+
+        /* Give the z8 a moment to process data block */
+        for (i = 0; i < 10; i++) {
+                ret = i2c_master_send(tx->c, buf, 1);
+                if (ret == 1)
+                        break;
+                udelay(100);
+        }
+
         if (ret != 1) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
 
         /* Send finished download? */
-        ret = i2c_master_recv(&ir->c_tx, buf, 1);
+        ret = i2c_master_recv(tx->c, buf, 1);
         if (ret != 1) {
                 zilog_error("i2c_master_recv failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
@@ -832,7 +868,7 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
         /* Send prepare command? */
         buf[0] = 0x00;
         buf[1] = 0x80;
-        ret = i2c_master_send(&ir->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
@@ -843,7 +879,7 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
          * last i2c_master_recv always fails with a -5, so for now, we're
          * going to skip this whole mess and say we're done on the HD PVR
          */
-        if (ir->is_hdpvr) {
+        if (!tx->post_tx_ready_poll) {
                 dprintk("sent code %u, key %u\n", code, key);
                 return 0;
         }
@@ -857,7 +893,7 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
         for (i = 0; i < 20; ++i) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout((50 * HZ + 999) / 1000);
-                ret = i2c_master_send(&ir->c_tx, buf, 1);
+                ret = i2c_master_send(tx->c, buf, 1);
                 if (ret == 1)
                         break;
                 dprintk("NAK expected: i2c_master_send "
@@ -870,7 +906,7 @@ static int send_code(struct IR *ir, unsigned int code, unsigned int key)
         }
 
         /* Seems to be an 'ok' response */
-        i = i2c_master_recv(&ir->c_tx, buf, 1);
+        i = i2c_master_recv(tx->c, buf, 1);
         if (i != 1) {
                 zilog_error("i2c_master_recv failed with %d\n", ret);
                 return -EFAULT;
@@ -895,10 +931,11 @@ static ssize_t write(struct file *filep, const char *buf, size_t n,
                           loff_t *ppos)
 {
         struct IR *ir = filep->private_data;
+        struct IR_tx *tx = ir->tx;
         size_t i;
         int failures = 0;
 
-        if (ir->c_tx.addr == 0)
+        if (tx == NULL)
                 return -ENODEV;
 
         /* Validate user parameters */
@@ -919,15 +956,15 @@ static ssize_t write(struct file *filep, const char *buf, size_t n,
                 }
 
                 /* Send boot data first if required */
-                if (ir->need_boot == 1) {
-                        ret = send_boot_data(ir);
+                if (tx->need_boot == 1) {
+                        ret = send_boot_data(tx);
                         if (ret == 0)
-                                ir->need_boot = 0;
+                                tx->need_boot = 0;
                 }
 
                 /* Send the code */
                 if (ret == 0) {
-                        ret = send_code(ir, (unsigned)command >> 16,
+                        ret = send_code(tx, (unsigned)command >> 16,
                                             (unsigned)command & 0xFFFF);
                         if (ret == -EPROTO) {
                                 mutex_unlock(&ir->ir_lock);
@@ -952,7 +989,7 @@ static ssize_t write(struct file *filep, const char *buf, size_t n,
                         }
                         set_current_state(TASK_UNINTERRUPTIBLE);
                         schedule_timeout((100 * HZ + 999) / 1000);
-                        ir->need_boot = 1;
+                        tx->need_boot = 1;
                         ++failures;
                 } else
                         i += sizeof(int);
@@ -969,22 +1006,23 @@ static ssize_t write(struct file *filep, const char *buf, size_t n,
 static unsigned int poll(struct file *filep, poll_table *wait)
 {
         struct IR *ir = filep->private_data;
+        struct IR_rx *rx = ir->rx;
         unsigned int ret;
 
         dprintk("poll called\n");
-        if (ir->c_rx.addr == 0)
+        if (rx == NULL)
                 return -ENODEV;
 
-        mutex_lock(&ir->buf_lock);
+        mutex_lock(&rx->buf_lock);
 
-        poll_wait(filep, &ir->buf.wait_poll, wait);
+        poll_wait(filep, &rx->buf.wait_poll, wait);
 
         dprintk("poll result = %s\n",
-                lirc_buffer_empty(&ir->buf) ? "0" : "POLLIN|POLLRDNORM");
+                lirc_buffer_empty(&rx->buf) ? "0" : "POLLIN|POLLRDNORM");
 
-        ret = lirc_buffer_empty(&ir->buf) ? 0 : (POLLIN|POLLRDNORM);
+        ret = lirc_buffer_empty(&rx->buf) ? 0 : (POLLIN|POLLRDNORM);
 
-        mutex_unlock(&ir->buf_lock);
+        mutex_unlock(&rx->buf_lock);
         return ret;
 }
 
@@ -994,10 +1032,9 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
         int result;
         unsigned long mode, features = 0;
 
-        if (ir->c_rx.addr != 0)
+        features |= LIRC_CAN_SEND_PULSE;
+        if (ir->rx != NULL)
                 features |= LIRC_CAN_REC_LIRCCODE;
-        if (ir->c_tx.addr != 0)
-                features |= LIRC_CAN_SEND_PULSE;
 
         switch (cmd) {
         case LIRC_GET_LENGTH:
@@ -1024,15 +1061,9 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
                         result = -EINVAL;
                 break;
         case LIRC_GET_SEND_MODE:
-                if (!(features&LIRC_CAN_SEND_MASK))
-                        return -ENOSYS;
-
                 result = put_user(LIRC_MODE_PULSE, (unsigned long *) arg);
                 break;
         case LIRC_SET_SEND_MODE:
-                if (!(features&LIRC_CAN_SEND_MASK))
-                        return -ENOSYS;
-
                 result = get_user(mode, (unsigned long *) arg);
                 if (!result && mode != LIRC_MODE_PULSE)
                         return -EINVAL;
@@ -1043,6 +1074,15 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
         return result;
 }
 
+/* ir_devices_lock must be held */
+static struct IR *find_ir_device_by_minor(unsigned int minor)
+{
+        if (minor >= MAX_IRCTL_DEVICES)
+                return NULL;
+
+        return ir_devices[minor];
+}
+
 /*
  * Open the IR device.  Get hold of our IR structure and
  * stash it in private_data for the file
@@ -1051,15 +1091,15 @@ static int open(struct inode *node, struct file *filep)
 {
         struct IR *ir;
         int ret;
+        unsigned int minor = MINOR(node->i_rdev);
 
         /* find our IR struct */
-        unsigned minor = MINOR(node->i_rdev);
-        if (minor >= MAX_IRCTL_DEVICES) {
-                dprintk("minor %d: open result = -ENODEV\n",
-                        minor);
+        mutex_lock(&ir_devices_lock);
+        ir = find_ir_device_by_minor(minor);
+        mutex_unlock(&ir_devices_lock);
+
+        if (ir == NULL)
                 return -ENODEV;
-        }
-        ir = ir_devices[minor];
 
         /* increment in use count */
         mutex_lock(&ir->ir_lock);
@@ -1106,7 +1146,6 @@ static struct lirc_driver lirc_template = {
 
 static int ir_remove(struct i2c_client *client);
 static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id);
-static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 #define ID_FLAG_TX      0x01
 #define ID_FLAG_HDPVR   0x02
@@ -1126,7 +1165,6 @@ static struct i2c_driver driver = {
         },
         .probe          = ir_probe,
         .remove         = ir_remove,
-        .command        = ir_command,
         .id_table       = ir_transceiver_id,
 };
 
@@ -1144,214 +1182,253 @@ static const struct file_operations lirc_fops = {
         .release        = close
 };
 
-static int ir_remove(struct i2c_client *client)
+static void destroy_rx_kthread(struct IR_rx *rx)
 {
-        struct IR *ir = i2c_get_clientdata(client);
+        /* end up polling thread */
+        if (rx != NULL && !IS_ERR_OR_NULL(rx->task)) {
+                kthread_stop(rx->task);
+                rx->task = NULL;
+        }
+}
 
-        mutex_lock(&ir->ir_lock);
+/* ir_devices_lock must be held */
+static int add_ir_device(struct IR *ir)
+{
+        int i;
 
-        if (ir->have_rx || ir->have_tx) {
-                DECLARE_COMPLETION(tn);
-                DECLARE_COMPLETION(tn2);
-
-                /* end up polling thread */
-                if (ir->task && !IS_ERR(ir->task)) {
-                        ir->t_notify = &tn;
-                        ir->t_notify2 = &tn2;
-                        ir->shutdown = 1;
-                        wake_up_process(ir->task);
-                        complete(&tn2);
-                        wait_for_completion(&tn);
-                        ir->t_notify = NULL;
-                        ir->t_notify2 = NULL;
+        for (i = 0; i < MAX_IRCTL_DEVICES; i++)
+                if (ir_devices[i] == NULL) {
+                        ir_devices[i] = ir;
+                        break;
                 }
 
-        } else {
-                mutex_unlock(&ir->ir_lock);
-                zilog_error("%s: detached from something we didn't "
-                            "attach to\n", __func__);
-                return -ENODEV;
+        return i == MAX_IRCTL_DEVICES ? -ENOMEM : i;
+}
+
+/* ir_devices_lock must be held */
+static void del_ir_device(struct IR *ir)
+{
+        int i;
+
+        for (i = 0; i < MAX_IRCTL_DEVICES; i++)
+                if (ir_devices[i] == ir) {
+                        ir_devices[i] = NULL;
+                        break;
+                }
+}
+
+static int ir_remove(struct i2c_client *client)
+{
+        struct IR *ir = i2c_get_clientdata(client);
+
+        mutex_lock(&ir_devices_lock);
+
+        if (ir == NULL) {
+                /* We destroyed everything when the first client came through */
+                mutex_unlock(&ir_devices_lock);
+                return 0;
         }
 
-        /* unregister lirc driver */
-        if (ir->l.minor >= 0 && ir->l.minor < MAX_IRCTL_DEVICES) {
-                lirc_unregister_driver(ir->l.minor);
-                ir_devices[ir->l.minor] = NULL;
+        /* Good-bye LIRC */
+        lirc_unregister_driver(ir->l.minor);
+
+        /* Good-bye Rx */
+        destroy_rx_kthread(ir->rx);
+        if (ir->rx != NULL) {
+                if (ir->rx->buf.fifo_initialized)
+                        lirc_buffer_free(&ir->rx->buf);
+                i2c_set_clientdata(ir->rx->c, NULL);
+                kfree(ir->rx);
         }
 
-        /* free memory */
-        lirc_buffer_free(&ir->buf);
-        mutex_unlock(&ir->ir_lock);
+        /* Good-bye Tx */
+        i2c_set_clientdata(ir->tx->c, NULL);
+        kfree(ir->tx);
+
+        /* Good-bye IR */
+        del_ir_device(ir);
         kfree(ir);
 
+        mutex_unlock(&ir_devices_lock);
         return 0;
 }
 
-static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+
+/* ir_devices_lock must be held */
+static struct IR *find_ir_device_by_adapter(struct i2c_adapter *adapter)
 {
+        int i;
         struct IR *ir = NULL;
+
+        for (i = 0; i < MAX_IRCTL_DEVICES; i++)
+                if (ir_devices[i] != NULL &&
+                    ir_devices[i]->adapter == adapter) {
+                        ir = ir_devices[i];
+                        break;
+                }
+
+        return ir;
+}
+
+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+        struct IR *ir;
         struct i2c_adapter *adap = client->adapter;
-        char buf;
         int ret;
-        int have_rx = 0, have_tx = 0;
+        bool tx_probe = false;
 
-        dprintk("%s: adapter name (%s) nr %d, i2c_device_id name (%s), "
-                "client addr=0x%02x\n",
-                __func__, adap->name, adap->nr, id->name, client->addr);
+        dprintk("%s: %s on i2c-%d (%s), client addr=0x%02x\n",
+                __func__, id->name, adap->nr, adap->name, client->addr);
 
         /*
-         * FIXME - This probe function probes both the Tx and Rx
-         * addresses of the IR microcontroller.
-         *
-         * However, the I2C subsystem is passing along one I2C client at a
-         * time, based on matches to the ir_transceiver_id[] table above.
-         * The expectation is that each i2c_client address will be probed
-         * individually by drivers so the I2C subsystem can mark all client
-         * addresses as claimed or not.
-         *
-         * This probe routine causes only one of the client addresses, TX or RX,
-         * to be claimed.  This will cause a problem if the I2C subsystem is
-         * subsequently triggered to probe unclaimed clients again.
+         * The IR receiver    is at i2c address 0x71.
+         * The IR transmitter is at i2c address 0x70.
          */
-        /*
-         * The external IR receiver is at i2c address 0x71.
-         * The IR transmitter is at 0x70.
-         */
-        client->addr = 0x70;
 
-        if (!disable_tx) {
-                if (i2c_master_recv(client, &buf, 1) == 1)
-                        have_tx = 1;
-                dprintk("probe 0x70 @ %s: %s\n",
-                        adap->name, have_tx ? "success" : "failed");
-        }
+        if (id->driver_data & ID_FLAG_TX)
+                tx_probe = true;
+        else if (tx_only) /* module option */
+                return -ENXIO;
 
-        if (!disable_rx) {
-                client->addr = 0x71;
-                if (i2c_master_recv(client, &buf, 1) == 1)
-                        have_rx = 1;
-                dprintk("probe 0x71 @ %s: %s\n",
-                        adap->name, have_rx ? "success" : "failed");
-        }
+        zilog_info("probing IR %s on %s (i2c-%d)\n",
+                   tx_probe ? "Tx" : "Rx", adap->name, adap->nr);
 
-        if (!(have_rx || have_tx)) {
-                zilog_error("%s: no devices found\n", adap->name);
-                goto out_nodev;
-        }
+        mutex_lock(&ir_devices_lock);
 
-        printk(KERN_INFO "lirc_zilog: chip found with %s\n",
-                have_rx && have_tx ? "RX and TX" :
-                        have_rx ? "RX only" : "TX only");
+        /* Use a single struct IR instance for both the Rx and Tx functions */
+        ir = find_ir_device_by_adapter(adap);
+        if (ir == NULL) {
+                ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
+                if (ir == NULL) {
+                        ret = -ENOMEM;
+                        goto out_no_ir;
+                }
+                /* store for use in ir_probe() again, and open() later on */
+                ret = add_ir_device(ir);
+                if (ret)
+                        goto out_free_ir;
+
+                ir->adapter = adap;
+                mutex_init(&ir->ir_lock);
+
+                /* set lirc_dev stuff */
+                memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver));
+                ir->l.minor       = minor; /* module option */
+                ir->l.code_length = 13;
+                ir->l.rbuf        = NULL;
+                ir->l.fops        = &lirc_fops;
+                ir->l.data        = ir;
+                ir->l.dev         = &adap->dev;
+                ir->l.sample_rate = 0;
+        }
 
-        ir = kzalloc(sizeof(struct IR), GFP_KERNEL);
+        if (tx_probe) {
+                /* Set up a struct IR_tx instance */
+                ir->tx = kzalloc(sizeof(struct IR_tx), GFP_KERNEL);
+                if (ir->tx == NULL) {
+                        ret = -ENOMEM;
+                        goto out_free_xx;
+                }
 
-        if (!ir)
-                goto out_nomem;
+                ir->tx->c = client;
+                ir->tx->need_boot = 1;
+                ir->tx->post_tx_ready_poll =
+                               (id->driver_data & ID_FLAG_HDPVR) ? false : true;
+        } else {
+                /* Set up a struct IR_rx instance */
+                ir->rx = kzalloc(sizeof(struct IR_rx), GFP_KERNEL);
+                if (ir->rx == NULL) {
+                        ret = -ENOMEM;
+                        goto out_free_xx;
+                }
 
-        ret = lirc_buffer_init(&ir->buf, 2, BUFLEN / 2);
-        if (ret)
-                goto out_nomem;
+                ret = lirc_buffer_init(&ir->rx->buf, 2, BUFLEN / 2);
+                if (ret)
+                        goto out_free_xx;
 
-        mutex_init(&ir->ir_lock);
-        mutex_init(&ir->buf_lock);
-        ir->need_boot = 1;
-        ir->is_hdpvr = (id->driver_data & ID_FLAG_HDPVR) ? true : false;
+                mutex_init(&ir->rx->buf_lock);
+                ir->rx->c = client;
+                ir->rx->hdpvr_data_fmt =
+                               (id->driver_data & ID_FLAG_HDPVR) ? true : false;
 
-        memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver));
-        ir->l.minor = -1;
+                /* set lirc_dev stuff */
+                ir->l.rbuf = &ir->rx->buf;
+        }
 
-        /* I2C attach to device */
         i2c_set_clientdata(client, ir);
 
-        /* initialise RX device */
-        if (have_rx) {
-                DECLARE_COMPLETION(tn);
-                memcpy(&ir->c_rx, client, sizeof(struct i2c_client));
-
-                ir->c_rx.addr = 0x71;
-                strlcpy(ir->c_rx.name, ZILOG_HAUPPAUGE_IR_RX_NAME,
-                        I2C_NAME_SIZE);
+        /* Proceed only if we have the required Tx and Rx clients ready to go */
+        if (ir->tx == NULL ||
+            (ir->rx == NULL && !tx_only)) {
+                zilog_info("probe of IR %s on %s (i2c-%d) done. Waiting on "
+                           "IR %s.\n", tx_probe ? "Tx" : "Rx", adap->name,
+                           adap->nr, tx_probe ? "Rx" : "Tx");
+                goto out_ok;
+        }
 
+        /* initialise RX device */
+        if (ir->rx != NULL) {
                 /* try to fire up polling thread */
-                ir->t_notify = &tn;
-                ir->task = kthread_run(lirc_thread, ir, "lirc_zilog");
-                if (IS_ERR(ir->task)) {
-                        ret = PTR_ERR(ir->task);
-                        zilog_error("lirc_register_driver: cannot run "
-                                    "poll thread %d\n", ret);
-                        goto err;
+                ir->rx->task = kthread_run(lirc_thread, ir,
+                                           "zilog-rx-i2c-%d", adap->nr);
+                if (IS_ERR(ir->rx->task)) {
+                        ret = PTR_ERR(ir->rx->task);
+                        zilog_error("%s: could not start IR Rx polling thread"
+                                    "\n", __func__);
+                        goto out_free_xx;
                 }
-                wait_for_completion(&tn);
-                ir->t_notify = NULL;
-                ir->have_rx = 1;
         }
 
-        /* initialise TX device */
-        if (have_tx) {
-                memcpy(&ir->c_tx, client, sizeof(struct i2c_client));
-                ir->c_tx.addr = 0x70;
-                strlcpy(ir->c_tx.name, ZILOG_HAUPPAUGE_IR_TX_NAME,
-                        I2C_NAME_SIZE);
-                ir->have_tx = 1;
-        }
-
-        /* set lirc_dev stuff */
-        ir->l.code_length = 13;
-        ir->l.rbuf        = &ir->buf;
-        ir->l.fops        = &lirc_fops;
-        ir->l.data        = ir;
-        ir->l.minor       = minor;
-        ir->l.dev         = &adap->dev;
-        ir->l.sample_rate = 0;
-
         /* register with lirc */
         ir->l.minor = lirc_register_driver(&ir->l);
         if (ir->l.minor < 0 || ir->l.minor >= MAX_IRCTL_DEVICES) {
-                zilog_error("ir_attach: \"minor\" must be between 0 and %d "
-                            "(%d)!\n", MAX_IRCTL_DEVICES-1, ir->l.minor);
+                zilog_error("%s: \"minor\" must be between 0 and %d (%d)!\n",
+                            __func__, MAX_IRCTL_DEVICES-1, ir->l.minor);
                 ret = -EBADRQC;
-                goto err;
+                goto out_free_thread;
         }
 
-        /* store this for getting back in open() later on */
-        ir_devices[ir->l.minor] = ir;
-
         /*
          * if we have the tx device, load the 'firmware'.  We do this
          * after registering with lirc as otherwise hotplug seems to take
          * 10s to create the lirc device.
          */
-        if (have_tx) {
-                /* Special TX init */
-                ret = tx_init(ir);
-                if (ret != 0)
-                        goto err;
-        }
+        ret = tx_init(ir->tx);
+        if (ret != 0)
+                goto out_unregister;
 
+        zilog_info("probe of IR %s on %s (i2c-%d) done. IR unit ready.\n",
+                   tx_probe ? "Tx" : "Rx", adap->name, adap->nr);
+out_ok:
+        mutex_unlock(&ir_devices_lock);
         return 0;
 
-err:
-        /* undo everything, hopefully... */
-        if (ir->c_rx.addr)
-                ir_remove(&ir->c_rx);
-        if (ir->c_tx.addr)
-                ir_remove(&ir->c_tx);
-        return ret;
-
-out_nodev:
-        zilog_error("no device found\n");
-        return -ENODEV;
-
-out_nomem:
-        zilog_error("memory allocation failure\n");
+out_unregister:
+        lirc_unregister_driver(ir->l.minor);
+out_free_thread:
+        destroy_rx_kthread(ir->rx);
+out_free_xx:
+        if (ir->rx != NULL) {
+                if (ir->rx->buf.fifo_initialized)
+                        lirc_buffer_free(&ir->rx->buf);
+                if (ir->rx->c != NULL)
+                        i2c_set_clientdata(ir->rx->c, NULL);
+                kfree(ir->rx);
+        }
+        if (ir->tx != NULL) {
+                if (ir->tx->c != NULL)
+                        i2c_set_clientdata(ir->tx->c, NULL);
+                kfree(ir->tx);
+        }
+out_free_ir:
+        del_ir_device(ir);
         kfree(ir);
-        return -ENOMEM;
-}
-
-static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        /* nothing */
-        return 0;
+out_no_ir:
+        zilog_error("%s: probing IR %s on %s (i2c-%d) failed with %d\n",
+                    __func__, tx_probe ? "Tx" : "Rx", adap->name, adap->nr,
+                   ret);
+        mutex_unlock(&ir_devices_lock);
+        return ret;
 }
 
 static int __init zilog_init(void)
@@ -1361,6 +1438,7 @@ static int __init zilog_init(void)
         zilog_notify("Zilog/Hauppauge IR driver initializing\n");
 
         mutex_init(&tx_data_lock);
+        mutex_init(&ir_devices_lock);
 
         request_module("firmware_class");
 
@@ -1386,7 +1464,8 @@ module_exit(zilog_exit);
 
 MODULE_DESCRIPTION("Zilog/Hauppauge infrared transmitter driver (i2c stack)");
 MODULE_AUTHOR("Gerd Knorr, Michal Kochanowicz, Christoph Bartelmus, "
-              "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver");
+              "Ulrich Mueller, Stefan Jahn, Jerome Brock, Mark Weaver, "
+              "Andy Walls");
 MODULE_LICENSE("GPL");
 /* for compat with old name, which isn't all that accurate anymore */
 MODULE_ALIAS("lirc_pvr150");
@@ -1397,8 +1476,5 @@ MODULE_PARM_DESC(minor, "Preferred minor device number");
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Enable debugging messages");
 
-module_param(disable_rx, bool, 0644);
-MODULE_PARM_DESC(disable_rx, "Disable the IR receiver device");
-
-module_param(disable_tx, bool, 0644);
-MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
+module_param(tx_only, bool, 0644);
+MODULE_PARM_DESC(tx_only, "Only handle the IR transmit function");
diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c
index 23fa049b51f2..a2f29d464051 100644
--- a/drivers/staging/msm/msm_fb.c
+++ b/drivers/staging/msm/msm_fb.c
@@ -347,7 +347,7 @@ static int msm_fb_suspend(struct platform_device *pdev, pm_message_t state)
         if ((!mfd) || (mfd->key != MFD_KEY))
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(mfd->fbi, 1);
 
         ret = msm_fb_suspend_sub(mfd);
@@ -358,7 +358,7 @@ static int msm_fb_suspend(struct platform_device *pdev, pm_message_t state)
                 pdev->dev.power.power_state = state;
         }
 
-        release_console_sem();
+        console_unlock();
         return ret;
 }
 #else
@@ -431,11 +431,11 @@ static int msm_fb_resume(struct platform_device *pdev)
         if ((!mfd) || (mfd->key != MFD_KEY))
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         ret = msm_fb_resume_sub(mfd);
         pdev->dev.power.power_state = PMSG_ON;
         fb_set_suspend(mfd->fbi, 1);
-        release_console_sem();
+        console_unlock();
 
         return ret;
 }
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 9f26dc9408bb..56a283d1a74d 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -373,17 +373,17 @@ static void dcon_source_switch(struct work_struct *work)
                  *
                  * For now, we just hope..
                  */
-                acquire_console_sem();
+                console_lock();
                 ignore_fb_events = 1;
                 if (fb_blank(fbinfo, FB_BLANK_UNBLANK)) {
                         ignore_fb_events = 0;
-                        release_console_sem();
+                        console_unlock();
                         printk(KERN_ERR "olpc-dcon:  Failed to enter CPU mode\n");
                         dcon_pending = DCON_SOURCE_DCON;
                         return;
                 }
                 ignore_fb_events = 0;
-                release_console_sem();
+                console_unlock();
 
                 /* And turn off the DCON */
                 pdata->set_dconload(1);
@@ -435,12 +435,12 @@ static void dcon_source_switch(struct work_struct *work)
                         }
                 }
 
-                acquire_console_sem();
+                console_lock();
                 ignore_fb_events = 1;
                 if (fb_blank(fbinfo, FB_BLANK_POWERDOWN))
                         printk(KERN_ERR "olpc-dcon:  couldn't blank fb!\n");
                 ignore_fb_events = 0;
-                release_console_sem();
+                console_unlock();
 
                 printk(KERN_INFO "olpc-dcon: The DCON has control\n");
                 break;
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index 701561d6b6fd..236dd36d349a 100644
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -484,8 +484,6 @@ struct net_device *RtmpPhyNetDevInit(struct rt_rtmp_adapter *pAd,
         net_dev->ml_priv = (void *)pAd;
         pAd->net_dev = net_dev;
 
-        netif_stop_queue(net_dev);
-
         return net_dev;
 
 }
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c
index ee68d51caa4e..322bf49ee906 100644
--- a/drivers/staging/rt2860/usb_main_dev.c
+++ b/drivers/staging/rt2860/usb_main_dev.c
@@ -106,6 +106,7 @@ struct usb_device_id rtusb_usb_id[] = {
         {USB_DEVICE(0x0411, 0x016f)},   /* MelCo.,Inc. WLI-UC-G301N */
         {USB_DEVICE(0x1737, 0x0070)},   /* Linksys WUSB100 */
         {USB_DEVICE(0x1737, 0x0071)},   /* Linksys WUSB600N */
+        {USB_DEVICE(0x1737, 0x0078)},   /* Linksys WUSB100v2 */
         {USB_DEVICE(0x0411, 0x00e8)},   /* Buffalo WLI-UC-G300N */
         {USB_DEVICE(0x050d, 0x815c)},   /* Belkin F5D8053 */
         {USB_DEVICE(0x100D, 0x9031)},   /* Motorola 2770 */
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 32088a641eba..84be383abec3 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -128,12 +128,13 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
         u8 *ptmpchar = NULL, *ppayload, *ptr;
         struct tx_desc *ptx_desc;
         u32 txdscp_sz = sizeof(struct tx_desc);
+        u8 ret = _FAIL;
 
         ulfilelength = rtl871x_open_fw(padapter, &phfwfile_hdl, &pmappedfw);
         if (pmappedfw && (ulfilelength > 0)) {
                 update_fwhdr(&fwhdr, pmappedfw);
                 if (chk_fwhdr(&fwhdr, ulfilelength) == _FAIL)
-                        goto exit_fail;
+                        goto firmware_rel;
                 fill_fwpriv(padapter, &fwhdr.fwpriv);
                 /* firmware check ok */
                 maxlen = (fwhdr.img_IMEM_size > fwhdr.img_SRAM_size) ?
@@ -141,7 +142,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
                 maxlen += txdscp_sz;
                 ptmpchar = _malloc(maxlen + FWBUFF_ALIGN_SZ);
                 if (ptmpchar == NULL)
-                        return _FAIL;
+                        goto firmware_rel;
 
                 ptx_desc = (struct tx_desc *)(ptmpchar + FWBUFF_ALIGN_SZ -
                             ((addr_t)(ptmpchar) & (FWBUFF_ALIGN_SZ - 1)));
@@ -273,11 +274,13 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
                         goto exit_fail;
         } else
                 goto exit_fail;
-        return _SUCCESS;
+        ret = _SUCCESS;
 
 exit_fail:
         kfree(ptmpchar);
-        return _FAIL;
+firmware_rel:
+        release_firmware((struct firmware *)phfwfile_hdl);
+        return ret;
 }
 
 uint rtl8712_hal_init(struct _adapter *padapter)
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index a692ee88b9e9..21ce2af447b5 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -47,54 +47,123 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
 static void r871xu_dev_remove(struct usb_interface *pusb_intf);
 
 static struct usb_device_id rtl871x_usb_id_tbl[] = {
-        /*92SU
-         * Realtek */
-        {USB_DEVICE(0x0bda, 0x8171)},
-        {USB_DEVICE(0x0bda, 0x8172)},
+
+/* RTL8188SU */
+        /* Realtek */
+        {USB_DEVICE(0x0BDA, 0x8171)},
         {USB_DEVICE(0x0bda, 0x8173)},
-        {USB_DEVICE(0x0bda, 0x8174)},
         {USB_DEVICE(0x0bda, 0x8712)},
         {USB_DEVICE(0x0bda, 0x8713)},
         {USB_DEVICE(0x0bda, 0xC512)},
-        /* Abocom  */
+        /* Abocom */
         {USB_DEVICE(0x07B8, 0x8188)},
+        /* ASUS */
+        {USB_DEVICE(0x0B05, 0x1786)},
+        {USB_DEVICE(0x0B05, 0x1791)}, /* 11n mode disable */
+        /* Belkin */
+        {USB_DEVICE(0x050D, 0x945A)},
         /* Corega */
-        {USB_DEVICE(0x07aa, 0x0047)},
-        /* Dlink */
-        {USB_DEVICE(0x07d1, 0x3303)},
-        {USB_DEVICE(0x07d1, 0x3302)},
-        {USB_DEVICE(0x07d1, 0x3300)},
-        /* Dlink for Skyworth */
-        {USB_DEVICE(0x14b2, 0x3300)},
-        {USB_DEVICE(0x14b2, 0x3301)},
-        {USB_DEVICE(0x14b2, 0x3302)},
+        {USB_DEVICE(0x07AA, 0x0047)},
+        /* D-Link */
+        {USB_DEVICE(0x2001, 0x3306)},
+        {USB_DEVICE(0x07D1, 0x3306)}, /* 11n mode disable */
+        /* Edimax */
+        {USB_DEVICE(0x7392, 0x7611)},
         /* EnGenius */
         {USB_DEVICE(0x1740, 0x9603)},
-        {USB_DEVICE(0x1740, 0x9605)},
+        /* Hawking */
+        {USB_DEVICE(0x0E66, 0x0016)},
+        /* Hercules */
+        {USB_DEVICE(0x06F8, 0xE034)},
+        {USB_DEVICE(0x06F8, 0xE032)},
+        /* Logitec */
+        {USB_DEVICE(0x0789, 0x0167)},
+        /* PCI */
+        {USB_DEVICE(0x2019, 0xAB28)},
+        {USB_DEVICE(0x2019, 0xED16)},
+        /* Sitecom */
+        {USB_DEVICE(0x0DF6, 0x0057)},
+        {USB_DEVICE(0x0DF6, 0x0045)},
+        {USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */
+        {USB_DEVICE(0x0DF6, 0x004B)},
+        {USB_DEVICE(0x0DF6, 0x0063)},
+        /* Sweex */
+        {USB_DEVICE(0x177F, 0x0154)},
+        /* Thinkware */
+        {USB_DEVICE(0x0BDA, 0x5077)},
+        /* Toshiba */
+        {USB_DEVICE(0x1690, 0x0752)},
+        /* - */
+        {USB_DEVICE(0x20F4, 0x646B)},
+        {USB_DEVICE(0x083A, 0xC512)},
+
+/* RTL8191SU */
+        /* Realtek */
+        {USB_DEVICE(0x0BDA, 0x8172)},
+        /* Amigo */
+        {USB_DEVICE(0x0EB0, 0x9061)},
+        /* ASUS/EKB */
+        {USB_DEVICE(0x0BDA, 0x8172)},
+        {USB_DEVICE(0x13D3, 0x3323)},
+        {USB_DEVICE(0x13D3, 0x3311)}, /* 11n mode disable */
+        {USB_DEVICE(0x13D3, 0x3342)},
+        /* ASUS/EKBLenovo */
+        {USB_DEVICE(0x13D3, 0x3333)},
+        {USB_DEVICE(0x13D3, 0x3334)},
+        {USB_DEVICE(0x13D3, 0x3335)}, /* 11n mode disable */
+        {USB_DEVICE(0x13D3, 0x3336)}, /* 11n mode disable */
+        /* ASUS/Media BOX */
+        {USB_DEVICE(0x13D3, 0x3309)},
         /* Belkin */
-        {USB_DEVICE(0x050d, 0x815F)},
-        {USB_DEVICE(0x050d, 0x945A)},
-        {USB_DEVICE(0x050d, 0x845A)},
-        /* Guillemot */
-        {USB_DEVICE(0x06f8, 0xe031)},
+        {USB_DEVICE(0x050D, 0x815F)},
+        /* D-Link */
+        {USB_DEVICE(0x07D1, 0x3302)},
+        {USB_DEVICE(0x07D1, 0x3300)},
+        {USB_DEVICE(0x07D1, 0x3303)},
         /* Edimax */
-        {USB_DEVICE(0x7392, 0x7611)},
         {USB_DEVICE(0x7392, 0x7612)},
-        {USB_DEVICE(0x7392, 0x7622)},
-        /* Sitecom */
-        {USB_DEVICE(0x0DF6, 0x0045)},
+        /* EnGenius */
+        {USB_DEVICE(0x1740, 0x9605)},
+        /* Guillemot */
+        {USB_DEVICE(0x06F8, 0xE031)},
         /* Hawking */
         {USB_DEVICE(0x0E66, 0x0015)},
-        {USB_DEVICE(0x0E66, 0x0016)},
-        {USB_DEVICE(0x0b05, 0x1786)},
-        {USB_DEVICE(0x0b05, 0x1791)},    /* 11n mode disable */
-
+        /* Mediao */
         {USB_DEVICE(0x13D3, 0x3306)},
-        {USB_DEVICE(0x13D3, 0x3309)},
+        /* PCI */
+        {USB_DEVICE(0x2019, 0xED18)},
+        {USB_DEVICE(0x2019, 0x4901)},
+        /* Sitecom */
+        {USB_DEVICE(0x0DF6, 0x0058)},
+        {USB_DEVICE(0x0DF6, 0x0049)},
+        {USB_DEVICE(0x0DF6, 0x004C)},
+        {USB_DEVICE(0x0DF6, 0x0064)},
+        /* Skyworth */
+        {USB_DEVICE(0x14b2, 0x3300)},
+        {USB_DEVICE(0x14b2, 0x3301)},
+        {USB_DEVICE(0x14B2, 0x3302)},
+        /* - */
+        {USB_DEVICE(0x04F2, 0xAFF2)},
+        {USB_DEVICE(0x04F2, 0xAFF5)},
+        {USB_DEVICE(0x04F2, 0xAFF6)},
+        {USB_DEVICE(0x13D3, 0x3339)},
+        {USB_DEVICE(0x13D3, 0x3340)}, /* 11n mode disable */
+        {USB_DEVICE(0x13D3, 0x3341)}, /* 11n mode disable */
         {USB_DEVICE(0x13D3, 0x3310)},
-        {USB_DEVICE(0x13D3, 0x3311)},    /* 11n mode disable */
         {USB_DEVICE(0x13D3, 0x3325)},
-        {USB_DEVICE(0x083A, 0xC512)},
+
+/* RTL8192SU */
+        /* Realtek */
+        {USB_DEVICE(0x0BDA, 0x8174)},
+        {USB_DEVICE(0x0BDA, 0x8174)},
+        /* Belkin */
+        {USB_DEVICE(0x050D, 0x845A)},
+        /* Corega */
+        {USB_DEVICE(0x07AA, 0x0051)},
+        /* Edimax */
+        {USB_DEVICE(0x7392, 0x7622)},
+        /* NEC */
+        {USB_DEVICE(0x0409, 0x02B6)},
         {}
 };
 
@@ -103,8 +172,20 @@ MODULE_DEVICE_TABLE(usb, rtl871x_usb_id_tbl);
 static struct specific_device_id specific_device_id_tbl[] = {
         {.idVendor = 0x0b05, .idProduct = 0x1791,
                  .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x0df6, .idProduct = 0x0059,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x13d3, .idProduct = 0x3306,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
         {.idVendor = 0x13D3, .idProduct = 0x3311,
                  .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x13d3, .idProduct = 0x3335,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x13d3, .idProduct = 0x3336,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x13d3, .idProduct = 0x3340,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
+        {.idVendor = 0x13d3, .idProduct = 0x3341,
+                 .flags = SPEC_DEV_ID_DISABLE_HT},
         {}
 };
 
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c
index f4b163f7338a..d007e4a12c14 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -1044,9 +1044,9 @@ static int __maybe_unused smtcfb_suspend(struct pci_dev *pdev, pm_message_t msg)
 
         /* when doing suspend, call fb apis and pci apis */
         if (msg.event == PM_EVENT_SUSPEND) {
-                acquire_console_sem();
+                console_lock();
                 fb_set_suspend(&sfb->fb, 1);
-                release_console_sem();
+                console_unlock();
                 retv = pci_save_state(pdev);
                 pci_disable_device(pdev);
                 retv = pci_choose_state(pdev, msg);
@@ -1071,7 +1071,7 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev)
         /* when resuming, restore pci data and fb cursor */
         if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) {
                 retv = pci_set_power_state(pdev, PCI_D0);
-                retv = pci_restore_state(pdev);
+                pci_restore_state(pdev);
                 if (pci_enable_device(pdev))
                         return -1;
                 pci_set_master(pdev);
@@ -1105,9 +1105,9 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev)
 
         smtcfb_setmode(sfb);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(&sfb->fb, 0);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/staging/smbfs/dir.c b/drivers/staging/smbfs/dir.c
index 87a3a9bd5842..f204d33910ec 100644
--- a/drivers/staging/smbfs/dir.c
+++ b/drivers/staging/smbfs/dir.c
@@ -283,7 +283,7 @@ static int smb_compare_dentry(const struct dentry *,
                 unsigned int, const char *, const struct qstr *);
 static int smb_delete_dentry(const struct dentry *);
 
-static const struct dentry_operations smbfs_dentry_operations =
+const struct dentry_operations smbfs_dentry_operations =
 {
         .d_revalidate   = smb_lookup_validate,
         .d_hash         = smb_hash_dentry,
@@ -291,7 +291,7 @@ static const struct dentry_operations smbfs_dentry_operations =
         .d_delete       = smb_delete_dentry,
 };
 
-static const struct dentry_operations smbfs_dentry_operations_case =
+const struct dentry_operations smbfs_dentry_operations_case =
 {
         .d_revalidate   = smb_lookup_validate,
         .d_delete       = smb_delete_dentry,
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 408bb9b3303e..07a7f5432597 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -332,7 +332,7 @@ static ssize_t silent_store(struct kobject *kobj, struct kobj_attribute *attr,
         unsigned long flags;
 
         len = strlen(buf);
-        if (len > 0 || len < 3) {
+        if (len > 0 && len < 3) {
                 ch = buf[0];
                 if (ch == '\n')
                         ch = '0';
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index e8f047e86a32..80183a7e6624 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -986,12 +986,6 @@ static int __devinit synaptics_rmi4_probe
         input_set_abs_params(rmi4_data->input_dev, ABS_MT_TOUCH_MAJOR, 0,
                                                 MAX_TOUCH_MAJOR, 0, 0);
 
-        retval = input_register_device(rmi4_data->input_dev);
-        if (retval) {
-                dev_err(&client->dev, "%s:input register failed\n", __func__);
-                goto err_input_register;
-        }
-
         /* Clear interrupts */
         synaptics_rmi4_i2c_block_read(rmi4_data,
                         rmi4_data->fn01_data_base_addr + 1, intr_status,
@@ -1003,15 +997,20 @@ static int __devinit synaptics_rmi4_probe
         if (retval) {
                 dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
                                 __func__, platformdata->irq_number);
-                goto err_request_irq;
+                goto err_unset_clientdata;
+        }
+
+        retval = input_register_device(rmi4_data->input_dev);
+        if (retval) {
+                dev_err(&client->dev, "%s:input register failed\n", __func__);
+                goto err_free_irq;
         }
 
         return retval;
 
-err_request_irq:
+err_free_irq:
         free_irq(platformdata->irq_number, rmi4_data);
-        input_unregister_device(rmi4_data->input_dev);
-err_input_register:
+err_unset_clientdata:
         i2c_set_clientdata(client, NULL);
 err_query_dev:
         if (platformdata->regulator_en) {
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 571864555ddd..27e0aa81a584 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -949,7 +949,7 @@ func_end:
  *      Calls the Bridge's CHNL_ISR to determine if this interrupt is ours, then
  *      schedules a DPC to dispatch I/O.
  */
-void io_mbox_msg(u32 msg)
+int io_mbox_msg(struct notifier_block *self, unsigned long len, void *msg)
 {
         struct io_mgr *pio_mgr;
         struct dev_object *dev_obj;
@@ -959,9 +959,9 @@ void io_mbox_msg(u32 msg)
         dev_get_io_mgr(dev_obj, &pio_mgr);
 
         if (!pio_mgr)
-                return;
+                return NOTIFY_BAD;
 
-        pio_mgr->intr_val = (u16)msg;
+        pio_mgr->intr_val = (u16)((u32)msg);
         if (pio_mgr->intr_val & MBX_PM_CLASS)
                 io_dispatch_pm(pio_mgr);
 
@@ -973,7 +973,7 @@ void io_mbox_msg(u32 msg)
                 spin_unlock_irqrestore(&pio_mgr->dpc_lock, flags);
                 tasklet_schedule(&pio_mgr->dpc_tasklet);
         }
-        return;
+        return NOTIFY_OK;
 }
 
 /*
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index a3b0a183d570..a3f69f6f505f 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -223,6 +223,10 @@ static struct bridge_drv_interface drv_interface_fxns = {
         bridge_msg_set_queue_id,
 };
 
+static struct notifier_block dsp_mbox_notifier = {
+        .notifier_call = io_mbox_msg,
+};
+
 static inline void flush_all(struct bridge_dev_context *dev_context)
 {
         if (dev_context->dw_brd_state == BRD_DSP_HIBERNATION ||
@@ -553,7 +557,7 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
                  * Enable Mailbox events and also drain any pending
                  * stale messages.
                  */
-                dev_context->mbox = omap_mbox_get("dsp");
+                dev_context->mbox = omap_mbox_get("dsp", &dsp_mbox_notifier);
                 if (IS_ERR(dev_context->mbox)) {
                         dev_context->mbox = NULL;
                         pr_err("%s: Failed to get dsp mailbox handle\n",
@@ -563,8 +567,6 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
 
         }
         if (!status) {
-                dev_context->mbox->rxq->callback = (int (*)(void *))io_mbox_msg;
-
 /*PM_IVA2GRPSEL_PER = 0xC0;*/
                 temp = readl(resources->dw_per_pm_base + 0xA8);
                 temp = (temp & 0xFFFFFF30) | 0xC0;
@@ -685,7 +687,7 @@ static int bridge_brd_stop(struct bridge_dev_context *dev_ctxt)
         /* Disable the mailbox interrupts */
         if (dev_context->mbox) {
                 omap_mbox_disable_irq(dev_context->mbox, IRQ_RX);
-                omap_mbox_put(dev_context->mbox);
+                omap_mbox_put(dev_context->mbox, &dsp_mbox_notifier);
                 dev_context->mbox = NULL;
         }
         /* Reset IVA2 clocks*/
@@ -786,10 +788,7 @@ static int bridge_dev_create(struct bridge_dev_context
 
         pt_attrs = kzalloc(sizeof(struct pg_table_attrs), GFP_KERNEL);
         if (pt_attrs != NULL) {
-                /* Assuming that we use only DSP's memory map
-                 * until 0x4000:0000 , we would need only 1024
-                 * L1 enties i.e L1 size = 4K */
-                pt_attrs->l1_size = 0x1000;
+                pt_attrs->l1_size = SZ_16K; /* 4096 entries of 32 bits */
                 align_size = pt_attrs->l1_size;
                 /* Align sizes are expected to be power of 2 */
                 /* we like to get aligned on L1 table size */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 18aec55d8647..8242c70e09dd 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -72,22 +72,17 @@ extern void io_dpc(unsigned long ref_data);
 /*
  *  ======== io_mbox_msg ========
  *  Purpose:
- *      Main interrupt handler for the shared memory Bridge channel manager.
- *      Calls the Bridge's chnlsm_isr to determine if this interrupt is ours,
- *      then schedules a DPC to dispatch I/O.
+ *      Main message handler for the shared memory Bridge channel manager.
+ *      Determine if this message is ours, then schedules a DPC to
+ *      dispatch I/O.
  *  Parameters:
- *      ref_data:   Pointer to the channel manager object for this board.
- *                  Set in an initial call to ISR_Install().
+ *      self:   Pointer to its own notifier_block struct.
+ *      len:    Length of message.
+ *      msg:    Message code received.
  *  Returns:
- *      TRUE if interrupt handled; FALSE otherwise.
- *  Requires:
- *      Must be in locked memory if executing in kernel mode.
- *      Must only call functions which are in locked memory if Kernel mode.
- *      Must only call asynchronous services.
- *      Interrupts are disabled and EOI for this interrupt has been sent.
- *  Ensures:
+ *      NOTIFY_OK if handled; NOTIFY_BAD otherwise.
  */
-void io_mbox_msg(u32 msg);
+int io_mbox_msg(struct notifier_block *self, unsigned long len, void *msg);
 
 /*
  *  ======== io_request_chnl ========
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index 8fe017c3721f..eb9b9f1bc138 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -1450,29 +1450,55 @@ static struct video_device tm6000_template = {
  * ------------------------------------------------------------------
  */
 
-int tm6000_v4l2_register(struct tm6000_core *dev)
+static struct video_device *vdev_init(struct tm6000_core *dev,
+                const struct video_device
+                *template, const char *type_name)
 {
-        int ret = -1;
         struct video_device *vfd;
 
         vfd = video_device_alloc();
-        if(!vfd) {
+        if (NULL == vfd)
+                return NULL;
+
+        *vfd = *template;
+        vfd->v4l2_dev = &dev->v4l2_dev;
+        vfd->release = video_device_release;
+        vfd->debug = tm6000_debug;
+        vfd->lock = &dev->lock;
+
+        snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
+
+        video_set_drvdata(vfd, dev);
+        return vfd;
+}
+
+int tm6000_v4l2_register(struct tm6000_core *dev)
+{
+        int ret = -1;
+
+        dev->vfd = vdev_init(dev, &tm6000_template, "video");
+
+        if (!dev->vfd) {
+                printk(KERN_INFO "%s: can't register video device\n",
+                       dev->name);
                 return -ENOMEM;
         }
-        dev->vfd = vfd;
 
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
         INIT_LIST_HEAD(&dev->vidq.queued);
 
-        memcpy(dev->vfd, &tm6000_template, sizeof(*(dev->vfd)));
-        dev->vfd->debug = tm6000_debug;
-        dev->vfd->lock = &dev->lock;
+        ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr);
 
-        vfd->v4l2_dev = &dev->v4l2_dev;
-        video_set_drvdata(vfd, dev);
+        if (ret < 0) {
+                printk(KERN_INFO "%s: can't register video device\n",
+                       dev->name);
+                return ret;
+        }
+
+        printk(KERN_INFO "%s: registered device %s\n",
+               dev->name, video_device_node_name(dev->vfd));
 
-        ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr);
         printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
         return ret;
 }
diff --git a/drivers/staging/usbip/stub.h b/drivers/staging/usbip/stub.h
index 30dbfb6d16f2..d73267961ef4 100644
--- a/drivers/staging/usbip/stub.h
+++ b/drivers/staging/usbip/stub.h
@@ -32,6 +32,7 @@
 
 struct stub_device {
         struct usb_interface *interface;
+        struct usb_device *udev;
         struct list_head list;
 
         struct usbip_device ud;
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index b186b5fed2b9..a7ce51cc8909 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -258,10 +258,11 @@ static void stub_shutdown_connection(struct usbip_device *ud)
 static void stub_device_reset(struct usbip_device *ud)
 {
         struct stub_device *sdev = container_of(ud, struct stub_device, ud);
-        struct usb_device *udev = interface_to_usbdev(sdev->interface);
+        struct usb_device *udev = sdev->udev;
         int ret;
 
         usbip_udbg("device reset");
+
         ret = usb_lock_device_for_reset(udev, sdev->interface);
         if (ret < 0) {
                 dev_err(&udev->dev, "lock for reset\n");
@@ -309,7 +310,8 @@ static void stub_device_unusable(struct usbip_device *ud)
  *
  * Allocates and initializes a new stub_device struct.
  */
-static struct stub_device *stub_device_alloc(struct usb_interface *interface)
+static struct stub_device *stub_device_alloc(struct usb_device *udev,
+                                             struct usb_interface *interface)
 {
         struct stub_device *sdev;
         int busnum = interface_to_busnum(interface);
@@ -324,7 +326,8 @@ static struct stub_device *stub_device_alloc(struct usb_interface *interface)
                 return NULL;
         }
 
-        sdev->interface = interface;
+        sdev->interface = usb_get_intf(interface);
+        sdev->udev = usb_get_dev(udev);
 
         /*
          * devid is defined with devnum when this driver is first allocated.
@@ -450,11 +453,12 @@ static int stub_probe(struct usb_interface *interface,
                         return err;
                 }
 
+                usb_get_intf(interface);
                 return 0;
         }
 
         /* ok. this is my device. */
-        sdev = stub_device_alloc(interface);
+        sdev = stub_device_alloc(udev, interface);
         if (!sdev)
                 return -ENOMEM;
 
@@ -476,6 +480,8 @@ static int stub_probe(struct usb_interface *interface,
                 dev_err(&interface->dev, "create sysfs files for %s\n",
                         udev_busid);
                 usb_set_intfdata(interface, NULL);
+                usb_put_intf(interface);
+
                 busid_priv->interf_count = 0;
 
                 busid_priv->sdev = NULL;
@@ -545,6 +551,7 @@ static void stub_disconnect(struct usb_interface *interface)
         if (busid_priv->interf_count > 1) {
                 busid_priv->interf_count--;
                 shutdown_busid(busid_priv);
+                usb_put_intf(interface);
                 return;
         }
 
@@ -554,6 +561,9 @@ static void stub_disconnect(struct usb_interface *interface)
         /* 1. shutdown the current connection */
         shutdown_busid(busid_priv);
 
+        usb_put_dev(sdev->udev);
+        usb_put_intf(interface);
+
         /* 3. free sdev */
         busid_priv->sdev = NULL;
         stub_device_free(sdev);
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
index 3de6fd2539dc..ae6ac82754a4 100644
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/staging/usbip/stub_rx.c
@@ -364,7 +364,7 @@ static struct stub_priv *stub_priv_alloc(struct stub_device *sdev,
 
 static int get_pipe(struct stub_device *sdev, int epnum, int dir)
 {
-        struct usb_device *udev = interface_to_usbdev(sdev->interface);
+        struct usb_device *udev = sdev->udev;
         struct usb_host_endpoint *ep;
         struct usb_endpoint_descriptor *epd = NULL;
 
@@ -484,7 +484,7 @@ static void stub_recv_cmd_submit(struct stub_device *sdev,
         int ret;
         struct stub_priv *priv;
         struct usbip_device *ud = &sdev->ud;
-        struct usb_device *udev = interface_to_usbdev(sdev->interface);
+        struct usb_device *udev = sdev->udev;
         int pipe = get_pipe(sdev, pdu->base.ep, pdu->base.direction);
 
 
diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
index 41a1fe5138f4..afc3b1a71881 100644
--- a/drivers/staging/usbip/vhci.h
+++ b/drivers/staging/usbip/vhci.h
@@ -100,9 +100,6 @@ struct vhci_hcd {
          * But, the index of this array begins from 0.
          */
         struct vhci_device vdev[VHCI_NPORTS];
-
-        /* vhci_device which has not been assiged its address yet */
-        int pending_port;
 };
 
 
@@ -119,6 +116,9 @@ void rh_port_disconnect(int rhport);
 void vhci_rx_loop(struct usbip_task *ut);
 void vhci_tx_loop(struct usbip_task *ut);
 
+struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev,
+                                            __u32 seqnum);
+
 #define hardware                (&the_controller->pdev.dev)
 
 static inline struct vhci_device *port_to_vdev(__u32 port)
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 08bd26a245d5..a35fe61268de 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -138,8 +138,6 @@ void rh_port_connect(int rhport, enum usb_device_speed speed)
          * the_controller->vdev[rhport].ud.status = VDEV_CONNECT;
          * spin_unlock(&the_controller->vdev[rhport].ud.lock); */
 
-        the_controller->pending_port = rhport;
-
         spin_unlock_irqrestore(&the_controller->lock, flags);
 
         usb_hcd_poll_rh_status(vhci_to_hcd(the_controller));
@@ -559,6 +557,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
         struct device *dev = &urb->dev->dev;
         int ret = 0;
         unsigned long flags;
+        struct vhci_device *vdev;
 
         usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n",
                     hcd, urb, mem_flags);
@@ -574,6 +573,18 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
                 return urb->status;
         }
 
+        vdev = port_to_vdev(urb->dev->portnum-1);
+
+        /* refuse enqueue for dead connection */
+        spin_lock(&vdev->ud.lock);
+        if (vdev->ud.status == VDEV_ST_NULL || vdev->ud.status == VDEV_ST_ERROR) {
+                usbip_uerr("enqueue for inactive port %d\n", vdev->rhport);
+                spin_unlock(&vdev->ud.lock);
+                spin_unlock_irqrestore(&the_controller->lock, flags);
+                return -ENODEV;
+        }
+        spin_unlock(&vdev->ud.lock);
+
         ret = usb_hcd_link_urb_to_ep(hcd, urb);
         if (ret)
                 goto no_need_unlink;
@@ -592,8 +603,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
                 __u8 type = usb_pipetype(urb->pipe);
                 struct usb_ctrlrequest *ctrlreq =
                                 (struct usb_ctrlrequest *) urb->setup_packet;
-                struct vhci_device *vdev =
-                                port_to_vdev(the_controller->pending_port);
 
                 if (type != PIPE_CONTROL || !ctrlreq) {
                         dev_err(dev, "invalid request to devnum 0\n");
@@ -607,7 +616,9 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
                         dev_info(dev, "SetAddress Request (%d) to port %d\n",
                                  ctrlreq->wValue, vdev->rhport);
 
-                        vdev->udev = urb->dev;
+                        if (vdev->udev)
+                                usb_put_dev(vdev->udev);
+                        vdev->udev = usb_get_dev(urb->dev);
 
                         spin_lock(&vdev->ud.lock);
                         vdev->ud.status = VDEV_ST_USED;
@@ -627,8 +638,9 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
                                                 "Get_Descriptor to device 0 "
                                                 "(get max pipe size)\n");
 
-                        /* FIXME: reference count? (usb_get_dev()) */
-                        vdev->udev = urb->dev;
+                        if (vdev->udev)
+                                usb_put_dev(vdev->udev);
+                        vdev->udev = usb_get_dev(urb->dev);
                         goto out;
 
                 default:
@@ -805,7 +817,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
         return 0;
 }
 
-
 static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
 {
         struct vhci_unlink *unlink, *tmp;
@@ -813,11 +824,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
         spin_lock(&vdev->priv_lock);
 
         list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+                usbip_uinfo("unlink cleanup tx %lu\n", unlink->unlink_seqnum);
                 list_del(&unlink->list);
                 kfree(unlink);
         }
 
         list_for_each_entry_safe(unlink, tmp, &vdev->unlink_rx, list) {
+                struct urb *urb;
+
+                /* give back URB of unanswered unlink request */
+                usbip_uinfo("unlink cleanup rx %lu\n", unlink->unlink_seqnum);
+
+                urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+                if (!urb) {
+                        usbip_uinfo("the urb (seqnum %lu) was already given back\n",
+                                                        unlink->unlink_seqnum);
+                        list_del(&unlink->list);
+                        kfree(unlink);
+                        continue;
+                }
+
+                urb->status = -ENODEV;
+
+                spin_lock(&the_controller->lock);
+                usb_hcd_unlink_urb_from_ep(vhci_to_hcd(the_controller), urb);
+                spin_unlock(&the_controller->lock);
+
+                usb_hcd_giveback_urb(vhci_to_hcd(the_controller), urb, urb->status);
+
                 list_del(&unlink->list);
                 kfree(unlink);
         }
@@ -887,6 +921,10 @@ static void vhci_device_reset(struct usbip_device *ud)
         vdev->speed  = 0;
         vdev->devid  = 0;
 
+        if (vdev->udev)
+                usb_put_dev(vdev->udev);
+        vdev->udev = NULL;
+
         ud->tcp_socket = NULL;
 
         ud->status = VDEV_ST_NULL;
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index 8147d7202b2d..bf6991470941 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -23,16 +23,14 @@
 #include "vhci.h"
 
 
-/* get URB from transmitted urb queue */
-static struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev,
+/* get URB from transmitted urb queue. caller must hold vdev->priv_lock */
+struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev,
                                             __u32 seqnum)
 {
         struct vhci_priv *priv, *tmp;
         struct urb *urb = NULL;
         int status;
 
-        spin_lock(&vdev->priv_lock);
-
         list_for_each_entry_safe(priv, tmp, &vdev->priv_rx, list) {
                 if (priv->seqnum == seqnum) {
                         urb = priv->urb;
@@ -63,8 +61,6 @@ static struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev,
                 }
         }
 
-        spin_unlock(&vdev->priv_lock);
-
         return urb;
 }
 
@@ -74,9 +70,11 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
         struct usbip_device *ud = &vdev->ud;
         struct urb *urb;
 
+        spin_lock(&vdev->priv_lock);
 
         urb = pickup_urb_and_free_priv(vdev, pdu->base.seqnum);
 
+        spin_unlock(&vdev->priv_lock);
 
         if (!urb) {
                 usbip_uerr("cannot find a urb of seqnum %u\n",
@@ -161,7 +159,12 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
                 return;
         }
 
+        spin_lock(&vdev->priv_lock);
+
         urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+
+        spin_unlock(&vdev->priv_lock);
+
         if (!urb) {
                 /*
                  * I get the result of a unlink request. But, it seems that I
@@ -190,6 +193,19 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
         return;
 }
 
+static int vhci_priv_tx_empty(struct vhci_device *vdev)
+{
+        int empty = 0;
+
+        spin_lock(&vdev->priv_lock);
+
+        empty = list_empty(&vdev->priv_rx);
+
+        spin_unlock(&vdev->priv_lock);
+
+        return empty;
+}
+
 /* recv a pdu */
 static void vhci_rx_pdu(struct usbip_device *ud)
 {
@@ -202,11 +218,29 @@ static void vhci_rx_pdu(struct usbip_device *ud)
 
         memset(&pdu, 0, sizeof(pdu));
 
-
         /* 1. receive a pdu header */
         ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+        if (ret < 0) {
+                if (ret == -ECONNRESET)
+                        usbip_uinfo("connection reset by peer\n");
+                else if (ret == -EAGAIN) {
+                        /* ignore if connection was idle */
+                        if (vhci_priv_tx_empty(vdev))
+                                return;
+                        usbip_uinfo("connection timed out with pending urbs\n");
+                } else if (ret != -ERESTARTSYS)
+                        usbip_uinfo("xmit failed %d\n", ret);
+
+                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
+                return;
+        }
+        if (ret == 0) {
+                usbip_uinfo("connection closed");
+                usbip_event_add(ud, VDEV_EVENT_DOWN);
+                return;
+        }
         if (ret != sizeof(pdu)) {
-                usbip_uerr("receiving pdu failed! size is %d, should be %d\n",
+                usbip_uerr("received pdu size is %d, should be %d\n",
                                         ret, (unsigned int)sizeof(pdu));
                 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                 return;
diff --git a/drivers/staging/vme/bridges/Module.symvers b/drivers/staging/vme/bridges/Module.symvers
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/staging/vme/bridges/Module.symvers
+++ /dev/null
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 7016fdd2509f..e19b932492e1 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3954,8 +3954,8 @@ void XGI_GetCRT2ResInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 unsigned char XGI_IsLCDDualLink(struct vb_device_info *pVBInfo)
 {
 
-        if ((((pVBInfo->VBInfo & SetCRT2ToLCD) | SetCRT2ToLCDA))
-                        && (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */
+        if ((pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) &&
+                        (pVBInfo->LCDInfo & SetLCDDualLink)) /* shampoo0129 */
                 return 1;
 
         return 0;
@@ -8773,7 +8773,7 @@ unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
 
         if (pVBInfo->IF_DEF_LVDS == 0) {
                 CRT2Index = CRT2Index >> 6; /*  for LCD */
-                if (((pVBInfo->VBInfo & SetCRT2ToLCD) | SetCRT2ToLCDA)) { /*301b*/
+                if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) { /*301b*/
                         if (pVBInfo->LCDResInfo != Panel1024x768)
                                 VCLKIndex = LCDXlat2VCLK[CRT2Index];
                         else
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 5415712f01f8..4bd8cbdaee76 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -227,6 +227,7 @@ static int zram_read(struct zram *zram, struct bio *bio)
 
                 if (zram_test_flag(zram, index, ZRAM_ZERO)) {
                         handle_zero_page(page);
+                        index++;
                         continue;
                 }
 
@@ -235,12 +236,14 @@ static int zram_read(struct zram *zram, struct bio *bio)
                         pr_debug("Read before write: sector=%lu, size=%u",
                                 (ulong)(bio->bi_sector), bio->bi_size);
                         /* Do nothing */
+                        index++;
                         continue;
                 }
 
                 /* Page is stored uncompressed since it's incompressible */
                 if (unlikely(zram_test_flag(zram, index, ZRAM_UNCOMPRESSED))) {
                         handle_uncompressed_page(zram, page, index);
+                        index++;
                         continue;
                 }
 
@@ -320,6 +323,7 @@ static int zram_write(struct zram *zram, struct bio *bio)
                         mutex_unlock(&zram->lock);
                         zram_stat_inc(&zram->stats.pages_zero);
                         zram_set_flag(zram, index, ZRAM_ZERO);
+                        index++;
                         continue;
                 }
 
diff --git a/drivers/target/Kconfig b/drivers/target/Kconfig
new file mode 100644
index 000000000000..2fac3be209ac
--- /dev/null
+++ b/drivers/target/Kconfig
@@ -0,0 +1,32 @@
+
+menuconfig TARGET_CORE
+        tristate "Generic Target Core Mod (TCM) and ConfigFS Infrastructure"
+        depends on SCSI && BLOCK
+        select CONFIGFS_FS
+        default n
+        help
+        Say Y or M here to enable the TCM Storage Engine and ConfigFS enabled
+        control path for target_core_mod.  This includes built-in TCM RAMDISK
+        subsystem logic for virtual LUN 0 access
+
+if TARGET_CORE
+
+config TCM_IBLOCK
+        tristate "TCM/IBLOCK Subsystem Plugin for Linux/BLOCK"
+        help
+        Say Y here to enable the TCM/IBLOCK subsystem plugin for non-buffered
+        access to Linux/Block devices using BIO
+
+config TCM_FILEIO
+        tristate "TCM/FILEIO Subsystem Plugin for Linux/VFS"
+        help
+        Say Y here to enable the TCM/FILEIO subsystem plugin for buffered
+        access to Linux/VFS struct file or struct block_device
+
+config TCM_PSCSI
+        tristate "TCM/pSCSI Subsystem Plugin for Linux/SCSI"
+        help
+        Say Y here to enable the TCM/pSCSI subsystem plugin for non-buffered
+        passthrough access to Linux/SCSI device
+
+endif
diff --git a/drivers/target/Makefile b/drivers/target/Makefile
new file mode 100644
index 000000000000..5cfd70819f08
--- /dev/null
+++ b/drivers/target/Makefile
@@ -0,0 +1,24 @@
+EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
+
+target_core_mod-y               := target_core_configfs.o \
+                                   target_core_device.o \
+                                   target_core_fabric_configfs.o \
+                                   target_core_fabric_lib.o \
+                                   target_core_hba.o \
+                                   target_core_pr.o \
+                                   target_core_alua.o \
+                                   target_core_scdb.o \
+                                   target_core_tmr.o \
+                                   target_core_tpg.o \
+                                   target_core_transport.o \
+                                   target_core_cdb.o \
+                                   target_core_ua.o \
+                                   target_core_rd.o \
+                                   target_core_mib.o
+
+obj-$(CONFIG_TARGET_CORE)       += target_core_mod.o
+
+# Subsystem modules
+obj-$(CONFIG_TCM_IBLOCK)        += target_core_iblock.o
+obj-$(CONFIG_TCM_FILEIO)        += target_core_file.o
+obj-$(CONFIG_TCM_PSCSI)         += target_core_pscsi.o
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
new file mode 100644
index 000000000000..2c5fcfed5934
--- /dev/null
+++ b/drivers/target/target_core_alua.c
@@ -0,0 +1,1991 @@
+/*******************************************************************************
+ * Filename:  target_core_alua.c
+ *
+ * This file contains SPC-3 compliant asymmetric logical unit assigntment (ALUA)
+ *
+ * Copyright (c) 2009-2010 Rising Tide Systems
+ * Copyright (c) 2009-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/configfs.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_ua.h"
+
+static int core_alua_check_transition(int state, int *primary);
+static int core_alua_set_tg_pt_secondary_state(
+                struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
+                struct se_port *port, int explict, int offline);
+
+/*
+ * REPORT_TARGET_PORT_GROUPS
+ *
+ * See spc4r17 section 6.27
+ */
+int core_emulate_report_target_port_groups(struct se_cmd *cmd)
+{
+        struct se_subsystem_dev *su_dev = SE_DEV(cmd)->se_sub_dev;
+        struct se_port *port;
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first
+                                    Target port group descriptor */
+
+        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+                        tg_pt_gp_list) {
+                /*
+                 * PREF: Preferred target port bit, determine if this
+                 * bit should be set for port group.
+                 */
+                if (tg_pt_gp->tg_pt_gp_pref)
+                        buf[off] = 0x80;
+                /*
+                 * Set the ASYMMETRIC ACCESS State
+                 */
+                buf[off++] |= (atomic_read(
+                        &tg_pt_gp->tg_pt_gp_alua_access_state) & 0xff);
+                /*
+                 * Set supported ASYMMETRIC ACCESS State bits
+                 */
+                buf[off] = 0x80; /* T_SUP */
+                buf[off] |= 0x40; /* O_SUP */
+                buf[off] |= 0x8; /* U_SUP */
+                buf[off] |= 0x4; /* S_SUP */
+                buf[off] |= 0x2; /* AN_SUP */
+                buf[off++] |= 0x1; /* AO_SUP */
+                /*
+                 * TARGET PORT GROUP
+                 */
+                buf[off++] = ((tg_pt_gp->tg_pt_gp_id >> 8) & 0xff);
+                buf[off++] = (tg_pt_gp->tg_pt_gp_id & 0xff);
+
+                off++; /* Skip over Reserved */
+                /*
+                 * STATUS CODE
+                 */
+                buf[off++] = (tg_pt_gp->tg_pt_gp_alua_access_status & 0xff);
+                /*
+                 * Vendor Specific field
+                 */
+                buf[off++] = 0x00;
+                /*
+                 * TARGET PORT COUNT
+                 */
+                buf[off++] = (tg_pt_gp->tg_pt_gp_members & 0xff);
+                rd_len += 8;
+
+                spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+                list_for_each_entry(tg_pt_gp_mem, &tg_pt_gp->tg_pt_gp_mem_list,
+                                tg_pt_gp_mem_list) {
+                        port = tg_pt_gp_mem->tg_pt;
+                        /*
+                         * Start Target Port descriptor format
+                         *
+                         * See spc4r17 section 6.2.7 Table 247
+                         */
+                        off += 2; /* Skip over Obsolete */
+                        /*
+                         * Set RELATIVE TARGET PORT IDENTIFIER
+                         */
+                        buf[off++] = ((port->sep_rtpi >> 8) & 0xff);
+                        buf[off++] = (port->sep_rtpi & 0xff);
+                        rd_len += 4;
+                }
+                spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+        }
+        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        /*
+         * Set the RETURN DATA LENGTH set in the header of the DataIN Payload
+         */
+        buf[0] = ((rd_len >> 24) & 0xff);
+        buf[1] = ((rd_len >> 16) & 0xff);
+        buf[2] = ((rd_len >> 8) & 0xff);
+        buf[3] = (rd_len & 0xff);
+
+        return 0;
+}
+
+/*
+ * SET_TARGET_PORT_GROUPS for explict ALUA operation.
+ *
+ * See spc4r17 section 6.35
+ */
+int core_emulate_set_target_port_groups(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_subsystem_dev *su_dev = SE_DEV(cmd)->se_sub_dev;
+        struct se_port *port, *l_port = SE_LUN(cmd)->lun_sep;
+        struct se_node_acl *nacl = SE_SESS(cmd)->se_node_acl;
+        struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *l_tg_pt_gp_mem;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        unsigned char *ptr = &buf[4]; /* Skip over RESERVED area in header */
+        u32 len = 4; /* Skip over RESERVED area in header */
+        int alua_access_state, primary = 0, rc;
+        u16 tg_pt_id, rtpi;
+
+        if (!(l_port))
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        /*
+         * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed
+         * for the local tg_pt_gp.
+         */
+        l_tg_pt_gp_mem = l_port->sep_alua_tg_pt_gp_mem;
+        if (!(l_tg_pt_gp_mem)) {
+                printk(KERN_ERR "Unable to access l_port->sep_alua_tg_pt_gp_mem\n");
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
+        spin_lock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        l_tg_pt_gp = l_tg_pt_gp_mem->tg_pt_gp;
+        if (!(l_tg_pt_gp)) {
+                spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                printk(KERN_ERR "Unable to access *l_tg_pt_gp_mem->tg_pt_gp\n");
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
+        rc = (l_tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA);
+        spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+        if (!(rc)) {
+                printk(KERN_INFO "Unable to process SET_TARGET_PORT_GROUPS"
+                                " while TPGS_EXPLICT_ALUA is disabled\n");
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
+
+        while (len < cmd->data_length) {
+                alua_access_state = (ptr[0] & 0x0f);
+                /*
+                 * Check the received ALUA access state, and determine if
+                 * the state is a primary or secondary target port asymmetric
+                 * access state.
+                 */
+                rc = core_alua_check_transition(alua_access_state, &primary);
+                if (rc != 0) {
+                        /*
+                         * If the SET TARGET PORT GROUPS attempts to establish
+                         * an invalid combination of target port asymmetric
+                         * access states or attempts to establish an
+                         * unsupported target port asymmetric access state,
+                         * then the command shall be terminated with CHECK
+                         * CONDITION status, with the sense key set to ILLEGAL
+                         * REQUEST, and the additional sense code set to INVALID
+                         * FIELD IN PARAMETER LIST.
+                         */
+                        return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                }
+                rc = -1;
+                /*
+                 * If the ASYMMETRIC ACCESS STATE field (see table 267)
+                 * specifies a primary target port asymmetric access state,
+                 * then the TARGET PORT GROUP OR TARGET PORT field specifies
+                 * a primary target port group for which the primary target
+                 * port asymmetric access state shall be changed. If the
+                 * ASYMMETRIC ACCESS STATE field specifies a secondary target
+                 * port asymmetric access state, then the TARGET PORT GROUP OR
+                 * TARGET PORT field specifies the relative target port
+                 * identifier (see 3.1.120) of the target port for which the
+                 * secondary target port asymmetric access state shall be
+                 * changed.
+                 */
+                if (primary) {
+                        tg_pt_id = ((ptr[2] << 8) & 0xff);
+                        tg_pt_id |= (ptr[3] & 0xff);
+                        /*
+                         * Locate the matching target port group ID from
+                         * the global tg_pt_gp list
+                         */
+                        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        list_for_each_entry(tg_pt_gp,
+                                        &T10_ALUA(su_dev)->tg_pt_gps_list,
+                                        tg_pt_gp_list) {
+                                if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                                        continue;
+
+                                if (tg_pt_id != tg_pt_gp->tg_pt_gp_id)
+                                        continue;
+
+                                atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
+                                smp_mb__after_atomic_inc();
+                                spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+
+                                rc = core_alua_do_port_transition(tg_pt_gp,
+                                                dev, l_port, nacl,
+                                                alua_access_state, 1);
+
+                                spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                                atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
+                                smp_mb__after_atomic_dec();
+                                break;
+                        }
+                        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        /*
+                         * If not matching target port group ID can be located
+                         * throw an exception with ASCQ: INVALID_PARAMETER_LIST
+                         */
+                        if (rc != 0)
+                                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                } else {
+                        /*
+                         * Extact the RELATIVE TARGET PORT IDENTIFIER to identify
+                         * the Target Port in question for the the incoming
+                         * SET_TARGET_PORT_GROUPS op.
+                         */
+                        rtpi = ((ptr[2] << 8) & 0xff);
+                        rtpi |= (ptr[3] & 0xff);
+                        /*
+                         * Locate the matching relative target port identifer
+                         * for the struct se_device storage object.
+                         */
+                        spin_lock(&dev->se_port_lock);
+                        list_for_each_entry(port, &dev->dev_sep_list,
+                                                        sep_list) {
+                                if (port->sep_rtpi != rtpi)
+                                        continue;
+
+                                tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+                                spin_unlock(&dev->se_port_lock);
+
+                                rc = core_alua_set_tg_pt_secondary_state(
+                                                tg_pt_gp_mem, port, 1, 1);
+
+                                spin_lock(&dev->se_port_lock);
+                                break;
+                        }
+                        spin_unlock(&dev->se_port_lock);
+                        /*
+                         * If not matching relative target port identifier can
+                         * be located, throw an exception with ASCQ:
+                         * INVALID_PARAMETER_LIST
+                         */
+                        if (rc != 0)
+                                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                }
+
+                ptr += 4;
+                len += 4;
+        }
+
+        return 0;
+}
+
+static inline int core_alua_state_nonoptimized(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        int nonop_delay_msecs,
+        u8 *alua_ascq)
+{
+        /*
+         * Set SCF_ALUA_NON_OPTIMIZED here, this value will be checked
+         * later to determine if processing of this cmd needs to be
+         * temporarily delayed for the Active/NonOptimized primary access state.
+         */
+        cmd->se_cmd_flags |= SCF_ALUA_NON_OPTIMIZED;
+        cmd->alua_nonop_delay = nonop_delay_msecs;
+        return 0;
+}
+
+static inline int core_alua_state_standby(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u8 *alua_ascq)
+{
+        /*
+         * Allowed CDBs for ALUA_ACCESS_STATE_STANDBY as defined by
+         * spc4r17 section 5.9.2.4.4
+         */
+        switch (cdb[0]) {
+        case INQUIRY:
+        case LOG_SELECT:
+        case LOG_SENSE:
+        case MODE_SELECT:
+        case MODE_SENSE:
+        case REPORT_LUNS:
+        case RECEIVE_DIAGNOSTIC:
+        case SEND_DIAGNOSTIC:
+        case MAINTENANCE_IN:
+                switch (cdb[1]) {
+                case MI_REPORT_TARGET_PGS:
+                        return 0;
+                default:
+                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                        return 1;
+                }
+        case MAINTENANCE_OUT:
+                switch (cdb[1]) {
+                case MO_SET_TARGET_PGS:
+                        return 0;
+                default:
+                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                        return 1;
+                }
+        case REQUEST_SENSE:
+        case PERSISTENT_RESERVE_IN:
+        case PERSISTENT_RESERVE_OUT:
+        case READ_BUFFER:
+        case WRITE_BUFFER:
+                return 0;
+        default:
+                *alua_ascq = ASCQ_04H_ALUA_TG_PT_STANDBY;
+                return 1;
+        }
+
+        return 0;
+}
+
+static inline int core_alua_state_unavailable(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u8 *alua_ascq)
+{
+        /*
+         * Allowed CDBs for ALUA_ACCESS_STATE_UNAVAILABLE as defined by
+         * spc4r17 section 5.9.2.4.5
+         */
+        switch (cdb[0]) {
+        case INQUIRY:
+        case REPORT_LUNS:
+        case MAINTENANCE_IN:
+                switch (cdb[1]) {
+                case MI_REPORT_TARGET_PGS:
+                        return 0;
+                default:
+                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                        return 1;
+                }
+        case MAINTENANCE_OUT:
+                switch (cdb[1]) {
+                case MO_SET_TARGET_PGS:
+                        return 0;
+                default:
+                        *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                        return 1;
+                }
+        case REQUEST_SENSE:
+        case READ_BUFFER:
+        case WRITE_BUFFER:
+                return 0;
+        default:
+                *alua_ascq = ASCQ_04H_ALUA_TG_PT_UNAVAILABLE;
+                return 1;
+        }
+
+        return 0;
+}
+
+static inline int core_alua_state_transition(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u8 *alua_ascq)
+{
+        /*
+         * Allowed CDBs for ALUA_ACCESS_STATE_TRANSITIO as defined by
+         * spc4r17 section 5.9.2.5
+         */
+        switch (cdb[0]) {
+        case INQUIRY:
+        case REPORT_LUNS:
+        case MAINTENANCE_IN:
+                switch (cdb[1]) {
+                case MI_REPORT_TARGET_PGS:
+                        return 0;
+                default:
+                        *alua_ascq = ASCQ_04H_ALUA_STATE_TRANSITION;
+                        return 1;
+                }
+        case REQUEST_SENSE:
+        case READ_BUFFER:
+        case WRITE_BUFFER:
+                return 0;
+        default:
+                *alua_ascq = ASCQ_04H_ALUA_STATE_TRANSITION;
+                return 1;
+        }
+
+        return 0;
+}
+
+/*
+ * Used for alua_type SPC_ALUA_PASSTHROUGH and SPC2_ALUA_DISABLED
+ * in transport_cmd_sequencer().  This function is assigned to
+ * struct t10_alua *->state_check() in core_setup_alua()
+ */
+static int core_alua_state_check_nop(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u8 *alua_ascq)
+{
+        return 0;
+}
+
+/*
+ * Used for alua_type SPC3_ALUA_EMULATED in transport_cmd_sequencer().
+ * This function is assigned to struct t10_alua *->state_check() in
+ * core_setup_alua()
+ *
+ * Also, this function can return three different return codes to
+ * signal transport_generic_cmd_sequencer()
+ *
+ * return 1: Is used to signal LUN not accecsable, and check condition/not ready
+ * return 0: Used to signal success
+ * reutrn -1: Used to signal failure, and invalid cdb field
+ */
+static int core_alua_state_check(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u8 *alua_ascq)
+{
+        struct se_lun *lun = SE_LUN(cmd);
+        struct se_port *port = lun->lun_sep;
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        int out_alua_state, nonop_delay_msecs;
+
+        if (!(port))
+                return 0;
+        /*
+         * First, check for a struct se_port specific secondary ALUA target port
+         * access state: OFFLINE
+         */
+        if (atomic_read(&port->sep_tg_pt_secondary_offline)) {
+                *alua_ascq = ASCQ_04H_ALUA_OFFLINE;
+                printk(KERN_INFO "ALUA: Got secondary offline status for local"
+                                " target port\n");
+                *alua_ascq = ASCQ_04H_ALUA_OFFLINE;
+                return 1;
+        }
+         /*
+         * Second, obtain the struct t10_alua_tg_pt_gp_member pointer to the
+         * ALUA target port group, to obtain current ALUA access state.
+         * Otherwise look for the underlying struct se_device association with
+         * a ALUA logical unit group.
+         */
+        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        out_alua_state = atomic_read(&tg_pt_gp->tg_pt_gp_alua_access_state);
+        nonop_delay_msecs = tg_pt_gp->tg_pt_gp_nonop_delay_msecs;
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        /*
+         * Process ALUA_ACCESS_STATE_ACTIVE_OPTMIZED in a seperate conditional
+         * statement so the complier knows explictly to check this case first.
+         * For the Optimized ALUA access state case, we want to process the
+         * incoming fabric cmd ASAP..
+         */
+        if (out_alua_state == ALUA_ACCESS_STATE_ACTIVE_OPTMIZED)
+                return 0;
+
+        switch (out_alua_state) {
+        case ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED:
+                return core_alua_state_nonoptimized(cmd, cdb,
+                                        nonop_delay_msecs, alua_ascq);
+        case ALUA_ACCESS_STATE_STANDBY:
+                return core_alua_state_standby(cmd, cdb, alua_ascq);
+        case ALUA_ACCESS_STATE_UNAVAILABLE:
+                return core_alua_state_unavailable(cmd, cdb, alua_ascq);
+        case ALUA_ACCESS_STATE_TRANSITION:
+                return core_alua_state_transition(cmd, cdb, alua_ascq);
+        /*
+         * OFFLINE is a secondary ALUA target port group access state, that is
+         * handled above with struct se_port->sep_tg_pt_secondary_offline=1
+         */
+        case ALUA_ACCESS_STATE_OFFLINE:
+        default:
+                printk(KERN_ERR "Unknown ALUA access state: 0x%02x\n",
+                                out_alua_state);
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * Check implict and explict ALUA state change request.
+ */
+static int core_alua_check_transition(int state, int *primary)
+{
+        switch (state) {
+        case ALUA_ACCESS_STATE_ACTIVE_OPTMIZED:
+        case ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED:
+        case ALUA_ACCESS_STATE_STANDBY:
+        case ALUA_ACCESS_STATE_UNAVAILABLE:
+                /*
+                 * OPTIMIZED, NON-OPTIMIZED, STANDBY and UNAVAILABLE are
+                 * defined as primary target port asymmetric access states.
+                 */
+                *primary = 1;
+                break;
+        case ALUA_ACCESS_STATE_OFFLINE:
+                /*
+                 * OFFLINE state is defined as a secondary target port
+                 * asymmetric access state.
+                 */
+                *primary = 0;
+                break;
+        default:
+                printk(KERN_ERR "Unknown ALUA access state: 0x%02x\n", state);
+                return -1;
+        }
+
+        return 0;
+}
+
+static char *core_alua_dump_state(int state)
+{
+        switch (state) {
+        case ALUA_ACCESS_STATE_ACTIVE_OPTMIZED:
+                return "Active/Optimized";
+        case ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED:
+                return "Active/NonOptimized";
+        case ALUA_ACCESS_STATE_STANDBY:
+                return "Standby";
+        case ALUA_ACCESS_STATE_UNAVAILABLE:
+                return "Unavailable";
+        case ALUA_ACCESS_STATE_OFFLINE:
+                return "Offline";
+        default:
+                return "Unknown";
+        }
+
+        return NULL;
+}
+
+char *core_alua_dump_status(int status)
+{
+        switch (status) {
+        case ALUA_STATUS_NONE:
+                return "None";
+        case ALUA_STATUS_ALTERED_BY_EXPLICT_STPG:
+                return "Altered by Explict STPG";
+        case ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA:
+                return "Altered by Implict ALUA";
+        default:
+                return "Unknown";
+        }
+
+        return NULL;
+}
+
+/*
+ * Used by fabric modules to determine when we need to delay processing
+ * for the Active/NonOptimized paths..
+ */
+int core_alua_check_nonop_delay(
+        struct se_cmd *cmd)
+{
+        if (!(cmd->se_cmd_flags & SCF_ALUA_NON_OPTIMIZED))
+                return 0;
+        if (in_interrupt())
+                return 0;
+        /*
+         * The ALUA Active/NonOptimized access state delay can be disabled
+         * in via configfs with a value of zero
+         */
+        if (!(cmd->alua_nonop_delay))
+                return 0;
+        /*
+         * struct se_cmd->alua_nonop_delay gets set by a target port group
+         * defined interval in core_alua_state_nonoptimized()
+         */
+        msleep_interruptible(cmd->alua_nonop_delay);
+        return 0;
+}
+EXPORT_SYMBOL(core_alua_check_nonop_delay);
+
+/*
+ * Called with tg_pt_gp->tg_pt_gp_md_mutex or tg_pt_gp_mem->sep_tg_pt_md_mutex
+ *
+ */
+static int core_alua_write_tpg_metadata(
+        const char *path,
+        unsigned char *md_buf,
+        u32 md_buf_len)
+{
+        mm_segment_t old_fs;
+        struct file *file;
+        struct iovec iov[1];
+        int flags = O_RDWR | O_CREAT | O_TRUNC, ret;
+
+        memset(iov, 0, sizeof(struct iovec));
+
+        file = filp_open(path, flags, 0600);
+        if (IS_ERR(file) || !file || !file->f_dentry) {
+                printk(KERN_ERR "filp_open(%s) for ALUA metadata failed\n",
+                        path);
+                return -ENODEV;
+        }
+
+        iov[0].iov_base = &md_buf[0];
+        iov[0].iov_len = md_buf_len;
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        ret = vfs_writev(file, &iov[0], 1, &file->f_pos);
+        set_fs(old_fs);
+
+        if (ret < 0) {
+                printk(KERN_ERR "Error writing ALUA metadata file: %s\n", path);
+                filp_close(file, NULL);
+                return -EIO;
+        }
+        filp_close(file, NULL);
+
+        return 0;
+}
+
+/*
+ * Called with tg_pt_gp->tg_pt_gp_md_mutex held
+ */
+static int core_alua_update_tpg_primary_metadata(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        int primary_state,
+        unsigned char *md_buf)
+{
+        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
+        struct t10_wwn *wwn = &su_dev->t10_wwn;
+        char path[ALUA_METADATA_PATH_LEN];
+        int len;
+
+        memset(path, 0, ALUA_METADATA_PATH_LEN);
+
+        len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len,
+                        "tg_pt_gp_id=%hu\n"
+                        "alua_access_state=0x%02x\n"
+                        "alua_access_status=0x%02x\n",
+                        tg_pt_gp->tg_pt_gp_id, primary_state,
+                        tg_pt_gp->tg_pt_gp_alua_access_status);
+
+        snprintf(path, ALUA_METADATA_PATH_LEN,
+                "/var/target/alua/tpgs_%s/%s", &wwn->unit_serial[0],
+                config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item));
+
+        return core_alua_write_tpg_metadata(path, md_buf, len);
+}
+
+static int core_alua_do_transition_tg_pt(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        struct se_port *l_port,
+        struct se_node_acl *nacl,
+        unsigned char *md_buf,
+        int new_state,
+        int explict)
+{
+        struct se_dev_entry *se_deve;
+        struct se_lun_acl *lacl;
+        struct se_port *port;
+        struct t10_alua_tg_pt_gp_member *mem;
+        int old_state = 0;
+        /*
+         * Save the old primary ALUA access state, and set the current state
+         * to ALUA_ACCESS_STATE_TRANSITION.
+         */
+        old_state = atomic_read(&tg_pt_gp->tg_pt_gp_alua_access_state);
+        atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state,
+                        ALUA_ACCESS_STATE_TRANSITION);
+        tg_pt_gp->tg_pt_gp_alua_access_status = (explict) ?
+                                ALUA_STATUS_ALTERED_BY_EXPLICT_STPG :
+                                ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA;
+        /*
+         * Check for the optional ALUA primary state transition delay
+         */
+        if (tg_pt_gp->tg_pt_gp_trans_delay_msecs != 0)
+                msleep_interruptible(tg_pt_gp->tg_pt_gp_trans_delay_msecs);
+
+        spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        list_for_each_entry(mem, &tg_pt_gp->tg_pt_gp_mem_list,
+                                tg_pt_gp_mem_list) {
+                port = mem->tg_pt;
+                /*
+                 * After an implicit target port asymmetric access state
+                 * change, a device server shall establish a unit attention
+                 * condition for the initiator port associated with every I_T
+                 * nexus with the additional sense code set to ASYMMETRIC
+                 * ACCESS STATE CHAGED.
+                 *
+                 * After an explicit target port asymmetric access state
+                 * change, a device server shall establish a unit attention
+                 * condition with the additional sense code set to ASYMMETRIC
+                 * ACCESS STATE CHANGED for the initiator port associated with
+                 * every I_T nexus other than the I_T nexus on which the SET
+                 * TARGET PORT GROUPS command
+                 */
+                atomic_inc(&mem->tg_pt_gp_mem_ref_cnt);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+
+                spin_lock_bh(&port->sep_alua_lock);
+                list_for_each_entry(se_deve, &port->sep_alua_list,
+                                        alua_port_list) {
+                        lacl = se_deve->se_lun_acl;
+                        /*
+                         * se_deve->se_lun_acl pointer may be NULL for a
+                         * entry created without explict Node+MappedLUN ACLs
+                         */
+                        if (!(lacl))
+                                continue;
+
+                        if (explict &&
+                           (nacl != NULL) && (nacl == lacl->se_lun_nacl) &&
+                           (l_port != NULL) && (l_port == port))
+                                continue;
+
+                        core_scsi3_ua_allocate(lacl->se_lun_nacl,
+                                se_deve->mapped_lun, 0x2A,
+                                ASCQ_2AH_ASYMMETRIC_ACCESS_STATE_CHANGED);
+                }
+                spin_unlock_bh(&port->sep_alua_lock);
+
+                spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+                atomic_dec(&mem->tg_pt_gp_mem_ref_cnt);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+        /*
+         * Update the ALUA metadata buf that has been allocated in
+         * core_alua_do_port_transition(), this metadata will be written
+         * to struct file.
+         *
+         * Note that there is the case where we do not want to update the
+         * metadata when the saved metadata is being parsed in userspace
+         * when setting the existing port access state and access status.
+         *
+         * Also note that the failure to write out the ALUA metadata to
+         * struct file does NOT affect the actual ALUA transition.
+         */
+        if (tg_pt_gp->tg_pt_gp_write_metadata) {
+                mutex_lock(&tg_pt_gp->tg_pt_gp_md_mutex);
+                core_alua_update_tpg_primary_metadata(tg_pt_gp,
+                                        new_state, md_buf);
+                mutex_unlock(&tg_pt_gp->tg_pt_gp_md_mutex);
+        }
+        /*
+         * Set the current primary ALUA access state to the requested new state
+         */
+        atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, new_state);
+
+        printk(KERN_INFO "Successful %s ALUA transition TG PT Group: %s ID: %hu"
+                " from primary access state %s to %s\n", (explict) ? "explict" :
+                "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item),
+                tg_pt_gp->tg_pt_gp_id, core_alua_dump_state(old_state),
+                core_alua_dump_state(new_state));
+
+        return 0;
+}
+
+int core_alua_do_port_transition(
+        struct t10_alua_tg_pt_gp *l_tg_pt_gp,
+        struct se_device *l_dev,
+        struct se_port *l_port,
+        struct se_node_acl *l_nacl,
+        int new_state,
+        int explict)
+{
+        struct se_device *dev;
+        struct se_port *port;
+        struct se_subsystem_dev *su_dev;
+        struct se_node_acl *nacl;
+        struct t10_alua_lu_gp *lu_gp;
+        struct t10_alua_lu_gp_member *lu_gp_mem, *local_lu_gp_mem;
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        unsigned char *md_buf;
+        int primary;
+
+        if (core_alua_check_transition(new_state, &primary) != 0)
+                return -EINVAL;
+
+        md_buf = kzalloc(l_tg_pt_gp->tg_pt_gp_md_buf_len, GFP_KERNEL);
+        if (!(md_buf)) {
+                printk("Unable to allocate buf for ALUA metadata\n");
+                return -ENOMEM;
+        }
+
+        local_lu_gp_mem = l_dev->dev_alua_lu_gp_mem;
+        spin_lock(&local_lu_gp_mem->lu_gp_mem_lock);
+        lu_gp = local_lu_gp_mem->lu_gp;
+        atomic_inc(&lu_gp->lu_gp_ref_cnt);
+        smp_mb__after_atomic_inc();
+        spin_unlock(&local_lu_gp_mem->lu_gp_mem_lock);
+        /*
+         * For storage objects that are members of the 'default_lu_gp',
+         * we only do transition on the passed *l_tp_pt_gp, and not
+         * on all of the matching target port groups IDs in default_lu_gp.
+         */
+        if (!(lu_gp->lu_gp_id)) {
+                /*
+                 * core_alua_do_transition_tg_pt() will always return
+                 * success.
+                 */
+                core_alua_do_transition_tg_pt(l_tg_pt_gp, l_port, l_nacl,
+                                        md_buf, new_state, explict);
+                atomic_dec(&lu_gp->lu_gp_ref_cnt);
+                smp_mb__after_atomic_dec();
+                kfree(md_buf);
+                return 0;
+        }
+        /*
+         * For all other LU groups aside from 'default_lu_gp', walk all of
+         * the associated storage objects looking for a matching target port
+         * group ID from the local target port group.
+         */
+        spin_lock(&lu_gp->lu_gp_lock);
+        list_for_each_entry(lu_gp_mem, &lu_gp->lu_gp_mem_list,
+                                lu_gp_mem_list) {
+
+                dev = lu_gp_mem->lu_gp_mem_dev;
+                su_dev = dev->se_sub_dev;
+                atomic_inc(&lu_gp_mem->lu_gp_mem_ref_cnt);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&lu_gp->lu_gp_lock);
+
+                spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                list_for_each_entry(tg_pt_gp,
+                                &T10_ALUA(su_dev)->tg_pt_gps_list,
+                                tg_pt_gp_list) {
+
+                        if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                                continue;
+                        /*
+                         * If the target behavior port asymmetric access state
+                         * is changed for any target port group accessiable via
+                         * a logical unit within a LU group, the target port
+                         * behavior group asymmetric access states for the same
+                         * target port group accessible via other logical units
+                         * in that LU group will also change.
+                         */
+                        if (l_tg_pt_gp->tg_pt_gp_id != tg_pt_gp->tg_pt_gp_id)
+                                continue;
+
+                        if (l_tg_pt_gp == tg_pt_gp) {
+                                port = l_port;
+                                nacl = l_nacl;
+                        } else {
+                                port = NULL;
+                                nacl = NULL;
+                        }
+                        atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
+                        smp_mb__after_atomic_inc();
+                        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        /*
+                         * core_alua_do_transition_tg_pt() will always return
+                         * success.
+                         */
+                        core_alua_do_transition_tg_pt(tg_pt_gp, port,
+                                        nacl, md_buf, new_state, explict);
+
+                        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
+                        smp_mb__after_atomic_dec();
+                }
+                spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+
+                spin_lock(&lu_gp->lu_gp_lock);
+                atomic_dec(&lu_gp_mem->lu_gp_mem_ref_cnt);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&lu_gp->lu_gp_lock);
+
+        printk(KERN_INFO "Successfully processed LU Group: %s all ALUA TG PT"
+                " Group IDs: %hu %s transition to primary state: %s\n",
+                config_item_name(&lu_gp->lu_gp_group.cg_item),
+                l_tg_pt_gp->tg_pt_gp_id, (explict) ? "explict" : "implict",
+                core_alua_dump_state(new_state));
+
+        atomic_dec(&lu_gp->lu_gp_ref_cnt);
+        smp_mb__after_atomic_dec();
+        kfree(md_buf);
+        return 0;
+}
+
+/*
+ * Called with tg_pt_gp_mem->sep_tg_pt_md_mutex held
+ */
+static int core_alua_update_tpg_secondary_metadata(
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
+        struct se_port *port,
+        unsigned char *md_buf,
+        u32 md_buf_len)
+{
+        struct se_portal_group *se_tpg = port->sep_tpg;
+        char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN];
+        int len;
+
+        memset(path, 0, ALUA_METADATA_PATH_LEN);
+        memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
+
+        len = snprintf(wwn, ALUA_SECONDARY_METADATA_WWN_LEN, "%s",
+                        TPG_TFO(se_tpg)->tpg_get_wwn(se_tpg));
+
+        if (TPG_TFO(se_tpg)->tpg_get_tag != NULL)
+                snprintf(wwn+len, ALUA_SECONDARY_METADATA_WWN_LEN-len, "+%hu",
+                                TPG_TFO(se_tpg)->tpg_get_tag(se_tpg));
+
+        len = snprintf(md_buf, md_buf_len, "alua_tg_pt_offline=%d\n"
+                        "alua_tg_pt_status=0x%02x\n",
+                        atomic_read(&port->sep_tg_pt_secondary_offline),
+                        port->sep_tg_pt_secondary_stat);
+
+        snprintf(path, ALUA_METADATA_PATH_LEN, "/var/target/alua/%s/%s/lun_%u",
+                        TPG_TFO(se_tpg)->get_fabric_name(), wwn,
+                        port->sep_lun->unpacked_lun);
+
+        return core_alua_write_tpg_metadata(path, md_buf, len);
+}
+
+static int core_alua_set_tg_pt_secondary_state(
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
+        struct se_port *port,
+        int explict,
+        int offline)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        unsigned char *md_buf;
+        u32 md_buf_len;
+        int trans_delay_msecs;
+
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        if (!(tg_pt_gp)) {
+                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                printk(KERN_ERR "Unable to complete secondary state"
+                                " transition\n");
+                return -1;
+        }
+        trans_delay_msecs = tg_pt_gp->tg_pt_gp_trans_delay_msecs;
+        /*
+         * Set the secondary ALUA target port access state to OFFLINE
+         * or release the previously secondary state for struct se_port
+         */
+        if (offline)
+                atomic_set(&port->sep_tg_pt_secondary_offline, 1);
+        else
+                atomic_set(&port->sep_tg_pt_secondary_offline, 0);
+
+        md_buf_len = tg_pt_gp->tg_pt_gp_md_buf_len;
+        port->sep_tg_pt_secondary_stat = (explict) ?
+                        ALUA_STATUS_ALTERED_BY_EXPLICT_STPG :
+                        ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA;
+
+        printk(KERN_INFO "Successful %s ALUA transition TG PT Group: %s ID: %hu"
+                " to secondary access state: %s\n", (explict) ? "explict" :
+                "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item),
+                tg_pt_gp->tg_pt_gp_id, (offline) ? "OFFLINE" : "ONLINE");
+
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        /*
+         * Do the optional transition delay after we set the secondary
+         * ALUA access state.
+         */
+        if (trans_delay_msecs != 0)
+                msleep_interruptible(trans_delay_msecs);
+        /*
+         * See if we need to update the ALUA fabric port metadata for
+         * secondary state and status
+         */
+        if (port->sep_tg_pt_secondary_write_md) {
+                md_buf = kzalloc(md_buf_len, GFP_KERNEL);
+                if (!(md_buf)) {
+                        printk(KERN_ERR "Unable to allocate md_buf for"
+                                " secondary ALUA access metadata\n");
+                        return -1;
+                }
+                mutex_lock(&port->sep_tg_pt_md_mutex);
+                core_alua_update_tpg_secondary_metadata(tg_pt_gp_mem, port,
+                                md_buf, md_buf_len);
+                mutex_unlock(&port->sep_tg_pt_md_mutex);
+
+                kfree(md_buf);
+        }
+
+        return 0;
+}
+
+struct t10_alua_lu_gp *
+core_alua_allocate_lu_gp(const char *name, int def_group)
+{
+        struct t10_alua_lu_gp *lu_gp;
+
+        lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL);
+        if (!(lu_gp)) {
+                printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n");
+                return ERR_PTR(-ENOMEM);;
+        }
+        INIT_LIST_HEAD(&lu_gp->lu_gp_list);
+        INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list);
+        spin_lock_init(&lu_gp->lu_gp_lock);
+        atomic_set(&lu_gp->lu_gp_ref_cnt, 0);
+
+        if (def_group) {
+                lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;;
+                lu_gp->lu_gp_valid_id = 1;
+                se_global->alua_lu_gps_count++;
+        }
+
+        return lu_gp;
+}
+
+int core_alua_set_lu_gp_id(struct t10_alua_lu_gp *lu_gp, u16 lu_gp_id)
+{
+        struct t10_alua_lu_gp *lu_gp_tmp;
+        u16 lu_gp_id_tmp;
+        /*
+         * The lu_gp->lu_gp_id may only be set once..
+         */
+        if (lu_gp->lu_gp_valid_id) {
+                printk(KERN_WARNING "ALUA LU Group already has a valid ID,"
+                        " ignoring request\n");
+                return -1;
+        }
+
+        spin_lock(&se_global->lu_gps_lock);
+        if (se_global->alua_lu_gps_count == 0x0000ffff) {
+                printk(KERN_ERR "Maximum ALUA se_global->alua_lu_gps_count:"
+                                " 0x0000ffff reached\n");
+                spin_unlock(&se_global->lu_gps_lock);
+                kmem_cache_free(t10_alua_lu_gp_cache, lu_gp);
+                return -1;
+        }
+again:
+        lu_gp_id_tmp = (lu_gp_id != 0) ? lu_gp_id :
+                                se_global->alua_lu_gps_counter++;
+
+        list_for_each_entry(lu_gp_tmp, &se_global->g_lu_gps_list, lu_gp_list) {
+                if (lu_gp_tmp->lu_gp_id == lu_gp_id_tmp) {
+                        if (!(lu_gp_id))
+                                goto again;
+
+                        printk(KERN_WARNING "ALUA Logical Unit Group ID: %hu"
+                                " already exists, ignoring request\n",
+                                lu_gp_id);
+                        spin_unlock(&se_global->lu_gps_lock);
+                        return -1;
+                }
+        }
+
+        lu_gp->lu_gp_id = lu_gp_id_tmp;
+        lu_gp->lu_gp_valid_id = 1;
+        list_add_tail(&lu_gp->lu_gp_list, &se_global->g_lu_gps_list);
+        se_global->alua_lu_gps_count++;
+        spin_unlock(&se_global->lu_gps_lock);
+
+        return 0;
+}
+
+static struct t10_alua_lu_gp_member *
+core_alua_allocate_lu_gp_mem(struct se_device *dev)
+{
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+
+        lu_gp_mem = kmem_cache_zalloc(t10_alua_lu_gp_mem_cache, GFP_KERNEL);
+        if (!(lu_gp_mem)) {
+                printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp_member\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        INIT_LIST_HEAD(&lu_gp_mem->lu_gp_mem_list);
+        spin_lock_init(&lu_gp_mem->lu_gp_mem_lock);
+        atomic_set(&lu_gp_mem->lu_gp_mem_ref_cnt, 0);
+
+        lu_gp_mem->lu_gp_mem_dev = dev;
+        dev->dev_alua_lu_gp_mem = lu_gp_mem;
+
+        return lu_gp_mem;
+}
+
+void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
+{
+        struct t10_alua_lu_gp_member *lu_gp_mem, *lu_gp_mem_tmp;
+        /*
+         * Once we have reached this point, config_item_put() has
+         * already been called from target_core_alua_drop_lu_gp().
+         *
+         * Here, we remove the *lu_gp from the global list so that
+         * no associations can be made while we are releasing
+         * struct t10_alua_lu_gp.
+         */
+        spin_lock(&se_global->lu_gps_lock);
+        atomic_set(&lu_gp->lu_gp_shutdown, 1);
+        list_del(&lu_gp->lu_gp_list);
+        se_global->alua_lu_gps_count--;
+        spin_unlock(&se_global->lu_gps_lock);
+        /*
+         * Allow struct t10_alua_lu_gp * referenced by core_alua_get_lu_gp_by_name()
+         * in target_core_configfs.c:target_core_store_alua_lu_gp() to be
+         * released with core_alua_put_lu_gp_from_name()
+         */
+        while (atomic_read(&lu_gp->lu_gp_ref_cnt))
+                cpu_relax();
+        /*
+         * Release reference to struct t10_alua_lu_gp * from all associated
+         * struct se_device.
+         */
+        spin_lock(&lu_gp->lu_gp_lock);
+        list_for_each_entry_safe(lu_gp_mem, lu_gp_mem_tmp,
+                                &lu_gp->lu_gp_mem_list, lu_gp_mem_list) {
+                if (lu_gp_mem->lu_gp_assoc) {
+                        list_del(&lu_gp_mem->lu_gp_mem_list);
+                        lu_gp->lu_gp_members--;
+                        lu_gp_mem->lu_gp_assoc = 0;
+                }
+                spin_unlock(&lu_gp->lu_gp_lock);
+                /*
+                 *
+                 * lu_gp_mem is assoicated with a single
+                 * struct se_device->dev_alua_lu_gp_mem, and is released when
+                 * struct se_device is released via core_alua_free_lu_gp_mem().
+                 *
+                 * If the passed lu_gp does NOT match the default_lu_gp, assume
+                 * we want to re-assocate a given lu_gp_mem with default_lu_gp.
+                 */
+                spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+                if (lu_gp != se_global->default_lu_gp)
+                        __core_alua_attach_lu_gp_mem(lu_gp_mem,
+                                        se_global->default_lu_gp);
+                else
+                        lu_gp_mem->lu_gp = NULL;
+                spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+                spin_lock(&lu_gp->lu_gp_lock);
+        }
+        spin_unlock(&lu_gp->lu_gp_lock);
+
+        kmem_cache_free(t10_alua_lu_gp_cache, lu_gp);
+}
+
+void core_alua_free_lu_gp_mem(struct se_device *dev)
+{
+        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
+        struct t10_alua *alua = T10_ALUA(su_dev);
+        struct t10_alua_lu_gp *lu_gp;
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+
+        if (alua->alua_type != SPC3_ALUA_EMULATED)
+                return;
+
+        lu_gp_mem = dev->dev_alua_lu_gp_mem;
+        if (!(lu_gp_mem))
+                return;
+
+        while (atomic_read(&lu_gp_mem->lu_gp_mem_ref_cnt))
+                cpu_relax();
+
+        spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+        lu_gp = lu_gp_mem->lu_gp;
+        if ((lu_gp)) {
+                spin_lock(&lu_gp->lu_gp_lock);
+                if (lu_gp_mem->lu_gp_assoc) {
+                        list_del(&lu_gp_mem->lu_gp_mem_list);
+                        lu_gp->lu_gp_members--;
+                        lu_gp_mem->lu_gp_assoc = 0;
+                }
+                spin_unlock(&lu_gp->lu_gp_lock);
+                lu_gp_mem->lu_gp = NULL;
+        }
+        spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+        kmem_cache_free(t10_alua_lu_gp_mem_cache, lu_gp_mem);
+}
+
+struct t10_alua_lu_gp *core_alua_get_lu_gp_by_name(const char *name)
+{
+        struct t10_alua_lu_gp *lu_gp;
+        struct config_item *ci;
+
+        spin_lock(&se_global->lu_gps_lock);
+        list_for_each_entry(lu_gp, &se_global->g_lu_gps_list, lu_gp_list) {
+                if (!(lu_gp->lu_gp_valid_id))
+                        continue;
+                ci = &lu_gp->lu_gp_group.cg_item;
+                if (!(strcmp(config_item_name(ci), name))) {
+                        atomic_inc(&lu_gp->lu_gp_ref_cnt);
+                        spin_unlock(&se_global->lu_gps_lock);
+                        return lu_gp;
+                }
+        }
+        spin_unlock(&se_global->lu_gps_lock);
+
+        return NULL;
+}
+
+void core_alua_put_lu_gp_from_name(struct t10_alua_lu_gp *lu_gp)
+{
+        spin_lock(&se_global->lu_gps_lock);
+        atomic_dec(&lu_gp->lu_gp_ref_cnt);
+        spin_unlock(&se_global->lu_gps_lock);
+}
+
+/*
+ * Called with struct t10_alua_lu_gp_member->lu_gp_mem_lock
+ */
+void __core_alua_attach_lu_gp_mem(
+        struct t10_alua_lu_gp_member *lu_gp_mem,
+        struct t10_alua_lu_gp *lu_gp)
+{
+        spin_lock(&lu_gp->lu_gp_lock);
+        lu_gp_mem->lu_gp = lu_gp;
+        lu_gp_mem->lu_gp_assoc = 1;
+        list_add_tail(&lu_gp_mem->lu_gp_mem_list, &lu_gp->lu_gp_mem_list);
+        lu_gp->lu_gp_members++;
+        spin_unlock(&lu_gp->lu_gp_lock);
+}
+
+/*
+ * Called with struct t10_alua_lu_gp_member->lu_gp_mem_lock
+ */
+void __core_alua_drop_lu_gp_mem(
+        struct t10_alua_lu_gp_member *lu_gp_mem,
+        struct t10_alua_lu_gp *lu_gp)
+{
+        spin_lock(&lu_gp->lu_gp_lock);
+        list_del(&lu_gp_mem->lu_gp_mem_list);
+        lu_gp_mem->lu_gp = NULL;
+        lu_gp_mem->lu_gp_assoc = 0;
+        lu_gp->lu_gp_members--;
+        spin_unlock(&lu_gp->lu_gp_lock);
+}
+
+struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(
+        struct se_subsystem_dev *su_dev,
+        const char *name,
+        int def_group)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+
+        tg_pt_gp = kmem_cache_zalloc(t10_alua_tg_pt_gp_cache, GFP_KERNEL);
+        if (!(tg_pt_gp)) {
+                printk(KERN_ERR "Unable to allocate struct t10_alua_tg_pt_gp\n");
+                return NULL;
+        }
+        INIT_LIST_HEAD(&tg_pt_gp->tg_pt_gp_list);
+        INIT_LIST_HEAD(&tg_pt_gp->tg_pt_gp_mem_list);
+        mutex_init(&tg_pt_gp->tg_pt_gp_md_mutex);
+        spin_lock_init(&tg_pt_gp->tg_pt_gp_lock);
+        atomic_set(&tg_pt_gp->tg_pt_gp_ref_cnt, 0);
+        tg_pt_gp->tg_pt_gp_su_dev = su_dev;
+        tg_pt_gp->tg_pt_gp_md_buf_len = ALUA_MD_BUF_LEN;
+        atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state,
+                ALUA_ACCESS_STATE_ACTIVE_OPTMIZED);
+        /*
+         * Enable both explict and implict ALUA support by default
+         */
+        tg_pt_gp->tg_pt_gp_alua_access_type =
+                        TPGS_EXPLICT_ALUA | TPGS_IMPLICT_ALUA;
+        /*
+         * Set the default Active/NonOptimized Delay in milliseconds
+         */
+        tg_pt_gp->tg_pt_gp_nonop_delay_msecs = ALUA_DEFAULT_NONOP_DELAY_MSECS;
+        tg_pt_gp->tg_pt_gp_trans_delay_msecs = ALUA_DEFAULT_TRANS_DELAY_MSECS;
+
+        if (def_group) {
+                spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                tg_pt_gp->tg_pt_gp_id =
+                                T10_ALUA(su_dev)->alua_tg_pt_gps_counter++;
+                tg_pt_gp->tg_pt_gp_valid_id = 1;
+                T10_ALUA(su_dev)->alua_tg_pt_gps_count++;
+                list_add_tail(&tg_pt_gp->tg_pt_gp_list,
+                              &T10_ALUA(su_dev)->tg_pt_gps_list);
+                spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        }
+
+        return tg_pt_gp;
+}
+
+int core_alua_set_tg_pt_gp_id(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        u16 tg_pt_gp_id)
+{
+        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
+        struct t10_alua_tg_pt_gp *tg_pt_gp_tmp;
+        u16 tg_pt_gp_id_tmp;
+        /*
+         * The tg_pt_gp->tg_pt_gp_id may only be set once..
+         */
+        if (tg_pt_gp->tg_pt_gp_valid_id) {
+                printk(KERN_WARNING "ALUA TG PT Group already has a valid ID,"
+                        " ignoring request\n");
+                return -1;
+        }
+
+        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        if (T10_ALUA(su_dev)->alua_tg_pt_gps_count == 0x0000ffff) {
+                printk(KERN_ERR "Maximum ALUA alua_tg_pt_gps_count:"
+                        " 0x0000ffff reached\n");
+                spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                kmem_cache_free(t10_alua_tg_pt_gp_cache, tg_pt_gp);
+                return -1;
+        }
+again:
+        tg_pt_gp_id_tmp = (tg_pt_gp_id != 0) ? tg_pt_gp_id :
+                        T10_ALUA(su_dev)->alua_tg_pt_gps_counter++;
+
+        list_for_each_entry(tg_pt_gp_tmp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+                        tg_pt_gp_list) {
+                if (tg_pt_gp_tmp->tg_pt_gp_id == tg_pt_gp_id_tmp) {
+                        if (!(tg_pt_gp_id))
+                                goto again;
+
+                        printk(KERN_ERR "ALUA Target Port Group ID: %hu already"
+                                " exists, ignoring request\n", tg_pt_gp_id);
+                        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        return -1;
+                }
+        }
+
+        tg_pt_gp->tg_pt_gp_id = tg_pt_gp_id_tmp;
+        tg_pt_gp->tg_pt_gp_valid_id = 1;
+        list_add_tail(&tg_pt_gp->tg_pt_gp_list,
+                        &T10_ALUA(su_dev)->tg_pt_gps_list);
+        T10_ALUA(su_dev)->alua_tg_pt_gps_count++;
+        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+
+        return 0;
+}
+
+struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem(
+        struct se_port *port)
+{
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+
+        tg_pt_gp_mem = kmem_cache_zalloc(t10_alua_tg_pt_gp_mem_cache,
+                                GFP_KERNEL);
+        if (!(tg_pt_gp_mem)) {
+                printk(KERN_ERR "Unable to allocate struct t10_alua_tg_pt_gp_member\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        INIT_LIST_HEAD(&tg_pt_gp_mem->tg_pt_gp_mem_list);
+        spin_lock_init(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        atomic_set(&tg_pt_gp_mem->tg_pt_gp_mem_ref_cnt, 0);
+
+        tg_pt_gp_mem->tg_pt = port;
+        port->sep_alua_tg_pt_gp_mem = tg_pt_gp_mem;
+        atomic_set(&port->sep_tg_pt_gp_active, 1);
+
+        return tg_pt_gp_mem;
+}
+
+void core_alua_free_tg_pt_gp(
+        struct t10_alua_tg_pt_gp *tg_pt_gp)
+{
+        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *tg_pt_gp_mem_tmp;
+        /*
+         * Once we have reached this point, config_item_put() has already
+         * been called from target_core_alua_drop_tg_pt_gp().
+         *
+         * Here we remove *tg_pt_gp from the global list so that
+         * no assications *OR* explict ALUA via SET_TARGET_PORT_GROUPS
+         * can be made while we are releasing struct t10_alua_tg_pt_gp.
+         */
+        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        list_del(&tg_pt_gp->tg_pt_gp_list);
+        T10_ALUA(su_dev)->alua_tg_pt_gps_counter--;
+        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        /*
+         * Allow a struct t10_alua_tg_pt_gp_member * referenced by
+         * core_alua_get_tg_pt_gp_by_name() in
+         * target_core_configfs.c:target_core_store_alua_tg_pt_gp()
+         * to be released with core_alua_put_tg_pt_gp_from_name().
+         */
+        while (atomic_read(&tg_pt_gp->tg_pt_gp_ref_cnt))
+                cpu_relax();
+        /*
+         * Release reference to struct t10_alua_tg_pt_gp from all associated
+         * struct se_port.
+         */
+        spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        list_for_each_entry_safe(tg_pt_gp_mem, tg_pt_gp_mem_tmp,
+                        &tg_pt_gp->tg_pt_gp_mem_list, tg_pt_gp_mem_list) {
+                if (tg_pt_gp_mem->tg_pt_gp_assoc) {
+                        list_del(&tg_pt_gp_mem->tg_pt_gp_mem_list);
+                        tg_pt_gp->tg_pt_gp_members--;
+                        tg_pt_gp_mem->tg_pt_gp_assoc = 0;
+                }
+                spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+                /*
+                 * tg_pt_gp_mem is assoicated with a single
+                 * se_port->sep_alua_tg_pt_gp_mem, and is released via
+                 * core_alua_free_tg_pt_gp_mem().
+                 *
+                 * If the passed tg_pt_gp does NOT match the default_tg_pt_gp,
+                 * assume we want to re-assocate a given tg_pt_gp_mem with
+                 * default_tg_pt_gp.
+                 */
+                spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                if (tg_pt_gp != T10_ALUA(su_dev)->default_tg_pt_gp) {
+                        __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem,
+                                        T10_ALUA(su_dev)->default_tg_pt_gp);
+                } else
+                        tg_pt_gp_mem->tg_pt_gp = NULL;
+                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+                spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        }
+        spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+
+        kmem_cache_free(t10_alua_tg_pt_gp_cache, tg_pt_gp);
+}
+
+void core_alua_free_tg_pt_gp_mem(struct se_port *port)
+{
+        struct se_subsystem_dev *su_dev = port->sep_lun->lun_se_dev->se_sub_dev;
+        struct t10_alua *alua = T10_ALUA(su_dev);
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+
+        if (alua->alua_type != SPC3_ALUA_EMULATED)
+                return;
+
+        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+        if (!(tg_pt_gp_mem))
+                return;
+
+        while (atomic_read(&tg_pt_gp_mem->tg_pt_gp_mem_ref_cnt))
+                cpu_relax();
+
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        if ((tg_pt_gp)) {
+                spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+                if (tg_pt_gp_mem->tg_pt_gp_assoc) {
+                        list_del(&tg_pt_gp_mem->tg_pt_gp_mem_list);
+                        tg_pt_gp->tg_pt_gp_members--;
+                        tg_pt_gp_mem->tg_pt_gp_assoc = 0;
+                }
+                spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+                tg_pt_gp_mem->tg_pt_gp = NULL;
+        }
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+        kmem_cache_free(t10_alua_tg_pt_gp_mem_cache, tg_pt_gp_mem);
+}
+
+static struct t10_alua_tg_pt_gp *core_alua_get_tg_pt_gp_by_name(
+        struct se_subsystem_dev *su_dev,
+        const char *name)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct config_item *ci;
+
+        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        list_for_each_entry(tg_pt_gp, &T10_ALUA(su_dev)->tg_pt_gps_list,
+                        tg_pt_gp_list) {
+                if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                        continue;
+                ci = &tg_pt_gp->tg_pt_gp_group.cg_item;
+                if (!(strcmp(config_item_name(ci), name))) {
+                        atomic_inc(&tg_pt_gp->tg_pt_gp_ref_cnt);
+                        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+                        return tg_pt_gp;
+                }
+        }
+        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+
+        return NULL;
+}
+
+static void core_alua_put_tg_pt_gp_from_name(
+        struct t10_alua_tg_pt_gp *tg_pt_gp)
+{
+        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
+
+        spin_lock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+        atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt);
+        spin_unlock(&T10_ALUA(su_dev)->tg_pt_gps_lock);
+}
+
+/*
+ * Called with struct t10_alua_tg_pt_gp_member->tg_pt_gp_mem_lock held
+ */
+void __core_alua_attach_tg_pt_gp_mem(
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
+        struct t10_alua_tg_pt_gp *tg_pt_gp)
+{
+        spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        tg_pt_gp_mem->tg_pt_gp = tg_pt_gp;
+        tg_pt_gp_mem->tg_pt_gp_assoc = 1;
+        list_add_tail(&tg_pt_gp_mem->tg_pt_gp_mem_list,
+                        &tg_pt_gp->tg_pt_gp_mem_list);
+        tg_pt_gp->tg_pt_gp_members++;
+        spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+}
+
+/*
+ * Called with struct t10_alua_tg_pt_gp_member->tg_pt_gp_mem_lock held
+ */
+static void __core_alua_drop_tg_pt_gp_mem(
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem,
+        struct t10_alua_tg_pt_gp *tg_pt_gp)
+{
+        spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        list_del(&tg_pt_gp_mem->tg_pt_gp_mem_list);
+        tg_pt_gp_mem->tg_pt_gp = NULL;
+        tg_pt_gp_mem->tg_pt_gp_assoc = 0;
+        tg_pt_gp->tg_pt_gp_members--;
+        spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+}
+
+ssize_t core_alua_show_tg_pt_gp_info(struct se_port *port, char *page)
+{
+        struct se_subsystem_dev *su_dev = port->sep_lun->lun_se_dev->se_sub_dev;
+        struct config_item *tg_pt_ci;
+        struct t10_alua *alua = T10_ALUA(su_dev);
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        ssize_t len = 0;
+
+        if (alua->alua_type != SPC3_ALUA_EMULATED)
+                return len;
+
+        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+        if (!(tg_pt_gp_mem))
+                return len;
+
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        if ((tg_pt_gp)) {
+                tg_pt_ci = &tg_pt_gp->tg_pt_gp_group.cg_item;
+                len += sprintf(page, "TG Port Alias: %s\nTG Port Group ID:"
+                        " %hu\nTG Port Primary Access State: %s\nTG Port "
+                        "Primary Access Status: %s\nTG Port Secondary Access"
+                        " State: %s\nTG Port Secondary Access Status: %s\n",
+                        config_item_name(tg_pt_ci), tg_pt_gp->tg_pt_gp_id,
+                        core_alua_dump_state(atomic_read(
+                                        &tg_pt_gp->tg_pt_gp_alua_access_state)),
+                        core_alua_dump_status(
+                                tg_pt_gp->tg_pt_gp_alua_access_status),
+                        (atomic_read(&port->sep_tg_pt_secondary_offline)) ?
+                        "Offline" : "None",
+                        core_alua_dump_status(port->sep_tg_pt_secondary_stat));
+        }
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+        return len;
+}
+
+ssize_t core_alua_store_tg_pt_gp_info(
+        struct se_port *port,
+        const char *page,
+        size_t count)
+{
+        struct se_portal_group *tpg;
+        struct se_lun *lun;
+        struct se_subsystem_dev *su_dev = port->sep_lun->lun_se_dev->se_sub_dev;
+        struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *tg_pt_gp_new = NULL;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        unsigned char buf[TG_PT_GROUP_NAME_BUF];
+        int move = 0;
+
+        tpg = port->sep_tpg;
+        lun = port->sep_lun;
+
+        if (T10_ALUA(su_dev)->alua_type != SPC3_ALUA_EMULATED) {
+                printk(KERN_WARNING "SPC3_ALUA_EMULATED not enabled for"
+                        " %s/tpgt_%hu/%s\n", TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                        TPG_TFO(tpg)->tpg_get_tag(tpg),
+                        config_item_name(&lun->lun_group.cg_item));
+                return -EINVAL;
+        }
+
+        if (count > TG_PT_GROUP_NAME_BUF) {
+                printk(KERN_ERR "ALUA Target Port Group alias too large!\n");
+                return -EINVAL;
+        }
+        memset(buf, 0, TG_PT_GROUP_NAME_BUF);
+        memcpy(buf, page, count);
+        /*
+         * Any ALUA target port group alias besides "NULL" means we will be
+         * making a new group association.
+         */
+        if (strcmp(strstrip(buf), "NULL")) {
+                /*
+                 * core_alua_get_tg_pt_gp_by_name() will increment reference to
+                 * struct t10_alua_tg_pt_gp.  This reference is released with
+                 * core_alua_put_tg_pt_gp_from_name() below.
+                 */
+                tg_pt_gp_new = core_alua_get_tg_pt_gp_by_name(su_dev,
+                                        strstrip(buf));
+                if (!(tg_pt_gp_new))
+                        return -ENODEV;
+        }
+        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+        if (!(tg_pt_gp_mem)) {
+                if (tg_pt_gp_new)
+                        core_alua_put_tg_pt_gp_from_name(tg_pt_gp_new);
+                printk(KERN_ERR "NULL struct se_port->sep_alua_tg_pt_gp_mem pointer\n");
+                return -EINVAL;
+        }
+
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        if ((tg_pt_gp)) {
+                /*
+                 * Clearing an existing tg_pt_gp association, and replacing
+                 * with the default_tg_pt_gp.
+                 */
+                if (!(tg_pt_gp_new)) {
+                        printk(KERN_INFO "Target_Core_ConfigFS: Moving"
+                                " %s/tpgt_%hu/%s from ALUA Target Port Group:"
+                                " alua/%s, ID: %hu back to"
+                                " default_tg_pt_gp\n",
+                                TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                                TPG_TFO(tpg)->tpg_get_tag(tpg),
+                                config_item_name(&lun->lun_group.cg_item),
+                                config_item_name(
+                                        &tg_pt_gp->tg_pt_gp_group.cg_item),
+                                tg_pt_gp->tg_pt_gp_id);
+
+                        __core_alua_drop_tg_pt_gp_mem(tg_pt_gp_mem, tg_pt_gp);
+                        __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem,
+                                        T10_ALUA(su_dev)->default_tg_pt_gp);
+                        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+                        return count;
+                }
+                /*
+                 * Removing existing association of tg_pt_gp_mem with tg_pt_gp
+                 */
+                __core_alua_drop_tg_pt_gp_mem(tg_pt_gp_mem, tg_pt_gp);
+                move = 1;
+        }
+        /*
+         * Associate tg_pt_gp_mem with tg_pt_gp_new.
+         */
+        __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem, tg_pt_gp_new);
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        printk(KERN_INFO "Target_Core_ConfigFS: %s %s/tpgt_%hu/%s to ALUA"
+                " Target Port Group: alua/%s, ID: %hu\n", (move) ?
+                "Moving" : "Adding", TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                TPG_TFO(tpg)->tpg_get_tag(tpg),
+                config_item_name(&lun->lun_group.cg_item),
+                config_item_name(&tg_pt_gp_new->tg_pt_gp_group.cg_item),
+                tg_pt_gp_new->tg_pt_gp_id);
+
+        core_alua_put_tg_pt_gp_from_name(tg_pt_gp_new);
+        return count;
+}
+
+ssize_t core_alua_show_access_type(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        if ((tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA) &&
+            (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA))
+                return sprintf(page, "Implict and Explict\n");
+        else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA)
+                return sprintf(page, "Implict\n");
+        else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA)
+                return sprintf(page, "Explict\n");
+        else
+                return sprintf(page, "None\n");
+}
+
+ssize_t core_alua_store_access_type(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract alua_access_type\n");
+                return -EINVAL;
+        }
+        if ((tmp != 0) && (tmp != 1) && (tmp != 2) && (tmp != 3)) {
+                printk(KERN_ERR "Illegal value for alua_access_type:"
+                                " %lu\n", tmp);
+                return -EINVAL;
+        }
+        if (tmp == 3)
+                tg_pt_gp->tg_pt_gp_alua_access_type =
+                        TPGS_IMPLICT_ALUA | TPGS_EXPLICT_ALUA;
+        else if (tmp == 2)
+                tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_EXPLICT_ALUA;
+        else if (tmp == 1)
+                tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_IMPLICT_ALUA;
+        else
+                tg_pt_gp->tg_pt_gp_alua_access_type = 0;
+
+        return count;
+}
+
+ssize_t core_alua_show_nonop_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_nonop_delay_msecs);
+}
+
+ssize_t core_alua_store_nonop_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract nonop_delay_msecs\n");
+                return -EINVAL;
+        }
+        if (tmp > ALUA_MAX_NONOP_DELAY_MSECS) {
+                printk(KERN_ERR "Passed nonop_delay_msecs: %lu, exceeds"
+                        " ALUA_MAX_NONOP_DELAY_MSECS: %d\n", tmp,
+                        ALUA_MAX_NONOP_DELAY_MSECS);
+                return -EINVAL;
+        }
+        tg_pt_gp->tg_pt_gp_nonop_delay_msecs = (int)tmp;
+
+        return count;
+}
+
+ssize_t core_alua_show_trans_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_trans_delay_msecs);
+}
+
+ssize_t core_alua_store_trans_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract trans_delay_msecs\n");
+                return -EINVAL;
+        }
+        if (tmp > ALUA_MAX_TRANS_DELAY_MSECS) {
+                printk(KERN_ERR "Passed trans_delay_msecs: %lu, exceeds"
+                        " ALUA_MAX_TRANS_DELAY_MSECS: %d\n", tmp,
+                        ALUA_MAX_TRANS_DELAY_MSECS);
+                return -EINVAL;
+        }
+        tg_pt_gp->tg_pt_gp_trans_delay_msecs = (int)tmp;
+
+        return count;
+}
+
+ssize_t core_alua_show_preferred_bit(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_pref);
+}
+
+ssize_t core_alua_store_preferred_bit(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract preferred ALUA value\n");
+                return -EINVAL;
+        }
+        if ((tmp != 0) && (tmp != 1)) {
+                printk(KERN_ERR "Illegal value for preferred ALUA: %lu\n", tmp);
+                return -EINVAL;
+        }
+        tg_pt_gp->tg_pt_gp_pref = (int)tmp;
+
+        return count;
+}
+
+ssize_t core_alua_show_offline_bit(struct se_lun *lun, char *page)
+{
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return sprintf(page, "%d\n",
+                atomic_read(&lun->lun_sep->sep_tg_pt_secondary_offline));
+}
+
+ssize_t core_alua_store_offline_bit(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        unsigned long tmp;
+        int ret;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract alua_tg_pt_offline value\n");
+                return -EINVAL;
+        }
+        if ((tmp != 0) && (tmp != 1)) {
+                printk(KERN_ERR "Illegal value for alua_tg_pt_offline: %lu\n",
+                                tmp);
+                return -EINVAL;
+        }
+        tg_pt_gp_mem = lun->lun_sep->sep_alua_tg_pt_gp_mem;
+        if (!(tg_pt_gp_mem)) {
+                printk(KERN_ERR "Unable to locate *tg_pt_gp_mem\n");
+                return -EINVAL;
+        }
+
+        ret = core_alua_set_tg_pt_secondary_state(tg_pt_gp_mem,
+                        lun->lun_sep, 0, (int)tmp);
+        if (ret < 0)
+                return -EINVAL;
+
+        return count;
+}
+
+ssize_t core_alua_show_secondary_status(
+        struct se_lun *lun,
+        char *page)
+{
+        return sprintf(page, "%d\n", lun->lun_sep->sep_tg_pt_secondary_stat);
+}
+
+ssize_t core_alua_store_secondary_status(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract alua_tg_pt_status\n");
+                return -EINVAL;
+        }
+        if ((tmp != ALUA_STATUS_NONE) &&
+            (tmp != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) &&
+            (tmp != ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA)) {
+                printk(KERN_ERR "Illegal value for alua_tg_pt_status: %lu\n",
+                                tmp);
+                return -EINVAL;
+        }
+        lun->lun_sep->sep_tg_pt_secondary_stat = (int)tmp;
+
+        return count;
+}
+
+ssize_t core_alua_show_secondary_write_metadata(
+        struct se_lun *lun,
+        char *page)
+{
+        return sprintf(page, "%d\n",
+                        lun->lun_sep->sep_tg_pt_secondary_write_md);
+}
+
+ssize_t core_alua_store_secondary_write_metadata(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract alua_tg_pt_write_md\n");
+                return -EINVAL;
+        }
+        if ((tmp != 0) && (tmp != 1)) {
+                printk(KERN_ERR "Illegal value for alua_tg_pt_write_md:"
+                                " %lu\n", tmp);
+                return -EINVAL;
+        }
+        lun->lun_sep->sep_tg_pt_secondary_write_md = (int)tmp;
+
+        return count;
+}
+
+int core_setup_alua(struct se_device *dev, int force_pt)
+{
+        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
+        struct t10_alua *alua = T10_ALUA(su_dev);
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+        /*
+         * If this device is from Target_Core_Mod/pSCSI, use the ALUA logic
+         * of the Underlying SCSI hardware.  In Linux/SCSI terms, this can
+         * cause a problem because libata and some SATA RAID HBAs appear
+         * under Linux/SCSI, but emulate SCSI logic themselves.
+         */
+        if (((TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) &&
+            !(DEV_ATTRIB(dev)->emulate_alua)) || force_pt) {
+                alua->alua_type = SPC_ALUA_PASSTHROUGH;
+                alua->alua_state_check = &core_alua_state_check_nop;
+                printk(KERN_INFO "%s: Using SPC_ALUA_PASSTHROUGH, no ALUA"
+                        " emulation\n", TRANSPORT(dev)->name);
+                return 0;
+        }
+        /*
+         * If SPC-3 or above is reported by real or emulated struct se_device,
+         * use emulated ALUA.
+         */
+        if (TRANSPORT(dev)->get_device_rev(dev) >= SCSI_3) {
+                printk(KERN_INFO "%s: Enabling ALUA Emulation for SPC-3"
+                        " device\n", TRANSPORT(dev)->name);
+                /*
+                 * Assoicate this struct se_device with the default ALUA
+                 * LUN Group.
+                 */
+                lu_gp_mem = core_alua_allocate_lu_gp_mem(dev);
+                if (IS_ERR(lu_gp_mem) || !lu_gp_mem)
+                        return -1;
+
+                alua->alua_type = SPC3_ALUA_EMULATED;
+                alua->alua_state_check = &core_alua_state_check;
+                spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+                __core_alua_attach_lu_gp_mem(lu_gp_mem,
+                                se_global->default_lu_gp);
+                spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+                printk(KERN_INFO "%s: Adding to default ALUA LU Group:"
+                        " core/alua/lu_gps/default_lu_gp\n",
+                        TRANSPORT(dev)->name);
+        } else {
+                alua->alua_type = SPC2_ALUA_DISABLED;
+                alua->alua_state_check = &core_alua_state_check_nop;
+                printk(KERN_INFO "%s: Disabling ALUA Emulation for SPC-2"
+                        " device\n", TRANSPORT(dev)->name);
+        }
+
+        return 0;
+}
diff --git a/drivers/target/target_core_alua.h b/drivers/target/target_core_alua.h
new file mode 100644
index 000000000000..c86f97a081ed
--- /dev/null
+++ b/drivers/target/target_core_alua.h
@@ -0,0 +1,126 @@
+#ifndef TARGET_CORE_ALUA_H
+#define TARGET_CORE_ALUA_H
+
+/*
+ * INQUIRY response data, TPGS Field
+ *
+ * from spc4r17 section 6.4.2 Table 135
+ */
+#define TPGS_NO_ALUA                            0x00
+#define TPGS_IMPLICT_ALUA                       0x10
+#define TPGS_EXPLICT_ALUA                       0x20
+
+/*
+ * ASYMMETRIC ACCESS STATE field
+ *
+ * from spc4r17 section 6.27 Table 245
+ */
+#define ALUA_ACCESS_STATE_ACTIVE_OPTMIZED       0x0
+#define ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED  0x1
+#define ALUA_ACCESS_STATE_STANDBY               0x2
+#define ALUA_ACCESS_STATE_UNAVAILABLE           0x3
+#define ALUA_ACCESS_STATE_OFFLINE               0xe
+#define ALUA_ACCESS_STATE_TRANSITION            0xf
+
+/*
+ * REPORT_TARGET_PORT_GROUP STATUS CODE
+ *
+ * from spc4r17 section 6.27 Table 246
+ */
+#define ALUA_STATUS_NONE                                0x00
+#define ALUA_STATUS_ALTERED_BY_EXPLICT_STPG             0x01
+#define ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA             0x02
+
+/*
+ * From spc4r17, Table D.1: ASC and ASCQ Assignement
+ */
+#define ASCQ_04H_ALUA_STATE_TRANSITION                  0x0a
+#define ASCQ_04H_ALUA_TG_PT_STANDBY                     0x0b
+#define ASCQ_04H_ALUA_TG_PT_UNAVAILABLE                 0x0c
+#define ASCQ_04H_ALUA_OFFLINE                           0x12
+
+/*
+ * Used as the default for Active/NonOptimized delay (in milliseconds)
+ * This can also be changed via configfs on a per target port group basis..
+ */
+#define ALUA_DEFAULT_NONOP_DELAY_MSECS                  100
+#define ALUA_MAX_NONOP_DELAY_MSECS                      10000 /* 10 seconds */
+/*
+ * Used for implict and explict ALUA transitional delay, that is disabled
+ * by default, and is intended to be used for debugging client side ALUA code.
+ */
+#define ALUA_DEFAULT_TRANS_DELAY_MSECS                  0
+#define ALUA_MAX_TRANS_DELAY_MSECS                      30000 /* 30 seconds */
+/*
+ * Used by core_alua_update_tpg_primary_metadata() and
+ * core_alua_update_tpg_secondary_metadata()
+ */
+#define ALUA_METADATA_PATH_LEN                          512
+/*
+ * Used by core_alua_update_tpg_secondary_metadata()
+ */
+#define ALUA_SECONDARY_METADATA_WWN_LEN                 256
+
+extern struct kmem_cache *t10_alua_lu_gp_cache;
+extern struct kmem_cache *t10_alua_lu_gp_mem_cache;
+extern struct kmem_cache *t10_alua_tg_pt_gp_cache;
+extern struct kmem_cache *t10_alua_tg_pt_gp_mem_cache;
+
+extern int core_emulate_report_target_port_groups(struct se_cmd *);
+extern int core_emulate_set_target_port_groups(struct se_cmd *);
+extern int core_alua_check_nonop_delay(struct se_cmd *);
+extern int core_alua_do_port_transition(struct t10_alua_tg_pt_gp *,
+                                struct se_device *, struct se_port *,
+                                struct se_node_acl *, int, int);
+extern char *core_alua_dump_status(int);
+extern struct t10_alua_lu_gp *core_alua_allocate_lu_gp(const char *, int);
+extern int core_alua_set_lu_gp_id(struct t10_alua_lu_gp *, u16);
+extern void core_alua_free_lu_gp(struct t10_alua_lu_gp *);
+extern void core_alua_free_lu_gp_mem(struct se_device *);
+extern struct t10_alua_lu_gp *core_alua_get_lu_gp_by_name(const char *);
+extern void core_alua_put_lu_gp_from_name(struct t10_alua_lu_gp *);
+extern void __core_alua_attach_lu_gp_mem(struct t10_alua_lu_gp_member *,
+                                        struct t10_alua_lu_gp *);
+extern void __core_alua_drop_lu_gp_mem(struct t10_alua_lu_gp_member *,
+                                        struct t10_alua_lu_gp *);
+extern void core_alua_drop_lu_gp_dev(struct se_device *);
+extern struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(
+                        struct se_subsystem_dev *, const char *, int);
+extern int core_alua_set_tg_pt_gp_id(struct t10_alua_tg_pt_gp *, u16);
+extern struct t10_alua_tg_pt_gp_member *core_alua_allocate_tg_pt_gp_mem(
+                                        struct se_port *);
+extern void core_alua_free_tg_pt_gp(struct t10_alua_tg_pt_gp *);
+extern void core_alua_free_tg_pt_gp_mem(struct se_port *);
+extern void __core_alua_attach_tg_pt_gp_mem(struct t10_alua_tg_pt_gp_member *,
+                                        struct t10_alua_tg_pt_gp *);
+extern ssize_t core_alua_show_tg_pt_gp_info(struct se_port *, char *);
+extern ssize_t core_alua_store_tg_pt_gp_info(struct se_port *, const char *,
+                                                size_t);
+extern ssize_t core_alua_show_access_type(struct t10_alua_tg_pt_gp *, char *);
+extern ssize_t core_alua_store_access_type(struct t10_alua_tg_pt_gp *,
+                                        const char *, size_t);
+extern ssize_t core_alua_show_nonop_delay_msecs(struct t10_alua_tg_pt_gp *,
+                                                char *);
+extern ssize_t core_alua_store_nonop_delay_msecs(struct t10_alua_tg_pt_gp *,
+                                        const char *, size_t);
+extern ssize_t core_alua_show_trans_delay_msecs(struct t10_alua_tg_pt_gp *,
+                                        char *);
+extern ssize_t core_alua_store_trans_delay_msecs(struct t10_alua_tg_pt_gp *,
+                                        const char *, size_t);
+extern ssize_t core_alua_show_preferred_bit(struct t10_alua_tg_pt_gp *,
+                                        char *);
+extern ssize_t core_alua_store_preferred_bit(struct t10_alua_tg_pt_gp *,
+                                        const char *, size_t);
+extern ssize_t core_alua_show_offline_bit(struct se_lun *, char *);
+extern ssize_t core_alua_store_offline_bit(struct se_lun *, const char *,
+                                        size_t);
+extern ssize_t core_alua_show_secondary_status(struct se_lun *, char *);
+extern ssize_t core_alua_store_secondary_status(struct se_lun *,
+                                        const char *, size_t);
+extern ssize_t core_alua_show_secondary_write_metadata(struct se_lun *,
+                                        char *);
+extern ssize_t core_alua_store_secondary_write_metadata(struct se_lun *,
+                                        const char *, size_t);
+extern int core_setup_alua(struct se_device *, int);
+
+#endif /* TARGET_CORE_ALUA_H */
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
new file mode 100644
index 000000000000..366080baf474
--- /dev/null
+++ b/drivers/target/target_core_cdb.c
@@ -0,0 +1,1131 @@
+/*
+ * CDB emulation for non-READ/WRITE commands.
+ *
+ * Copyright (c) 2002, 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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 <asm/unaligned.h>
+#include <scsi/scsi.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include "target_core_ua.h"
+
+static void
+target_fill_alua_data(struct se_port *port, unsigned char *buf)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+
+        /*
+         * Set SCCS for MAINTENANCE_IN + REPORT_TARGET_PORT_GROUPS.
+         */
+        buf[5]  = 0x80;
+
+        /*
+         * Set TPGS field for explict and/or implict ALUA access type
+         * and opteration.
+         *
+         * See spc4r17 section 6.4.2 Table 135
+         */
+        if (!port)
+                return;
+        tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+        if (!tg_pt_gp_mem)
+                return;
+
+        spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+        tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+        if (tg_pt_gp)
+                buf[5] |= tg_pt_gp->tg_pt_gp_alua_access_type;
+        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+}
+
+static int
+target_emulate_inquiry_std(struct se_cmd *cmd)
+{
+        struct se_lun *lun = SE_LUN(cmd);
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *buf = cmd->t_task->t_task_buf;
+
+        /*
+         * Make sure we at least have 6 bytes of INQUIRY response
+         * payload going back for EVPD=0
+         */
+        if (cmd->data_length < 6) {
+                printk(KERN_ERR "SCSI Inquiry payload length: %u"
+                        " too small for EVPD=0\n", cmd->data_length);
+                return -1;
+        }
+
+        buf[0] = dev->transport->get_device_type(dev);
+        if (buf[0] == TYPE_TAPE)
+                buf[1] = 0x80;
+        buf[2] = dev->transport->get_device_rev(dev);
+
+        /*
+         * Enable SCCS and TPGS fields for Emulated ALUA
+         */
+        if (T10_ALUA(dev->se_sub_dev)->alua_type == SPC3_ALUA_EMULATED)
+                target_fill_alua_data(lun->lun_sep, buf);
+
+        if (cmd->data_length < 8) {
+                buf[4] = 1; /* Set additional length to 1 */
+                return 0;
+        }
+
+        buf[7] = 0x32; /* Sync=1 and CmdQue=1 */
+
+        /*
+         * Do not include vendor, product, reversion info in INQUIRY
+         * response payload for cdbs with a small allocation length.
+         */
+        if (cmd->data_length < 36) {
+                buf[4] = 3; /* Set additional length to 3 */
+                return 0;
+        }
+
+        snprintf((unsigned char *)&buf[8], 8, "LIO-ORG");
+        snprintf((unsigned char *)&buf[16], 16, "%s",
+                 &DEV_T10_WWN(dev)->model[0]);
+        snprintf((unsigned char *)&buf[32], 4, "%s",
+                 &DEV_T10_WWN(dev)->revision[0]);
+        buf[4] = 31; /* Set additional length to 31 */
+        return 0;
+}
+
+/* supported vital product data pages */
+static int
+target_emulate_evpd_00(struct se_cmd *cmd, unsigned char *buf)
+{
+        buf[1] = 0x00;
+        if (cmd->data_length < 8)
+                return 0;
+
+        buf[4] = 0x0;
+        /*
+         * Only report the INQUIRY EVPD=1 pages after a valid NAA
+         * Registered Extended LUN WWN has been set via ConfigFS
+         * during device creation/restart.
+         */
+        if (SE_DEV(cmd)->se_sub_dev->su_dev_flags &
+                        SDF_EMULATED_VPD_UNIT_SERIAL) {
+                buf[3] = 3;
+                buf[5] = 0x80;
+                buf[6] = 0x83;
+                buf[7] = 0x86;
+        }
+
+        return 0;
+}
+
+/* unit serial number */
+static int
+target_emulate_evpd_80(struct se_cmd *cmd, unsigned char *buf)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        u16 len = 0;
+
+        buf[1] = 0x80;
+        if (dev->se_sub_dev->su_dev_flags &
+                        SDF_EMULATED_VPD_UNIT_SERIAL) {
+                u32 unit_serial_len;
+
+                unit_serial_len =
+                        strlen(&DEV_T10_WWN(dev)->unit_serial[0]);
+                unit_serial_len++; /* For NULL Terminator */
+
+                if (((len + 4) + unit_serial_len) > cmd->data_length) {
+                        len += unit_serial_len;
+                        buf[2] = ((len >> 8) & 0xff);
+                        buf[3] = (len & 0xff);
+                        return 0;
+                }
+                len += sprintf((unsigned char *)&buf[4], "%s",
+                        &DEV_T10_WWN(dev)->unit_serial[0]);
+                len++; /* Extra Byte for NULL Terminator */
+                buf[3] = len;
+        }
+        return 0;
+}
+
+/*
+ * Device identification VPD, for a complete list of
+ * DESIGNATOR TYPEs see spc4r17 Table 459.
+ */
+static int
+target_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_lun *lun = SE_LUN(cmd);
+        struct se_port *port = NULL;
+        struct se_portal_group *tpg = NULL;
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        unsigned char binary, binary_new;
+        unsigned char *prod = &DEV_T10_WWN(dev)->model[0];
+        u32 prod_len;
+        u32 unit_serial_len, off = 0;
+        int i;
+        u16 len = 0, id_len;
+
+        buf[1] = 0x83;
+        off = 4;
+
+        /*
+         * NAA IEEE Registered Extended Assigned designator format, see
+         * spc4r17 section 7.7.3.6.5
+         *
+         * We depend upon a target_core_mod/ConfigFS provided
+         * /sys/kernel/config/target/core/$HBA/$DEV/wwn/vpd_unit_serial
+         * value in order to return the NAA id.
+         */
+        if (!(dev->se_sub_dev->su_dev_flags & SDF_EMULATED_VPD_UNIT_SERIAL))
+                goto check_t10_vend_desc;
+
+        if (off + 20 > cmd->data_length)
+                goto check_t10_vend_desc;
+
+        /* CODE SET == Binary */
+        buf[off++] = 0x1;
+
+        /* Set ASSOICATION == addressed logical unit: 0)b */
+        buf[off] = 0x00;
+
+        /* Identifier/Designator type == NAA identifier */
+        buf[off++] = 0x3;
+        off++;
+
+        /* Identifier/Designator length */
+        buf[off++] = 0x10;
+
+        /*
+         * Start NAA IEEE Registered Extended Identifier/Designator
+         */
+        buf[off++] = (0x6 << 4);
+
+        /*
+         * Use OpenFabrics IEEE Company ID: 00 14 05
+         */
+        buf[off++] = 0x01;
+        buf[off++] = 0x40;
+        buf[off] = (0x5 << 4);
+
+        /*
+         * Return ConfigFS Unit Serial Number information for
+         * VENDOR_SPECIFIC_IDENTIFIER and
+         * VENDOR_SPECIFIC_IDENTIFIER_EXTENTION
+         */
+        binary = transport_asciihex_to_binaryhex(
+                                &DEV_T10_WWN(dev)->unit_serial[0]);
+        buf[off++] |= (binary & 0xf0) >> 4;
+        for (i = 0; i < 24; i += 2) {
+                binary_new = transport_asciihex_to_binaryhex(
+                        &DEV_T10_WWN(dev)->unit_serial[i+2]);
+                buf[off] = (binary & 0x0f) << 4;
+                buf[off++] |= (binary_new & 0xf0) >> 4;
+                binary = binary_new;
+        }
+        len = 20;
+        off = (len + 4);
+
+check_t10_vend_desc:
+        /*
+         * T10 Vendor Identifier Page, see spc4r17 section 7.7.3.4
+         */
+        id_len = 8; /* For Vendor field */
+        prod_len = 4; /* For VPD Header */
+        prod_len += 8; /* For Vendor field */
+        prod_len += strlen(prod);
+        prod_len++; /* For : */
+
+        if (dev->se_sub_dev->su_dev_flags &
+                        SDF_EMULATED_VPD_UNIT_SERIAL) {
+                unit_serial_len =
+                        strlen(&DEV_T10_WWN(dev)->unit_serial[0]);
+                unit_serial_len++; /* For NULL Terminator */
+
+                if ((len + (id_len + 4) +
+                    (prod_len + unit_serial_len)) >
+                                cmd->data_length) {
+                        len += (prod_len + unit_serial_len);
+                        goto check_port;
+                }
+                id_len += sprintf((unsigned char *)&buf[off+12],
+                                "%s:%s", prod,
+                                &DEV_T10_WWN(dev)->unit_serial[0]);
+        }
+        buf[off] = 0x2; /* ASCII */
+        buf[off+1] = 0x1; /* T10 Vendor ID */
+        buf[off+2] = 0x0;
+        memcpy((unsigned char *)&buf[off+4], "LIO-ORG", 8);
+        /* Extra Byte for NULL Terminator */
+        id_len++;
+        /* Identifier Length */
+        buf[off+3] = id_len;
+        /* Header size for Designation descriptor */
+        len += (id_len + 4);
+        off += (id_len + 4);
+        /*
+         * struct se_port is only set for INQUIRY VPD=1 through $FABRIC_MOD
+         */
+check_port:
+        port = lun->lun_sep;
+        if (port) {
+                struct t10_alua_lu_gp *lu_gp;
+                u32 padding, scsi_name_len;
+                u16 lu_gp_id = 0;
+                u16 tg_pt_gp_id = 0;
+                u16 tpgt;
+
+                tpg = port->sep_tpg;
+                /*
+                 * Relative target port identifer, see spc4r17
+                 * section 7.7.3.7
+                 *
+                 * Get the PROTOCOL IDENTIFIER as defined by spc4r17
+                 * section 7.5.1 Table 362
+                 */
+                if (((len + 4) + 8) > cmd->data_length) {
+                        len += 8;
+                        goto check_tpgi;
+                }
+                buf[off] =
+                        (TPG_TFO(tpg)->get_fabric_proto_ident(tpg) << 4);
+                buf[off++] |= 0x1; /* CODE SET == Binary */
+                buf[off] = 0x80; /* Set PIV=1 */
+                /* Set ASSOICATION == target port: 01b */
+                buf[off] |= 0x10;
+                /* DESIGNATOR TYPE == Relative target port identifer */
+                buf[off++] |= 0x4;
+                off++; /* Skip over Reserved */
+                buf[off++] = 4; /* DESIGNATOR LENGTH */
+                /* Skip over Obsolete field in RTPI payload
+                 * in Table 472 */
+                off += 2;
+                buf[off++] = ((port->sep_rtpi >> 8) & 0xff);
+                buf[off++] = (port->sep_rtpi & 0xff);
+                len += 8; /* Header size + Designation descriptor */
+                /*
+                 * Target port group identifier, see spc4r17
+                 * section 7.7.3.8
+                 *
+                 * Get the PROTOCOL IDENTIFIER as defined by spc4r17
+                 * section 7.5.1 Table 362
+                 */
+check_tpgi:
+                if (T10_ALUA(dev->se_sub_dev)->alua_type !=
+                                SPC3_ALUA_EMULATED)
+                        goto check_scsi_name;
+
+                if (((len + 4) + 8) > cmd->data_length) {
+                        len += 8;
+                        goto check_lu_gp;
+                }
+                tg_pt_gp_mem = port->sep_alua_tg_pt_gp_mem;
+                if (!tg_pt_gp_mem)
+                        goto check_lu_gp;
+
+                spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                tg_pt_gp = tg_pt_gp_mem->tg_pt_gp;
+                if (!(tg_pt_gp)) {
+                        spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                        goto check_lu_gp;
+                }
+                tg_pt_gp_id = tg_pt_gp->tg_pt_gp_id;
+                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+
+                buf[off] =
+                        (TPG_TFO(tpg)->get_fabric_proto_ident(tpg) << 4);
+                buf[off++] |= 0x1; /* CODE SET == Binary */
+                buf[off] = 0x80; /* Set PIV=1 */
+                /* Set ASSOICATION == target port: 01b */
+                buf[off] |= 0x10;
+                /* DESIGNATOR TYPE == Target port group identifier */
+                buf[off++] |= 0x5;
+                off++; /* Skip over Reserved */
+                buf[off++] = 4; /* DESIGNATOR LENGTH */
+                off += 2; /* Skip over Reserved Field */
+                buf[off++] = ((tg_pt_gp_id >> 8) & 0xff);
+                buf[off++] = (tg_pt_gp_id & 0xff);
+                len += 8; /* Header size + Designation descriptor */
+                /*
+                 * Logical Unit Group identifier, see spc4r17
+                 * section 7.7.3.8
+                 */
+check_lu_gp:
+                if (((len + 4) + 8) > cmd->data_length) {
+                        len += 8;
+                        goto check_scsi_name;
+                }
+                lu_gp_mem = dev->dev_alua_lu_gp_mem;
+                if (!(lu_gp_mem))
+                        goto check_scsi_name;
+
+                spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+                lu_gp = lu_gp_mem->lu_gp;
+                if (!(lu_gp)) {
+                        spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+                        goto check_scsi_name;
+                }
+                lu_gp_id = lu_gp->lu_gp_id;
+                spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+                buf[off++] |= 0x1; /* CODE SET == Binary */
+                /* DESIGNATOR TYPE == Logical Unit Group identifier */
+                buf[off++] |= 0x6;
+                off++; /* Skip over Reserved */
+                buf[off++] = 4; /* DESIGNATOR LENGTH */
+                off += 2; /* Skip over Reserved Field */
+                buf[off++] = ((lu_gp_id >> 8) & 0xff);
+                buf[off++] = (lu_gp_id & 0xff);
+                len += 8; /* Header size + Designation descriptor */
+                /*
+                 * SCSI name string designator, see spc4r17
+                 * section 7.7.3.11
+                 *
+                 * Get the PROTOCOL IDENTIFIER as defined by spc4r17
+                 * section 7.5.1 Table 362
+                 */
+check_scsi_name:
+                scsi_name_len = strlen(TPG_TFO(tpg)->tpg_get_wwn(tpg));
+                /* UTF-8 ",t,0x<16-bit TPGT>" + NULL Terminator */
+                scsi_name_len += 10;
+                /* Check for 4-byte padding */
+                padding = ((-scsi_name_len) & 3);
+                if (padding != 0)
+                        scsi_name_len += padding;
+                /* Header size + Designation descriptor */
+                scsi_name_len += 4;
+
+                if (((len + 4) + scsi_name_len) > cmd->data_length) {
+                        len += scsi_name_len;
+                        goto set_len;
+                }
+                buf[off] =
+                        (TPG_TFO(tpg)->get_fabric_proto_ident(tpg) << 4);
+                buf[off++] |= 0x3; /* CODE SET == UTF-8 */
+                buf[off] = 0x80; /* Set PIV=1 */
+                /* Set ASSOICATION == target port: 01b */
+                buf[off] |= 0x10;
+                /* DESIGNATOR TYPE == SCSI name string */
+                buf[off++] |= 0x8;
+                off += 2; /* Skip over Reserved and length */
+                /*
+                 * SCSI name string identifer containing, $FABRIC_MOD
+                 * dependent information.  For LIO-Target and iSCSI
+                 * Target Port, this means "<iSCSI name>,t,0x<TPGT> in
+                 * UTF-8 encoding.
+                 */
+                tpgt = TPG_TFO(tpg)->tpg_get_tag(tpg);
+                scsi_name_len = sprintf(&buf[off], "%s,t,0x%04x",
+                                        TPG_TFO(tpg)->tpg_get_wwn(tpg), tpgt);
+                scsi_name_len += 1 /* Include  NULL terminator */;
+                /*
+                 * The null-terminated, null-padded (see 4.4.2) SCSI
+                 * NAME STRING field contains a UTF-8 format string.
+                 * The number of bytes in the SCSI NAME STRING field
+                 * (i.e., the value in the DESIGNATOR LENGTH field)
+                 * shall be no larger than 256 and shall be a multiple
+                 * of four.
+                 */
+                if (padding)
+                        scsi_name_len += padding;
+
+                buf[off-1] = scsi_name_len;
+                off += scsi_name_len;
+                /* Header size + Designation descriptor */
+                len += (scsi_name_len + 4);
+        }
+set_len:
+        buf[2] = ((len >> 8) & 0xff);
+        buf[3] = (len & 0xff); /* Page Length for VPD 0x83 */
+        return 0;
+}
+
+/* Extended INQUIRY Data VPD Page */
+static int
+target_emulate_evpd_86(struct se_cmd *cmd, unsigned char *buf)
+{
+        if (cmd->data_length < 60)
+                return 0;
+
+        buf[1] = 0x86;
+        buf[2] = 0x3c;
+        /* Set HEADSUP, ORDSUP, SIMPSUP */
+        buf[5] = 0x07;
+
+        /* If WriteCache emulation is enabled, set V_SUP */
+        if (DEV_ATTRIB(SE_DEV(cmd))->emulate_write_cache > 0)
+                buf[6] = 0x01;
+        return 0;
+}
+
+/* Block Limits VPD page */
+static int
+target_emulate_evpd_b0(struct se_cmd *cmd, unsigned char *buf)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        int have_tp = 0;
+
+        /*
+         * Following sbc3r22 section 6.5.3 Block Limits VPD page, when
+         * emulate_tpu=1 or emulate_tpws=1 we will be expect a
+         * different page length for Thin Provisioning.
+         */
+        if (DEV_ATTRIB(dev)->emulate_tpu || DEV_ATTRIB(dev)->emulate_tpws)
+                have_tp = 1;
+
+        if (cmd->data_length < (0x10 + 4)) {
+                printk(KERN_INFO "Received data_length: %u"
+                        " too small for EVPD 0xb0\n",
+                        cmd->data_length);
+                return -1;
+        }
+
+        if (have_tp && cmd->data_length < (0x3c + 4)) {
+                printk(KERN_INFO "Received data_length: %u"
+                        " too small for TPE=1 EVPD 0xb0\n",
+                        cmd->data_length);
+                have_tp = 0;
+        }
+
+        buf[0] = dev->transport->get_device_type(dev);
+        buf[1] = 0xb0;
+        buf[3] = have_tp ? 0x3c : 0x10;
+
+        /*
+         * Set OPTIMAL TRANSFER LENGTH GRANULARITY
+         */
+        put_unaligned_be16(1, &buf[6]);
+
+        /*
+         * Set MAXIMUM TRANSFER LENGTH
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->max_sectors, &buf[8]);
+
+        /*
+         * Set OPTIMAL TRANSFER LENGTH
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->optimal_sectors, &buf[12]);
+
+        /*
+         * Exit now if we don't support TP or the initiator sent a too
+         * short buffer.
+         */
+        if (!have_tp || cmd->data_length < (0x3c + 4))
+                return 0;
+
+        /*
+         * Set MAXIMUM UNMAP LBA COUNT
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->max_unmap_lba_count, &buf[20]);
+
+        /*
+         * Set MAXIMUM UNMAP BLOCK DESCRIPTOR COUNT
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->max_unmap_block_desc_count,
+                           &buf[24]);
+
+        /*
+         * Set OPTIMAL UNMAP GRANULARITY
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->unmap_granularity, &buf[28]);
+
+        /*
+         * UNMAP GRANULARITY ALIGNMENT
+         */
+        put_unaligned_be32(DEV_ATTRIB(dev)->unmap_granularity_alignment,
+                           &buf[32]);
+        if (DEV_ATTRIB(dev)->unmap_granularity_alignment != 0)
+                buf[32] |= 0x80; /* Set the UGAVALID bit */
+
+        return 0;
+}
+
+/* Thin Provisioning VPD */
+static int
+target_emulate_evpd_b2(struct se_cmd *cmd, unsigned char *buf)
+{
+        struct se_device *dev = SE_DEV(cmd);
+
+        /*
+         * From sbc3r22 section 6.5.4 Thin Provisioning VPD page:
+         *
+         * The PAGE LENGTH field is defined in SPC-4. If the DP bit is set to
+         * zero, then the page length shall be set to 0004h.  If the DP bit
+         * is set to one, then the page length shall be set to the value
+         * defined in table 162.
+         */
+        buf[0] = dev->transport->get_device_type(dev);
+        buf[1] = 0xb2;
+
+        /*
+         * Set Hardcoded length mentioned above for DP=0
+         */
+        put_unaligned_be16(0x0004, &buf[2]);
+
+        /*
+         * The THRESHOLD EXPONENT field indicates the threshold set size in
+         * LBAs as a power of 2 (i.e., the threshold set size is equal to
+         * 2(threshold exponent)).
+         *
+         * Note that this is currently set to 0x00 as mkp says it will be
+         * changing again.  We can enable this once it has settled in T10
+         * and is actually used by Linux/SCSI ML code.
+         */
+        buf[4] = 0x00;
+
+        /*
+         * A TPU bit set to one indicates that the device server supports
+         * the UNMAP command (see 5.25). A TPU bit set to zero indicates
+         * that the device server does not support the UNMAP command.
+         */
+        if (DEV_ATTRIB(dev)->emulate_tpu != 0)
+                buf[5] = 0x80;
+
+        /*
+         * A TPWS bit set to one indicates that the device server supports
+         * the use of the WRITE SAME (16) command (see 5.42) to unmap LBAs.
+         * A TPWS bit set to zero indicates that the device server does not
+         * support the use of the WRITE SAME (16) command to unmap LBAs.
+         */
+        if (DEV_ATTRIB(dev)->emulate_tpws != 0)
+                buf[5] |= 0x40;
+
+        return 0;
+}
+
+static int
+target_emulate_inquiry(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *buf = cmd->t_task->t_task_buf;
+        unsigned char *cdb = cmd->t_task->t_task_cdb;
+
+        if (!(cdb[1] & 0x1))
+                return target_emulate_inquiry_std(cmd);
+
+        /*
+         * Make sure we at least have 4 bytes of INQUIRY response
+         * payload for 0x00 going back for EVPD=1.  Note that 0x80
+         * and 0x83 will check for enough payload data length and
+         * jump to set_len: label when there is not enough inquiry EVPD
+         * payload length left for the next outgoing EVPD metadata
+         */
+        if (cmd->data_length < 4) {
+                printk(KERN_ERR "SCSI Inquiry payload length: %u"
+                        " too small for EVPD=1\n", cmd->data_length);
+                return -1;
+        }
+        buf[0] = dev->transport->get_device_type(dev);
+
+        switch (cdb[2]) {
+        case 0x00:
+                return target_emulate_evpd_00(cmd, buf);
+        case 0x80:
+                return target_emulate_evpd_80(cmd, buf);
+        case 0x83:
+                return target_emulate_evpd_83(cmd, buf);
+        case 0x86:
+                return target_emulate_evpd_86(cmd, buf);
+        case 0xb0:
+                return target_emulate_evpd_b0(cmd, buf);
+        case 0xb2:
+                return target_emulate_evpd_b2(cmd, buf);
+        default:
+                printk(KERN_ERR "Unknown VPD Code: 0x%02x\n", cdb[2]);
+                return -1;
+        }
+
+        return 0;
+}
+
+static int
+target_emulate_readcapacity(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *buf = cmd->t_task->t_task_buf;
+        u32 blocks = dev->transport->get_blocks(dev);
+
+        buf[0] = (blocks >> 24) & 0xff;
+        buf[1] = (blocks >> 16) & 0xff;
+        buf[2] = (blocks >> 8) & 0xff;
+        buf[3] = blocks & 0xff;
+        buf[4] = (DEV_ATTRIB(dev)->block_size >> 24) & 0xff;
+        buf[5] = (DEV_ATTRIB(dev)->block_size >> 16) & 0xff;
+        buf[6] = (DEV_ATTRIB(dev)->block_size >> 8) & 0xff;
+        buf[7] = DEV_ATTRIB(dev)->block_size & 0xff;
+        /*
+         * Set max 32-bit blocks to signal SERVICE ACTION READ_CAPACITY_16
+        */
+        if (DEV_ATTRIB(dev)->emulate_tpu || DEV_ATTRIB(dev)->emulate_tpws)
+                put_unaligned_be32(0xFFFFFFFF, &buf[0]);
+
+        return 0;
+}
+
+static int
+target_emulate_readcapacity_16(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *buf = cmd->t_task->t_task_buf;
+        unsigned long long blocks = dev->transport->get_blocks(dev);
+
+        buf[0] = (blocks >> 56) & 0xff;
+        buf[1] = (blocks >> 48) & 0xff;
+        buf[2] = (blocks >> 40) & 0xff;
+        buf[3] = (blocks >> 32) & 0xff;
+        buf[4] = (blocks >> 24) & 0xff;
+        buf[5] = (blocks >> 16) & 0xff;
+        buf[6] = (blocks >> 8) & 0xff;
+        buf[7] = blocks & 0xff;
+        buf[8] = (DEV_ATTRIB(dev)->block_size >> 24) & 0xff;
+        buf[9] = (DEV_ATTRIB(dev)->block_size >> 16) & 0xff;
+        buf[10] = (DEV_ATTRIB(dev)->block_size >> 8) & 0xff;
+        buf[11] = DEV_ATTRIB(dev)->block_size & 0xff;
+        /*
+         * Set Thin Provisioning Enable bit following sbc3r22 in section
+         * READ CAPACITY (16) byte 14 if emulate_tpu or emulate_tpws is enabled.
+         */
+        if (DEV_ATTRIB(dev)->emulate_tpu || DEV_ATTRIB(dev)->emulate_tpws)
+                buf[14] = 0x80;
+
+        return 0;
+}
+
+static int
+target_modesense_rwrecovery(unsigned char *p)
+{
+        p[0] = 0x01;
+        p[1] = 0x0a;
+
+        return 12;
+}
+
+static int
+target_modesense_control(struct se_device *dev, unsigned char *p)
+{
+        p[0] = 0x0a;
+        p[1] = 0x0a;
+        p[2] = 2;
+        /*
+         * From spc4r17, section 7.4.6 Control mode Page
+         *
+         * Unit Attention interlocks control (UN_INTLCK_CTRL) to code 00b
+         *
+         * 00b: The logical unit shall clear any unit attention condition
+         * reported in the same I_T_L_Q nexus transaction as a CHECK CONDITION
+         * status and shall not establish a unit attention condition when a com-
+         * mand is completed with BUSY, TASK SET FULL, or RESERVATION CONFLICT
+         * status.
+         *
+         * 10b: The logical unit shall not clear any unit attention condition
+         * reported in the same I_T_L_Q nexus transaction as a CHECK CONDITION
+         * status and shall not establish a unit attention condition when
+         * a command is completed with BUSY, TASK SET FULL, or RESERVATION
+         * CONFLICT status.
+         *
+         * 11b a The logical unit shall not clear any unit attention condition
+         * reported in the same I_T_L_Q nexus transaction as a CHECK CONDITION
+         * status and shall establish a unit attention condition for the
+         * initiator port associated with the I_T nexus on which the BUSY,
+         * TASK SET FULL, or RESERVATION CONFLICT status is being returned.
+         * Depending on the status, the additional sense code shall be set to
+         * PREVIOUS BUSY STATUS, PREVIOUS TASK SET FULL STATUS, or PREVIOUS
+         * RESERVATION CONFLICT STATUS. Until it is cleared by a REQUEST SENSE
+         * command, a unit attention condition shall be established only once
+         * for a BUSY, TASK SET FULL, or RESERVATION CONFLICT status regardless
+         * to the number of commands completed with one of those status codes.
+         */
+        p[4] = (DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl == 2) ? 0x30 :
+               (DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl == 1) ? 0x20 : 0x00;
+        /*
+         * From spc4r17, section 7.4.6 Control mode Page
+         *
+         * Task Aborted Status (TAS) bit set to zero.
+         *
+         * A task aborted status (TAS) bit set to zero specifies that aborted
+         * tasks shall be terminated by the device server without any response
+         * to the application client. A TAS bit set to one specifies that tasks
+         * aborted by the actions of an I_T nexus other than the I_T nexus on
+         * which the command was received shall be completed with TASK ABORTED
+         * status (see SAM-4).
+         */
+        p[5] = (DEV_ATTRIB(dev)->emulate_tas) ? 0x40 : 0x00;
+        p[8] = 0xff;
+        p[9] = 0xff;
+        p[11] = 30;
+
+        return 12;
+}
+
+static int
+target_modesense_caching(struct se_device *dev, unsigned char *p)
+{
+        p[0] = 0x08;
+        p[1] = 0x12;
+        if (DEV_ATTRIB(dev)->emulate_write_cache > 0)
+                p[2] = 0x04; /* Write Cache Enable */
+        p[12] = 0x20; /* Disabled Read Ahead */
+
+        return 20;
+}
+
+static void
+target_modesense_write_protect(unsigned char *buf, int type)
+{
+        /*
+         * I believe that the WP bit (bit 7) in the mode header is the same for
+         * all device types..
+         */
+        switch (type) {
+        case TYPE_DISK:
+        case TYPE_TAPE:
+        default:
+                buf[0] |= 0x80; /* WP bit */
+                break;
+        }
+}
+
+static void
+target_modesense_dpofua(unsigned char *buf, int type)
+{
+        switch (type) {
+        case TYPE_DISK:
+                buf[0] |= 0x10; /* DPOFUA bit */
+                break;
+        default:
+                break;
+        }
+}
+
+static int
+target_emulate_modesense(struct se_cmd *cmd, int ten)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        char *cdb = cmd->t_task->t_task_cdb;
+        unsigned char *rbuf = cmd->t_task->t_task_buf;
+        int type = dev->transport->get_device_type(dev);
+        int offset = (ten) ? 8 : 4;
+        int length = 0;
+        unsigned char buf[SE_MODE_PAGE_BUF];
+
+        memset(buf, 0, SE_MODE_PAGE_BUF);
+
+        switch (cdb[2] & 0x3f) {
+        case 0x01:
+                length = target_modesense_rwrecovery(&buf[offset]);
+                break;
+        case 0x08:
+                length = target_modesense_caching(dev, &buf[offset]);
+                break;
+        case 0x0a:
+                length = target_modesense_control(dev, &buf[offset]);
+                break;
+        case 0x3f:
+                length = target_modesense_rwrecovery(&buf[offset]);
+                length += target_modesense_caching(dev, &buf[offset+length]);
+                length += target_modesense_control(dev, &buf[offset+length]);
+                break;
+        default:
+                printk(KERN_ERR "Got Unknown Mode Page: 0x%02x\n",
+                                cdb[2] & 0x3f);
+                return PYX_TRANSPORT_UNKNOWN_MODE_PAGE;
+        }
+        offset += length;
+
+        if (ten) {
+                offset -= 2;
+                buf[0] = (offset >> 8) & 0xff;
+                buf[1] = offset & 0xff;
+
+                if ((SE_LUN(cmd)->lun_access & TRANSPORT_LUNFLAGS_READ_ONLY) ||
+                    (cmd->se_deve &&
+                    (cmd->se_deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY)))
+                        target_modesense_write_protect(&buf[3], type);
+
+                if ((DEV_ATTRIB(dev)->emulate_write_cache > 0) &&
+                    (DEV_ATTRIB(dev)->emulate_fua_write > 0))
+                        target_modesense_dpofua(&buf[3], type);
+
+                if ((offset + 2) > cmd->data_length)
+                        offset = cmd->data_length;
+
+        } else {
+                offset -= 1;
+                buf[0] = offset & 0xff;
+
+                if ((SE_LUN(cmd)->lun_access & TRANSPORT_LUNFLAGS_READ_ONLY) ||
+                    (cmd->se_deve &&
+                    (cmd->se_deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY)))
+                        target_modesense_write_protect(&buf[2], type);
+
+                if ((DEV_ATTRIB(dev)->emulate_write_cache > 0) &&
+                    (DEV_ATTRIB(dev)->emulate_fua_write > 0))
+                        target_modesense_dpofua(&buf[2], type);
+
+                if ((offset + 1) > cmd->data_length)
+                        offset = cmd->data_length;
+        }
+        memcpy(rbuf, buf, offset);
+
+        return 0;
+}
+
+static int
+target_emulate_request_sense(struct se_cmd *cmd)
+{
+        unsigned char *cdb = cmd->t_task->t_task_cdb;
+        unsigned char *buf = cmd->t_task->t_task_buf;
+        u8 ua_asc = 0, ua_ascq = 0;
+
+        if (cdb[1] & 0x01) {
+                printk(KERN_ERR "REQUEST_SENSE description emulation not"
+                        " supported\n");
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+        if (!(core_scsi3_ua_clear_for_request_sense(cmd, &ua_asc, &ua_ascq))) {
+                /*
+                 * CURRENT ERROR, UNIT ATTENTION
+                 */
+                buf[0] = 0x70;
+                buf[SPC_SENSE_KEY_OFFSET] = UNIT_ATTENTION;
+                /*
+                 * Make sure request data length is enough for additional
+                 * sense data.
+                 */
+                if (cmd->data_length <= 18) {
+                        buf[7] = 0x00;
+                        return 0;
+                }
+                /*
+                 * The Additional Sense Code (ASC) from the UNIT ATTENTION
+                 */
+                buf[SPC_ASC_KEY_OFFSET] = ua_asc;
+                buf[SPC_ASCQ_KEY_OFFSET] = ua_ascq;
+                buf[7] = 0x0A;
+        } else {
+                /*
+                 * CURRENT ERROR, NO SENSE
+                 */
+                buf[0] = 0x70;
+                buf[SPC_SENSE_KEY_OFFSET] = NO_SENSE;
+                /*
+                 * Make sure request data length is enough for additional
+                 * sense data.
+                 */
+                if (cmd->data_length <= 18) {
+                        buf[7] = 0x00;
+                        return 0;
+                }
+                /*
+                 * NO ADDITIONAL SENSE INFORMATION
+                 */
+                buf[SPC_ASC_KEY_OFFSET] = 0x00;
+                buf[7] = 0x0A;
+        }
+
+        return 0;
+}
+
+/*
+ * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
+ * Note this is not used for TCM/pSCSI passthrough
+ */
+static int
+target_emulate_unmap(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *buf = cmd->t_task->t_task_buf, *ptr = NULL;
+        unsigned char *cdb = &cmd->t_task->t_task_cdb[0];
+        sector_t lba;
+        unsigned int size = cmd->data_length, range;
+        int ret, offset;
+        unsigned short dl, bd_dl;
+
+        /* First UNMAP block descriptor starts at 8 byte offset */
+        offset = 8;
+        size -= 8;
+        dl = get_unaligned_be16(&cdb[0]);
+        bd_dl = get_unaligned_be16(&cdb[2]);
+        ptr = &buf[offset];
+        printk(KERN_INFO "UNMAP: Sub: %s Using dl: %hu bd_dl: %hu size: %hu"
+                " ptr: %p\n", dev->transport->name, dl, bd_dl, size, ptr);
+
+        while (size) {
+                lba = get_unaligned_be64(&ptr[0]);
+                range = get_unaligned_be32(&ptr[8]);
+                printk(KERN_INFO "UNMAP: Using lba: %llu and range: %u\n",
+                                 (unsigned long long)lba, range);
+
+                ret = dev->transport->do_discard(dev, lba, range);
+                if (ret < 0) {
+                        printk(KERN_ERR "blkdev_issue_discard() failed: %d\n",
+                                        ret);
+                        return -1;
+                }
+
+                ptr += 16;
+                size -= 16;
+        }
+
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+        return 0;
+}
+
+/*
+ * Used for TCM/IBLOCK and TCM/FILEIO for block/blk-lib.c level discard support.
+ * Note this is not used for TCM/pSCSI passthrough
+ */
+static int
+target_emulate_write_same(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct se_device *dev = SE_DEV(cmd);
+        sector_t lba = cmd->t_task->t_task_lba;
+        unsigned int range;
+        int ret;
+
+        range = (cmd->data_length / DEV_ATTRIB(dev)->block_size);
+
+        printk(KERN_INFO "WRITE_SAME UNMAP: LBA: %llu Range: %u\n",
+                         (unsigned long long)lba, range);
+
+        ret = dev->transport->do_discard(dev, lba, range);
+        if (ret < 0) {
+                printk(KERN_INFO "blkdev_issue_discard() failed for WRITE_SAME\n");
+                return -1;
+        }
+
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+        return 0;
+}
+
+int
+transport_emulate_control_cdb(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned short service_action;
+        int ret = 0;
+
+        switch (cmd->t_task->t_task_cdb[0]) {
+        case INQUIRY:
+                ret = target_emulate_inquiry(cmd);
+                break;
+        case READ_CAPACITY:
+                ret = target_emulate_readcapacity(cmd);
+                break;
+        case MODE_SENSE:
+                ret = target_emulate_modesense(cmd, 0);
+                break;
+        case MODE_SENSE_10:
+                ret = target_emulate_modesense(cmd, 1);
+                break;
+        case SERVICE_ACTION_IN:
+                switch (cmd->t_task->t_task_cdb[1] & 0x1f) {
+                case SAI_READ_CAPACITY_16:
+                        ret = target_emulate_readcapacity_16(cmd);
+                        break;
+                default:
+                        printk(KERN_ERR "Unsupported SA: 0x%02x\n",
+                                cmd->t_task->t_task_cdb[1] & 0x1f);
+                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                }
+                break;
+        case REQUEST_SENSE:
+                ret = target_emulate_request_sense(cmd);
+                break;
+        case UNMAP:
+                if (!dev->transport->do_discard) {
+                        printk(KERN_ERR "UNMAP emulation not supported for: %s\n",
+                                        dev->transport->name);
+                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                }
+                ret = target_emulate_unmap(task);
+                break;
+        case WRITE_SAME_16:
+                if (!dev->transport->do_discard) {
+                        printk(KERN_ERR "WRITE_SAME_16 emulation not supported"
+                                        " for: %s\n", dev->transport->name);
+                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                }
+                ret = target_emulate_write_same(task);
+                break;
+        case VARIABLE_LENGTH_CMD:
+                service_action =
+                        get_unaligned_be16(&cmd->t_task->t_task_cdb[8]);
+                switch (service_action) {
+                case WRITE_SAME_32:
+                        if (!dev->transport->do_discard) {
+                                printk(KERN_ERR "WRITE_SAME_32 SA emulation not"
+                                        " supported for: %s\n",
+                                        dev->transport->name);
+                                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                        }
+                        ret = target_emulate_write_same(task);
+                        break;
+                default:
+                        printk(KERN_ERR "Unsupported VARIABLE_LENGTH_CMD SA:"
+                                        " 0x%02x\n", service_action);
+                        break;
+                }
+                break;
+        case SYNCHRONIZE_CACHE:
+        case 0x91: /* SYNCHRONIZE_CACHE_16: */
+                if (!dev->transport->do_sync_cache) {
+                        printk(KERN_ERR
+                                "SYNCHRONIZE_CACHE emulation not supported"
+                                " for: %s\n", dev->transport->name);
+                        return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                }
+                dev->transport->do_sync_cache(task);
+                break;
+        case ALLOW_MEDIUM_REMOVAL:
+        case ERASE:
+        case REZERO_UNIT:
+        case SEEK_10:
+        case SPACE:
+        case START_STOP:
+        case TEST_UNIT_READY:
+        case VERIFY:
+        case WRITE_FILEMARKS:
+                break;
+        default:
+                printk(KERN_ERR "Unsupported SCSI Opcode: 0x%02x for %s\n",
+                        cmd->t_task->t_task_cdb[0], dev->transport->name);
+                return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+        }
+
+        if (ret < 0)
+                return ret;
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
new file mode 100644
index 000000000000..2764510798b0
--- /dev/null
+++ b/drivers/target/target_core_configfs.c
@@ -0,0 +1,3225 @@
+/*******************************************************************************
+ * Filename:  target_core_configfs.c
+ *
+ * This file contains ConfigFS logic for the Generic Target Engine project.
+ *
+ * Copyright (c) 2008-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.org>
+ *
+ * based on configfs Copyright (C) 2005 Oracle.  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.
+ ****************************************************************************/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/version.h>
+#include <generated/utsrelease.h>
+#include <linux/utsname.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
+#include <linux/parser.h>
+#include <linux/syscalls.h>
+#include <linux/configfs.h>
+#include <linux/proc_fs.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_fabric_configfs.h>
+#include <target/target_core_configfs.h>
+#include <target/configfs_macros.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+#include "target_core_rd.h"
+
+static struct list_head g_tf_list;
+static struct mutex g_tf_lock;
+
+struct target_core_configfs_attribute {
+        struct configfs_attribute attr;
+        ssize_t (*show)(void *, char *);
+        ssize_t (*store)(void *, const char *, size_t);
+};
+
+static inline struct se_hba *
+item_to_hba(struct config_item *item)
+{
+        return container_of(to_config_group(item), struct se_hba, hba_group);
+}
+
+/*
+ * Attributes for /sys/kernel/config/target/
+ */
+static ssize_t target_core_attr_show(struct config_item *item,
+                                      struct configfs_attribute *attr,
+                                      char *page)
+{
+        return sprintf(page, "Target Engine Core ConfigFS Infrastructure %s"
+                " on %s/%s on "UTS_RELEASE"\n", TARGET_CORE_CONFIGFS_VERSION,
+                utsname()->sysname, utsname()->machine);
+}
+
+static struct configfs_item_operations target_core_fabric_item_ops = {
+        .show_attribute = target_core_attr_show,
+};
+
+static struct configfs_attribute target_core_item_attr_version = {
+        .ca_owner       = THIS_MODULE,
+        .ca_name        = "version",
+        .ca_mode        = S_IRUGO,
+};
+
+static struct target_fabric_configfs *target_core_get_fabric(
+        const char *name)
+{
+        struct target_fabric_configfs *tf;
+
+        if (!(name))
+                return NULL;
+
+        mutex_lock(&g_tf_lock);
+        list_for_each_entry(tf, &g_tf_list, tf_list) {
+                if (!(strcmp(tf->tf_name, name))) {
+                        atomic_inc(&tf->tf_access_cnt);
+                        mutex_unlock(&g_tf_lock);
+                        return tf;
+                }
+        }
+        mutex_unlock(&g_tf_lock);
+
+        return NULL;
+}
+
+/*
+ * Called from struct target_core_group_ops->make_group()
+ */
+static struct config_group *target_core_register_fabric(
+        struct config_group *group,
+        const char *name)
+{
+        struct target_fabric_configfs *tf;
+        int ret;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> group: %p name:"
+                        " %s\n", group, name);
+        /*
+         * Ensure that TCM subsystem plugins are loaded at this point for
+         * using the RAMDISK_DR virtual LUN 0 and all other struct se_port
+         * LUN symlinks.
+         */
+        if (transport_subsystem_check_init() < 0)
+                return ERR_PTR(-EINVAL);
+
+        /*
+         * Below are some hardcoded request_module() calls to automatically
+         * local fabric modules when the following is called:
+         *
+         * mkdir -p /sys/kernel/config/target/$MODULE_NAME
+         *
+         * Note that this does not limit which TCM fabric module can be
+         * registered, but simply provids auto loading logic for modules with
+         * mkdir(2) system calls with known TCM fabric modules.
+         */
+        if (!(strncmp(name, "iscsi", 5))) {
+                /*
+                 * Automatically load the LIO Target fabric module when the
+                 * following is called:
+                 *
+                 * mkdir -p $CONFIGFS/target/iscsi
+                 */
+                ret = request_module("iscsi_target_mod");
+                if (ret < 0) {
+                        printk(KERN_ERR "request_module() failed for"
+                                " iscsi_target_mod.ko: %d\n", ret);
+                        return ERR_PTR(-EINVAL);
+                }
+        } else if (!(strncmp(name, "loopback", 8))) {
+                /*
+                 * Automatically load the tcm_loop fabric module when the
+                 * following is called:
+                 *
+                 * mkdir -p $CONFIGFS/target/loopback
+                 */
+                ret = request_module("tcm_loop");
+                if (ret < 0) {
+                        printk(KERN_ERR "request_module() failed for"
+                                " tcm_loop.ko: %d\n", ret);
+                        return ERR_PTR(-EINVAL);
+                }
+        }
+
+        tf = target_core_get_fabric(name);
+        if (!(tf)) {
+                printk(KERN_ERR "target_core_get_fabric() failed for %s\n",
+                        name);
+                return ERR_PTR(-EINVAL);
+        }
+        printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> Located fabric:"
+                        " %s\n", tf->tf_name);
+        /*
+         * On a successful target_core_get_fabric() look, the returned
+         * struct target_fabric_configfs *tf will contain a usage reference.
+         */
+        printk(KERN_INFO "Target_Core_ConfigFS: REGISTER tfc_wwn_cit -> %p\n",
+                        &TF_CIT_TMPL(tf)->tfc_wwn_cit);
+
+        tf->tf_group.default_groups = tf->tf_default_groups;
+        tf->tf_group.default_groups[0] = &tf->tf_disc_group;
+        tf->tf_group.default_groups[1] = NULL;
+
+        config_group_init_type_name(&tf->tf_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_wwn_cit);
+        config_group_init_type_name(&tf->tf_disc_group, "discovery_auth",
+                        &TF_CIT_TMPL(tf)->tfc_discovery_cit);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> Allocated Fabric:"
+                        " %s\n", tf->tf_group.cg_item.ci_name);
+        /*
+         * Setup tf_ops.tf_subsys pointer for usage with configfs_depend_item()
+         */
+        tf->tf_ops.tf_subsys = tf->tf_subsys;
+        tf->tf_fabric = &tf->tf_group.cg_item;
+        printk(KERN_INFO "Target_Core_ConfigFS: REGISTER -> Set tf->tf_fabric"
+                        " for %s\n", name);
+
+        return &tf->tf_group;
+}
+
+/*
+ * Called from struct target_core_group_ops->drop_item()
+ */
+static void target_core_deregister_fabric(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct target_fabric_configfs *tf = container_of(
+                to_config_group(item), struct target_fabric_configfs, tf_group);
+        struct config_group *tf_group;
+        struct config_item *df_item;
+        int i;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: DEREGISTER -> Looking up %s in"
+                " tf list\n", config_item_name(item));
+
+        printk(KERN_INFO "Target_Core_ConfigFS: DEREGISTER -> located fabric:"
+                        " %s\n", tf->tf_name);
+        atomic_dec(&tf->tf_access_cnt);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: DEREGISTER -> Releasing"
+                        " tf->tf_fabric for %s\n", tf->tf_name);
+        tf->tf_fabric = NULL;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: DEREGISTER -> Releasing ci"
+                        " %s\n", config_item_name(item));
+
+        tf_group = &tf->tf_group;
+        for (i = 0; tf_group->default_groups[i]; i++) {
+                df_item = &tf_group->default_groups[i]->cg_item;
+                tf_group->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+        config_item_put(item);
+}
+
+static struct configfs_group_operations target_core_fabric_group_ops = {
+        .make_group     = &target_core_register_fabric,
+        .drop_item      = &target_core_deregister_fabric,
+};
+
+/*
+ * All item attributes appearing in /sys/kernel/target/ appear here.
+ */
+static struct configfs_attribute *target_core_fabric_item_attrs[] = {
+        &target_core_item_attr_version,
+        NULL,
+};
+
+/*
+ * Provides Fabrics Groups and Item Attributes for /sys/kernel/config/target/
+ */
+static struct config_item_type target_core_fabrics_item = {
+        .ct_item_ops    = &target_core_fabric_item_ops,
+        .ct_group_ops   = &target_core_fabric_group_ops,
+        .ct_attrs       = target_core_fabric_item_attrs,
+        .ct_owner       = THIS_MODULE,
+};
+
+static struct configfs_subsystem target_core_fabrics = {
+        .su_group = {
+                .cg_item = {
+                        .ci_namebuf = "target",
+                        .ci_type = &target_core_fabrics_item,
+                },
+        },
+};
+
+static struct configfs_subsystem *target_core_subsystem[] = {
+        &target_core_fabrics,
+        NULL,
+};
+
+/*##############################################################################
+// Start functions called by external Target Fabrics Modules
+//############################################################################*/
+
+/*
+ * First function called by fabric modules to:
+ *
+ * 1) Allocate a struct target_fabric_configfs and save the *fabric_cit pointer.
+ * 2) Add struct target_fabric_configfs to g_tf_list
+ * 3) Return struct target_fabric_configfs to fabric module to be passed
+ *    into target_fabric_configfs_register().
+ */
+struct target_fabric_configfs *target_fabric_configfs_init(
+        struct module *fabric_mod,
+        const char *name)
+{
+        struct target_fabric_configfs *tf;
+
+        if (!(fabric_mod)) {
+                printk(KERN_ERR "Missing struct module *fabric_mod pointer\n");
+                return NULL;
+        }
+        if (!(name)) {
+                printk(KERN_ERR "Unable to locate passed fabric name\n");
+                return NULL;
+        }
+        if (strlen(name) > TARGET_FABRIC_NAME_SIZE) {
+                printk(KERN_ERR "Passed name: %s exceeds TARGET_FABRIC"
+                        "_NAME_SIZE\n", name);
+                return NULL;
+        }
+
+        tf = kzalloc(sizeof(struct target_fabric_configfs), GFP_KERNEL);
+        if (!(tf))
+                return ERR_PTR(-ENOMEM);
+
+        INIT_LIST_HEAD(&tf->tf_list);
+        atomic_set(&tf->tf_access_cnt, 0);
+        /*
+         * Setup the default generic struct config_item_type's (cits) in
+         * struct target_fabric_configfs->tf_cit_tmpl
+         */
+        tf->tf_module = fabric_mod;
+        target_fabric_setup_cits(tf);
+
+        tf->tf_subsys = target_core_subsystem[0];
+        snprintf(tf->tf_name, TARGET_FABRIC_NAME_SIZE, "%s", name);
+
+        mutex_lock(&g_tf_lock);
+        list_add_tail(&tf->tf_list, &g_tf_list);
+        mutex_unlock(&g_tf_lock);
+
+        printk(KERN_INFO "<<<<<<<<<<<<<<<<<<<<<< BEGIN FABRIC API >>>>>>>>"
+                        ">>>>>>>>>>>>>>\n");
+        printk(KERN_INFO "Initialized struct target_fabric_configfs: %p for"
+                        " %s\n", tf, tf->tf_name);
+        return tf;
+}
+EXPORT_SYMBOL(target_fabric_configfs_init);
+
+/*
+ * Called by fabric plugins after FAILED target_fabric_configfs_register() call.
+ */
+void target_fabric_configfs_free(
+        struct target_fabric_configfs *tf)
+{
+        mutex_lock(&g_tf_lock);
+        list_del(&tf->tf_list);
+        mutex_unlock(&g_tf_lock);
+
+        kfree(tf);
+}
+EXPORT_SYMBOL(target_fabric_configfs_free);
+
+/*
+ * Perform a sanity check of the passed tf->tf_ops before completing
+ * TCM fabric module registration.
+ */
+static int target_fabric_tf_ops_check(
+        struct target_fabric_configfs *tf)
+{
+        struct target_core_fabric_ops *tfo = &tf->tf_ops;
+
+        if (!(tfo->get_fabric_name)) {
+                printk(KERN_ERR "Missing tfo->get_fabric_name()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->get_fabric_proto_ident)) {
+                printk(KERN_ERR "Missing tfo->get_fabric_proto_ident()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_wwn)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_wwn()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_tag)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_tag()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_default_depth)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_default_depth()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_pr_transport_id)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_pr_transport_id()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_pr_transport_id_len)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_pr_transport_id_len()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_check_demo_mode)) {
+                printk(KERN_ERR "Missing tfo->tpg_check_demo_mode()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_check_demo_mode_cache)) {
+                printk(KERN_ERR "Missing tfo->tpg_check_demo_mode_cache()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_check_demo_mode_write_protect)) {
+                printk(KERN_ERR "Missing tfo->tpg_check_demo_mode_write_protect()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_check_prod_mode_write_protect)) {
+                printk(KERN_ERR "Missing tfo->tpg_check_prod_mode_write_protect()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_alloc_fabric_acl)) {
+                printk(KERN_ERR "Missing tfo->tpg_alloc_fabric_acl()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_release_fabric_acl)) {
+                printk(KERN_ERR "Missing tfo->tpg_release_fabric_acl()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->tpg_get_inst_index)) {
+                printk(KERN_ERR "Missing tfo->tpg_get_inst_index()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->release_cmd_to_pool)) {
+                printk(KERN_ERR "Missing tfo->release_cmd_to_pool()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->release_cmd_direct)) {
+                printk(KERN_ERR "Missing tfo->release_cmd_direct()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->shutdown_session)) {
+                printk(KERN_ERR "Missing tfo->shutdown_session()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->close_session)) {
+                printk(KERN_ERR "Missing tfo->close_session()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->stop_session)) {
+                printk(KERN_ERR "Missing tfo->stop_session()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->fall_back_to_erl0)) {
+                printk(KERN_ERR "Missing tfo->fall_back_to_erl0()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->sess_logged_in)) {
+                printk(KERN_ERR "Missing tfo->sess_logged_in()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->sess_get_index)) {
+                printk(KERN_ERR "Missing tfo->sess_get_index()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->write_pending)) {
+                printk(KERN_ERR "Missing tfo->write_pending()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->write_pending_status)) {
+                printk(KERN_ERR "Missing tfo->write_pending_status()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->set_default_node_attributes)) {
+                printk(KERN_ERR "Missing tfo->set_default_node_attributes()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->get_task_tag)) {
+                printk(KERN_ERR "Missing tfo->get_task_tag()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->get_cmd_state)) {
+                printk(KERN_ERR "Missing tfo->get_cmd_state()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->new_cmd_failure)) {
+                printk(KERN_ERR "Missing tfo->new_cmd_failure()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->queue_data_in)) {
+                printk(KERN_ERR "Missing tfo->queue_data_in()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->queue_status)) {
+                printk(KERN_ERR "Missing tfo->queue_status()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->queue_tm_rsp)) {
+                printk(KERN_ERR "Missing tfo->queue_tm_rsp()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->set_fabric_sense_len)) {
+                printk(KERN_ERR "Missing tfo->set_fabric_sense_len()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->get_fabric_sense_len)) {
+                printk(KERN_ERR "Missing tfo->get_fabric_sense_len()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->is_state_remove)) {
+                printk(KERN_ERR "Missing tfo->is_state_remove()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->pack_lun)) {
+                printk(KERN_ERR "Missing tfo->pack_lun()\n");
+                return -EINVAL;
+        }
+        /*
+         * We at least require tfo->fabric_make_wwn(), tfo->fabric_drop_wwn()
+         * tfo->fabric_make_tpg() and tfo->fabric_drop_tpg() in
+         * target_core_fabric_configfs.c WWN+TPG group context code.
+         */
+        if (!(tfo->fabric_make_wwn)) {
+                printk(KERN_ERR "Missing tfo->fabric_make_wwn()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->fabric_drop_wwn)) {
+                printk(KERN_ERR "Missing tfo->fabric_drop_wwn()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->fabric_make_tpg)) {
+                printk(KERN_ERR "Missing tfo->fabric_make_tpg()\n");
+                return -EINVAL;
+        }
+        if (!(tfo->fabric_drop_tpg)) {
+                printk(KERN_ERR "Missing tfo->fabric_drop_tpg()\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * Called 2nd from fabric module with returned parameter of
+ * struct target_fabric_configfs * from target_fabric_configfs_init().
+ *
+ * Upon a successful registration, the new fabric's struct config_item is
+ * return.  Also, a pointer to this struct is set in the passed
+ * struct target_fabric_configfs.
+ */
+int target_fabric_configfs_register(
+        struct target_fabric_configfs *tf)
+{
+        struct config_group *su_group;
+        int ret;
+
+        if (!(tf)) {
+                printk(KERN_ERR "Unable to locate target_fabric_configfs"
+                        " pointer\n");
+                return -EINVAL;
+        }
+        if (!(tf->tf_subsys)) {
+                printk(KERN_ERR "Unable to target struct config_subsystem"
+                        " pointer\n");
+                return -EINVAL;
+        }
+        su_group = &tf->tf_subsys->su_group;
+        if (!(su_group)) {
+                printk(KERN_ERR "Unable to locate target struct config_group"
+                        " pointer\n");
+                return -EINVAL;
+        }
+        ret = target_fabric_tf_ops_check(tf);
+        if (ret < 0)
+                return ret;
+
+        printk(KERN_INFO "<<<<<<<<<<<<<<<<<<<<<< END FABRIC API >>>>>>>>>>>>"
+                ">>>>>>>>>>\n");
+        return 0;
+}
+EXPORT_SYMBOL(target_fabric_configfs_register);
+
+void target_fabric_configfs_deregister(
+        struct target_fabric_configfs *tf)
+{
+        struct config_group *su_group;
+        struct configfs_subsystem *su;
+
+        if (!(tf)) {
+                printk(KERN_ERR "Unable to locate passed target_fabric_"
+                        "configfs\n");
+                return;
+        }
+        su = tf->tf_subsys;
+        if (!(su)) {
+                printk(KERN_ERR "Unable to locate passed tf->tf_subsys"
+                        " pointer\n");
+                return;
+        }
+        su_group = &tf->tf_subsys->su_group;
+        if (!(su_group)) {
+                printk(KERN_ERR "Unable to locate target struct config_group"
+                        " pointer\n");
+                return;
+        }
+
+        printk(KERN_INFO "<<<<<<<<<<<<<<<<<<<<<< BEGIN FABRIC API >>>>>>>>>>"
+                        ">>>>>>>>>>>>\n");
+        mutex_lock(&g_tf_lock);
+        if (atomic_read(&tf->tf_access_cnt)) {
+                mutex_unlock(&g_tf_lock);
+                printk(KERN_ERR "Non zero tf->tf_access_cnt for fabric %s\n",
+                        tf->tf_name);
+                BUG();
+        }
+        list_del(&tf->tf_list);
+        mutex_unlock(&g_tf_lock);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: DEREGISTER -> Releasing tf:"
+                        " %s\n", tf->tf_name);
+        tf->tf_module = NULL;
+        tf->tf_subsys = NULL;
+        kfree(tf);
+
+        printk("<<<<<<<<<<<<<<<<<<<<<< END FABRIC API >>>>>>>>>>>>>>>>>"
+                        ">>>>>\n");
+        return;
+}
+EXPORT_SYMBOL(target_fabric_configfs_deregister);
+
+/*##############################################################################
+// Stop functions called by external Target Fabrics Modules
+//############################################################################*/
+
+/* Start functions for struct config_item_type target_core_dev_attrib_cit */
+
+#define DEF_DEV_ATTRIB_SHOW(_name)                                      \
+static ssize_t target_core_dev_show_attr_##_name(                       \
+        struct se_dev_attrib *da,                                       \
+        char *page)                                                     \
+{                                                                       \
+        struct se_device *dev;                                          \
+        struct se_subsystem_dev *se_dev = da->da_sub_dev;                       \
+        ssize_t rb;                                                     \
+                                                                        \
+        spin_lock(&se_dev->se_dev_lock);                                \
+        dev = se_dev->se_dev_ptr;                                       \
+        if (!(dev)) {                                                   \
+                spin_unlock(&se_dev->se_dev_lock);                      \
+                return -ENODEV;                                         \
+        }                                                               \
+        rb = snprintf(page, PAGE_SIZE, "%u\n", (u32)DEV_ATTRIB(dev)->_name); \
+        spin_unlock(&se_dev->se_dev_lock);                              \
+                                                                        \
+        return rb;                                                      \
+}
+
+#define DEF_DEV_ATTRIB_STORE(_name)                                     \
+static ssize_t target_core_dev_store_attr_##_name(                      \
+        struct se_dev_attrib *da,                                       \
+        const char *page,                                               \
+        size_t count)                                                   \
+{                                                                       \
+        struct se_device *dev;                                          \
+        struct se_subsystem_dev *se_dev = da->da_sub_dev;                       \
+        unsigned long val;                                              \
+        int ret;                                                        \
+                                                                        \
+        spin_lock(&se_dev->se_dev_lock);                                \
+        dev = se_dev->se_dev_ptr;                                       \
+        if (!(dev)) {                                                   \
+                spin_unlock(&se_dev->se_dev_lock);                      \
+                return -ENODEV;                                         \
+        }                                                               \
+        ret = strict_strtoul(page, 0, &val);                            \
+        if (ret < 0) {                                                  \
+                spin_unlock(&se_dev->se_dev_lock);                      \
+                printk(KERN_ERR "strict_strtoul() failed with"          \
+                        " ret: %d\n", ret);                             \
+                return -EINVAL;                                         \
+        }                                                               \
+        ret = se_dev_set_##_name(dev, (u32)val);                        \
+        spin_unlock(&se_dev->se_dev_lock);                              \
+                                                                        \
+        return (!ret) ? count : -EINVAL;                                \
+}
+
+#define DEF_DEV_ATTRIB(_name)                                           \
+DEF_DEV_ATTRIB_SHOW(_name);                                             \
+DEF_DEV_ATTRIB_STORE(_name);
+
+#define DEF_DEV_ATTRIB_RO(_name)                                        \
+DEF_DEV_ATTRIB_SHOW(_name);
+
+CONFIGFS_EATTR_STRUCT(target_core_dev_attrib, se_dev_attrib);
+#define SE_DEV_ATTR(_name, _mode)                                       \
+static struct target_core_dev_attrib_attribute                          \
+                        target_core_dev_attrib_##_name =                \
+                __CONFIGFS_EATTR(_name, _mode,                          \
+                target_core_dev_show_attr_##_name,                      \
+                target_core_dev_store_attr_##_name);
+
+#define SE_DEV_ATTR_RO(_name);                                          \
+static struct target_core_dev_attrib_attribute                          \
+                        target_core_dev_attrib_##_name =                \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        target_core_dev_show_attr_##_name);
+
+DEF_DEV_ATTRIB(emulate_dpo);
+SE_DEV_ATTR(emulate_dpo, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_fua_write);
+SE_DEV_ATTR(emulate_fua_write, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_fua_read);
+SE_DEV_ATTR(emulate_fua_read, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_write_cache);
+SE_DEV_ATTR(emulate_write_cache, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_ua_intlck_ctrl);
+SE_DEV_ATTR(emulate_ua_intlck_ctrl, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_tas);
+SE_DEV_ATTR(emulate_tas, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_tpu);
+SE_DEV_ATTR(emulate_tpu, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(emulate_tpws);
+SE_DEV_ATTR(emulate_tpws, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(enforce_pr_isids);
+SE_DEV_ATTR(enforce_pr_isids, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB_RO(hw_block_size);
+SE_DEV_ATTR_RO(hw_block_size);
+
+DEF_DEV_ATTRIB(block_size);
+SE_DEV_ATTR(block_size, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB_RO(hw_max_sectors);
+SE_DEV_ATTR_RO(hw_max_sectors);
+
+DEF_DEV_ATTRIB(max_sectors);
+SE_DEV_ATTR(max_sectors, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(optimal_sectors);
+SE_DEV_ATTR(optimal_sectors, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB_RO(hw_queue_depth);
+SE_DEV_ATTR_RO(hw_queue_depth);
+
+DEF_DEV_ATTRIB(queue_depth);
+SE_DEV_ATTR(queue_depth, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(task_timeout);
+SE_DEV_ATTR(task_timeout, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(max_unmap_lba_count);
+SE_DEV_ATTR(max_unmap_lba_count, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(max_unmap_block_desc_count);
+SE_DEV_ATTR(max_unmap_block_desc_count, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(unmap_granularity);
+SE_DEV_ATTR(unmap_granularity, S_IRUGO | S_IWUSR);
+
+DEF_DEV_ATTRIB(unmap_granularity_alignment);
+SE_DEV_ATTR(unmap_granularity_alignment, S_IRUGO | S_IWUSR);
+
+CONFIGFS_EATTR_OPS(target_core_dev_attrib, se_dev_attrib, da_group);
+
+static struct configfs_attribute *target_core_dev_attrib_attrs[] = {
+        &target_core_dev_attrib_emulate_dpo.attr,
+        &target_core_dev_attrib_emulate_fua_write.attr,
+        &target_core_dev_attrib_emulate_fua_read.attr,
+        &target_core_dev_attrib_emulate_write_cache.attr,
+        &target_core_dev_attrib_emulate_ua_intlck_ctrl.attr,
+        &target_core_dev_attrib_emulate_tas.attr,
+        &target_core_dev_attrib_emulate_tpu.attr,
+        &target_core_dev_attrib_emulate_tpws.attr,
+        &target_core_dev_attrib_enforce_pr_isids.attr,
+        &target_core_dev_attrib_hw_block_size.attr,
+        &target_core_dev_attrib_block_size.attr,
+        &target_core_dev_attrib_hw_max_sectors.attr,
+        &target_core_dev_attrib_max_sectors.attr,
+        &target_core_dev_attrib_optimal_sectors.attr,
+        &target_core_dev_attrib_hw_queue_depth.attr,
+        &target_core_dev_attrib_queue_depth.attr,
+        &target_core_dev_attrib_task_timeout.attr,
+        &target_core_dev_attrib_max_unmap_lba_count.attr,
+        &target_core_dev_attrib_max_unmap_block_desc_count.attr,
+        &target_core_dev_attrib_unmap_granularity.attr,
+        &target_core_dev_attrib_unmap_granularity_alignment.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_dev_attrib_ops = {
+        .show_attribute         = target_core_dev_attrib_attr_show,
+        .store_attribute        = target_core_dev_attrib_attr_store,
+};
+
+static struct config_item_type target_core_dev_attrib_cit = {
+        .ct_item_ops            = &target_core_dev_attrib_ops,
+        .ct_attrs               = target_core_dev_attrib_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_dev_attrib_cit */
+
+/*  Start functions for struct config_item_type target_core_dev_wwn_cit */
+
+CONFIGFS_EATTR_STRUCT(target_core_dev_wwn, t10_wwn);
+#define SE_DEV_WWN_ATTR(_name, _mode)                                   \
+static struct target_core_dev_wwn_attribute target_core_dev_wwn_##_name = \
+                __CONFIGFS_EATTR(_name, _mode,                          \
+                target_core_dev_wwn_show_attr_##_name,                  \
+                target_core_dev_wwn_store_attr_##_name);
+
+#define SE_DEV_WWN_ATTR_RO(_name);                                      \
+do {                                                                    \
+        static struct target_core_dev_wwn_attribute                     \
+                        target_core_dev_wwn_##_name =                   \
+                __CONFIGFS_EATTR_RO(_name,                              \
+                target_core_dev_wwn_show_attr_##_name);                 \
+} while (0);
+
+/*
+ * VPD page 0x80 Unit serial
+ */
+static ssize_t target_core_dev_wwn_show_attr_vpd_unit_serial(
+        struct t10_wwn *t10_wwn,
+        char *page)
+{
+        struct se_subsystem_dev *se_dev = t10_wwn->t10_sub_dev;
+        struct se_device *dev;
+
+        dev = se_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        return sprintf(page, "T10 VPD Unit Serial Number: %s\n",
+                &t10_wwn->unit_serial[0]);
+}
+
+static ssize_t target_core_dev_wwn_store_attr_vpd_unit_serial(
+        struct t10_wwn *t10_wwn,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *su_dev = t10_wwn->t10_sub_dev;
+        struct se_device *dev;
+        unsigned char buf[INQUIRY_VPD_SERIAL_LEN];
+
+        /*
+         * If Linux/SCSI subsystem_api_t plugin got a VPD Unit Serial
+         * from the struct scsi_device level firmware, do not allow
+         * VPD Unit Serial to be emulated.
+         *
+         * Note this struct scsi_device could also be emulating VPD
+         * information from its drivers/scsi LLD.  But for now we assume
+         * it is doing 'the right thing' wrt a world wide unique
+         * VPD Unit Serial Number that OS dependent multipath can depend on.
+         */
+        if (su_dev->su_dev_flags & SDF_FIRMWARE_VPD_UNIT_SERIAL) {
+                printk(KERN_ERR "Underlying SCSI device firmware provided VPD"
+                        " Unit Serial, ignoring request\n");
+                return -EOPNOTSUPP;
+        }
+
+        if ((strlen(page) + 1) > INQUIRY_VPD_SERIAL_LEN) {
+                printk(KERN_ERR "Emulated VPD Unit Serial exceeds"
+                " INQUIRY_VPD_SERIAL_LEN: %d\n", INQUIRY_VPD_SERIAL_LEN);
+                return -EOVERFLOW;
+        }
+        /*
+         * Check to see if any active $FABRIC_MOD exports exist.  If they
+         * do exist, fail here as changing this information on the fly
+         * (underneath the initiator side OS dependent multipath code)
+         * could cause negative effects.
+         */
+        dev = su_dev->se_dev_ptr;
+        if ((dev)) {
+                if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                        printk(KERN_ERR "Unable to set VPD Unit Serial while"
+                                " active %d $FABRIC_MOD exports exist\n",
+                                atomic_read(&dev->dev_export_obj.obj_access_count));
+                        return -EINVAL;
+                }
+        }
+        /*
+         * This currently assumes ASCII encoding for emulated VPD Unit Serial.
+         *
+         * Also, strip any newline added from the userspace
+         * echo $UUID > $TARGET/$HBA/$STORAGE_OBJECT/wwn/vpd_unit_serial
+         */
+        memset(buf, 0, INQUIRY_VPD_SERIAL_LEN);
+        snprintf(buf, INQUIRY_VPD_SERIAL_LEN, "%s", page);
+        snprintf(su_dev->t10_wwn.unit_serial, INQUIRY_VPD_SERIAL_LEN,
+                        "%s", strstrip(buf));
+        su_dev->su_dev_flags |= SDF_EMULATED_VPD_UNIT_SERIAL;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Set emulated VPD Unit Serial:"
+                        " %s\n", su_dev->t10_wwn.unit_serial);
+
+        return count;
+}
+
+SE_DEV_WWN_ATTR(vpd_unit_serial, S_IRUGO | S_IWUSR);
+
+/*
+ * VPD page 0x83 Protocol Identifier
+ */
+static ssize_t target_core_dev_wwn_show_attr_vpd_protocol_identifier(
+        struct t10_wwn *t10_wwn,
+        char *page)
+{
+        struct se_subsystem_dev *se_dev = t10_wwn->t10_sub_dev;
+        struct se_device *dev;
+        struct t10_vpd *vpd;
+        unsigned char buf[VPD_TMP_BUF_SIZE];
+        ssize_t len = 0;
+
+        dev = se_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        memset(buf, 0, VPD_TMP_BUF_SIZE);
+
+        spin_lock(&t10_wwn->t10_vpd_lock);
+        list_for_each_entry(vpd, &t10_wwn->t10_vpd_list, vpd_list) {
+                if (!(vpd->protocol_identifier_set))
+                        continue;
+
+                transport_dump_vpd_proto_id(vpd, buf, VPD_TMP_BUF_SIZE);
+
+                if ((len + strlen(buf) > PAGE_SIZE))
+                        break;
+
+                len += sprintf(page+len, "%s", buf);
+        }
+        spin_unlock(&t10_wwn->t10_vpd_lock);
+
+        return len;
+}
+
+static ssize_t target_core_dev_wwn_store_attr_vpd_protocol_identifier(
+        struct t10_wwn *t10_wwn,
+        const char *page,
+        size_t count)
+{
+        return -ENOSYS;
+}
+
+SE_DEV_WWN_ATTR(vpd_protocol_identifier, S_IRUGO | S_IWUSR);
+
+/*
+ * Generic wrapper for dumping VPD identifiers by association.
+ */
+#define DEF_DEV_WWN_ASSOC_SHOW(_name, _assoc)                           \
+static ssize_t target_core_dev_wwn_show_attr_##_name(                   \
+        struct t10_wwn *t10_wwn,                                        \
+        char *page)                                                     \
+{                                                                       \
+        struct se_subsystem_dev *se_dev = t10_wwn->t10_sub_dev;         \
+        struct se_device *dev;                                          \
+        struct t10_vpd *vpd;                                                    \
+        unsigned char buf[VPD_TMP_BUF_SIZE];                            \
+        ssize_t len = 0;                                                \
+                                                                        \
+        dev = se_dev->se_dev_ptr;                                       \
+        if (!(dev))                                                     \
+                return -ENODEV;                                         \
+                                                                        \
+        spin_lock(&t10_wwn->t10_vpd_lock);                              \
+        list_for_each_entry(vpd, &t10_wwn->t10_vpd_list, vpd_list) {    \
+                if (vpd->association != _assoc)                         \
+                        continue;                                       \
+                                                                        \
+                memset(buf, 0, VPD_TMP_BUF_SIZE);                       \
+                transport_dump_vpd_assoc(vpd, buf, VPD_TMP_BUF_SIZE);   \
+                if ((len + strlen(buf) > PAGE_SIZE))                    \
+                        break;                                          \
+                len += sprintf(page+len, "%s", buf);                    \
+                                                                        \
+                memset(buf, 0, VPD_TMP_BUF_SIZE);                       \
+                transport_dump_vpd_ident_type(vpd, buf, VPD_TMP_BUF_SIZE); \
+                if ((len + strlen(buf) > PAGE_SIZE))                    \
+                        break;                                          \
+                len += sprintf(page+len, "%s", buf);                    \
+                                                                        \
+                memset(buf, 0, VPD_TMP_BUF_SIZE);                       \
+                transport_dump_vpd_ident(vpd, buf, VPD_TMP_BUF_SIZE); \
+                if ((len + strlen(buf) > PAGE_SIZE))                    \
+                        break;                                          \
+                len += sprintf(page+len, "%s", buf);                    \
+        }                                                               \
+        spin_unlock(&t10_wwn->t10_vpd_lock);                            \
+                                                                        \
+        return len;                                                     \
+}
+
+/*
+ * VPD page 0x83 Assoication: Logical Unit
+ */
+DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_logical_unit, 0x00);
+
+static ssize_t target_core_dev_wwn_store_attr_vpd_assoc_logical_unit(
+        struct t10_wwn *t10_wwn,
+        const char *page,
+        size_t count)
+{
+        return -ENOSYS;
+}
+
+SE_DEV_WWN_ATTR(vpd_assoc_logical_unit, S_IRUGO | S_IWUSR);
+
+/*
+ * VPD page 0x83 Association: Target Port
+ */
+DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_target_port, 0x10);
+
+static ssize_t target_core_dev_wwn_store_attr_vpd_assoc_target_port(
+        struct t10_wwn *t10_wwn,
+        const char *page,
+        size_t count)
+{
+        return -ENOSYS;
+}
+
+SE_DEV_WWN_ATTR(vpd_assoc_target_port, S_IRUGO | S_IWUSR);
+
+/*
+ * VPD page 0x83 Association: SCSI Target Device
+ */
+DEF_DEV_WWN_ASSOC_SHOW(vpd_assoc_scsi_target_device, 0x20);
+
+static ssize_t target_core_dev_wwn_store_attr_vpd_assoc_scsi_target_device(
+        struct t10_wwn *t10_wwn,
+        const char *page,
+        size_t count)
+{
+        return -ENOSYS;
+}
+
+SE_DEV_WWN_ATTR(vpd_assoc_scsi_target_device, S_IRUGO | S_IWUSR);
+
+CONFIGFS_EATTR_OPS(target_core_dev_wwn, t10_wwn, t10_wwn_group);
+
+static struct configfs_attribute *target_core_dev_wwn_attrs[] = {
+        &target_core_dev_wwn_vpd_unit_serial.attr,
+        &target_core_dev_wwn_vpd_protocol_identifier.attr,
+        &target_core_dev_wwn_vpd_assoc_logical_unit.attr,
+        &target_core_dev_wwn_vpd_assoc_target_port.attr,
+        &target_core_dev_wwn_vpd_assoc_scsi_target_device.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_dev_wwn_ops = {
+        .show_attribute         = target_core_dev_wwn_attr_show,
+        .store_attribute        = target_core_dev_wwn_attr_store,
+};
+
+static struct config_item_type target_core_dev_wwn_cit = {
+        .ct_item_ops            = &target_core_dev_wwn_ops,
+        .ct_attrs               = target_core_dev_wwn_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/*  End functions for struct config_item_type target_core_dev_wwn_cit */
+
+/*  Start functions for struct config_item_type target_core_dev_pr_cit */
+
+CONFIGFS_EATTR_STRUCT(target_core_dev_pr, se_subsystem_dev);
+#define SE_DEV_PR_ATTR(_name, _mode)                                    \
+static struct target_core_dev_pr_attribute target_core_dev_pr_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        target_core_dev_pr_show_attr_##_name,                           \
+        target_core_dev_pr_store_attr_##_name);
+
+#define SE_DEV_PR_ATTR_RO(_name);                                       \
+static struct target_core_dev_pr_attribute target_core_dev_pr_##_name = \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        target_core_dev_pr_show_attr_##_name);
+
+/*
+ * res_holder
+ */
+static ssize_t target_core_dev_pr_show_spc3_res(
+        struct se_device *dev,
+        char *page,
+        ssize_t *len)
+{
+        struct se_node_acl *se_nacl;
+        struct t10_pr_registration *pr_reg;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_reg = dev->dev_pr_res_holder;
+        if (!(pr_reg)) {
+                *len += sprintf(page + *len, "No SPC-3 Reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                return *len;
+        }
+        se_nacl = pr_reg->pr_reg_nacl;
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+
+        *len += sprintf(page + *len, "SPC-3 Reservation: %s Initiator: %s%s\n",
+                TPG_TFO(se_nacl->se_tpg)->get_fabric_name(),
+                se_nacl->initiatorname, (prf_isid) ? &i_buf[0] : "");
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return *len;
+}
+
+static ssize_t target_core_dev_pr_show_spc2_res(
+        struct se_device *dev,
+        char *page,
+        ssize_t *len)
+{
+        struct se_node_acl *se_nacl;
+
+        spin_lock(&dev->dev_reservation_lock);
+        se_nacl = dev->dev_reserved_node_acl;
+        if (!(se_nacl)) {
+                *len += sprintf(page + *len, "No SPC-2 Reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                return *len;
+        }
+        *len += sprintf(page + *len, "SPC-2 Reservation: %s Initiator: %s\n",
+                TPG_TFO(se_nacl->se_tpg)->get_fabric_name(),
+                se_nacl->initiatorname);
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return *len;
+}
+
+static ssize_t target_core_dev_pr_show_attr_res_holder(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        ssize_t len = 0;
+
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        switch (T10_RES(su_dev)->res_type) {
+        case SPC3_PERSISTENT_RESERVATIONS:
+                target_core_dev_pr_show_spc3_res(su_dev->se_dev_ptr,
+                                page, &len);
+                break;
+        case SPC2_RESERVATIONS:
+                target_core_dev_pr_show_spc2_res(su_dev->se_dev_ptr,
+                                page, &len);
+                break;
+        case SPC_PASSTHROUGH:
+                len += sprintf(page+len, "Passthrough\n");
+                break;
+        default:
+                len += sprintf(page+len, "Unknown\n");
+                break;
+        }
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_holder);
+
+/*
+ * res_pr_all_tgt_pts
+ */
+static ssize_t target_core_dev_pr_show_attr_res_pr_all_tgt_pts(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        struct se_device *dev;
+        struct t10_pr_registration *pr_reg;
+        ssize_t len = 0;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return len;
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_reg = dev->dev_pr_res_holder;
+        if (!(pr_reg)) {
+                len = sprintf(page, "No SPC-3 Reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                return len;
+        }
+        /*
+         * See All Target Ports (ALL_TG_PT) bit in spcr17, section 6.14.3
+         * Basic PERSISTENT RESERVER OUT parameter list, page 290
+         */
+        if (pr_reg->pr_reg_all_tg_pt)
+                len = sprintf(page, "SPC-3 Reservation: All Target"
+                        " Ports registration\n");
+        else
+                len = sprintf(page, "SPC-3 Reservation: Single"
+                        " Target Port registration\n");
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_pr_all_tgt_pts);
+
+/*
+ * res_pr_generation
+ */
+static ssize_t target_core_dev_pr_show_attr_res_pr_generation(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return 0;
+
+        return sprintf(page, "0x%08x\n", T10_RES(su_dev)->pr_generation);
+}
+
+SE_DEV_PR_ATTR_RO(res_pr_generation);
+
+/*
+ * res_pr_holder_tg_port
+ */
+static ssize_t target_core_dev_pr_show_attr_res_pr_holder_tg_port(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        struct se_device *dev;
+        struct se_node_acl *se_nacl;
+        struct se_lun *lun;
+        struct se_portal_group *se_tpg;
+        struct t10_pr_registration *pr_reg;
+        struct target_core_fabric_ops *tfo;
+        ssize_t len = 0;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return len;
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_reg = dev->dev_pr_res_holder;
+        if (!(pr_reg)) {
+                len = sprintf(page, "No SPC-3 Reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                return len;
+        }
+        se_nacl = pr_reg->pr_reg_nacl;
+        se_tpg = se_nacl->se_tpg;
+        lun = pr_reg->pr_reg_tg_pt_lun;
+        tfo = TPG_TFO(se_tpg);
+
+        len += sprintf(page+len, "SPC-3 Reservation: %s"
+                " Target Node Endpoint: %s\n", tfo->get_fabric_name(),
+                tfo->tpg_get_wwn(se_tpg));
+        len += sprintf(page+len, "SPC-3 Reservation: Relative Port"
+                " Identifer Tag: %hu %s Portal Group Tag: %hu"
+                " %s Logical Unit: %u\n", lun->lun_sep->sep_rtpi,
+                tfo->get_fabric_name(), tfo->tpg_get_tag(se_tpg),
+                tfo->get_fabric_name(), lun->unpacked_lun);
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_pr_holder_tg_port);
+
+/*
+ * res_pr_registered_i_pts
+ */
+static ssize_t target_core_dev_pr_show_attr_res_pr_registered_i_pts(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        struct target_core_fabric_ops *tfo;
+        struct t10_pr_registration *pr_reg;
+        unsigned char buf[384];
+        char i_buf[PR_REG_ISID_ID_LEN];
+        ssize_t len = 0;
+        int reg_count = 0, prf_isid;
+
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return len;
+
+        len += sprintf(page+len, "SPC-3 PR Registrations:\n");
+
+        spin_lock(&T10_RES(su_dev)->registration_lock);
+        list_for_each_entry(pr_reg, &T10_RES(su_dev)->registration_list,
+                        pr_reg_list) {
+
+                memset(buf, 0, 384);
+                memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+                tfo = pr_reg->pr_reg_nacl->se_tpg->se_tpg_tfo;
+                prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                        PR_REG_ISID_ID_LEN);
+                sprintf(buf, "%s Node: %s%s Key: 0x%016Lx PRgen: 0x%08x\n",
+                        tfo->get_fabric_name(),
+                        pr_reg->pr_reg_nacl->initiatorname, (prf_isid) ?
+                        &i_buf[0] : "", pr_reg->pr_res_key,
+                        pr_reg->pr_res_generation);
+
+                if ((len + strlen(buf) > PAGE_SIZE))
+                        break;
+
+                len += sprintf(page+len, "%s", buf);
+                reg_count++;
+        }
+        spin_unlock(&T10_RES(su_dev)->registration_lock);
+
+        if (!(reg_count))
+                len += sprintf(page+len, "None\n");
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_pr_registered_i_pts);
+
+/*
+ * res_pr_type
+ */
+static ssize_t target_core_dev_pr_show_attr_res_pr_type(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        struct se_device *dev;
+        struct t10_pr_registration *pr_reg;
+        ssize_t len = 0;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return len;
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_reg = dev->dev_pr_res_holder;
+        if (!(pr_reg)) {
+                len = sprintf(page, "No SPC-3 Reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                return len;
+        }
+        len = sprintf(page, "SPC-3 Reservation Type: %s\n",
+                core_scsi3_pr_dump_type(pr_reg->pr_res_type));
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_pr_type);
+
+/*
+ * res_type
+ */
+static ssize_t target_core_dev_pr_show_attr_res_type(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        ssize_t len = 0;
+
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        switch (T10_RES(su_dev)->res_type) {
+        case SPC3_PERSISTENT_RESERVATIONS:
+                len = sprintf(page, "SPC3_PERSISTENT_RESERVATIONS\n");
+                break;
+        case SPC2_RESERVATIONS:
+                len = sprintf(page, "SPC2_RESERVATIONS\n");
+                break;
+        case SPC_PASSTHROUGH:
+                len = sprintf(page, "SPC_PASSTHROUGH\n");
+                break;
+        default:
+                len = sprintf(page, "UNKNOWN\n");
+                break;
+        }
+
+        return len;
+}
+
+SE_DEV_PR_ATTR_RO(res_type);
+
+/*
+ * res_aptpl_active
+ */
+
+static ssize_t target_core_dev_pr_show_attr_res_aptpl_active(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return 0;
+
+        return sprintf(page, "APTPL Bit Status: %s\n",
+                (T10_RES(su_dev)->pr_aptpl_active) ? "Activated" : "Disabled");
+}
+
+SE_DEV_PR_ATTR_RO(res_aptpl_active);
+
+/*
+ * res_aptpl_metadata
+ */
+static ssize_t target_core_dev_pr_show_attr_res_aptpl_metadata(
+        struct se_subsystem_dev *su_dev,
+        char *page)
+{
+        if (!(su_dev->se_dev_ptr))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return 0;
+
+        return sprintf(page, "Ready to process PR APTPL metadata..\n");
+}
+
+enum {
+        Opt_initiator_fabric, Opt_initiator_node, Opt_initiator_sid,
+        Opt_sa_res_key, Opt_res_holder, Opt_res_type, Opt_res_scope,
+        Opt_res_all_tg_pt, Opt_mapped_lun, Opt_target_fabric,
+        Opt_target_node, Opt_tpgt, Opt_port_rtpi, Opt_target_lun, Opt_err
+};
+
+static match_table_t tokens = {
+        {Opt_initiator_fabric, "initiator_fabric=%s"},
+        {Opt_initiator_node, "initiator_node=%s"},
+        {Opt_initiator_sid, "initiator_sid=%s"},
+        {Opt_sa_res_key, "sa_res_key=%s"},
+        {Opt_res_holder, "res_holder=%d"},
+        {Opt_res_type, "res_type=%d"},
+        {Opt_res_scope, "res_scope=%d"},
+        {Opt_res_all_tg_pt, "res_all_tg_pt=%d"},
+        {Opt_mapped_lun, "mapped_lun=%d"},
+        {Opt_target_fabric, "target_fabric=%s"},
+        {Opt_target_node, "target_node=%s"},
+        {Opt_tpgt, "tpgt=%d"},
+        {Opt_port_rtpi, "port_rtpi=%d"},
+        {Opt_target_lun, "target_lun=%d"},
+        {Opt_err, NULL}
+};
+
+static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata(
+        struct se_subsystem_dev *su_dev,
+        const char *page,
+        size_t count)
+{
+        struct se_device *dev;
+        unsigned char *i_fabric, *t_fabric, *i_port = NULL, *t_port = NULL;
+        unsigned char *isid = NULL;
+        char *orig, *ptr, *arg_p, *opts;
+        substring_t args[MAX_OPT_ARGS];
+        unsigned long long tmp_ll;
+        u64 sa_res_key = 0;
+        u32 mapped_lun = 0, target_lun = 0;
+        int ret = -1, res_holder = 0, all_tg_pt = 0, arg, token;
+        u16 port_rpti = 0, tpgt = 0;
+        u8 type = 0, scope;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return 0;
+
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_INFO "Unable to process APTPL metadata while"
+                        " active fabric exports exist\n");
+                return -EINVAL;
+        }
+
+        opts = kstrdup(page, GFP_KERNEL);
+        if (!opts)
+                return -ENOMEM;
+
+        orig = opts;
+        while ((ptr = strsep(&opts, ",")) != NULL) {
+                if (!*ptr)
+                        continue;
+
+                token = match_token(ptr, tokens, args);
+                switch (token) {
+                case Opt_initiator_fabric:
+                        i_fabric = match_strdup(&args[0]);
+                        break;
+                case Opt_initiator_node:
+                        i_port = match_strdup(&args[0]);
+                        if (strlen(i_port) > PR_APTPL_MAX_IPORT_LEN) {
+                                printk(KERN_ERR "APTPL metadata initiator_node="
+                                        " exceeds PR_APTPL_MAX_IPORT_LEN: %d\n",
+                                        PR_APTPL_MAX_IPORT_LEN);
+                                ret = -EINVAL;
+                                break;
+                        }
+                        break;
+                case Opt_initiator_sid:
+                        isid = match_strdup(&args[0]);
+                        if (strlen(isid) > PR_REG_ISID_LEN) {
+                                printk(KERN_ERR "APTPL metadata initiator_isid"
+                                        "= exceeds PR_REG_ISID_LEN: %d\n",
+                                        PR_REG_ISID_LEN);
+                                ret = -EINVAL;
+                                break;
+                        }
+                        break;
+                case Opt_sa_res_key:
+                        arg_p = match_strdup(&args[0]);
+                        ret = strict_strtoull(arg_p, 0, &tmp_ll);
+                        if (ret < 0) {
+                                printk(KERN_ERR "strict_strtoull() failed for"
+                                        " sa_res_key=\n");
+                                goto out;
+                        }
+                        sa_res_key = (u64)tmp_ll;
+                        break;
+                /*
+                 * PR APTPL Metadata for Reservation
+                 */
+                case Opt_res_holder:
+                        match_int(args, &arg);
+                        res_holder = arg;
+                        break;
+                case Opt_res_type:
+                        match_int(args, &arg);
+                        type = (u8)arg;
+                        break;
+                case Opt_res_scope:
+                        match_int(args, &arg);
+                        scope = (u8)arg;
+                        break;
+                case Opt_res_all_tg_pt:
+                        match_int(args, &arg);
+                        all_tg_pt = (int)arg;
+                        break;
+                case Opt_mapped_lun:
+                        match_int(args, &arg);
+                        mapped_lun = (u32)arg;
+                        break;
+                /*
+                 * PR APTPL Metadata for Target Port
+                 */
+                case Opt_target_fabric:
+                        t_fabric = match_strdup(&args[0]);
+                        break;
+                case Opt_target_node:
+                        t_port = match_strdup(&args[0]);
+                        if (strlen(t_port) > PR_APTPL_MAX_TPORT_LEN) {
+                                printk(KERN_ERR "APTPL metadata target_node="
+                                        " exceeds PR_APTPL_MAX_TPORT_LEN: %d\n",
+                                        PR_APTPL_MAX_TPORT_LEN);
+                                ret = -EINVAL;
+                                break;
+                        }
+                        break;
+                case Opt_tpgt:
+                        match_int(args, &arg);
+                        tpgt = (u16)arg;
+                        break;
+                case Opt_port_rtpi:
+                        match_int(args, &arg);
+                        port_rpti = (u16)arg;
+                        break;
+                case Opt_target_lun:
+                        match_int(args, &arg);
+                        target_lun = (u32)arg;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        if (!(i_port) || !(t_port) || !(sa_res_key)) {
+                printk(KERN_ERR "Illegal parameters for APTPL registration\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (res_holder && !(type)) {
+                printk(KERN_ERR "Illegal PR type: 0x%02x for reservation"
+                                " holder\n", type);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = core_scsi3_alloc_aptpl_registration(T10_RES(su_dev), sa_res_key,
+                        i_port, isid, mapped_lun, t_port, tpgt, target_lun,
+                        res_holder, all_tg_pt, type);
+out:
+        kfree(orig);
+        return (ret == 0) ? count : ret;
+}
+
+SE_DEV_PR_ATTR(res_aptpl_metadata, S_IRUGO | S_IWUSR);
+
+CONFIGFS_EATTR_OPS(target_core_dev_pr, se_subsystem_dev, se_dev_pr_group);
+
+static struct configfs_attribute *target_core_dev_pr_attrs[] = {
+        &target_core_dev_pr_res_holder.attr,
+        &target_core_dev_pr_res_pr_all_tgt_pts.attr,
+        &target_core_dev_pr_res_pr_generation.attr,
+        &target_core_dev_pr_res_pr_holder_tg_port.attr,
+        &target_core_dev_pr_res_pr_registered_i_pts.attr,
+        &target_core_dev_pr_res_pr_type.attr,
+        &target_core_dev_pr_res_type.attr,
+        &target_core_dev_pr_res_aptpl_active.attr,
+        &target_core_dev_pr_res_aptpl_metadata.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_dev_pr_ops = {
+        .show_attribute         = target_core_dev_pr_attr_show,
+        .store_attribute        = target_core_dev_pr_attr_store,
+};
+
+static struct config_item_type target_core_dev_pr_cit = {
+        .ct_item_ops            = &target_core_dev_pr_ops,
+        .ct_attrs               = target_core_dev_pr_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/*  End functions for struct config_item_type target_core_dev_pr_cit */
+
+/*  Start functions for struct config_item_type target_core_dev_cit */
+
+static ssize_t target_core_show_dev_info(void *p, char *page)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+        struct se_hba *hba = se_dev->se_dev_hba;
+        struct se_subsystem_api *t = hba->transport;
+        int bl = 0;
+        ssize_t read_bytes = 0;
+
+        if (!(se_dev->se_dev_ptr))
+                return -ENODEV;
+
+        transport_dump_dev_state(se_dev->se_dev_ptr, page, &bl);
+        read_bytes += bl;
+        read_bytes += t->show_configfs_dev_params(hba, se_dev, page+read_bytes);
+        return read_bytes;
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_info = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "info",
+                    .ca_mode = S_IRUGO },
+        .show   = target_core_show_dev_info,
+        .store  = NULL,
+};
+
+static ssize_t target_core_store_dev_control(
+        void *p,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+        struct se_hba *hba = se_dev->se_dev_hba;
+        struct se_subsystem_api *t = hba->transport;
+
+        if (!(se_dev->se_dev_su_ptr)) {
+                printk(KERN_ERR "Unable to locate struct se_subsystem_dev>se"
+                                "_dev_su_ptr\n");
+                return -EINVAL;
+        }
+
+        return t->set_configfs_dev_params(hba, se_dev, page, count);
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_control = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "control",
+                    .ca_mode = S_IWUSR },
+        .show   = NULL,
+        .store  = target_core_store_dev_control,
+};
+
+static ssize_t target_core_show_dev_alias(void *p, char *page)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+
+        if (!(se_dev->su_dev_flags & SDF_USING_ALIAS))
+                return 0;
+
+        return snprintf(page, PAGE_SIZE, "%s\n", se_dev->se_dev_alias);
+}
+
+static ssize_t target_core_store_dev_alias(
+        void *p,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+        struct se_hba *hba = se_dev->se_dev_hba;
+        ssize_t read_bytes;
+
+        if (count > (SE_DEV_ALIAS_LEN-1)) {
+                printk(KERN_ERR "alias count: %d exceeds"
+                        " SE_DEV_ALIAS_LEN-1: %u\n", (int)count,
+                        SE_DEV_ALIAS_LEN-1);
+                return -EINVAL;
+        }
+
+        se_dev->su_dev_flags |= SDF_USING_ALIAS;
+        read_bytes = snprintf(&se_dev->se_dev_alias[0], SE_DEV_ALIAS_LEN,
+                        "%s", page);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: %s/%s set alias: %s\n",
+                config_item_name(&hba->hba_group.cg_item),
+                config_item_name(&se_dev->se_dev_group.cg_item),
+                se_dev->se_dev_alias);
+
+        return read_bytes;
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_alias = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "alias",
+                    .ca_mode =  S_IRUGO | S_IWUSR },
+        .show   = target_core_show_dev_alias,
+        .store  = target_core_store_dev_alias,
+};
+
+static ssize_t target_core_show_dev_udev_path(void *p, char *page)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+
+        if (!(se_dev->su_dev_flags & SDF_USING_UDEV_PATH))
+                return 0;
+
+        return snprintf(page, PAGE_SIZE, "%s\n", se_dev->se_dev_udev_path);
+}
+
+static ssize_t target_core_store_dev_udev_path(
+        void *p,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+        struct se_hba *hba = se_dev->se_dev_hba;
+        ssize_t read_bytes;
+
+        if (count > (SE_UDEV_PATH_LEN-1)) {
+                printk(KERN_ERR "udev_path count: %d exceeds"
+                        " SE_UDEV_PATH_LEN-1: %u\n", (int)count,
+                        SE_UDEV_PATH_LEN-1);
+                return -EINVAL;
+        }
+
+        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
+        read_bytes = snprintf(&se_dev->se_dev_udev_path[0], SE_UDEV_PATH_LEN,
+                        "%s", page);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: %s/%s set udev_path: %s\n",
+                config_item_name(&hba->hba_group.cg_item),
+                config_item_name(&se_dev->se_dev_group.cg_item),
+                se_dev->se_dev_udev_path);
+
+        return read_bytes;
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_udev_path = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "udev_path",
+                    .ca_mode =  S_IRUGO | S_IWUSR },
+        .show   = target_core_show_dev_udev_path,
+        .store  = target_core_store_dev_udev_path,
+};
+
+static ssize_t target_core_store_dev_enable(
+        void *p,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *se_dev = (struct se_subsystem_dev *)p;
+        struct se_device *dev;
+        struct se_hba *hba = se_dev->se_dev_hba;
+        struct se_subsystem_api *t = hba->transport;
+        char *ptr;
+
+        ptr = strstr(page, "1");
+        if (!(ptr)) {
+                printk(KERN_ERR "For dev_enable ops, only valid value"
+                                " is \"1\"\n");
+                return -EINVAL;
+        }
+        if ((se_dev->se_dev_ptr)) {
+                printk(KERN_ERR "se_dev->se_dev_ptr already set for storage"
+                                " object\n");
+                return -EEXIST;
+        }
+
+        if (t->check_configfs_dev_params(hba, se_dev) < 0)
+                return -EINVAL;
+
+        dev = t->create_virtdevice(hba, se_dev, se_dev->se_dev_su_ptr);
+        if (!(dev) || IS_ERR(dev))
+                return -EINVAL;
+
+        se_dev->se_dev_ptr = dev;
+        printk(KERN_INFO "Target_Core_ConfigFS: Registered se_dev->se_dev_ptr:"
+                " %p\n", se_dev->se_dev_ptr);
+
+        return count;
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_enable = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "enable",
+                    .ca_mode = S_IWUSR },
+        .show   = NULL,
+        .store  = target_core_store_dev_enable,
+};
+
+static ssize_t target_core_show_alua_lu_gp(void *p, char *page)
+{
+        struct se_device *dev;
+        struct se_subsystem_dev *su_dev = (struct se_subsystem_dev *)p;
+        struct config_item *lu_ci;
+        struct t10_alua_lu_gp *lu_gp;
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+        ssize_t len = 0;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_ALUA(su_dev)->alua_type != SPC3_ALUA_EMULATED)
+                return len;
+
+        lu_gp_mem = dev->dev_alua_lu_gp_mem;
+        if (!(lu_gp_mem)) {
+                printk(KERN_ERR "NULL struct se_device->dev_alua_lu_gp_mem"
+                                " pointer\n");
+                return -EINVAL;
+        }
+
+        spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+        lu_gp = lu_gp_mem->lu_gp;
+        if ((lu_gp)) {
+                lu_ci = &lu_gp->lu_gp_group.cg_item;
+                len += sprintf(page, "LU Group Alias: %s\nLU Group ID: %hu\n",
+                        config_item_name(lu_ci), lu_gp->lu_gp_id);
+        }
+        spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+        return len;
+}
+
+static ssize_t target_core_store_alua_lu_gp(
+        void *p,
+        const char *page,
+        size_t count)
+{
+        struct se_device *dev;
+        struct se_subsystem_dev *su_dev = (struct se_subsystem_dev *)p;
+        struct se_hba *hba = su_dev->se_dev_hba;
+        struct t10_alua_lu_gp *lu_gp = NULL, *lu_gp_new = NULL;
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+        unsigned char buf[LU_GROUP_NAME_BUF];
+        int move = 0;
+
+        dev = su_dev->se_dev_ptr;
+        if (!(dev))
+                return -ENODEV;
+
+        if (T10_ALUA(su_dev)->alua_type != SPC3_ALUA_EMULATED) {
+                printk(KERN_WARNING "SPC3_ALUA_EMULATED not enabled for %s/%s\n",
+                        config_item_name(&hba->hba_group.cg_item),
+                        config_item_name(&su_dev->se_dev_group.cg_item));
+                return -EINVAL;
+        }
+        if (count > LU_GROUP_NAME_BUF) {
+                printk(KERN_ERR "ALUA LU Group Alias too large!\n");
+                return -EINVAL;
+        }
+        memset(buf, 0, LU_GROUP_NAME_BUF);
+        memcpy(buf, page, count);
+        /*
+         * Any ALUA logical unit alias besides "NULL" means we will be
+         * making a new group association.
+         */
+        if (strcmp(strstrip(buf), "NULL")) {
+                /*
+                 * core_alua_get_lu_gp_by_name() will increment reference to
+                 * struct t10_alua_lu_gp.  This reference is released with
+                 * core_alua_get_lu_gp_by_name below().
+                 */
+                lu_gp_new = core_alua_get_lu_gp_by_name(strstrip(buf));
+                if (!(lu_gp_new))
+                        return -ENODEV;
+        }
+        lu_gp_mem = dev->dev_alua_lu_gp_mem;
+        if (!(lu_gp_mem)) {
+                if (lu_gp_new)
+                        core_alua_put_lu_gp_from_name(lu_gp_new);
+                printk(KERN_ERR "NULL struct se_device->dev_alua_lu_gp_mem"
+                                " pointer\n");
+                return -EINVAL;
+        }
+
+        spin_lock(&lu_gp_mem->lu_gp_mem_lock);
+        lu_gp = lu_gp_mem->lu_gp;
+        if ((lu_gp)) {
+                /*
+                 * Clearing an existing lu_gp association, and replacing
+                 * with NULL
+                 */
+                if (!(lu_gp_new)) {
+                        printk(KERN_INFO "Target_Core_ConfigFS: Releasing %s/%s"
+                                " from ALUA LU Group: core/alua/lu_gps/%s, ID:"
+                                " %hu\n",
+                                config_item_name(&hba->hba_group.cg_item),
+                                config_item_name(&su_dev->se_dev_group.cg_item),
+                                config_item_name(&lu_gp->lu_gp_group.cg_item),
+                                lu_gp->lu_gp_id);
+
+                        __core_alua_drop_lu_gp_mem(lu_gp_mem, lu_gp);
+                        spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+                        return count;
+                }
+                /*
+                 * Removing existing association of lu_gp_mem with lu_gp
+                 */
+                __core_alua_drop_lu_gp_mem(lu_gp_mem, lu_gp);
+                move = 1;
+        }
+        /*
+         * Associate lu_gp_mem with lu_gp_new.
+         */
+        __core_alua_attach_lu_gp_mem(lu_gp_mem, lu_gp_new);
+        spin_unlock(&lu_gp_mem->lu_gp_mem_lock);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: %s %s/%s to ALUA LU Group:"
+                " core/alua/lu_gps/%s, ID: %hu\n",
+                (move) ? "Moving" : "Adding",
+                config_item_name(&hba->hba_group.cg_item),
+                config_item_name(&su_dev->se_dev_group.cg_item),
+                config_item_name(&lu_gp_new->lu_gp_group.cg_item),
+                lu_gp_new->lu_gp_id);
+
+        core_alua_put_lu_gp_from_name(lu_gp_new);
+        return count;
+}
+
+static struct target_core_configfs_attribute target_core_attr_dev_alua_lu_gp = {
+        .attr   = { .ca_owner = THIS_MODULE,
+                    .ca_name = "alua_lu_gp",
+                    .ca_mode = S_IRUGO | S_IWUSR },
+        .show   = target_core_show_alua_lu_gp,
+        .store  = target_core_store_alua_lu_gp,
+};
+
+static struct configfs_attribute *lio_core_dev_attrs[] = {
+        &target_core_attr_dev_info.attr,
+        &target_core_attr_dev_control.attr,
+        &target_core_attr_dev_alias.attr,
+        &target_core_attr_dev_udev_path.attr,
+        &target_core_attr_dev_enable.attr,
+        &target_core_attr_dev_alua_lu_gp.attr,
+        NULL,
+};
+
+static void target_core_dev_release(struct config_item *item)
+{
+        struct se_subsystem_dev *se_dev = container_of(to_config_group(item),
+                                struct se_subsystem_dev, se_dev_group);
+        struct config_group *dev_cg;
+
+        if (!(se_dev))
+                return;
+
+        dev_cg = &se_dev->se_dev_group;
+        kfree(dev_cg->default_groups);
+}
+
+static ssize_t target_core_dev_show(struct config_item *item,
+                                     struct configfs_attribute *attr,
+                                     char *page)
+{
+        struct se_subsystem_dev *se_dev = container_of(
+                        to_config_group(item), struct se_subsystem_dev,
+                        se_dev_group);
+        struct target_core_configfs_attribute *tc_attr = container_of(
+                        attr, struct target_core_configfs_attribute, attr);
+
+        if (!(tc_attr->show))
+                return -EINVAL;
+
+        return tc_attr->show((void *)se_dev, page);
+}
+
+static ssize_t target_core_dev_store(struct config_item *item,
+                                      struct configfs_attribute *attr,
+                                      const char *page, size_t count)
+{
+        struct se_subsystem_dev *se_dev = container_of(
+                        to_config_group(item), struct se_subsystem_dev,
+                        se_dev_group);
+        struct target_core_configfs_attribute *tc_attr = container_of(
+                        attr, struct target_core_configfs_attribute, attr);
+
+        if (!(tc_attr->store))
+                return -EINVAL;
+
+        return tc_attr->store((void *)se_dev, page, count);
+}
+
+static struct configfs_item_operations target_core_dev_item_ops = {
+        .release                = target_core_dev_release,
+        .show_attribute         = target_core_dev_show,
+        .store_attribute        = target_core_dev_store,
+};
+
+static struct config_item_type target_core_dev_cit = {
+        .ct_item_ops            = &target_core_dev_item_ops,
+        .ct_attrs               = lio_core_dev_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_dev_cit */
+
+/* Start functions for struct config_item_type target_core_alua_lu_gp_cit */
+
+CONFIGFS_EATTR_STRUCT(target_core_alua_lu_gp, t10_alua_lu_gp);
+#define SE_DEV_ALUA_LU_ATTR(_name, _mode)                               \
+static struct target_core_alua_lu_gp_attribute                          \
+                        target_core_alua_lu_gp_##_name =                \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        target_core_alua_lu_gp_show_attr_##_name,                       \
+        target_core_alua_lu_gp_store_attr_##_name);
+
+#define SE_DEV_ALUA_LU_ATTR_RO(_name)                                   \
+static struct target_core_alua_lu_gp_attribute                          \
+                        target_core_alua_lu_gp_##_name =                \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        target_core_alua_lu_gp_show_attr_##_name);
+
+/*
+ * lu_gp_id
+ */
+static ssize_t target_core_alua_lu_gp_show_attr_lu_gp_id(
+        struct t10_alua_lu_gp *lu_gp,
+        char *page)
+{
+        if (!(lu_gp->lu_gp_valid_id))
+                return 0;
+
+        return sprintf(page, "%hu\n", lu_gp->lu_gp_id);
+}
+
+static ssize_t target_core_alua_lu_gp_store_attr_lu_gp_id(
+        struct t10_alua_lu_gp *lu_gp,
+        const char *page,
+        size_t count)
+{
+        struct config_group *alua_lu_gp_cg = &lu_gp->lu_gp_group;
+        unsigned long lu_gp_id;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &lu_gp_id);
+        if (ret < 0) {
+                printk(KERN_ERR "strict_strtoul() returned %d for"
+                        " lu_gp_id\n", ret);
+                return -EINVAL;
+        }
+        if (lu_gp_id > 0x0000ffff) {
+                printk(KERN_ERR "ALUA lu_gp_id: %lu exceeds maximum:"
+                        " 0x0000ffff\n", lu_gp_id);
+                return -EINVAL;
+        }
+
+        ret = core_alua_set_lu_gp_id(lu_gp, (u16)lu_gp_id);
+        if (ret < 0)
+                return -EINVAL;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Set ALUA Logical Unit"
+                " Group: core/alua/lu_gps/%s to ID: %hu\n",
+                config_item_name(&alua_lu_gp_cg->cg_item),
+                lu_gp->lu_gp_id);
+
+        return count;
+}
+
+SE_DEV_ALUA_LU_ATTR(lu_gp_id, S_IRUGO | S_IWUSR);
+
+/*
+ * members
+ */
+static ssize_t target_core_alua_lu_gp_show_attr_members(
+        struct t10_alua_lu_gp *lu_gp,
+        char *page)
+{
+        struct se_device *dev;
+        struct se_hba *hba;
+        struct se_subsystem_dev *su_dev;
+        struct t10_alua_lu_gp_member *lu_gp_mem;
+        ssize_t len = 0, cur_len;
+        unsigned char buf[LU_GROUP_NAME_BUF];
+
+        memset(buf, 0, LU_GROUP_NAME_BUF);
+
+        spin_lock(&lu_gp->lu_gp_lock);
+        list_for_each_entry(lu_gp_mem, &lu_gp->lu_gp_mem_list, lu_gp_mem_list) {
+                dev = lu_gp_mem->lu_gp_mem_dev;
+                su_dev = dev->se_sub_dev;
+                hba = su_dev->se_dev_hba;
+
+                cur_len = snprintf(buf, LU_GROUP_NAME_BUF, "%s/%s\n",
+                        config_item_name(&hba->hba_group.cg_item),
+                        config_item_name(&su_dev->se_dev_group.cg_item));
+                cur_len++; /* Extra byte for NULL terminator */
+
+                if ((cur_len + len) > PAGE_SIZE) {
+                        printk(KERN_WARNING "Ran out of lu_gp_show_attr"
+                                "_members buffer\n");
+                        break;
+                }
+                memcpy(page+len, buf, cur_len);
+                len += cur_len;
+        }
+        spin_unlock(&lu_gp->lu_gp_lock);
+
+        return len;
+}
+
+SE_DEV_ALUA_LU_ATTR_RO(members);
+
+CONFIGFS_EATTR_OPS(target_core_alua_lu_gp, t10_alua_lu_gp, lu_gp_group);
+
+static struct configfs_attribute *target_core_alua_lu_gp_attrs[] = {
+        &target_core_alua_lu_gp_lu_gp_id.attr,
+        &target_core_alua_lu_gp_members.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_alua_lu_gp_ops = {
+        .show_attribute         = target_core_alua_lu_gp_attr_show,
+        .store_attribute        = target_core_alua_lu_gp_attr_store,
+};
+
+static struct config_item_type target_core_alua_lu_gp_cit = {
+        .ct_item_ops            = &target_core_alua_lu_gp_ops,
+        .ct_attrs               = target_core_alua_lu_gp_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_alua_lu_gp_cit */
+
+/* Start functions for struct config_item_type target_core_alua_lu_gps_cit */
+
+static struct config_group *target_core_alua_create_lu_gp(
+        struct config_group *group,
+        const char *name)
+{
+        struct t10_alua_lu_gp *lu_gp;
+        struct config_group *alua_lu_gp_cg = NULL;
+        struct config_item *alua_lu_gp_ci = NULL;
+
+        lu_gp = core_alua_allocate_lu_gp(name, 0);
+        if (IS_ERR(lu_gp))
+                return NULL;
+
+        alua_lu_gp_cg = &lu_gp->lu_gp_group;
+        alua_lu_gp_ci = &alua_lu_gp_cg->cg_item;
+
+        config_group_init_type_name(alua_lu_gp_cg, name,
+                        &target_core_alua_lu_gp_cit);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Allocated ALUA Logical Unit"
+                " Group: core/alua/lu_gps/%s\n",
+                config_item_name(alua_lu_gp_ci));
+
+        return alua_lu_gp_cg;
+
+}
+
+static void target_core_alua_drop_lu_gp(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct t10_alua_lu_gp *lu_gp = container_of(to_config_group(item),
+                        struct t10_alua_lu_gp, lu_gp_group);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Releasing ALUA Logical Unit"
+                " Group: core/alua/lu_gps/%s, ID: %hu\n",
+                config_item_name(item), lu_gp->lu_gp_id);
+
+        config_item_put(item);
+        core_alua_free_lu_gp(lu_gp);
+}
+
+static struct configfs_group_operations target_core_alua_lu_gps_group_ops = {
+        .make_group             = &target_core_alua_create_lu_gp,
+        .drop_item              = &target_core_alua_drop_lu_gp,
+};
+
+static struct config_item_type target_core_alua_lu_gps_cit = {
+        .ct_item_ops            = NULL,
+        .ct_group_ops           = &target_core_alua_lu_gps_group_ops,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_alua_lu_gps_cit */
+
+/* Start functions for struct config_item_type target_core_alua_tg_pt_gp_cit */
+
+CONFIGFS_EATTR_STRUCT(target_core_alua_tg_pt_gp, t10_alua_tg_pt_gp);
+#define SE_DEV_ALUA_TG_PT_ATTR(_name, _mode)                            \
+static struct target_core_alua_tg_pt_gp_attribute                       \
+                        target_core_alua_tg_pt_gp_##_name =             \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        target_core_alua_tg_pt_gp_show_attr_##_name,                    \
+        target_core_alua_tg_pt_gp_store_attr_##_name);
+
+#define SE_DEV_ALUA_TG_PT_ATTR_RO(_name)                                \
+static struct target_core_alua_tg_pt_gp_attribute                       \
+                        target_core_alua_tg_pt_gp_##_name =             \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        target_core_alua_tg_pt_gp_show_attr_##_name);
+
+/*
+ * alua_access_state
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_alua_access_state(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%d\n",
+                atomic_read(&tg_pt_gp->tg_pt_gp_alua_access_state));
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_state(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        struct se_subsystem_dev *su_dev = tg_pt_gp->tg_pt_gp_su_dev;
+        unsigned long tmp;
+        int new_state, ret;
+
+        if (!(tg_pt_gp->tg_pt_gp_valid_id)) {
+                printk(KERN_ERR "Unable to do implict ALUA on non valid"
+                        " tg_pt_gp ID: %hu\n", tg_pt_gp->tg_pt_gp_valid_id);
+                return -EINVAL;
+        }
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk("Unable to extract new ALUA access state from"
+                                " %s\n", page);
+                return -EINVAL;
+        }
+        new_state = (int)tmp;
+
+        if (!(tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA)) {
+                printk(KERN_ERR "Unable to process implict configfs ALUA"
+                        " transition while TPGS_IMPLICT_ALUA is diabled\n");
+                return -EINVAL;
+        }
+
+        ret = core_alua_do_port_transition(tg_pt_gp, su_dev->se_dev_ptr,
+                                        NULL, NULL, new_state, 0);
+        return (!ret) ? count : -EINVAL;
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(alua_access_state, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_access_status
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_alua_access_status(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%s\n",
+                core_alua_dump_status(tg_pt_gp->tg_pt_gp_alua_access_status));
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_status(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int new_status, ret;
+
+        if (!(tg_pt_gp->tg_pt_gp_valid_id)) {
+                printk(KERN_ERR "Unable to do set ALUA access status on non"
+                        " valid tg_pt_gp ID: %hu\n",
+                        tg_pt_gp->tg_pt_gp_valid_id);
+                return -EINVAL;
+        }
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract new ALUA access status"
+                                " from %s\n", page);
+                return -EINVAL;
+        }
+        new_status = (int)tmp;
+
+        if ((new_status != ALUA_STATUS_NONE) &&
+            (new_status != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) &&
+            (new_status != ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA)) {
+                printk(KERN_ERR "Illegal ALUA access status: 0x%02x\n",
+                                new_status);
+                return -EINVAL;
+        }
+
+        tg_pt_gp->tg_pt_gp_alua_access_status = new_status;
+        return count;
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(alua_access_status, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_access_type
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_alua_access_type(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return core_alua_show_access_type(tg_pt_gp, page);
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_type(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        return core_alua_store_access_type(tg_pt_gp, page, count);
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(alua_access_type, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_write_metadata
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_alua_write_metadata(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_write_metadata);
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_write_metadata(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        unsigned long tmp;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tmp);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract alua_write_metadata\n");
+                return -EINVAL;
+        }
+
+        if ((tmp != 0) && (tmp != 1)) {
+                printk(KERN_ERR "Illegal value for alua_write_metadata:"
+                        " %lu\n", tmp);
+                return -EINVAL;
+        }
+        tg_pt_gp->tg_pt_gp_write_metadata = (int)tmp;
+
+        return count;
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(alua_write_metadata, S_IRUGO | S_IWUSR);
+
+
+
+/*
+ * nonop_delay_msecs
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_nonop_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return core_alua_show_nonop_delay_msecs(tg_pt_gp, page);
+
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_nonop_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        return core_alua_store_nonop_delay_msecs(tg_pt_gp, page, count);
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(nonop_delay_msecs, S_IRUGO | S_IWUSR);
+
+/*
+ * trans_delay_msecs
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_trans_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return core_alua_show_trans_delay_msecs(tg_pt_gp, page);
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_trans_delay_msecs(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        return core_alua_store_trans_delay_msecs(tg_pt_gp, page, count);
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(trans_delay_msecs, S_IRUGO | S_IWUSR);
+
+/*
+ * preferred
+ */
+
+static ssize_t target_core_alua_tg_pt_gp_show_attr_preferred(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        return core_alua_show_preferred_bit(tg_pt_gp, page);
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_preferred(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        return core_alua_store_preferred_bit(tg_pt_gp, page, count);
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(preferred, S_IRUGO | S_IWUSR);
+
+/*
+ * tg_pt_gp_id
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_tg_pt_gp_id(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        if (!(tg_pt_gp->tg_pt_gp_valid_id))
+                return 0;
+
+        return sprintf(page, "%hu\n", tg_pt_gp->tg_pt_gp_id);
+}
+
+static ssize_t target_core_alua_tg_pt_gp_store_attr_tg_pt_gp_id(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        const char *page,
+        size_t count)
+{
+        struct config_group *alua_tg_pt_gp_cg = &tg_pt_gp->tg_pt_gp_group;
+        unsigned long tg_pt_gp_id;
+        int ret;
+
+        ret = strict_strtoul(page, 0, &tg_pt_gp_id);
+        if (ret < 0) {
+                printk(KERN_ERR "strict_strtoul() returned %d for"
+                        " tg_pt_gp_id\n", ret);
+                return -EINVAL;
+        }
+        if (tg_pt_gp_id > 0x0000ffff) {
+                printk(KERN_ERR "ALUA tg_pt_gp_id: %lu exceeds maximum:"
+                        " 0x0000ffff\n", tg_pt_gp_id);
+                return -EINVAL;
+        }
+
+        ret = core_alua_set_tg_pt_gp_id(tg_pt_gp, (u16)tg_pt_gp_id);
+        if (ret < 0)
+                return -EINVAL;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Set ALUA Target Port Group: "
+                "core/alua/tg_pt_gps/%s to ID: %hu\n",
+                config_item_name(&alua_tg_pt_gp_cg->cg_item),
+                tg_pt_gp->tg_pt_gp_id);
+
+        return count;
+}
+
+SE_DEV_ALUA_TG_PT_ATTR(tg_pt_gp_id, S_IRUGO | S_IWUSR);
+
+/*
+ * members
+ */
+static ssize_t target_core_alua_tg_pt_gp_show_attr_members(
+        struct t10_alua_tg_pt_gp *tg_pt_gp,
+        char *page)
+{
+        struct se_port *port;
+        struct se_portal_group *tpg;
+        struct se_lun *lun;
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
+        ssize_t len = 0, cur_len;
+        unsigned char buf[TG_PT_GROUP_NAME_BUF];
+
+        memset(buf, 0, TG_PT_GROUP_NAME_BUF);
+
+        spin_lock(&tg_pt_gp->tg_pt_gp_lock);
+        list_for_each_entry(tg_pt_gp_mem, &tg_pt_gp->tg_pt_gp_mem_list,
+                        tg_pt_gp_mem_list) {
+                port = tg_pt_gp_mem->tg_pt;
+                tpg = port->sep_tpg;
+                lun = port->sep_lun;
+
+                cur_len = snprintf(buf, TG_PT_GROUP_NAME_BUF, "%s/%s/tpgt_%hu"
+                        "/%s\n", TPG_TFO(tpg)->get_fabric_name(),
+                        TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                        TPG_TFO(tpg)->tpg_get_tag(tpg),
+                        config_item_name(&lun->lun_group.cg_item));
+                cur_len++; /* Extra byte for NULL terminator */
+
+                if ((cur_len + len) > PAGE_SIZE) {
+                        printk(KERN_WARNING "Ran out of lu_gp_show_attr"
+                                "_members buffer\n");
+                        break;
+                }
+                memcpy(page+len, buf, cur_len);
+                len += cur_len;
+        }
+        spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
+
+        return len;
+}
+
+SE_DEV_ALUA_TG_PT_ATTR_RO(members);
+
+CONFIGFS_EATTR_OPS(target_core_alua_tg_pt_gp, t10_alua_tg_pt_gp,
+                        tg_pt_gp_group);
+
+static struct configfs_attribute *target_core_alua_tg_pt_gp_attrs[] = {
+        &target_core_alua_tg_pt_gp_alua_access_state.attr,
+        &target_core_alua_tg_pt_gp_alua_access_status.attr,
+        &target_core_alua_tg_pt_gp_alua_access_type.attr,
+        &target_core_alua_tg_pt_gp_alua_write_metadata.attr,
+        &target_core_alua_tg_pt_gp_nonop_delay_msecs.attr,
+        &target_core_alua_tg_pt_gp_trans_delay_msecs.attr,
+        &target_core_alua_tg_pt_gp_preferred.attr,
+        &target_core_alua_tg_pt_gp_tg_pt_gp_id.attr,
+        &target_core_alua_tg_pt_gp_members.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_alua_tg_pt_gp_ops = {
+        .show_attribute         = target_core_alua_tg_pt_gp_attr_show,
+        .store_attribute        = target_core_alua_tg_pt_gp_attr_store,
+};
+
+static struct config_item_type target_core_alua_tg_pt_gp_cit = {
+        .ct_item_ops            = &target_core_alua_tg_pt_gp_ops,
+        .ct_attrs               = target_core_alua_tg_pt_gp_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_alua_tg_pt_gp_cit */
+
+/* Start functions for struct config_item_type target_core_alua_tg_pt_gps_cit */
+
+static struct config_group *target_core_alua_create_tg_pt_gp(
+        struct config_group *group,
+        const char *name)
+{
+        struct t10_alua *alua = container_of(group, struct t10_alua,
+                                        alua_tg_pt_gps_group);
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct se_subsystem_dev *su_dev = alua->t10_sub_dev;
+        struct config_group *alua_tg_pt_gp_cg = NULL;
+        struct config_item *alua_tg_pt_gp_ci = NULL;
+
+        tg_pt_gp = core_alua_allocate_tg_pt_gp(su_dev, name, 0);
+        if (!(tg_pt_gp))
+                return NULL;
+
+        alua_tg_pt_gp_cg = &tg_pt_gp->tg_pt_gp_group;
+        alua_tg_pt_gp_ci = &alua_tg_pt_gp_cg->cg_item;
+
+        config_group_init_type_name(alua_tg_pt_gp_cg, name,
+                        &target_core_alua_tg_pt_gp_cit);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Allocated ALUA Target Port"
+                " Group: alua/tg_pt_gps/%s\n",
+                config_item_name(alua_tg_pt_gp_ci));
+
+        return alua_tg_pt_gp_cg;
+}
+
+static void target_core_alua_drop_tg_pt_gp(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp = container_of(to_config_group(item),
+                        struct t10_alua_tg_pt_gp, tg_pt_gp_group);
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Releasing ALUA Target Port"
+                " Group: alua/tg_pt_gps/%s, ID: %hu\n",
+                config_item_name(item), tg_pt_gp->tg_pt_gp_id);
+
+        config_item_put(item);
+        core_alua_free_tg_pt_gp(tg_pt_gp);
+}
+
+static struct configfs_group_operations target_core_alua_tg_pt_gps_group_ops = {
+        .make_group             = &target_core_alua_create_tg_pt_gp,
+        .drop_item              = &target_core_alua_drop_tg_pt_gp,
+};
+
+static struct config_item_type target_core_alua_tg_pt_gps_cit = {
+        .ct_group_ops           = &target_core_alua_tg_pt_gps_group_ops,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_alua_tg_pt_gps_cit */
+
+/* Start functions for struct config_item_type target_core_alua_cit */
+
+/*
+ * target_core_alua_cit is a ConfigFS group that lives under
+ * /sys/kernel/config/target/core/alua.  There are default groups
+ * core/alua/lu_gps and core/alua/tg_pt_gps that are attached to
+ * target_core_alua_cit in target_core_init_configfs() below.
+ */
+static struct config_item_type target_core_alua_cit = {
+        .ct_item_ops            = NULL,
+        .ct_attrs               = NULL,
+        .ct_owner               = THIS_MODULE,
+};
+
+/* End functions for struct config_item_type target_core_alua_cit */
+
+/* Start functions for struct config_item_type target_core_hba_cit */
+
+static struct config_group *target_core_make_subdev(
+        struct config_group *group,
+        const char *name)
+{
+        struct t10_alua_tg_pt_gp *tg_pt_gp;
+        struct se_subsystem_dev *se_dev;
+        struct se_subsystem_api *t;
+        struct config_item *hba_ci = &group->cg_item;
+        struct se_hba *hba = item_to_hba(hba_ci);
+        struct config_group *dev_cg = NULL, *tg_pt_gp_cg = NULL;
+
+        if (mutex_lock_interruptible(&hba->hba_access_mutex))
+                return NULL;
+
+        /*
+         * Locate the struct se_subsystem_api from parent's struct se_hba.
+         */
+        t = hba->transport;
+
+        se_dev = kzalloc(sizeof(struct se_subsystem_dev), GFP_KERNEL);
+        if (!se_dev) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " struct se_subsystem_dev\n");
+                goto unlock;
+        }
+        INIT_LIST_HEAD(&se_dev->g_se_dev_list);
+        INIT_LIST_HEAD(&se_dev->t10_wwn.t10_vpd_list);
+        spin_lock_init(&se_dev->t10_wwn.t10_vpd_lock);
+        INIT_LIST_HEAD(&se_dev->t10_reservation.registration_list);
+        INIT_LIST_HEAD(&se_dev->t10_reservation.aptpl_reg_list);
+        spin_lock_init(&se_dev->t10_reservation.registration_lock);
+        spin_lock_init(&se_dev->t10_reservation.aptpl_reg_lock);
+        INIT_LIST_HEAD(&se_dev->t10_alua.tg_pt_gps_list);
+        spin_lock_init(&se_dev->t10_alua.tg_pt_gps_lock);
+        spin_lock_init(&se_dev->se_dev_lock);
+        se_dev->t10_reservation.pr_aptpl_buf_len = PR_APTPL_BUF_LEN;
+        se_dev->t10_wwn.t10_sub_dev = se_dev;
+        se_dev->t10_alua.t10_sub_dev = se_dev;
+        se_dev->se_dev_attrib.da_sub_dev = se_dev;
+
+        se_dev->se_dev_hba = hba;
+        dev_cg = &se_dev->se_dev_group;
+
+        dev_cg->default_groups = kzalloc(sizeof(struct config_group) * 6,
+                        GFP_KERNEL);
+        if (!(dev_cg->default_groups))
+                goto out;
+        /*
+         * Set se_dev_su_ptr from struct se_subsystem_api returned void ptr
+         * for ->allocate_virtdevice()
+         *
+         * se_dev->se_dev_ptr will be set after ->create_virtdev()
+         * has been called successfully in the next level up in the
+         * configfs tree for device object's struct config_group.
+         */
+        se_dev->se_dev_su_ptr = t->allocate_virtdevice(hba, name);
+        if (!(se_dev->se_dev_su_ptr)) {
+                printk(KERN_ERR "Unable to locate subsystem dependent pointer"
+                        " from allocate_virtdevice()\n");
+                goto out;
+        }
+        spin_lock(&se_global->g_device_lock);
+        list_add_tail(&se_dev->g_se_dev_list, &se_global->g_se_dev_list);
+        spin_unlock(&se_global->g_device_lock);
+
+        config_group_init_type_name(&se_dev->se_dev_group, name,
+                        &target_core_dev_cit);
+        config_group_init_type_name(&se_dev->se_dev_attrib.da_group, "attrib",
+                        &target_core_dev_attrib_cit);
+        config_group_init_type_name(&se_dev->se_dev_pr_group, "pr",
+                        &target_core_dev_pr_cit);
+        config_group_init_type_name(&se_dev->t10_wwn.t10_wwn_group, "wwn",
+                        &target_core_dev_wwn_cit);
+        config_group_init_type_name(&se_dev->t10_alua.alua_tg_pt_gps_group,
+                        "alua", &target_core_alua_tg_pt_gps_cit);
+        dev_cg->default_groups[0] = &se_dev->se_dev_attrib.da_group;
+        dev_cg->default_groups[1] = &se_dev->se_dev_pr_group;
+        dev_cg->default_groups[2] = &se_dev->t10_wwn.t10_wwn_group;
+        dev_cg->default_groups[3] = &se_dev->t10_alua.alua_tg_pt_gps_group;
+        dev_cg->default_groups[4] = NULL;
+        /*
+         * Add core/$HBA/$DEV/alua/tg_pt_gps/default_tg_pt_gp
+         */
+        tg_pt_gp = core_alua_allocate_tg_pt_gp(se_dev, "default_tg_pt_gp", 1);
+        if (!(tg_pt_gp))
+                goto out;
+
+        tg_pt_gp_cg = &T10_ALUA(se_dev)->alua_tg_pt_gps_group;
+        tg_pt_gp_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+                                GFP_KERNEL);
+        if (!(tg_pt_gp_cg->default_groups)) {
+                printk(KERN_ERR "Unable to allocate tg_pt_gp_cg->"
+                                "default_groups\n");
+                goto out;
+        }
+
+        config_group_init_type_name(&tg_pt_gp->tg_pt_gp_group,
+                        "default_tg_pt_gp", &target_core_alua_tg_pt_gp_cit);
+        tg_pt_gp_cg->default_groups[0] = &tg_pt_gp->tg_pt_gp_group;
+        tg_pt_gp_cg->default_groups[1] = NULL;
+        T10_ALUA(se_dev)->default_tg_pt_gp = tg_pt_gp;
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Allocated struct se_subsystem_dev:"
+                " %p se_dev_su_ptr: %p\n", se_dev, se_dev->se_dev_su_ptr);
+
+        mutex_unlock(&hba->hba_access_mutex);
+        return &se_dev->se_dev_group;
+out:
+        if (T10_ALUA(se_dev)->default_tg_pt_gp) {
+                core_alua_free_tg_pt_gp(T10_ALUA(se_dev)->default_tg_pt_gp);
+                T10_ALUA(se_dev)->default_tg_pt_gp = NULL;
+        }
+        if (tg_pt_gp_cg)
+                kfree(tg_pt_gp_cg->default_groups);
+        if (dev_cg)
+                kfree(dev_cg->default_groups);
+        if (se_dev->se_dev_su_ptr)
+                t->free_device(se_dev->se_dev_su_ptr);
+        kfree(se_dev);
+unlock:
+        mutex_unlock(&hba->hba_access_mutex);
+        return NULL;
+}
+
+static void target_core_drop_subdev(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_subsystem_dev *se_dev = container_of(to_config_group(item),
+                                struct se_subsystem_dev, se_dev_group);
+        struct se_hba *hba;
+        struct se_subsystem_api *t;
+        struct config_item *df_item;
+        struct config_group *dev_cg, *tg_pt_gp_cg;
+        int i, ret;
+
+        hba = item_to_hba(&se_dev->se_dev_hba->hba_group.cg_item);
+
+        if (mutex_lock_interruptible(&hba->hba_access_mutex))
+                goto out;
+
+        t = hba->transport;
+
+        spin_lock(&se_global->g_device_lock);
+        list_del(&se_dev->g_se_dev_list);
+        spin_unlock(&se_global->g_device_lock);
+
+        tg_pt_gp_cg = &T10_ALUA(se_dev)->alua_tg_pt_gps_group;
+        for (i = 0; tg_pt_gp_cg->default_groups[i]; i++) {
+                df_item = &tg_pt_gp_cg->default_groups[i]->cg_item;
+                tg_pt_gp_cg->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+        kfree(tg_pt_gp_cg->default_groups);
+        core_alua_free_tg_pt_gp(T10_ALUA(se_dev)->default_tg_pt_gp);
+        T10_ALUA(se_dev)->default_tg_pt_gp = NULL;
+
+        dev_cg = &se_dev->se_dev_group;
+        for (i = 0; dev_cg->default_groups[i]; i++) {
+                df_item = &dev_cg->default_groups[i]->cg_item;
+                dev_cg->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+
+        config_item_put(item);
+        /*
+         * This pointer will set when the storage is enabled with:
+         * `echo 1 > $CONFIGFS/core/$HBA/$DEV/dev_enable`
+         */
+        if (se_dev->se_dev_ptr) {
+                printk(KERN_INFO "Target_Core_ConfigFS: Calling se_free_"
+                        "virtual_device() for se_dev_ptr: %p\n",
+                                se_dev->se_dev_ptr);
+
+                ret = se_free_virtual_device(se_dev->se_dev_ptr, hba);
+                if (ret < 0)
+                        goto hba_out;
+        } else {
+                /*
+                 * Release struct se_subsystem_dev->se_dev_su_ptr..
+                 */
+                printk(KERN_INFO "Target_Core_ConfigFS: Calling t->free_"
+                        "device() for se_dev_su_ptr: %p\n",
+                        se_dev->se_dev_su_ptr);
+
+                t->free_device(se_dev->se_dev_su_ptr);
+        }
+
+        printk(KERN_INFO "Target_Core_ConfigFS: Deallocating se_subsystem"
+                "_dev_t: %p\n", se_dev);
+
+hba_out:
+        mutex_unlock(&hba->hba_access_mutex);
+out:
+        kfree(se_dev);
+}
+
+static struct configfs_group_operations target_core_hba_group_ops = {
+        .make_group             = target_core_make_subdev,
+        .drop_item              = target_core_drop_subdev,
+};
+
+CONFIGFS_EATTR_STRUCT(target_core_hba, se_hba);
+#define SE_HBA_ATTR(_name, _mode)                               \
+static struct target_core_hba_attribute                         \
+                target_core_hba_##_name =                       \
+                __CONFIGFS_EATTR(_name, _mode,                  \
+                target_core_hba_show_attr_##_name,              \
+                target_core_hba_store_attr_##_name);
+
+#define SE_HBA_ATTR_RO(_name)                                   \
+static struct target_core_hba_attribute                         \
+                target_core_hba_##_name =                       \
+                __CONFIGFS_EATTR_RO(_name,                      \
+                target_core_hba_show_attr_##_name);
+
+static ssize_t target_core_hba_show_attr_hba_info(
+        struct se_hba *hba,
+        char *page)
+{
+        return sprintf(page, "HBA Index: %d plugin: %s version: %s\n",
+                        hba->hba_id, hba->transport->name,
+                        TARGET_CORE_CONFIGFS_VERSION);
+}
+
+SE_HBA_ATTR_RO(hba_info);
+
+static ssize_t target_core_hba_show_attr_hba_mode(struct se_hba *hba,
+                                char *page)
+{
+        int hba_mode = 0;
+
+        if (hba->hba_flags & HBA_FLAGS_PSCSI_MODE)
+                hba_mode = 1;
+
+        return sprintf(page, "%d\n", hba_mode);
+}
+
+static ssize_t target_core_hba_store_attr_hba_mode(struct se_hba *hba,
+                                const char *page, size_t count)
+{
+        struct se_subsystem_api *transport = hba->transport;
+        unsigned long mode_flag;
+        int ret;
+
+        if (transport->pmode_enable_hba == NULL)
+                return -EINVAL;
+
+        ret = strict_strtoul(page, 0, &mode_flag);
+        if (ret < 0) {
+                printk(KERN_ERR "Unable to extract hba mode flag: %d\n", ret);
+                return -EINVAL;
+        }
+
+        spin_lock(&hba->device_lock);
+        if (!(list_empty(&hba->hba_dev_list))) {
+                printk(KERN_ERR "Unable to set hba_mode with active devices\n");
+                spin_unlock(&hba->device_lock);
+                return -EINVAL;
+        }
+        spin_unlock(&hba->device_lock);
+
+        ret = transport->pmode_enable_hba(hba, mode_flag);
+        if (ret < 0)
+                return -EINVAL;
+        if (ret > 0)
+                hba->hba_flags |= HBA_FLAGS_PSCSI_MODE;
+        else if (ret == 0)
+                hba->hba_flags &= ~HBA_FLAGS_PSCSI_MODE;
+
+        return count;
+}
+
+SE_HBA_ATTR(hba_mode, S_IRUGO | S_IWUSR);
+
+CONFIGFS_EATTR_OPS(target_core_hba, se_hba, hba_group);
+
+static struct configfs_attribute *target_core_hba_attrs[] = {
+        &target_core_hba_hba_info.attr,
+        &target_core_hba_hba_mode.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_core_hba_item_ops = {
+        .show_attribute         = target_core_hba_attr_show,
+        .store_attribute        = target_core_hba_attr_store,
+};
+
+static struct config_item_type target_core_hba_cit = {
+        .ct_item_ops            = &target_core_hba_item_ops,
+        .ct_group_ops           = &target_core_hba_group_ops,
+        .ct_attrs               = target_core_hba_attrs,
+        .ct_owner               = THIS_MODULE,
+};
+
+static struct config_group *target_core_call_addhbatotarget(
+        struct config_group *group,
+        const char *name)
+{
+        char *se_plugin_str, *str, *str2;
+        struct se_hba *hba;
+        char buf[TARGET_CORE_NAME_MAX_LEN];
+        unsigned long plugin_dep_id = 0;
+        int ret;
+
+        memset(buf, 0, TARGET_CORE_NAME_MAX_LEN);
+        if (strlen(name) > TARGET_CORE_NAME_MAX_LEN) {
+                printk(KERN_ERR "Passed *name strlen(): %d exceeds"
+                        " TARGET_CORE_NAME_MAX_LEN: %d\n", (int)strlen(name),
+                        TARGET_CORE_NAME_MAX_LEN);
+                return ERR_PTR(-ENAMETOOLONG);
+        }
+        snprintf(buf, TARGET_CORE_NAME_MAX_LEN, "%s", name);
+
+        str = strstr(buf, "_");
+        if (!(str)) {
+                printk(KERN_ERR "Unable to locate \"_\" for $SUBSYSTEM_PLUGIN_$HOST_ID\n");
+                return ERR_PTR(-EINVAL);
+        }
+        se_plugin_str = buf;
+        /*
+         * Special case for subsystem plugins that have "_" in their names.
+         * Namely rd_direct and rd_mcp..
+         */
+        str2 = strstr(str+1, "_");
+        if ((str2)) {
+                *str2 = '\0'; /* Terminate for *se_plugin_str */
+                str2++; /* Skip to start of plugin dependent ID */
+                str = str2;
+        } else {
+                *str = '\0'; /* Terminate for *se_plugin_str */
+                str++; /* Skip to start of plugin dependent ID */
+        }
+
+        ret = strict_strtoul(str, 0, &plugin_dep_id);
+        if (ret < 0) {
+                printk(KERN_ERR "strict_strtoul() returned %d for"
+                                " plugin_dep_id\n", ret);
+                return ERR_PTR(-EINVAL);
+        }
+        /*
+         * Load up TCM subsystem plugins if they have not already been loaded.
+         */
+        if (transport_subsystem_check_init() < 0)
+                return ERR_PTR(-EINVAL);
+
+        hba = core_alloc_hba(se_plugin_str, plugin_dep_id, 0);
+        if (IS_ERR(hba))
+                return ERR_CAST(hba);
+
+        config_group_init_type_name(&hba->hba_group, name,
+                        &target_core_hba_cit);
+
+        return &hba->hba_group;
+}
+
+static void target_core_call_delhbafromtarget(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_hba *hba = item_to_hba(item);
+
+        config_item_put(item);
+        core_delete_hba(hba);
+}
+
+static struct configfs_group_operations target_core_group_ops = {
+        .make_group     = target_core_call_addhbatotarget,
+        .drop_item      = target_core_call_delhbafromtarget,
+};
+
+static struct config_item_type target_core_cit = {
+        .ct_item_ops    = NULL,
+        .ct_group_ops   = &target_core_group_ops,
+        .ct_attrs       = NULL,
+        .ct_owner       = THIS_MODULE,
+};
+
+/* Stop functions for struct config_item_type target_core_hba_cit */
+
+static int target_core_init_configfs(void)
+{
+        struct config_group *target_cg, *hba_cg = NULL, *alua_cg = NULL;
+        struct config_group *lu_gp_cg = NULL;
+        struct configfs_subsystem *subsys;
+        struct proc_dir_entry *scsi_target_proc = NULL;
+        struct t10_alua_lu_gp *lu_gp;
+        int ret;
+
+        printk(KERN_INFO "TARGET_CORE[0]: Loading Generic Kernel Storage"
+                " Engine: %s on %s/%s on "UTS_RELEASE"\n",
+                TARGET_CORE_VERSION, utsname()->sysname, utsname()->machine);
+
+        subsys = target_core_subsystem[0];
+        config_group_init(&subsys->su_group);
+        mutex_init(&subsys->su_mutex);
+
+        INIT_LIST_HEAD(&g_tf_list);
+        mutex_init(&g_tf_lock);
+        init_scsi_index_table();
+        ret = init_se_global();
+        if (ret < 0)
+                return -1;
+        /*
+         * Create $CONFIGFS/target/core default group for HBA <-> Storage Object
+         * and ALUA Logical Unit Group and Target Port Group infrastructure.
+         */
+        target_cg = &subsys->su_group;
+        target_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+                                GFP_KERNEL);
+        if (!(target_cg->default_groups)) {
+                printk(KERN_ERR "Unable to allocate target_cg->default_groups\n");
+                goto out_global;
+        }
+
+        config_group_init_type_name(&se_global->target_core_hbagroup,
+                        "core", &target_core_cit);
+        target_cg->default_groups[0] = &se_global->target_core_hbagroup;
+        target_cg->default_groups[1] = NULL;
+        /*
+         * Create ALUA infrastructure under /sys/kernel/config/target/core/alua/
+         */
+        hba_cg = &se_global->target_core_hbagroup;
+        hba_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+                                GFP_KERNEL);
+        if (!(hba_cg->default_groups)) {
+                printk(KERN_ERR "Unable to allocate hba_cg->default_groups\n");
+                goto out_global;
+        }
+        config_group_init_type_name(&se_global->alua_group,
+                        "alua", &target_core_alua_cit);
+        hba_cg->default_groups[0] = &se_global->alua_group;
+        hba_cg->default_groups[1] = NULL;
+        /*
+         * Add ALUA Logical Unit Group and Target Port Group ConfigFS
+         * groups under /sys/kernel/config/target/core/alua/
+         */
+        alua_cg = &se_global->alua_group;
+        alua_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+                        GFP_KERNEL);
+        if (!(alua_cg->default_groups)) {
+                printk(KERN_ERR "Unable to allocate alua_cg->default_groups\n");
+                goto out_global;
+        }
+
+        config_group_init_type_name(&se_global->alua_lu_gps_group,
+                        "lu_gps", &target_core_alua_lu_gps_cit);
+        alua_cg->default_groups[0] = &se_global->alua_lu_gps_group;
+        alua_cg->default_groups[1] = NULL;
+        /*
+         * Add core/alua/lu_gps/default_lu_gp
+         */
+        lu_gp = core_alua_allocate_lu_gp("default_lu_gp", 1);
+        if (IS_ERR(lu_gp))
+                goto out_global;
+
+        lu_gp_cg = &se_global->alua_lu_gps_group;
+        lu_gp_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
+                        GFP_KERNEL);
+        if (!(lu_gp_cg->default_groups)) {
+                printk(KERN_ERR "Unable to allocate lu_gp_cg->default_groups\n");
+                goto out_global;
+        }
+
+        config_group_init_type_name(&lu_gp->lu_gp_group, "default_lu_gp",
+                                &target_core_alua_lu_gp_cit);
+        lu_gp_cg->default_groups[0] = &lu_gp->lu_gp_group;
+        lu_gp_cg->default_groups[1] = NULL;
+        se_global->default_lu_gp = lu_gp;
+        /*
+         * Register the target_core_mod subsystem with configfs.
+         */
+        ret = configfs_register_subsystem(subsys);
+        if (ret < 0) {
+                printk(KERN_ERR "Error %d while registering subsystem %s\n",
+                        ret, subsys->su_group.cg_item.ci_namebuf);
+                goto out_global;
+        }
+        printk(KERN_INFO "TARGET_CORE[0]: Initialized ConfigFS Fabric"
+                " Infrastructure: "TARGET_CORE_CONFIGFS_VERSION" on %s/%s"
+                " on "UTS_RELEASE"\n", utsname()->sysname, utsname()->machine);
+        /*
+         * Register built-in RAMDISK subsystem logic for virtual LUN 0
+         */
+        ret = rd_module_init();
+        if (ret < 0)
+                goto out;
+
+        if (core_dev_setup_virtual_lun0() < 0)
+                goto out;
+
+        scsi_target_proc = proc_mkdir("scsi_target", 0);
+        if (!(scsi_target_proc)) {
+                printk(KERN_ERR "proc_mkdir(scsi_target, 0) failed\n");
+                goto out;
+        }
+        ret = init_scsi_target_mib();
+        if (ret < 0)
+                goto out;
+
+        return 0;
+
+out:
+        configfs_unregister_subsystem(subsys);
+        if (scsi_target_proc)
+                remove_proc_entry("scsi_target", 0);
+        core_dev_release_virtual_lun0();
+        rd_module_exit();
+out_global:
+        if (se_global->default_lu_gp) {
+                core_alua_free_lu_gp(se_global->default_lu_gp);
+                se_global->default_lu_gp = NULL;
+        }
+        if (lu_gp_cg)
+                kfree(lu_gp_cg->default_groups);
+        if (alua_cg)
+                kfree(alua_cg->default_groups);
+        if (hba_cg)
+                kfree(hba_cg->default_groups);
+        kfree(target_cg->default_groups);
+        release_se_global();
+        return -1;
+}
+
+static void target_core_exit_configfs(void)
+{
+        struct configfs_subsystem *subsys;
+        struct config_group *hba_cg, *alua_cg, *lu_gp_cg;
+        struct config_item *item;
+        int i;
+
+        se_global->in_shutdown = 1;
+        subsys = target_core_subsystem[0];
+
+        lu_gp_cg = &se_global->alua_lu_gps_group;
+        for (i = 0; lu_gp_cg->default_groups[i]; i++) {
+                item = &lu_gp_cg->default_groups[i]->cg_item;
+                lu_gp_cg->default_groups[i] = NULL;
+                config_item_put(item);
+        }
+        kfree(lu_gp_cg->default_groups);
+        core_alua_free_lu_gp(se_global->default_lu_gp);
+        se_global->default_lu_gp = NULL;
+
+        alua_cg = &se_global->alua_group;
+        for (i = 0; alua_cg->default_groups[i]; i++) {
+                item = &alua_cg->default_groups[i]->cg_item;
+                alua_cg->default_groups[i] = NULL;
+                config_item_put(item);
+        }
+        kfree(alua_cg->default_groups);
+
+        hba_cg = &se_global->target_core_hbagroup;
+        for (i = 0; hba_cg->default_groups[i]; i++) {
+                item = &hba_cg->default_groups[i]->cg_item;
+                hba_cg->default_groups[i] = NULL;
+                config_item_put(item);
+        }
+        kfree(hba_cg->default_groups);
+
+        for (i = 0; subsys->su_group.default_groups[i]; i++) {
+                item = &subsys->su_group.default_groups[i]->cg_item;
+                subsys->su_group.default_groups[i] = NULL;
+                config_item_put(item);
+        }
+        kfree(subsys->su_group.default_groups);
+
+        configfs_unregister_subsystem(subsys);
+        printk(KERN_INFO "TARGET_CORE[0]: Released ConfigFS Fabric"
+                        " Infrastructure\n");
+
+        remove_scsi_target_mib();
+        remove_proc_entry("scsi_target", 0);
+        core_dev_release_virtual_lun0();
+        rd_module_exit();
+        release_se_global();
+
+        return;
+}
+
+MODULE_DESCRIPTION("Target_Core_Mod/ConfigFS");
+MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_LICENSE("GPL");
+
+module_init(target_core_init_configfs);
+module_exit(target_core_exit_configfs);
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
new file mode 100644
index 000000000000..317ce58d426d
--- /dev/null
+++ b/drivers/target/target_core_device.c
@@ -0,0 +1,1694 @@
+/*******************************************************************************
+ * Filename:  target_core_device.c (based on iscsi_target_device.c)
+ *
+ * This file contains the iSCSI Virtual Device and Disk Transport
+ * agnostic related functions.
+ *
+ * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005-2006 SBE, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/net.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/kthread.h>
+#include <linux/in.h>
+#include <net/sock.h>
+#include <net/tcp.h>
+#include <scsi/scsi.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+#include "target_core_ua.h"
+
+static void se_dev_start(struct se_device *dev);
+static void se_dev_stop(struct se_device *dev);
+
+int transport_get_lun_for_cmd(
+        struct se_cmd *se_cmd,
+        unsigned char *cdb,
+        u32 unpacked_lun)
+{
+        struct se_dev_entry *deve;
+        struct se_lun *se_lun = NULL;
+        struct se_session *se_sess = SE_SESS(se_cmd);
+        unsigned long flags;
+        int read_only = 0;
+
+        spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+        deve = se_cmd->se_deve =
+                        &SE_NODE_ACL(se_sess)->device_list[unpacked_lun];
+        if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
+                if (se_cmd) {
+                        deve->total_cmds++;
+                        deve->total_bytes += se_cmd->data_length;
+
+                        if (se_cmd->data_direction == DMA_TO_DEVICE) {
+                                if (deve->lun_flags &
+                                                TRANSPORT_LUNFLAGS_READ_ONLY) {
+                                        read_only = 1;
+                                        goto out;
+                                }
+                                deve->write_bytes += se_cmd->data_length;
+                        } else if (se_cmd->data_direction ==
+                                   DMA_FROM_DEVICE) {
+                                deve->read_bytes += se_cmd->data_length;
+                        }
+                }
+                deve->deve_cmds++;
+
+                se_lun = se_cmd->se_lun = deve->se_lun;
+                se_cmd->pr_res_key = deve->pr_res_key;
+                se_cmd->orig_fe_lun = unpacked_lun;
+                se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
+                se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
+        }
+out:
+        spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+
+        if (!se_lun) {
+                if (read_only) {
+                        se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+                        se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                        printk("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
+                                " Access for 0x%08x\n",
+                                CMD_TFO(se_cmd)->get_fabric_name(),
+                                unpacked_lun);
+                        return -1;
+                } else {
+                        /*
+                         * Use the se_portal_group->tpg_virt_lun0 to allow for
+                         * REPORT_LUNS, et al to be returned when no active
+                         * MappedLUN=0 exists for this Initiator Port.
+                         */
+                        if (unpacked_lun != 0) {
+                                se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
+                                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                                printk("TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
+                                        " Access for 0x%08x\n",
+                                        CMD_TFO(se_cmd)->get_fabric_name(),
+                                        unpacked_lun);
+                                return -1;
+                        }
+                        /*
+                         * Force WRITE PROTECT for virtual LUN 0
+                         */
+                        if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
+                            (se_cmd->data_direction != DMA_NONE)) {
+                                se_cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+                                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                                return -1;
+                        }
+#if 0
+                        printk("TARGET_CORE[%s]: Using virtual LUN0! :-)\n",
+                                CMD_TFO(se_cmd)->get_fabric_name());
+#endif
+                        se_lun = se_cmd->se_lun = &se_sess->se_tpg->tpg_virt_lun0;
+                        se_cmd->orig_fe_lun = 0;
+                        se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
+                        se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
+                }
+        }
+        /*
+         * Determine if the struct se_lun is online.
+         */
+/* #warning FIXME: Check for LUN_RESET + UNIT Attention */
+        if (se_dev_check_online(se_lun->lun_se_dev) != 0) {
+                se_cmd->scsi_sense_reason = TCM_NON_EXISTENT_LUN;
+                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                return -1;
+        }
+
+        {
+        struct se_device *dev = se_lun->lun_se_dev;
+        spin_lock(&dev->stats_lock);
+        dev->num_cmds++;
+        if (se_cmd->data_direction == DMA_TO_DEVICE)
+                dev->write_bytes += se_cmd->data_length;
+        else if (se_cmd->data_direction == DMA_FROM_DEVICE)
+                dev->read_bytes += se_cmd->data_length;
+        spin_unlock(&dev->stats_lock);
+        }
+
+        /*
+         * Add the iscsi_cmd_t to the struct se_lun's cmd list.  This list is used
+         * for tracking state of struct se_cmds during LUN shutdown events.
+         */
+        spin_lock_irqsave(&se_lun->lun_cmd_lock, flags);
+        list_add_tail(&se_cmd->se_lun_list, &se_lun->lun_cmd_list);
+        atomic_set(&T_TASK(se_cmd)->transport_lun_active, 1);
+#if 0
+        printk(KERN_INFO "Adding ITT: 0x%08x to LUN LIST[%d]\n",
+                CMD_TFO(se_cmd)->get_task_tag(se_cmd), se_lun->unpacked_lun);
+#endif
+        spin_unlock_irqrestore(&se_lun->lun_cmd_lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(transport_get_lun_for_cmd);
+
+int transport_get_lun_for_tmr(
+        struct se_cmd *se_cmd,
+        u32 unpacked_lun)
+{
+        struct se_device *dev = NULL;
+        struct se_dev_entry *deve;
+        struct se_lun *se_lun = NULL;
+        struct se_session *se_sess = SE_SESS(se_cmd);
+        struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;
+
+        spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+        deve = se_cmd->se_deve =
+                        &SE_NODE_ACL(se_sess)->device_list[unpacked_lun];
+        if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
+                se_lun = se_cmd->se_lun = se_tmr->tmr_lun = deve->se_lun;
+                dev = se_tmr->tmr_dev = se_lun->lun_se_dev;
+                se_cmd->pr_res_key = deve->pr_res_key;
+                se_cmd->orig_fe_lun = unpacked_lun;
+                se_cmd->se_orig_obj_ptr = SE_LUN(se_cmd)->lun_se_dev;
+/*              se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD; */
+        }
+        spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+
+        if (!se_lun) {
+                printk(KERN_INFO "TARGET_CORE[%s]: Detected NON_EXISTENT_LUN"
+                        " Access for 0x%08x\n",
+                        CMD_TFO(se_cmd)->get_fabric_name(),
+                        unpacked_lun);
+                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                return -1;
+        }
+        /*
+         * Determine if the struct se_lun is online.
+         */
+/* #warning FIXME: Check for LUN_RESET + UNIT Attention */
+        if (se_dev_check_online(se_lun->lun_se_dev) != 0) {
+                se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                return -1;
+        }
+
+        spin_lock(&dev->se_tmr_lock);
+        list_add_tail(&se_tmr->tmr_list, &dev->dev_tmr_list);
+        spin_unlock(&dev->se_tmr_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(transport_get_lun_for_tmr);
+
+/*
+ * This function is called from core_scsi3_emulate_pro_register_and_move()
+ * and core_scsi3_decode_spec_i_port(), and will increment &deve->pr_ref_count
+ * when a matching rtpi is found.
+ */
+struct se_dev_entry *core_get_se_deve_from_rtpi(
+        struct se_node_acl *nacl,
+        u16 rtpi)
+{
+        struct se_dev_entry *deve;
+        struct se_lun *lun;
+        struct se_port *port;
+        struct se_portal_group *tpg = nacl->se_tpg;
+        u32 i;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                deve = &nacl->device_list[i];
+
+                if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
+                        continue;
+
+                lun = deve->se_lun;
+                if (!(lun)) {
+                        printk(KERN_ERR "%s device entries device pointer is"
+                                " NULL, but Initiator has access.\n",
+                                TPG_TFO(tpg)->get_fabric_name());
+                        continue;
+                }
+                port = lun->lun_sep;
+                if (!(port)) {
+                        printk(KERN_ERR "%s device entries device pointer is"
+                                " NULL, but Initiator has access.\n",
+                                TPG_TFO(tpg)->get_fabric_name());
+                        continue;
+                }
+                if (port->sep_rtpi != rtpi)
+                        continue;
+
+                atomic_inc(&deve->pr_ref_count);
+                smp_mb__after_atomic_inc();
+                spin_unlock_irq(&nacl->device_list_lock);
+
+                return deve;
+        }
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        return NULL;
+}
+
+int core_free_device_list_for_node(
+        struct se_node_acl *nacl,
+        struct se_portal_group *tpg)
+{
+        struct se_dev_entry *deve;
+        struct se_lun *lun;
+        u32 i;
+
+        if (!nacl->device_list)
+                return 0;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                deve = &nacl->device_list[i];
+
+                if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
+                        continue;
+
+                if (!deve->se_lun) {
+                        printk(KERN_ERR "%s device entries device pointer is"
+                                " NULL, but Initiator has access.\n",
+                                TPG_TFO(tpg)->get_fabric_name());
+                        continue;
+                }
+                lun = deve->se_lun;
+
+                spin_unlock_irq(&nacl->device_list_lock);
+                core_update_device_list_for_node(lun, NULL, deve->mapped_lun,
+                        TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
+                spin_lock_irq(&nacl->device_list_lock);
+        }
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        kfree(nacl->device_list);
+        nacl->device_list = NULL;
+
+        return 0;
+}
+
+void core_dec_lacl_count(struct se_node_acl *se_nacl, struct se_cmd *se_cmd)
+{
+        struct se_dev_entry *deve;
+
+        spin_lock_irq(&se_nacl->device_list_lock);
+        deve = &se_nacl->device_list[se_cmd->orig_fe_lun];
+        deve->deve_cmds--;
+        spin_unlock_irq(&se_nacl->device_list_lock);
+
+        return;
+}
+
+void core_update_device_list_access(
+        u32 mapped_lun,
+        u32 lun_access,
+        struct se_node_acl *nacl)
+{
+        struct se_dev_entry *deve;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        deve = &nacl->device_list[mapped_lun];
+        if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
+                deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
+                deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
+        } else {
+                deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
+                deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+        }
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        return;
+}
+
+/*      core_update_device_list_for_node():
+ *
+ *
+ */
+int core_update_device_list_for_node(
+        struct se_lun *lun,
+        struct se_lun_acl *lun_acl,
+        u32 mapped_lun,
+        u32 lun_access,
+        struct se_node_acl *nacl,
+        struct se_portal_group *tpg,
+        int enable)
+{
+        struct se_port *port = lun->lun_sep;
+        struct se_dev_entry *deve = &nacl->device_list[mapped_lun];
+        int trans = 0;
+        /*
+         * If the MappedLUN entry is being disabled, the entry in
+         * port->sep_alua_list must be removed now before clearing the
+         * struct se_dev_entry pointers below as logic in
+         * core_alua_do_transition_tg_pt() depends on these being present.
+         */
+        if (!(enable)) {
+                /*
+                 * deve->se_lun_acl will be NULL for demo-mode created LUNs
+                 * that have not been explictly concerted to MappedLUNs ->
+                 * struct se_lun_acl.
+                 */
+                if (!(deve->se_lun_acl))
+                        return 0;
+
+                spin_lock_bh(&port->sep_alua_lock);
+                list_del(&deve->alua_port_list);
+                spin_unlock_bh(&port->sep_alua_lock);
+        }
+
+        spin_lock_irq(&nacl->device_list_lock);
+        if (enable) {
+                /*
+                 * Check if the call is handling demo mode -> explict LUN ACL
+                 * transition.  This transition must be for the same struct se_lun
+                 * + mapped_lun that was setup in demo mode..
+                 */
+                if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) {
+                        if (deve->se_lun_acl != NULL) {
+                                printk(KERN_ERR "struct se_dev_entry->se_lun_acl"
+                                        " already set for demo mode -> explict"
+                                        " LUN ACL transition\n");
+                                return -1;
+                        }
+                        if (deve->se_lun != lun) {
+                                printk(KERN_ERR "struct se_dev_entry->se_lun does"
+                                        " match passed struct se_lun for demo mode"
+                                        " -> explict LUN ACL transition\n");
+                                return -1;
+                        }
+                        deve->se_lun_acl = lun_acl;
+                        trans = 1;
+                } else {
+                        deve->se_lun = lun;
+                        deve->se_lun_acl = lun_acl;
+                        deve->mapped_lun = mapped_lun;
+                        deve->lun_flags |= TRANSPORT_LUNFLAGS_INITIATOR_ACCESS;
+                }
+
+                if (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) {
+                        deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_ONLY;
+                        deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_WRITE;
+                } else {
+                        deve->lun_flags &= ~TRANSPORT_LUNFLAGS_READ_WRITE;
+                        deve->lun_flags |= TRANSPORT_LUNFLAGS_READ_ONLY;
+                }
+
+                if (trans) {
+                        spin_unlock_irq(&nacl->device_list_lock);
+                        return 0;
+                }
+                deve->creation_time = get_jiffies_64();
+                deve->attach_count++;
+                spin_unlock_irq(&nacl->device_list_lock);
+
+                spin_lock_bh(&port->sep_alua_lock);
+                list_add_tail(&deve->alua_port_list, &port->sep_alua_list);
+                spin_unlock_bh(&port->sep_alua_lock);
+
+                return 0;
+        }
+        /*
+         * Wait for any in process SPEC_I_PT=1 or REGISTER_AND_MOVE
+         * PR operation to complete.
+         */
+        spin_unlock_irq(&nacl->device_list_lock);
+        while (atomic_read(&deve->pr_ref_count) != 0)
+                cpu_relax();
+        spin_lock_irq(&nacl->device_list_lock);
+        /*
+         * Disable struct se_dev_entry LUN ACL mapping
+         */
+        core_scsi3_ua_release_all(deve);
+        deve->se_lun = NULL;
+        deve->se_lun_acl = NULL;
+        deve->lun_flags = 0;
+        deve->creation_time = 0;
+        deve->attach_count--;
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        core_scsi3_free_pr_reg_from_nacl(lun->lun_se_dev, nacl);
+        return 0;
+}
+
+/*      core_clear_lun_from_tpg():
+ *
+ *
+ */
+void core_clear_lun_from_tpg(struct se_lun *lun, struct se_portal_group *tpg)
+{
+        struct se_node_acl *nacl;
+        struct se_dev_entry *deve;
+        u32 i;
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        list_for_each_entry(nacl, &tpg->acl_node_list, acl_list) {
+                spin_unlock_bh(&tpg->acl_node_lock);
+
+                spin_lock_irq(&nacl->device_list_lock);
+                for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                        deve = &nacl->device_list[i];
+                        if (lun != deve->se_lun)
+                                continue;
+                        spin_unlock_irq(&nacl->device_list_lock);
+
+                        core_update_device_list_for_node(lun, NULL,
+                                deve->mapped_lun, TRANSPORT_LUNFLAGS_NO_ACCESS,
+                                nacl, tpg, 0);
+
+                        spin_lock_irq(&nacl->device_list_lock);
+                }
+                spin_unlock_irq(&nacl->device_list_lock);
+
+                spin_lock_bh(&tpg->acl_node_lock);
+        }
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        return;
+}
+
+static struct se_port *core_alloc_port(struct se_device *dev)
+{
+        struct se_port *port, *port_tmp;
+
+        port = kzalloc(sizeof(struct se_port), GFP_KERNEL);
+        if (!(port)) {
+                printk(KERN_ERR "Unable to allocate struct se_port\n");
+                return NULL;
+        }
+        INIT_LIST_HEAD(&port->sep_alua_list);
+        INIT_LIST_HEAD(&port->sep_list);
+        atomic_set(&port->sep_tg_pt_secondary_offline, 0);
+        spin_lock_init(&port->sep_alua_lock);
+        mutex_init(&port->sep_tg_pt_md_mutex);
+
+        spin_lock(&dev->se_port_lock);
+        if (dev->dev_port_count == 0x0000ffff) {
+                printk(KERN_WARNING "Reached dev->dev_port_count =="
+                                " 0x0000ffff\n");
+                spin_unlock(&dev->se_port_lock);
+                return NULL;
+        }
+again:
+        /*
+         * Allocate the next RELATIVE TARGET PORT IDENTIFER for this struct se_device
+         * Here is the table from spc4r17 section 7.7.3.8.
+         *
+         *    Table 473 -- RELATIVE TARGET PORT IDENTIFIER field
+         *
+         * Code      Description
+         * 0h        Reserved
+         * 1h        Relative port 1, historically known as port A
+         * 2h        Relative port 2, historically known as port B
+         * 3h to FFFFh    Relative port 3 through 65 535
+         */
+        port->sep_rtpi = dev->dev_rpti_counter++;
+        if (!(port->sep_rtpi))
+                goto again;
+
+        list_for_each_entry(port_tmp, &dev->dev_sep_list, sep_list) {
+                /*
+                 * Make sure RELATIVE TARGET PORT IDENTIFER is unique
+                 * for 16-bit wrap..
+                 */
+                if (port->sep_rtpi == port_tmp->sep_rtpi)
+                        goto again;
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return port;
+}
+
+static void core_export_port(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_port *port,
+        struct se_lun *lun)
+{
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem = NULL;
+
+        spin_lock(&dev->se_port_lock);
+        spin_lock(&lun->lun_sep_lock);
+        port->sep_tpg = tpg;
+        port->sep_lun = lun;
+        lun->lun_sep = port;
+        spin_unlock(&lun->lun_sep_lock);
+
+        list_add_tail(&port->sep_list, &dev->dev_sep_list);
+        spin_unlock(&dev->se_port_lock);
+
+        if (T10_ALUA(su_dev)->alua_type == SPC3_ALUA_EMULATED) {
+                tg_pt_gp_mem = core_alua_allocate_tg_pt_gp_mem(port);
+                if (IS_ERR(tg_pt_gp_mem) || !tg_pt_gp_mem) {
+                        printk(KERN_ERR "Unable to allocate t10_alua_tg_pt"
+                                        "_gp_member_t\n");
+                        return;
+                }
+                spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                __core_alua_attach_tg_pt_gp_mem(tg_pt_gp_mem,
+                        T10_ALUA(su_dev)->default_tg_pt_gp);
+                spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
+                printk(KERN_INFO "%s/%s: Adding to default ALUA Target Port"
+                        " Group: alua/default_tg_pt_gp\n",
+                        TRANSPORT(dev)->name, TPG_TFO(tpg)->get_fabric_name());
+        }
+
+        dev->dev_port_count++;
+        port->sep_index = port->sep_rtpi; /* RELATIVE TARGET PORT IDENTIFER */
+}
+
+/*
+ *      Called with struct se_device->se_port_lock spinlock held.
+ */
+static void core_release_port(struct se_device *dev, struct se_port *port)
+{
+        /*
+         * Wait for any port reference for PR ALL_TG_PT=1 operation
+         * to complete in __core_scsi3_alloc_registration()
+         */
+        spin_unlock(&dev->se_port_lock);
+        if (atomic_read(&port->sep_tg_pt_ref_cnt))
+                cpu_relax();
+        spin_lock(&dev->se_port_lock);
+
+        core_alua_free_tg_pt_gp_mem(port);
+
+        list_del(&port->sep_list);
+        dev->dev_port_count--;
+        kfree(port);
+
+        return;
+}
+
+int core_dev_export(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_lun *lun)
+{
+        struct se_port *port;
+
+        port = core_alloc_port(dev);
+        if (!(port))
+                return -1;
+
+        lun->lun_se_dev = dev;
+        se_dev_start(dev);
+
+        atomic_inc(&dev->dev_export_obj.obj_access_count);
+        core_export_port(dev, tpg, port, lun);
+        return 0;
+}
+
+void core_dev_unexport(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_lun *lun)
+{
+        struct se_port *port = lun->lun_sep;
+
+        spin_lock(&lun->lun_sep_lock);
+        if (lun->lun_se_dev == NULL) {
+                spin_unlock(&lun->lun_sep_lock);
+                return;
+        }
+        spin_unlock(&lun->lun_sep_lock);
+
+        spin_lock(&dev->se_port_lock);
+        atomic_dec(&dev->dev_export_obj.obj_access_count);
+        core_release_port(dev, port);
+        spin_unlock(&dev->se_port_lock);
+
+        se_dev_stop(dev);
+        lun->lun_se_dev = NULL;
+}
+
+int transport_core_report_lun_response(struct se_cmd *se_cmd)
+{
+        struct se_dev_entry *deve;
+        struct se_lun *se_lun;
+        struct se_session *se_sess = SE_SESS(se_cmd);
+        struct se_task *se_task;
+        unsigned char *buf = (unsigned char *)T_TASK(se_cmd)->t_task_buf;
+        u32 cdb_offset = 0, lun_count = 0, offset = 8;
+        u64 i, lun;
+
+        list_for_each_entry(se_task, &T_TASK(se_cmd)->t_task_list, t_list)
+                break;
+
+        if (!(se_task)) {
+                printk(KERN_ERR "Unable to locate struct se_task for struct se_cmd\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+
+        /*
+         * If no struct se_session pointer is present, this struct se_cmd is
+         * coming via a target_core_mod PASSTHROUGH op, and not through
+         * a $FABRIC_MOD.  In that case, report LUN=0 only.
+         */
+        if (!(se_sess)) {
+                lun = 0;
+                buf[offset++] = ((lun >> 56) & 0xff);
+                buf[offset++] = ((lun >> 48) & 0xff);
+                buf[offset++] = ((lun >> 40) & 0xff);
+                buf[offset++] = ((lun >> 32) & 0xff);
+                buf[offset++] = ((lun >> 24) & 0xff);
+                buf[offset++] = ((lun >> 16) & 0xff);
+                buf[offset++] = ((lun >> 8) & 0xff);
+                buf[offset++] = (lun & 0xff);
+                lun_count = 1;
+                goto done;
+        }
+
+        spin_lock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                deve = &SE_NODE_ACL(se_sess)->device_list[i];
+                if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
+                        continue;
+                se_lun = deve->se_lun;
+                /*
+                 * We determine the correct LUN LIST LENGTH even once we
+                 * have reached the initial allocation length.
+                 * See SPC2-R20 7.19.
+                 */
+                lun_count++;
+                if ((cdb_offset + 8) >= se_cmd->data_length)
+                        continue;
+
+                lun = cpu_to_be64(CMD_TFO(se_cmd)->pack_lun(deve->mapped_lun));
+                buf[offset++] = ((lun >> 56) & 0xff);
+                buf[offset++] = ((lun >> 48) & 0xff);
+                buf[offset++] = ((lun >> 40) & 0xff);
+                buf[offset++] = ((lun >> 32) & 0xff);
+                buf[offset++] = ((lun >> 24) & 0xff);
+                buf[offset++] = ((lun >> 16) & 0xff);
+                buf[offset++] = ((lun >> 8) & 0xff);
+                buf[offset++] = (lun & 0xff);
+                cdb_offset += 8;
+        }
+        spin_unlock_irq(&SE_NODE_ACL(se_sess)->device_list_lock);
+
+        /*
+         * See SPC3 r07, page 159.
+         */
+done:
+        lun_count *= 8;
+        buf[0] = ((lun_count >> 24) & 0xff);
+        buf[1] = ((lun_count >> 16) & 0xff);
+        buf[2] = ((lun_count >> 8) & 0xff);
+        buf[3] = (lun_count & 0xff);
+
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+/*      se_release_device_for_hba():
+ *
+ *
+ */
+void se_release_device_for_hba(struct se_device *dev)
+{
+        struct se_hba *hba = dev->se_hba;
+
+        if ((dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) ||
+            (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED) ||
+            (dev->dev_status & TRANSPORT_DEVICE_SHUTDOWN) ||
+            (dev->dev_status & TRANSPORT_DEVICE_OFFLINE_ACTIVATED) ||
+            (dev->dev_status & TRANSPORT_DEVICE_OFFLINE_DEACTIVATED))
+                se_dev_stop(dev);
+
+        if (dev->dev_ptr) {
+                kthread_stop(dev->process_thread);
+                if (dev->transport->free_device)
+                        dev->transport->free_device(dev->dev_ptr);
+        }
+
+        spin_lock(&hba->device_lock);
+        list_del(&dev->dev_list);
+        hba->dev_count--;
+        spin_unlock(&hba->device_lock);
+
+        core_scsi3_free_all_registrations(dev);
+        se_release_vpd_for_dev(dev);
+
+        kfree(dev->dev_status_queue_obj);
+        kfree(dev->dev_queue_obj);
+        kfree(dev);
+
+        return;
+}
+
+void se_release_vpd_for_dev(struct se_device *dev)
+{
+        struct t10_vpd *vpd, *vpd_tmp;
+
+        spin_lock(&DEV_T10_WWN(dev)->t10_vpd_lock);
+        list_for_each_entry_safe(vpd, vpd_tmp,
+                        &DEV_T10_WWN(dev)->t10_vpd_list, vpd_list) {
+                list_del(&vpd->vpd_list);
+                kfree(vpd);
+        }
+        spin_unlock(&DEV_T10_WWN(dev)->t10_vpd_lock);
+
+        return;
+}
+
+/*
+ * Called with struct se_hba->device_lock held.
+ */
+void se_clear_dev_ports(struct se_device *dev)
+{
+        struct se_hba *hba = dev->se_hba;
+        struct se_lun *lun;
+        struct se_portal_group *tpg;
+        struct se_port *sep, *sep_tmp;
+
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry_safe(sep, sep_tmp, &dev->dev_sep_list, sep_list) {
+                spin_unlock(&dev->se_port_lock);
+                spin_unlock(&hba->device_lock);
+
+                lun = sep->sep_lun;
+                tpg = sep->sep_tpg;
+                spin_lock(&lun->lun_sep_lock);
+                if (lun->lun_se_dev == NULL) {
+                        spin_unlock(&lun->lun_sep_lock);
+                        continue;
+                }
+                spin_unlock(&lun->lun_sep_lock);
+
+                core_dev_del_lun(tpg, lun->unpacked_lun);
+
+                spin_lock(&hba->device_lock);
+                spin_lock(&dev->se_port_lock);
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return;
+}
+
+/*      se_free_virtual_device():
+ *
+ *      Used for IBLOCK, RAMDISK, and FILEIO Transport Drivers.
+ */
+int se_free_virtual_device(struct se_device *dev, struct se_hba *hba)
+{
+        spin_lock(&hba->device_lock);
+        se_clear_dev_ports(dev);
+        spin_unlock(&hba->device_lock);
+
+        core_alua_free_lu_gp_mem(dev);
+        se_release_device_for_hba(dev);
+
+        return 0;
+}
+
+static void se_dev_start(struct se_device *dev)
+{
+        struct se_hba *hba = dev->se_hba;
+
+        spin_lock(&hba->device_lock);
+        atomic_inc(&dev->dev_obj.obj_access_count);
+        if (atomic_read(&dev->dev_obj.obj_access_count) == 1) {
+                if (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED) {
+                        dev->dev_status &= ~TRANSPORT_DEVICE_DEACTIVATED;
+                        dev->dev_status |= TRANSPORT_DEVICE_ACTIVATED;
+                } else if (dev->dev_status &
+                           TRANSPORT_DEVICE_OFFLINE_DEACTIVATED) {
+                        dev->dev_status &=
+                                ~TRANSPORT_DEVICE_OFFLINE_DEACTIVATED;
+                        dev->dev_status |= TRANSPORT_DEVICE_OFFLINE_ACTIVATED;
+                }
+        }
+        spin_unlock(&hba->device_lock);
+}
+
+static void se_dev_stop(struct se_device *dev)
+{
+        struct se_hba *hba = dev->se_hba;
+
+        spin_lock(&hba->device_lock);
+        atomic_dec(&dev->dev_obj.obj_access_count);
+        if (atomic_read(&dev->dev_obj.obj_access_count) == 0) {
+                if (dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) {
+                        dev->dev_status &= ~TRANSPORT_DEVICE_ACTIVATED;
+                        dev->dev_status |= TRANSPORT_DEVICE_DEACTIVATED;
+                } else if (dev->dev_status &
+                           TRANSPORT_DEVICE_OFFLINE_ACTIVATED) {
+                        dev->dev_status &= ~TRANSPORT_DEVICE_OFFLINE_ACTIVATED;
+                        dev->dev_status |= TRANSPORT_DEVICE_OFFLINE_DEACTIVATED;
+                }
+        }
+        spin_unlock(&hba->device_lock);
+
+        while (atomic_read(&hba->dev_mib_access_count))
+                cpu_relax();
+}
+
+int se_dev_check_online(struct se_device *dev)
+{
+        int ret;
+
+        spin_lock_irq(&dev->dev_status_lock);
+        ret = ((dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) ||
+               (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED)) ? 0 : 1;
+        spin_unlock_irq(&dev->dev_status_lock);
+
+        return ret;
+}
+
+int se_dev_check_shutdown(struct se_device *dev)
+{
+        int ret;
+
+        spin_lock_irq(&dev->dev_status_lock);
+        ret = (dev->dev_status & TRANSPORT_DEVICE_SHUTDOWN);
+        spin_unlock_irq(&dev->dev_status_lock);
+
+        return ret;
+}
+
+void se_dev_set_default_attribs(
+        struct se_device *dev,
+        struct se_dev_limits *dev_limits)
+{
+        struct queue_limits *limits = &dev_limits->limits;
+
+        DEV_ATTRIB(dev)->emulate_dpo = DA_EMULATE_DPO;
+        DEV_ATTRIB(dev)->emulate_fua_write = DA_EMULATE_FUA_WRITE;
+        DEV_ATTRIB(dev)->emulate_fua_read = DA_EMULATE_FUA_READ;
+        DEV_ATTRIB(dev)->emulate_write_cache = DA_EMULATE_WRITE_CACHE;
+        DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl = DA_EMULATE_UA_INTLLCK_CTRL;
+        DEV_ATTRIB(dev)->emulate_tas = DA_EMULATE_TAS;
+        DEV_ATTRIB(dev)->emulate_tpu = DA_EMULATE_TPU;
+        DEV_ATTRIB(dev)->emulate_tpws = DA_EMULATE_TPWS;
+        DEV_ATTRIB(dev)->emulate_reservations = DA_EMULATE_RESERVATIONS;
+        DEV_ATTRIB(dev)->emulate_alua = DA_EMULATE_ALUA;
+        DEV_ATTRIB(dev)->enforce_pr_isids = DA_ENFORCE_PR_ISIDS;
+        /*
+         * The TPU=1 and TPWS=1 settings will be set in TCM/IBLOCK
+         * iblock_create_virtdevice() from struct queue_limits values
+         * if blk_queue_discard()==1
+         */
+        DEV_ATTRIB(dev)->max_unmap_lba_count = DA_MAX_UNMAP_LBA_COUNT;
+        DEV_ATTRIB(dev)->max_unmap_block_desc_count =
+                                DA_MAX_UNMAP_BLOCK_DESC_COUNT;
+        DEV_ATTRIB(dev)->unmap_granularity = DA_UNMAP_GRANULARITY_DEFAULT;
+        DEV_ATTRIB(dev)->unmap_granularity_alignment =
+                                DA_UNMAP_GRANULARITY_ALIGNMENT_DEFAULT;
+        /*
+         * block_size is based on subsystem plugin dependent requirements.
+         */
+        DEV_ATTRIB(dev)->hw_block_size = limits->logical_block_size;
+        DEV_ATTRIB(dev)->block_size = limits->logical_block_size;
+        /*
+         * max_sectors is based on subsystem plugin dependent requirements.
+         */
+        DEV_ATTRIB(dev)->hw_max_sectors = limits->max_hw_sectors;
+        DEV_ATTRIB(dev)->max_sectors = limits->max_sectors;
+        /*
+         * Set optimal_sectors from max_sectors, which can be lowered via
+         * configfs.
+         */
+        DEV_ATTRIB(dev)->optimal_sectors = limits->max_sectors;
+        /*
+         * queue_depth is based on subsystem plugin dependent requirements.
+         */
+        DEV_ATTRIB(dev)->hw_queue_depth = dev_limits->hw_queue_depth;
+        DEV_ATTRIB(dev)->queue_depth = dev_limits->queue_depth;
+}
+
+int se_dev_set_task_timeout(struct se_device *dev, u32 task_timeout)
+{
+        if (task_timeout > DA_TASK_TIMEOUT_MAX) {
+                printk(KERN_ERR "dev[%p]: Passed task_timeout: %u larger then"
+                        " DA_TASK_TIMEOUT_MAX\n", dev, task_timeout);
+                return -1;
+        } else {
+                DEV_ATTRIB(dev)->task_timeout = task_timeout;
+                printk(KERN_INFO "dev[%p]: Set SE Device task_timeout: %u\n",
+                        dev, task_timeout);
+        }
+
+        return 0;
+}
+
+int se_dev_set_max_unmap_lba_count(
+        struct se_device *dev,
+        u32 max_unmap_lba_count)
+{
+        DEV_ATTRIB(dev)->max_unmap_lba_count = max_unmap_lba_count;
+        printk(KERN_INFO "dev[%p]: Set max_unmap_lba_count: %u\n",
+                        dev, DEV_ATTRIB(dev)->max_unmap_lba_count);
+        return 0;
+}
+
+int se_dev_set_max_unmap_block_desc_count(
+        struct se_device *dev,
+        u32 max_unmap_block_desc_count)
+{
+        DEV_ATTRIB(dev)->max_unmap_block_desc_count = max_unmap_block_desc_count;
+        printk(KERN_INFO "dev[%p]: Set max_unmap_block_desc_count: %u\n",
+                        dev, DEV_ATTRIB(dev)->max_unmap_block_desc_count);
+        return 0;
+}
+
+int se_dev_set_unmap_granularity(
+        struct se_device *dev,
+        u32 unmap_granularity)
+{
+        DEV_ATTRIB(dev)->unmap_granularity = unmap_granularity;
+        printk(KERN_INFO "dev[%p]: Set unmap_granularity: %u\n",
+                        dev, DEV_ATTRIB(dev)->unmap_granularity);
+        return 0;
+}
+
+int se_dev_set_unmap_granularity_alignment(
+        struct se_device *dev,
+        u32 unmap_granularity_alignment)
+{
+        DEV_ATTRIB(dev)->unmap_granularity_alignment = unmap_granularity_alignment;
+        printk(KERN_INFO "dev[%p]: Set unmap_granularity_alignment: %u\n",
+                        dev, DEV_ATTRIB(dev)->unmap_granularity_alignment);
+        return 0;
+}
+
+int se_dev_set_emulate_dpo(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        if (TRANSPORT(dev)->dpo_emulated == NULL) {
+                printk(KERN_ERR "TRANSPORT(dev)->dpo_emulated is NULL\n");
+                return -1;
+        }
+        if (TRANSPORT(dev)->dpo_emulated(dev) == 0) {
+                printk(KERN_ERR "TRANSPORT(dev)->dpo_emulated not supported\n");
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_dpo = flag;
+        printk(KERN_INFO "dev[%p]: SE Device Page Out (DPO) Emulation"
+                        " bit: %d\n", dev, DEV_ATTRIB(dev)->emulate_dpo);
+        return 0;
+}
+
+int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        if (TRANSPORT(dev)->fua_write_emulated == NULL) {
+                printk(KERN_ERR "TRANSPORT(dev)->fua_write_emulated is NULL\n");
+                return -1;
+        }
+        if (TRANSPORT(dev)->fua_write_emulated(dev) == 0) {
+                printk(KERN_ERR "TRANSPORT(dev)->fua_write_emulated not supported\n");
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_fua_write = flag;
+        printk(KERN_INFO "dev[%p]: SE Device Forced Unit Access WRITEs: %d\n",
+                        dev, DEV_ATTRIB(dev)->emulate_fua_write);
+        return 0;
+}
+
+int se_dev_set_emulate_fua_read(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        if (TRANSPORT(dev)->fua_read_emulated == NULL) {
+                printk(KERN_ERR "TRANSPORT(dev)->fua_read_emulated is NULL\n");
+                return -1;
+        }
+        if (TRANSPORT(dev)->fua_read_emulated(dev) == 0) {
+                printk(KERN_ERR "TRANSPORT(dev)->fua_read_emulated not supported\n");
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_fua_read = flag;
+        printk(KERN_INFO "dev[%p]: SE Device Forced Unit Access READs: %d\n",
+                        dev, DEV_ATTRIB(dev)->emulate_fua_read);
+        return 0;
+}
+
+int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        if (TRANSPORT(dev)->write_cache_emulated == NULL) {
+                printk(KERN_ERR "TRANSPORT(dev)->write_cache_emulated is NULL\n");
+                return -1;
+        }
+        if (TRANSPORT(dev)->write_cache_emulated(dev) == 0) {
+                printk(KERN_ERR "TRANSPORT(dev)->write_cache_emulated not supported\n");
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_write_cache = flag;
+        printk(KERN_INFO "dev[%p]: SE Device WRITE_CACHE_EMULATION flag: %d\n",
+                        dev, DEV_ATTRIB(dev)->emulate_write_cache);
+        return 0;
+}
+
+int se_dev_set_emulate_ua_intlck_ctrl(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1) && (flag != 2)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+                        " UA_INTRLCK_CTRL while dev_export_obj: %d count"
+                        " exists\n", dev,
+                        atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl = flag;
+        printk(KERN_INFO "dev[%p]: SE Device UA_INTRLCK_CTRL flag: %d\n",
+                dev, DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl);
+
+        return 0;
+}
+
+int se_dev_set_emulate_tas(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device TAS while"
+                        " dev_export_obj: %d count exists\n", dev,
+                        atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -1;
+        }
+        DEV_ATTRIB(dev)->emulate_tas = flag;
+        printk(KERN_INFO "dev[%p]: SE Device TASK_ABORTED status bit: %s\n",
+                dev, (DEV_ATTRIB(dev)->emulate_tas) ? "Enabled" : "Disabled");
+
+        return 0;
+}
+
+int se_dev_set_emulate_tpu(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        /*
+         * We expect this value to be non-zero when generic Block Layer
+         * Discard supported is detected iblock_create_virtdevice().
+         */
+        if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
+                printk(KERN_ERR "Generic Block Discard not supported\n");
+                return -ENOSYS;
+        }
+
+        DEV_ATTRIB(dev)->emulate_tpu = flag;
+        printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning UNMAP bit: %d\n",
+                                dev, flag);
+        return 0;
+}
+
+int se_dev_set_emulate_tpws(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        /*
+         * We expect this value to be non-zero when generic Block Layer
+         * Discard supported is detected iblock_create_virtdevice().
+         */
+        if (!(DEV_ATTRIB(dev)->max_unmap_block_desc_count)) {
+                printk(KERN_ERR "Generic Block Discard not supported\n");
+                return -ENOSYS;
+        }
+
+        DEV_ATTRIB(dev)->emulate_tpws = flag;
+        printk(KERN_INFO "dev[%p]: SE Device Thin Provisioning WRITE_SAME: %d\n",
+                                dev, flag);
+        return 0;
+}
+
+int se_dev_set_enforce_pr_isids(struct se_device *dev, int flag)
+{
+        if ((flag != 0) && (flag != 1)) {
+                printk(KERN_ERR "Illegal value %d\n", flag);
+                return -1;
+        }
+        DEV_ATTRIB(dev)->enforce_pr_isids = flag;
+        printk(KERN_INFO "dev[%p]: SE Device enforce_pr_isids bit: %s\n", dev,
+                (DEV_ATTRIB(dev)->enforce_pr_isids) ? "Enabled" : "Disabled");
+        return 0;
+}
+
+/*
+ * Note, this can only be called on unexported SE Device Object.
+ */
+int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth)
+{
+        u32 orig_queue_depth = dev->queue_depth;
+
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device TCQ while"
+                        " dev_export_obj: %d count exists\n", dev,
+                        atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -1;
+        }
+        if (!(queue_depth)) {
+                printk(KERN_ERR "dev[%p]: Illegal ZERO value for queue"
+                        "_depth\n", dev);
+                return -1;
+        }
+
+        if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                if (queue_depth > DEV_ATTRIB(dev)->hw_queue_depth) {
+                        printk(KERN_ERR "dev[%p]: Passed queue_depth: %u"
+                                " exceeds TCM/SE_Device TCQ: %u\n",
+                                dev, queue_depth,
+                                DEV_ATTRIB(dev)->hw_queue_depth);
+                        return -1;
+                }
+        } else {
+                if (queue_depth > DEV_ATTRIB(dev)->queue_depth) {
+                        if (queue_depth > DEV_ATTRIB(dev)->hw_queue_depth) {
+                                printk(KERN_ERR "dev[%p]: Passed queue_depth:"
+                                        " %u exceeds TCM/SE_Device MAX"
+                                        " TCQ: %u\n", dev, queue_depth,
+                                        DEV_ATTRIB(dev)->hw_queue_depth);
+                                return -1;
+                        }
+                }
+        }
+
+        DEV_ATTRIB(dev)->queue_depth = dev->queue_depth = queue_depth;
+        if (queue_depth > orig_queue_depth)
+                atomic_add(queue_depth - orig_queue_depth, &dev->depth_left);
+        else if (queue_depth < orig_queue_depth)
+                atomic_sub(orig_queue_depth - queue_depth, &dev->depth_left);
+
+        printk(KERN_INFO "dev[%p]: SE Device TCQ Depth changed to: %u\n",
+                        dev, queue_depth);
+        return 0;
+}
+
+int se_dev_set_max_sectors(struct se_device *dev, u32 max_sectors)
+{
+        int force = 0; /* Force setting for VDEVS */
+
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+                        " max_sectors while dev_export_obj: %d count exists\n",
+                        dev, atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -1;
+        }
+        if (!(max_sectors)) {
+                printk(KERN_ERR "dev[%p]: Illegal ZERO value for"
+                        " max_sectors\n", dev);
+                return -1;
+        }
+        if (max_sectors < DA_STATUS_MAX_SECTORS_MIN) {
+                printk(KERN_ERR "dev[%p]: Passed max_sectors: %u less than"
+                        " DA_STATUS_MAX_SECTORS_MIN: %u\n", dev, max_sectors,
+                                DA_STATUS_MAX_SECTORS_MIN);
+                return -1;
+        }
+        if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                if (max_sectors > DEV_ATTRIB(dev)->hw_max_sectors) {
+                        printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+                                " greater than TCM/SE_Device max_sectors:"
+                                " %u\n", dev, max_sectors,
+                                DEV_ATTRIB(dev)->hw_max_sectors);
+                         return -1;
+                }
+        } else {
+                if (!(force) && (max_sectors >
+                                 DEV_ATTRIB(dev)->hw_max_sectors)) {
+                        printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+                                " greater than TCM/SE_Device max_sectors"
+                                ": %u, use force=1 to override.\n", dev,
+                                max_sectors, DEV_ATTRIB(dev)->hw_max_sectors);
+                        return -1;
+                }
+                if (max_sectors > DA_STATUS_MAX_SECTORS_MAX) {
+                        printk(KERN_ERR "dev[%p]: Passed max_sectors: %u"
+                                " greater than DA_STATUS_MAX_SECTORS_MAX:"
+                                " %u\n", dev, max_sectors,
+                                DA_STATUS_MAX_SECTORS_MAX);
+                        return -1;
+                }
+        }
+
+        DEV_ATTRIB(dev)->max_sectors = max_sectors;
+        printk("dev[%p]: SE Device max_sectors changed to %u\n",
+                        dev, max_sectors);
+        return 0;
+}
+
+int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)
+{
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device"
+                        " optimal_sectors while dev_export_obj: %d count exists\n",
+                        dev, atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -EINVAL;
+        }
+        if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                printk(KERN_ERR "dev[%p]: Passed optimal_sectors cannot be"
+                                " changed for TCM/pSCSI\n", dev);
+                return -EINVAL;
+        }
+        if (optimal_sectors > DEV_ATTRIB(dev)->max_sectors) {
+                printk(KERN_ERR "dev[%p]: Passed optimal_sectors %u cannot be"
+                        " greater than max_sectors: %u\n", dev,
+                        optimal_sectors, DEV_ATTRIB(dev)->max_sectors);
+                return -EINVAL;
+        }
+
+        DEV_ATTRIB(dev)->optimal_sectors = optimal_sectors;
+        printk(KERN_INFO "dev[%p]: SE Device optimal_sectors changed to %u\n",
+                        dev, optimal_sectors);
+        return 0;
+}
+
+int se_dev_set_block_size(struct se_device *dev, u32 block_size)
+{
+        if (atomic_read(&dev->dev_export_obj.obj_access_count)) {
+                printk(KERN_ERR "dev[%p]: Unable to change SE Device block_size"
+                        " while dev_export_obj: %d count exists\n", dev,
+                        atomic_read(&dev->dev_export_obj.obj_access_count));
+                return -1;
+        }
+
+        if ((block_size != 512) &&
+            (block_size != 1024) &&
+            (block_size != 2048) &&
+            (block_size != 4096)) {
+                printk(KERN_ERR "dev[%p]: Illegal value for block_device: %u"
+                        " for SE device, must be 512, 1024, 2048 or 4096\n",
+                        dev, block_size);
+                return -1;
+        }
+
+        if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                printk(KERN_ERR "dev[%p]: Not allowed to change block_size for"
+                        " Physical Device, use for Linux/SCSI to change"
+                        " block_size for underlying hardware\n", dev);
+                return -1;
+        }
+
+        DEV_ATTRIB(dev)->block_size = block_size;
+        printk(KERN_INFO "dev[%p]: SE Device block_size changed to %u\n",
+                        dev, block_size);
+        return 0;
+}
+
+struct se_lun *core_dev_add_lun(
+        struct se_portal_group *tpg,
+        struct se_hba *hba,
+        struct se_device *dev,
+        u32 lun)
+{
+        struct se_lun *lun_p;
+        u32 lun_access = 0;
+
+        if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
+                printk(KERN_ERR "Unable to export struct se_device while dev_access_obj: %d\n",
+                        atomic_read(&dev->dev_access_obj.obj_access_count));
+                return NULL;
+        }
+
+        lun_p = core_tpg_pre_addlun(tpg, lun);
+        if ((IS_ERR(lun_p)) || !(lun_p))
+                return NULL;
+
+        if (dev->dev_flags & DF_READ_ONLY)
+                lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
+        else
+                lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
+
+        if (core_tpg_post_addlun(tpg, lun_p, lun_access, dev) < 0)
+                return NULL;
+
+        printk(KERN_INFO "%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
+                " CORE HBA: %u\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), lun_p->unpacked_lun,
+                TPG_TFO(tpg)->get_fabric_name(), hba->hba_id);
+        /*
+         * Update LUN maps for dynamically added initiators when
+         * generate_node_acl is enabled.
+         */
+        if (TPG_TFO(tpg)->tpg_check_demo_mode(tpg)) {
+                struct se_node_acl *acl;
+                spin_lock_bh(&tpg->acl_node_lock);
+                list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
+                        if (acl->dynamic_node_acl) {
+                                spin_unlock_bh(&tpg->acl_node_lock);
+                                core_tpg_add_node_to_devs(acl, tpg);
+                                spin_lock_bh(&tpg->acl_node_lock);
+                        }
+                }
+                spin_unlock_bh(&tpg->acl_node_lock);
+        }
+
+        return lun_p;
+}
+
+/*      core_dev_del_lun():
+ *
+ *
+ */
+int core_dev_del_lun(
+        struct se_portal_group *tpg,
+        u32 unpacked_lun)
+{
+        struct se_lun *lun;
+        int ret = 0;
+
+        lun = core_tpg_pre_dellun(tpg, unpacked_lun, &ret);
+        if (!(lun))
+                return ret;
+
+        core_tpg_post_dellun(tpg, lun);
+
+        printk(KERN_INFO "%s_TPG[%u]_LUN[%u] - Deactivated %s Logical Unit from"
+                " device object\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), unpacked_lun,
+                TPG_TFO(tpg)->get_fabric_name());
+
+        return 0;
+}
+
+struct se_lun *core_get_lun_from_tpg(struct se_portal_group *tpg, u32 unpacked_lun)
+{
+        struct se_lun *lun;
+
+        spin_lock(&tpg->tpg_lun_lock);
+        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
+                printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS"
+                        "_PER_TPG-1: %u for Target Portal Group: %hu\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TRANSPORT_MAX_LUNS_PER_TPG-1,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return NULL;
+        }
+        lun = &tpg->tpg_lun_list[unpacked_lun];
+
+        if (lun->lun_status != TRANSPORT_LUN_STATUS_FREE) {
+                printk(KERN_ERR "%s Logical Unit Number: %u is not free on"
+                        " Target Portal Group: %hu, ignoring request.\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return NULL;
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return lun;
+}
+
+/*      core_dev_get_lun():
+ *
+ *
+ */
+static struct se_lun *core_dev_get_lun(struct se_portal_group *tpg, u32 unpacked_lun)
+{
+        struct se_lun *lun;
+
+        spin_lock(&tpg->tpg_lun_lock);
+        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
+                printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER"
+                        "_TPG-1: %u for Target Portal Group: %hu\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TRANSPORT_MAX_LUNS_PER_TPG-1,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return NULL;
+        }
+        lun = &tpg->tpg_lun_list[unpacked_lun];
+
+        if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
+                printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+                        " Target Portal Group: %hu, ignoring request.\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return NULL;
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return lun;
+}
+
+struct se_lun_acl *core_dev_init_initiator_node_lun_acl(
+        struct se_portal_group *tpg,
+        u32 mapped_lun,
+        char *initiatorname,
+        int *ret)
+{
+        struct se_lun_acl *lacl;
+        struct se_node_acl *nacl;
+
+        if (strlen(initiatorname) > TRANSPORT_IQN_LEN) {
+                printk(KERN_ERR "%s InitiatorName exceeds maximum size.\n",
+                        TPG_TFO(tpg)->get_fabric_name());
+                *ret = -EOVERFLOW;
+                return NULL;
+        }
+        nacl = core_tpg_get_initiator_node_acl(tpg, initiatorname);
+        if (!(nacl)) {
+                *ret = -EINVAL;
+                return NULL;
+        }
+        lacl = kzalloc(sizeof(struct se_lun_acl), GFP_KERNEL);
+        if (!(lacl)) {
+                printk(KERN_ERR "Unable to allocate memory for struct se_lun_acl.\n");
+                *ret = -ENOMEM;
+                return NULL;
+        }
+
+        INIT_LIST_HEAD(&lacl->lacl_list);
+        lacl->mapped_lun = mapped_lun;
+        lacl->se_lun_nacl = nacl;
+        snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname);
+
+        return lacl;
+}
+
+int core_dev_add_initiator_node_lun_acl(
+        struct se_portal_group *tpg,
+        struct se_lun_acl *lacl,
+        u32 unpacked_lun,
+        u32 lun_access)
+{
+        struct se_lun *lun;
+        struct se_node_acl *nacl;
+
+        lun = core_dev_get_lun(tpg, unpacked_lun);
+        if (!(lun)) {
+                printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+                        " Target Portal Group: %hu, ignoring request.\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                return -EINVAL;
+        }
+
+        nacl = lacl->se_lun_nacl;
+        if (!(nacl))
+                return -EINVAL;
+
+        if ((lun->lun_access & TRANSPORT_LUNFLAGS_READ_ONLY) &&
+            (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE))
+                lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
+
+        lacl->se_lun = lun;
+
+        if (core_update_device_list_for_node(lun, lacl, lacl->mapped_lun,
+                        lun_access, nacl, tpg, 1) < 0)
+                return -EINVAL;
+
+        spin_lock(&lun->lun_acl_lock);
+        list_add_tail(&lacl->lacl_list, &lun->lun_acl_list);
+        atomic_inc(&lun->lun_acl_count);
+        smp_mb__after_atomic_inc();
+        spin_unlock(&lun->lun_acl_lock);
+
+        printk(KERN_INFO "%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
+                " InitiatorNode: %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), unpacked_lun, lacl->mapped_lun,
+                (lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) ? "RW" : "RO",
+                lacl->initiatorname);
+        /*
+         * Check to see if there are any existing persistent reservation APTPL
+         * pre-registrations that need to be enabled for this LUN ACL..
+         */
+        core_scsi3_check_aptpl_registration(lun->lun_se_dev, tpg, lun, lacl);
+        return 0;
+}
+
+/*      core_dev_del_initiator_node_lun_acl():
+ *
+ *
+ */
+int core_dev_del_initiator_node_lun_acl(
+        struct se_portal_group *tpg,
+        struct se_lun *lun,
+        struct se_lun_acl *lacl)
+{
+        struct se_node_acl *nacl;
+
+        nacl = lacl->se_lun_nacl;
+        if (!(nacl))
+                return -EINVAL;
+
+        spin_lock(&lun->lun_acl_lock);
+        list_del(&lacl->lacl_list);
+        atomic_dec(&lun->lun_acl_count);
+        smp_mb__after_atomic_dec();
+        spin_unlock(&lun->lun_acl_lock);
+
+        core_update_device_list_for_node(lun, NULL, lacl->mapped_lun,
+                TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
+
+        lacl->se_lun = NULL;
+
+        printk(KERN_INFO "%s_TPG[%hu]_LUN[%u] - Removed ACL for"
+                " InitiatorNode: %s Mapped LUN: %u\n",
+                TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), lun->unpacked_lun,
+                lacl->initiatorname, lacl->mapped_lun);
+
+        return 0;
+}
+
+void core_dev_free_initiator_node_lun_acl(
+        struct se_portal_group *tpg,
+        struct se_lun_acl *lacl)
+{
+        printk("%s_TPG[%hu] - Freeing ACL for %s InitiatorNode: %s"
+                " Mapped LUN: %u\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg),
+                TPG_TFO(tpg)->get_fabric_name(),
+                lacl->initiatorname, lacl->mapped_lun);
+
+        kfree(lacl);
+}
+
+int core_dev_setup_virtual_lun0(void)
+{
+        struct se_hba *hba;
+        struct se_device *dev;
+        struct se_subsystem_dev *se_dev = NULL;
+        struct se_subsystem_api *t;
+        char buf[16];
+        int ret;
+
+        hba = core_alloc_hba("rd_dr", 0, HBA_FLAGS_INTERNAL_USE);
+        if (IS_ERR(hba))
+                return PTR_ERR(hba);
+
+        se_global->g_lun0_hba = hba;
+        t = hba->transport;
+
+        se_dev = kzalloc(sizeof(struct se_subsystem_dev), GFP_KERNEL);
+        if (!(se_dev)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " struct se_subsystem_dev\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+        INIT_LIST_HEAD(&se_dev->g_se_dev_list);
+        INIT_LIST_HEAD(&se_dev->t10_wwn.t10_vpd_list);
+        spin_lock_init(&se_dev->t10_wwn.t10_vpd_lock);
+        INIT_LIST_HEAD(&se_dev->t10_reservation.registration_list);
+        INIT_LIST_HEAD(&se_dev->t10_reservation.aptpl_reg_list);
+        spin_lock_init(&se_dev->t10_reservation.registration_lock);
+        spin_lock_init(&se_dev->t10_reservation.aptpl_reg_lock);
+        INIT_LIST_HEAD(&se_dev->t10_alua.tg_pt_gps_list);
+        spin_lock_init(&se_dev->t10_alua.tg_pt_gps_lock);
+        spin_lock_init(&se_dev->se_dev_lock);
+        se_dev->t10_reservation.pr_aptpl_buf_len = PR_APTPL_BUF_LEN;
+        se_dev->t10_wwn.t10_sub_dev = se_dev;
+        se_dev->t10_alua.t10_sub_dev = se_dev;
+        se_dev->se_dev_attrib.da_sub_dev = se_dev;
+        se_dev->se_dev_hba = hba;
+
+        se_dev->se_dev_su_ptr = t->allocate_virtdevice(hba, "virt_lun0");
+        if (!(se_dev->se_dev_su_ptr)) {
+                printk(KERN_ERR "Unable to locate subsystem dependent pointer"
+                        " from allocate_virtdevice()\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+        se_global->g_lun0_su_dev = se_dev;
+
+        memset(buf, 0, 16);
+        sprintf(buf, "rd_pages=8");
+        t->set_configfs_dev_params(hba, se_dev, buf, sizeof(buf));
+
+        dev = t->create_virtdevice(hba, se_dev, se_dev->se_dev_su_ptr);
+        if (!(dev) || IS_ERR(dev)) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        se_dev->se_dev_ptr = dev;
+        se_global->g_lun0_dev = dev;
+
+        return 0;
+out:
+        se_global->g_lun0_su_dev = NULL;
+        kfree(se_dev);
+        if (se_global->g_lun0_hba) {
+                core_delete_hba(se_global->g_lun0_hba);
+                se_global->g_lun0_hba = NULL;
+        }
+        return ret;
+}
+
+
+void core_dev_release_virtual_lun0(void)
+{
+        struct se_hba *hba = se_global->g_lun0_hba;
+        struct se_subsystem_dev *su_dev = se_global->g_lun0_su_dev;
+
+        if (!(hba))
+                return;
+
+        if (se_global->g_lun0_dev)
+                se_free_virtual_device(se_global->g_lun0_dev, hba);
+
+        kfree(su_dev);
+        core_delete_hba(hba);
+}
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
new file mode 100644
index 000000000000..32b148d7e261
--- /dev/null
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -0,0 +1,996 @@
+/*******************************************************************************
+* Filename: target_core_fabric_configfs.c
+ *
+ * This file contains generic fabric module configfs infrastructure for
+ * TCM v4.x code
+ *
+ * Copyright (c) 2010 Rising Tide Systems
+ * Copyright (c) 2010 Linux-iSCSI.org
+ *
+ * Copyright (c) 2010 Nicholas A. Bellinger <nab@linux-iscsi.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.
+ ****************************************************************************/
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/version.h>
+#include <generated/utsrelease.h>
+#include <linux/utsname.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
+#include <linux/slab.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
+#include <linux/syscalls.h>
+#include <linux/configfs.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_fabric_configfs.h>
+#include <target/target_core_configfs.h>
+#include <target/configfs_macros.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+
+#define TF_CIT_SETUP(_name, _item_ops, _group_ops, _attrs)              \
+static void target_fabric_setup_##_name##_cit(struct target_fabric_configfs *tf) \
+{                                                                       \
+        struct target_fabric_configfs_template *tfc = &tf->tf_cit_tmpl; \
+        struct config_item_type *cit = &tfc->tfc_##_name##_cit;         \
+                                                                        \
+        cit->ct_item_ops = _item_ops;                                   \
+        cit->ct_group_ops = _group_ops;                                 \
+        cit->ct_attrs = _attrs;                                         \
+        cit->ct_owner = tf->tf_module;                                  \
+        printk("Setup generic %s\n", __stringify(_name));               \
+}
+
+/* Start of tfc_tpg_mappedlun_cit */
+
+static int target_fabric_mappedlun_link(
+        struct config_item *lun_acl_ci,
+        struct config_item *lun_ci)
+{
+        struct se_dev_entry *deve;
+        struct se_lun *lun = container_of(to_config_group(lun_ci),
+                        struct se_lun, lun_group);
+        struct se_lun_acl *lacl = container_of(to_config_group(lun_acl_ci),
+                        struct se_lun_acl, se_lun_group);
+        struct se_portal_group *se_tpg;
+        struct config_item *nacl_ci, *tpg_ci, *tpg_ci_s, *wwn_ci, *wwn_ci_s;
+        int ret = 0, lun_access;
+        /*
+         * Ensure that the source port exists
+         */
+        if (!(lun->lun_sep) || !(lun->lun_sep->sep_tpg)) {
+                printk(KERN_ERR "Source se_lun->lun_sep or lun->lun_sep->sep"
+                                "_tpg does not exist\n");
+                return -EINVAL;
+        }
+        se_tpg = lun->lun_sep->sep_tpg;
+
+        nacl_ci = &lun_acl_ci->ci_parent->ci_group->cg_item;
+        tpg_ci = &nacl_ci->ci_group->cg_item;
+        wwn_ci = &tpg_ci->ci_group->cg_item;
+        tpg_ci_s = &lun_ci->ci_parent->ci_group->cg_item;
+        wwn_ci_s = &tpg_ci_s->ci_group->cg_item;
+        /*
+         * Make sure the SymLink is going to the same $FABRIC/$WWN/tpgt_$TPGT
+         */
+        if (strcmp(config_item_name(wwn_ci), config_item_name(wwn_ci_s))) {
+                printk(KERN_ERR "Illegal Initiator ACL SymLink outside of %s\n",
+                        config_item_name(wwn_ci));
+                return -EINVAL;
+        }
+        if (strcmp(config_item_name(tpg_ci), config_item_name(tpg_ci_s))) {
+                printk(KERN_ERR "Illegal Initiator ACL Symlink outside of %s"
+                        " TPGT: %s\n", config_item_name(wwn_ci),
+                        config_item_name(tpg_ci));
+                return -EINVAL;
+        }
+        /*
+         * If this struct se_node_acl was dynamically generated with
+         * tpg_1/attrib/generate_node_acls=1, use the existing deve->lun_flags,
+         * which be will write protected (READ-ONLY) when
+         * tpg_1/attrib/demo_mode_write_protect=1
+         */
+        spin_lock_irq(&lacl->se_lun_nacl->device_list_lock);
+        deve = &lacl->se_lun_nacl->device_list[lacl->mapped_lun];
+        if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS)
+                lun_access = deve->lun_flags;
+        else
+                lun_access =
+                        (TPG_TFO(se_tpg)->tpg_check_prod_mode_write_protect(
+                                se_tpg)) ? TRANSPORT_LUNFLAGS_READ_ONLY :
+                                           TRANSPORT_LUNFLAGS_READ_WRITE;
+        spin_unlock_irq(&lacl->se_lun_nacl->device_list_lock);
+        /*
+         * Determine the actual mapped LUN value user wants..
+         *
+         * This value is what the SCSI Initiator actually sees the
+         * iscsi/$IQN/$TPGT/lun/lun_* as on their SCSI Initiator Ports.
+         */
+        ret = core_dev_add_initiator_node_lun_acl(se_tpg, lacl,
+                        lun->unpacked_lun, lun_access);
+
+        return (ret < 0) ? -EINVAL : 0;
+}
+
+static int target_fabric_mappedlun_unlink(
+        struct config_item *lun_acl_ci,
+        struct config_item *lun_ci)
+{
+        struct se_lun *lun;
+        struct se_lun_acl *lacl = container_of(to_config_group(lun_acl_ci),
+                        struct se_lun_acl, se_lun_group);
+        struct se_node_acl *nacl = lacl->se_lun_nacl;
+        struct se_dev_entry *deve = &nacl->device_list[lacl->mapped_lun];
+        struct se_portal_group *se_tpg;
+        /*
+         * Determine if the underlying MappedLUN has already been released..
+         */
+        if (!(deve->se_lun))
+                return 0;
+
+        lun = container_of(to_config_group(lun_ci), struct se_lun, lun_group);
+        se_tpg = lun->lun_sep->sep_tpg;
+
+        core_dev_del_initiator_node_lun_acl(se_tpg, lun, lacl);
+        return 0;
+}
+
+CONFIGFS_EATTR_STRUCT(target_fabric_mappedlun, se_lun_acl);
+#define TCM_MAPPEDLUN_ATTR(_name, _mode)                                \
+static struct target_fabric_mappedlun_attribute target_fabric_mappedlun_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        target_fabric_mappedlun_show_##_name,                           \
+        target_fabric_mappedlun_store_##_name);
+
+static ssize_t target_fabric_mappedlun_show_write_protect(
+        struct se_lun_acl *lacl,
+        char *page)
+{
+        struct se_node_acl *se_nacl = lacl->se_lun_nacl;
+        struct se_dev_entry *deve;
+        ssize_t len;
+
+        spin_lock_irq(&se_nacl->device_list_lock);
+        deve = &se_nacl->device_list[lacl->mapped_lun];
+        len = sprintf(page, "%d\n",
+                        (deve->lun_flags & TRANSPORT_LUNFLAGS_READ_ONLY) ?
+                        1 : 0);
+        spin_unlock_irq(&se_nacl->device_list_lock);
+
+        return len;
+}
+
+static ssize_t target_fabric_mappedlun_store_write_protect(
+        struct se_lun_acl *lacl,
+        const char *page,
+        size_t count)
+{
+        struct se_node_acl *se_nacl = lacl->se_lun_nacl;
+        struct se_portal_group *se_tpg = se_nacl->se_tpg;
+        unsigned long op;
+
+        if (strict_strtoul(page, 0, &op))
+                return -EINVAL;
+
+        if ((op != 1) && (op != 0))
+                return -EINVAL;
+
+        core_update_device_list_access(lacl->mapped_lun, (op) ?
+                        TRANSPORT_LUNFLAGS_READ_ONLY :
+                        TRANSPORT_LUNFLAGS_READ_WRITE,
+                        lacl->se_lun_nacl);
+
+        printk(KERN_INFO "%s_ConfigFS: Changed Initiator ACL: %s"
+                " Mapped LUN: %u Write Protect bit to %s\n",
+                TPG_TFO(se_tpg)->get_fabric_name(),
+                lacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");
+
+        return count;
+
+}
+
+TCM_MAPPEDLUN_ATTR(write_protect, S_IRUGO | S_IWUSR);
+
+CONFIGFS_EATTR_OPS(target_fabric_mappedlun, se_lun_acl, se_lun_group);
+
+static struct configfs_attribute *target_fabric_mappedlun_attrs[] = {
+        &target_fabric_mappedlun_write_protect.attr,
+        NULL,
+};
+
+static struct configfs_item_operations target_fabric_mappedlun_item_ops = {
+        .show_attribute         = target_fabric_mappedlun_attr_show,
+        .store_attribute        = target_fabric_mappedlun_attr_store,
+        .allow_link             = target_fabric_mappedlun_link,
+        .drop_link              = target_fabric_mappedlun_unlink,
+};
+
+TF_CIT_SETUP(tpg_mappedlun, &target_fabric_mappedlun_item_ops, NULL,
+                target_fabric_mappedlun_attrs);
+
+/* End of tfc_tpg_mappedlun_cit */
+
+/* Start of tfc_tpg_nacl_attrib_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_nacl_attrib, se_node_acl, acl_attrib_group);
+
+static struct configfs_item_operations target_fabric_nacl_attrib_item_ops = {
+        .show_attribute         = target_fabric_nacl_attrib_attr_show,
+        .store_attribute        = target_fabric_nacl_attrib_attr_store,
+};
+
+TF_CIT_SETUP(tpg_nacl_attrib, &target_fabric_nacl_attrib_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_nacl_attrib_cit */
+
+/* Start of tfc_tpg_nacl_auth_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_nacl_auth, se_node_acl, acl_auth_group);
+
+static struct configfs_item_operations target_fabric_nacl_auth_item_ops = {
+        .show_attribute         = target_fabric_nacl_auth_attr_show,
+        .store_attribute        = target_fabric_nacl_auth_attr_store,
+};
+
+TF_CIT_SETUP(tpg_nacl_auth, &target_fabric_nacl_auth_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_nacl_auth_cit */
+
+/* Start of tfc_tpg_nacl_param_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_nacl_param, se_node_acl, acl_param_group);
+
+static struct configfs_item_operations target_fabric_nacl_param_item_ops = {
+        .show_attribute         = target_fabric_nacl_param_attr_show,
+        .store_attribute        = target_fabric_nacl_param_attr_store,
+};
+
+TF_CIT_SETUP(tpg_nacl_param, &target_fabric_nacl_param_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_nacl_param_cit */
+
+/* Start of tfc_tpg_nacl_base_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_nacl_base, se_node_acl, acl_group);
+
+static struct config_group *target_fabric_make_mappedlun(
+        struct config_group *group,
+        const char *name)
+{
+        struct se_node_acl *se_nacl = container_of(group,
+                        struct se_node_acl, acl_group);
+        struct se_portal_group *se_tpg = se_nacl->se_tpg;
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        struct se_lun_acl *lacl;
+        struct config_item *acl_ci;
+        char *buf;
+        unsigned long mapped_lun;
+        int ret = 0;
+
+        acl_ci = &group->cg_item;
+        if (!(acl_ci)) {
+                printk(KERN_ERR "Unable to locatel acl_ci\n");
+                return NULL;
+        }
+
+        buf = kzalloc(strlen(name) + 1, GFP_KERNEL);
+        if (!(buf)) {
+                printk(KERN_ERR "Unable to allocate memory for name buf\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        snprintf(buf, strlen(name) + 1, "%s", name);
+        /*
+         * Make sure user is creating iscsi/$IQN/$TPGT/acls/$INITIATOR/lun_$ID.
+         */
+        if (strstr(buf, "lun_") != buf) {
+                printk(KERN_ERR "Unable to locate \"lun_\" from buf: %s"
+                        " name: %s\n", buf, name);
+                ret = -EINVAL;
+                goto out;
+        }
+        /*
+         * Determine the Mapped LUN value.  This is what the SCSI Initiator
+         * Port will actually see.
+         */
+        if (strict_strtoul(buf + 4, 0, &mapped_lun) || mapped_lun > UINT_MAX) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        lacl = core_dev_init_initiator_node_lun_acl(se_tpg, mapped_lun,
+                        config_item_name(acl_ci), &ret);
+        if (!(lacl))
+                goto out;
+
+        config_group_init_type_name(&lacl->se_lun_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_mappedlun_cit);
+
+        kfree(buf);
+        return &lacl->se_lun_group;
+out:
+        kfree(buf);
+        return ERR_PTR(ret);
+}
+
+static void target_fabric_drop_mappedlun(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_lun_acl *lacl = container_of(to_config_group(item),
+                        struct se_lun_acl, se_lun_group);
+        struct se_portal_group *se_tpg = lacl->se_lun_nacl->se_tpg;
+
+        config_item_put(item);
+        core_dev_free_initiator_node_lun_acl(se_tpg, lacl);
+}
+
+static struct configfs_item_operations target_fabric_nacl_base_item_ops = {
+        .show_attribute         = target_fabric_nacl_base_attr_show,
+        .store_attribute        = target_fabric_nacl_base_attr_store,
+};
+
+static struct configfs_group_operations target_fabric_nacl_base_group_ops = {
+        .make_group             = target_fabric_make_mappedlun,
+        .drop_item              = target_fabric_drop_mappedlun,
+};
+
+TF_CIT_SETUP(tpg_nacl_base, &target_fabric_nacl_base_item_ops,
+                &target_fabric_nacl_base_group_ops, NULL);
+
+/* End of tfc_tpg_nacl_base_cit */
+
+/* Start of tfc_tpg_nacl_cit */
+
+static struct config_group *target_fabric_make_nodeacl(
+        struct config_group *group,
+        const char *name)
+{
+        struct se_portal_group *se_tpg = container_of(group,
+                        struct se_portal_group, tpg_acl_group);
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        struct se_node_acl *se_nacl;
+        struct config_group *nacl_cg;
+
+        if (!(tf->tf_ops.fabric_make_nodeacl)) {
+                printk(KERN_ERR "tf->tf_ops.fabric_make_nodeacl is NULL\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        se_nacl = tf->tf_ops.fabric_make_nodeacl(se_tpg, group, name);
+        if (IS_ERR(se_nacl))
+                return ERR_PTR(PTR_ERR(se_nacl));
+
+        nacl_cg = &se_nacl->acl_group;
+        nacl_cg->default_groups = se_nacl->acl_default_groups;
+        nacl_cg->default_groups[0] = &se_nacl->acl_attrib_group;
+        nacl_cg->default_groups[1] = &se_nacl->acl_auth_group;
+        nacl_cg->default_groups[2] = &se_nacl->acl_param_group;
+        nacl_cg->default_groups[3] = NULL;
+
+        config_group_init_type_name(&se_nacl->acl_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_nacl_base_cit);
+        config_group_init_type_name(&se_nacl->acl_attrib_group, "attrib",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_nacl_attrib_cit);
+        config_group_init_type_name(&se_nacl->acl_auth_group, "auth",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_nacl_auth_cit);
+        config_group_init_type_name(&se_nacl->acl_param_group, "param",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_nacl_param_cit);
+
+        return &se_nacl->acl_group;
+}
+
+static void target_fabric_drop_nodeacl(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_portal_group *se_tpg = container_of(group,
+                        struct se_portal_group, tpg_acl_group);
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        struct se_node_acl *se_nacl = container_of(to_config_group(item),
+                        struct se_node_acl, acl_group);
+        struct config_item *df_item;
+        struct config_group *nacl_cg;
+        int i;
+
+        nacl_cg = &se_nacl->acl_group;
+        for (i = 0; nacl_cg->default_groups[i]; i++) {
+                df_item = &nacl_cg->default_groups[i]->cg_item;
+                nacl_cg->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+
+        config_item_put(item);
+        tf->tf_ops.fabric_drop_nodeacl(se_nacl);
+}
+
+static struct configfs_group_operations target_fabric_nacl_group_ops = {
+        .make_group     = target_fabric_make_nodeacl,
+        .drop_item      = target_fabric_drop_nodeacl,
+};
+
+TF_CIT_SETUP(tpg_nacl, NULL, &target_fabric_nacl_group_ops, NULL);
+
+/* End of tfc_tpg_nacl_cit */
+
+/* Start of tfc_tpg_np_base_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_np_base, se_tpg_np, tpg_np_group);
+
+static struct configfs_item_operations target_fabric_np_base_item_ops = {
+        .show_attribute         = target_fabric_np_base_attr_show,
+        .store_attribute        = target_fabric_np_base_attr_store,
+};
+
+TF_CIT_SETUP(tpg_np_base, &target_fabric_np_base_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_np_base_cit */
+
+/* Start of tfc_tpg_np_cit */
+
+static struct config_group *target_fabric_make_np(
+        struct config_group *group,
+        const char *name)
+{
+        struct se_portal_group *se_tpg = container_of(group,
+                                struct se_portal_group, tpg_np_group);
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        struct se_tpg_np *se_tpg_np;
+
+        if (!(tf->tf_ops.fabric_make_np)) {
+                printk(KERN_ERR "tf->tf_ops.fabric_make_np is NULL\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        se_tpg_np = tf->tf_ops.fabric_make_np(se_tpg, group, name);
+        if (!(se_tpg_np) || IS_ERR(se_tpg_np))
+                return ERR_PTR(-EINVAL);
+
+        config_group_init_type_name(&se_tpg_np->tpg_np_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_np_base_cit);
+
+        return &se_tpg_np->tpg_np_group;
+}
+
+static void target_fabric_drop_np(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_portal_group *se_tpg = container_of(group,
+                                struct se_portal_group, tpg_np_group);
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        struct se_tpg_np *se_tpg_np = container_of(to_config_group(item),
+                                struct se_tpg_np, tpg_np_group);
+
+        config_item_put(item);
+        tf->tf_ops.fabric_drop_np(se_tpg_np);
+}
+
+static struct configfs_group_operations target_fabric_np_group_ops = {
+        .make_group     = &target_fabric_make_np,
+        .drop_item      = &target_fabric_drop_np,
+};
+
+TF_CIT_SETUP(tpg_np, NULL, &target_fabric_np_group_ops, NULL);
+
+/* End of tfc_tpg_np_cit */
+
+/* Start of tfc_tpg_port_cit */
+
+CONFIGFS_EATTR_STRUCT(target_fabric_port, se_lun);
+#define TCM_PORT_ATTR(_name, _mode)                                     \
+static struct target_fabric_port_attribute target_fabric_port_##_name = \
+        __CONFIGFS_EATTR(_name, _mode,                                  \
+        target_fabric_port_show_attr_##_name,                           \
+        target_fabric_port_store_attr_##_name);
+
+#define TCM_PORT_ATTOR_RO(_name)                                        \
+        __CONFIGFS_EATTR_RO(_name,                                      \
+        target_fabric_port_show_attr_##_name);
+
+/*
+ * alua_tg_pt_gp
+ */
+static ssize_t target_fabric_port_show_attr_alua_tg_pt_gp(
+        struct se_lun *lun,
+        char *page)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_show_tg_pt_gp_info(lun->lun_sep, page);
+}
+
+static ssize_t target_fabric_port_store_attr_alua_tg_pt_gp(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_store_tg_pt_gp_info(lun->lun_sep, page, count);
+}
+
+TCM_PORT_ATTR(alua_tg_pt_gp, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_tg_pt_offline
+ */
+static ssize_t target_fabric_port_show_attr_alua_tg_pt_offline(
+        struct se_lun *lun,
+        char *page)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_show_offline_bit(lun, page);
+}
+
+static ssize_t target_fabric_port_store_attr_alua_tg_pt_offline(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_store_offline_bit(lun, page, count);
+}
+
+TCM_PORT_ATTR(alua_tg_pt_offline, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_tg_pt_status
+ */
+static ssize_t target_fabric_port_show_attr_alua_tg_pt_status(
+        struct se_lun *lun,
+        char *page)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_show_secondary_status(lun, page);
+}
+
+static ssize_t target_fabric_port_store_attr_alua_tg_pt_status(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_store_secondary_status(lun, page, count);
+}
+
+TCM_PORT_ATTR(alua_tg_pt_status, S_IRUGO | S_IWUSR);
+
+/*
+ * alua_tg_pt_write_md
+ */
+static ssize_t target_fabric_port_show_attr_alua_tg_pt_write_md(
+        struct se_lun *lun,
+        char *page)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_show_secondary_write_metadata(lun, page);
+}
+
+static ssize_t target_fabric_port_store_attr_alua_tg_pt_write_md(
+        struct se_lun *lun,
+        const char *page,
+        size_t count)
+{
+        if (!(lun))
+                return -ENODEV;
+
+        if (!(lun->lun_sep))
+                return -ENODEV;
+
+        return core_alua_store_secondary_write_metadata(lun, page, count);
+}
+
+TCM_PORT_ATTR(alua_tg_pt_write_md, S_IRUGO | S_IWUSR);
+
+
+static struct configfs_attribute *target_fabric_port_attrs[] = {
+        &target_fabric_port_alua_tg_pt_gp.attr,
+        &target_fabric_port_alua_tg_pt_offline.attr,
+        &target_fabric_port_alua_tg_pt_status.attr,
+        &target_fabric_port_alua_tg_pt_write_md.attr,
+        NULL,
+};
+
+CONFIGFS_EATTR_OPS(target_fabric_port, se_lun, lun_group);
+
+static int target_fabric_port_link(
+        struct config_item *lun_ci,
+        struct config_item *se_dev_ci)
+{
+        struct config_item *tpg_ci;
+        struct se_device *dev;
+        struct se_lun *lun = container_of(to_config_group(lun_ci),
+                                struct se_lun, lun_group);
+        struct se_lun *lun_p;
+        struct se_portal_group *se_tpg;
+        struct se_subsystem_dev *se_dev = container_of(
+                                to_config_group(se_dev_ci), struct se_subsystem_dev,
+                                se_dev_group);
+        struct target_fabric_configfs *tf;
+        int ret;
+
+        tpg_ci = &lun_ci->ci_parent->ci_group->cg_item;
+        se_tpg = container_of(to_config_group(tpg_ci),
+                                struct se_portal_group, tpg_group);
+        tf = se_tpg->se_tpg_wwn->wwn_tf;
+
+        if (lun->lun_se_dev !=  NULL) {
+                printk(KERN_ERR "Port Symlink already exists\n");
+                return -EEXIST;
+        }
+
+        dev = se_dev->se_dev_ptr;
+        if (!(dev)) {
+                printk(KERN_ERR "Unable to locate struct se_device pointer from"
+                        " %s\n", config_item_name(se_dev_ci));
+                ret = -ENODEV;
+                goto out;
+        }
+
+        lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev,
+                                lun->unpacked_lun);
+        if ((IS_ERR(lun_p)) || !(lun_p)) {
+                printk(KERN_ERR "core_dev_add_lun() failed\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (tf->tf_ops.fabric_post_link) {
+                /*
+                 * Call the optional fabric_post_link() to allow a
+                 * fabric module to setup any additional state once
+                 * core_dev_add_lun() has been called..
+                 */
+                tf->tf_ops.fabric_post_link(se_tpg, lun);
+        }
+
+        return 0;
+out:
+        return ret;
+}
+
+static int target_fabric_port_unlink(
+        struct config_item *lun_ci,
+        struct config_item *se_dev_ci)
+{
+        struct se_lun *lun = container_of(to_config_group(lun_ci),
+                                struct se_lun, lun_group);
+        struct se_portal_group *se_tpg = lun->lun_sep->sep_tpg;
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+
+        if (tf->tf_ops.fabric_pre_unlink) {
+                /*
+                 * Call the optional fabric_pre_unlink() to allow a
+                 * fabric module to release any additional stat before
+                 * core_dev_del_lun() is called.
+                */
+                tf->tf_ops.fabric_pre_unlink(se_tpg, lun);
+        }
+
+        core_dev_del_lun(se_tpg, lun->unpacked_lun);
+        return 0;
+}
+
+static struct configfs_item_operations target_fabric_port_item_ops = {
+        .show_attribute         = target_fabric_port_attr_show,
+        .store_attribute        = target_fabric_port_attr_store,
+        .allow_link             = target_fabric_port_link,
+        .drop_link              = target_fabric_port_unlink,
+};
+
+TF_CIT_SETUP(tpg_port, &target_fabric_port_item_ops, NULL, target_fabric_port_attrs);
+
+/* End of tfc_tpg_port_cit */
+
+/* Start of tfc_tpg_lun_cit */
+
+static struct config_group *target_fabric_make_lun(
+        struct config_group *group,
+        const char *name)
+{
+        struct se_lun *lun;
+        struct se_portal_group *se_tpg = container_of(group,
+                        struct se_portal_group, tpg_lun_group);
+        struct target_fabric_configfs *tf = se_tpg->se_tpg_wwn->wwn_tf;
+        unsigned long unpacked_lun;
+
+        if (strstr(name, "lun_") != name) {
+                printk(KERN_ERR "Unable to locate \'_\" in"
+                                " \"lun_$LUN_NUMBER\"\n");
+                return ERR_PTR(-EINVAL);
+        }
+        if (strict_strtoul(name + 4, 0, &unpacked_lun) || unpacked_lun > UINT_MAX)
+                return ERR_PTR(-EINVAL);
+
+        lun = core_get_lun_from_tpg(se_tpg, unpacked_lun);
+        if (!(lun))
+                return ERR_PTR(-EINVAL);
+
+        config_group_init_type_name(&lun->lun_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_port_cit);
+
+        return &lun->lun_group;
+}
+
+static void target_fabric_drop_lun(
+        struct config_group *group,
+        struct config_item *item)
+{
+        config_item_put(item);
+}
+
+static struct configfs_group_operations target_fabric_lun_group_ops = {
+        .make_group     = &target_fabric_make_lun,
+        .drop_item      = &target_fabric_drop_lun,
+};
+
+TF_CIT_SETUP(tpg_lun, NULL, &target_fabric_lun_group_ops, NULL);
+
+/* End of tfc_tpg_lun_cit */
+
+/* Start of tfc_tpg_attrib_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_tpg_attrib, se_portal_group, tpg_attrib_group);
+
+static struct configfs_item_operations target_fabric_tpg_attrib_item_ops = {
+        .show_attribute         = target_fabric_tpg_attrib_attr_show,
+        .store_attribute        = target_fabric_tpg_attrib_attr_store,
+};
+
+TF_CIT_SETUP(tpg_attrib, &target_fabric_tpg_attrib_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_attrib_cit */
+
+/* Start of tfc_tpg_param_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_tpg_param, se_portal_group, tpg_param_group);
+
+static struct configfs_item_operations target_fabric_tpg_param_item_ops = {
+        .show_attribute         = target_fabric_tpg_param_attr_show,
+        .store_attribute        = target_fabric_tpg_param_attr_store,
+};
+
+TF_CIT_SETUP(tpg_param, &target_fabric_tpg_param_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_param_cit */
+
+/* Start of tfc_tpg_base_cit */
+/*
+ * For use with TF_TPG_ATTR() and TF_TPG_ATTR_RO()
+ */
+CONFIGFS_EATTR_OPS(target_fabric_tpg, se_portal_group, tpg_group);
+
+static struct configfs_item_operations target_fabric_tpg_base_item_ops = {
+        .show_attribute         = target_fabric_tpg_attr_show,
+        .store_attribute        = target_fabric_tpg_attr_store,
+};
+
+TF_CIT_SETUP(tpg_base, &target_fabric_tpg_base_item_ops, NULL, NULL);
+
+/* End of tfc_tpg_base_cit */
+
+/* Start of tfc_tpg_cit */
+
+static struct config_group *target_fabric_make_tpg(
+        struct config_group *group,
+        const char *name)
+{
+        struct se_wwn *wwn = container_of(group, struct se_wwn, wwn_group);
+        struct target_fabric_configfs *tf = wwn->wwn_tf;
+        struct se_portal_group *se_tpg;
+
+        if (!(tf->tf_ops.fabric_make_tpg)) {
+                printk(KERN_ERR "tf->tf_ops.fabric_make_tpg is NULL\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        se_tpg = tf->tf_ops.fabric_make_tpg(wwn, group, name);
+        if (!(se_tpg) || IS_ERR(se_tpg))
+                return ERR_PTR(-EINVAL);
+        /*
+         * Setup default groups from pre-allocated se_tpg->tpg_default_groups
+         */
+        se_tpg->tpg_group.default_groups = se_tpg->tpg_default_groups;
+        se_tpg->tpg_group.default_groups[0] = &se_tpg->tpg_lun_group;
+        se_tpg->tpg_group.default_groups[1] = &se_tpg->tpg_np_group;
+        se_tpg->tpg_group.default_groups[2] = &se_tpg->tpg_acl_group;
+        se_tpg->tpg_group.default_groups[3] = &se_tpg->tpg_attrib_group;
+        se_tpg->tpg_group.default_groups[4] = &se_tpg->tpg_param_group;
+        se_tpg->tpg_group.default_groups[5] = NULL;
+
+        config_group_init_type_name(&se_tpg->tpg_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_base_cit);
+        config_group_init_type_name(&se_tpg->tpg_lun_group, "lun",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_lun_cit);
+        config_group_init_type_name(&se_tpg->tpg_np_group, "np",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_np_cit);
+        config_group_init_type_name(&se_tpg->tpg_acl_group, "acls",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_nacl_cit);
+        config_group_init_type_name(&se_tpg->tpg_attrib_group, "attrib",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_attrib_cit);
+        config_group_init_type_name(&se_tpg->tpg_param_group, "param",
+                        &TF_CIT_TMPL(tf)->tfc_tpg_param_cit);
+
+        return &se_tpg->tpg_group;
+}
+
+static void target_fabric_drop_tpg(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct se_wwn *wwn = container_of(group, struct se_wwn, wwn_group);
+        struct target_fabric_configfs *tf = wwn->wwn_tf;
+        struct se_portal_group *se_tpg = container_of(to_config_group(item),
+                                struct se_portal_group, tpg_group);
+        struct config_group *tpg_cg = &se_tpg->tpg_group;
+        struct config_item *df_item;
+        int i;
+        /*
+         * Release default groups, but do not release tpg_cg->default_groups
+         * memory as it is statically allocated at se_tpg->tpg_default_groups.
+         */
+        for (i = 0; tpg_cg->default_groups[i]; i++) {
+                df_item = &tpg_cg->default_groups[i]->cg_item;
+                tpg_cg->default_groups[i] = NULL;
+                config_item_put(df_item);
+        }
+
+        config_item_put(item);
+        tf->tf_ops.fabric_drop_tpg(se_tpg);
+}
+
+static struct configfs_group_operations target_fabric_tpg_group_ops = {
+        .make_group     = target_fabric_make_tpg,
+        .drop_item      = target_fabric_drop_tpg,
+};
+
+TF_CIT_SETUP(tpg, NULL, &target_fabric_tpg_group_ops, NULL);
+
+/* End of tfc_tpg_cit */
+
+/* Start of tfc_wwn_cit */
+
+static struct config_group *target_fabric_make_wwn(
+        struct config_group *group,
+        const char *name)
+{
+        struct target_fabric_configfs *tf = container_of(group,
+                                struct target_fabric_configfs, tf_group);
+        struct se_wwn *wwn;
+
+        if (!(tf->tf_ops.fabric_make_wwn)) {
+                printk(KERN_ERR "tf->tf_ops.fabric_make_wwn is NULL\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        wwn = tf->tf_ops.fabric_make_wwn(tf, group, name);
+        if (!(wwn) || IS_ERR(wwn))
+                return ERR_PTR(-EINVAL);
+
+        wwn->wwn_tf = tf;
+        config_group_init_type_name(&wwn->wwn_group, name,
+                        &TF_CIT_TMPL(tf)->tfc_tpg_cit);
+
+        return &wwn->wwn_group;
+}
+
+static void target_fabric_drop_wwn(
+        struct config_group *group,
+        struct config_item *item)
+{
+        struct target_fabric_configfs *tf = container_of(group,
+                                struct target_fabric_configfs, tf_group);
+        struct se_wwn *wwn = container_of(to_config_group(item),
+                                struct se_wwn, wwn_group);
+
+        config_item_put(item);
+        tf->tf_ops.fabric_drop_wwn(wwn);
+}
+
+static struct configfs_group_operations target_fabric_wwn_group_ops = {
+        .make_group     = target_fabric_make_wwn,
+        .drop_item      = target_fabric_drop_wwn,
+};
+/*
+ * For use with TF_WWN_ATTR() and TF_WWN_ATTR_RO()
+ */
+CONFIGFS_EATTR_OPS(target_fabric_wwn, target_fabric_configfs, tf_group);
+
+static struct configfs_item_operations target_fabric_wwn_item_ops = {
+        .show_attribute         = target_fabric_wwn_attr_show,
+        .store_attribute        = target_fabric_wwn_attr_store,
+};
+
+TF_CIT_SETUP(wwn, &target_fabric_wwn_item_ops, &target_fabric_wwn_group_ops, NULL);
+
+/* End of tfc_wwn_cit */
+
+/* Start of tfc_discovery_cit */
+
+CONFIGFS_EATTR_OPS(target_fabric_discovery, target_fabric_configfs,
+                tf_disc_group);
+
+static struct configfs_item_operations target_fabric_discovery_item_ops = {
+        .show_attribute         = target_fabric_discovery_attr_show,
+        .store_attribute        = target_fabric_discovery_attr_store,
+};
+
+TF_CIT_SETUP(discovery, &target_fabric_discovery_item_ops, NULL, NULL);
+
+/* End of tfc_discovery_cit */
+
+int target_fabric_setup_cits(struct target_fabric_configfs *tf)
+{
+        target_fabric_setup_discovery_cit(tf);
+        target_fabric_setup_wwn_cit(tf);
+        target_fabric_setup_tpg_cit(tf);
+        target_fabric_setup_tpg_base_cit(tf);
+        target_fabric_setup_tpg_port_cit(tf);
+        target_fabric_setup_tpg_lun_cit(tf);
+        target_fabric_setup_tpg_np_cit(tf);
+        target_fabric_setup_tpg_np_base_cit(tf);
+        target_fabric_setup_tpg_attrib_cit(tf);
+        target_fabric_setup_tpg_param_cit(tf);
+        target_fabric_setup_tpg_nacl_cit(tf);
+        target_fabric_setup_tpg_nacl_base_cit(tf);
+        target_fabric_setup_tpg_nacl_attrib_cit(tf);
+        target_fabric_setup_tpg_nacl_auth_cit(tf);
+        target_fabric_setup_tpg_nacl_param_cit(tf);
+        target_fabric_setup_tpg_mappedlun_cit(tf);
+
+        return 0;
+}
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
new file mode 100644
index 000000000000..26285644e4de
--- /dev/null
+++ b/drivers/target/target_core_fabric_lib.c
@@ -0,0 +1,451 @@
+/*******************************************************************************
+ * Filename:  target_core_fabric_lib.c
+ *
+ * This file contains generic high level protocol identifier and PR
+ * handlers for TCM fabric modules
+ *
+ * Copyright (c) 2010 Rising Tide Systems, Inc.
+ * Copyright (c) 2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@linux-iscsi.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/string.h>
+#include <linux/ctype.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+
+/*
+ * Handlers for Serial Attached SCSI (SAS)
+ */
+u8 sas_get_fabric_proto_ident(struct se_portal_group *se_tpg)
+{
+        /*
+         * Return a SAS Serial SCSI Protocol identifier for loopback operations
+         * This is defined in  section 7.5.1 Table 362 in spc4r17
+         */
+        return 0x6;
+}
+EXPORT_SYMBOL(sas_get_fabric_proto_ident);
+
+u32 sas_get_pr_transport_id(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code,
+        unsigned char *buf)
+{
+        unsigned char binary, *ptr;
+        int i;
+        u32 off = 4;
+        /*
+         * Set PROTOCOL IDENTIFIER to 6h for SAS
+         */
+        buf[0] = 0x06;
+        /*
+         * From spc4r17, 7.5.4.7 TransportID for initiator ports using SCSI
+         * over SAS Serial SCSI Protocol
+         */
+        ptr = &se_nacl->initiatorname[4]; /* Skip over 'naa. prefix */
+
+        for (i = 0; i < 16; i += 2) {
+                binary = transport_asciihex_to_binaryhex(&ptr[i]);
+                buf[off++] = binary;
+        }
+        /*
+         * The SAS Transport ID is a hardcoded 24-byte length
+         */
+        return 24;
+}
+EXPORT_SYMBOL(sas_get_pr_transport_id);
+
+u32 sas_get_pr_transport_id_len(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code)
+{
+        *format_code = 0;
+        /*
+         * From spc4r17, 7.5.4.7 TransportID for initiator ports using SCSI
+         * over SAS Serial SCSI Protocol
+         *
+         * The SAS Transport ID is a hardcoded 24-byte length
+         */
+        return 24;
+}
+EXPORT_SYMBOL(sas_get_pr_transport_id_len);
+
+/*
+ * Used for handling SCSI fabric dependent TransportIDs in SPC-3 and above
+ * Persistent Reservation SPEC_I_PT=1 and PROUT REGISTER_AND_MOVE operations.
+ */
+char *sas_parse_pr_out_transport_id(
+        struct se_portal_group *se_tpg,
+        const char *buf,
+        u32 *out_tid_len,
+        char **port_nexus_ptr)
+{
+        /*
+         * Assume the FORMAT CODE 00b from spc4r17, 7.5.4.7 TransportID
+         * for initiator ports using SCSI over SAS Serial SCSI Protocol
+         *
+         * The TransportID for a SAS Initiator Port is of fixed size of
+         * 24 bytes, and SAS does not contain a I_T nexus identifier,
+         * so we return the **port_nexus_ptr set to NULL.
+         */
+        *port_nexus_ptr = NULL;
+        *out_tid_len = 24;
+
+        return (char *)&buf[4];
+}
+EXPORT_SYMBOL(sas_parse_pr_out_transport_id);
+
+/*
+ * Handlers for Fibre Channel Protocol (FCP)
+ */
+u8 fc_get_fabric_proto_ident(struct se_portal_group *se_tpg)
+{
+        return 0x0;     /* 0 = fcp-2 per SPC4 section 7.5.1 */
+}
+EXPORT_SYMBOL(fc_get_fabric_proto_ident);
+
+u32 fc_get_pr_transport_id_len(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code)
+{
+        *format_code = 0;
+        /*
+         * The FC Transport ID is a hardcoded 24-byte length
+         */
+        return 24;
+}
+EXPORT_SYMBOL(fc_get_pr_transport_id_len);
+
+u32 fc_get_pr_transport_id(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code,
+        unsigned char *buf)
+{
+        unsigned char binary, *ptr;
+        int i;
+        u32 off = 8;
+        /*
+         * PROTOCOL IDENTIFIER is 0h for FCP-2
+         *
+         * From spc4r17, 7.5.4.2 TransportID for initiator ports using
+         * SCSI over Fibre Channel
+         *
+         * We convert the ASCII formatted N Port name into a binary
+         * encoded TransportID.
+         */
+        ptr = &se_nacl->initiatorname[0];
+
+        for (i = 0; i < 24; ) {
+                if (!(strncmp(&ptr[i], ":", 1))) {
+                        i++;
+                        continue;
+                }
+                binary = transport_asciihex_to_binaryhex(&ptr[i]);
+                buf[off++] = binary;
+                i += 2;
+        }
+        /*
+         * The FC Transport ID is a hardcoded 24-byte length
+         */
+        return 24;
+}
+EXPORT_SYMBOL(fc_get_pr_transport_id);
+
+char *fc_parse_pr_out_transport_id(
+        struct se_portal_group *se_tpg,
+        const char *buf,
+        u32 *out_tid_len,
+        char **port_nexus_ptr)
+{
+        /*
+         * The TransportID for a FC N Port is of fixed size of
+         * 24 bytes, and FC does not contain a I_T nexus identifier,
+         * so we return the **port_nexus_ptr set to NULL.
+         */
+        *port_nexus_ptr = NULL;
+        *out_tid_len = 24;
+
+         return (char *)&buf[8];
+}
+EXPORT_SYMBOL(fc_parse_pr_out_transport_id);
+
+/*
+ * Handlers for Internet Small Computer Systems Interface (iSCSI)
+ */
+
+u8 iscsi_get_fabric_proto_ident(struct se_portal_group *se_tpg)
+{
+        /*
+         * This value is defined for "Internet SCSI (iSCSI)"
+         * in spc4r17 section 7.5.1 Table 362
+         */
+        return 0x5;
+}
+EXPORT_SYMBOL(iscsi_get_fabric_proto_ident);
+
+u32 iscsi_get_pr_transport_id(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code,
+        unsigned char *buf)
+{
+        u32 off = 4, padding = 0;
+        u16 len = 0;
+
+        spin_lock_irq(&se_nacl->nacl_sess_lock);
+        /*
+         * Set PROTOCOL IDENTIFIER to 5h for iSCSI
+        */
+        buf[0] = 0x05;
+        /*
+         * From spc4r17 Section 7.5.4.6: TransportID for initiator
+         * ports using SCSI over iSCSI.
+         *
+         * The null-terminated, null-padded (see 4.4.2) ISCSI NAME field
+         * shall contain the iSCSI name of an iSCSI initiator node (see
+         * RFC 3720). The first ISCSI NAME field byte containing an ASCII
+         * null character terminates the ISCSI NAME field without regard for
+         * the specified length of the iSCSI TransportID or the contents of
+         * the ADDITIONAL LENGTH field.
+         */
+        len = sprintf(&buf[off], "%s", se_nacl->initiatorname);
+        /*
+         * Add Extra byte for NULL terminator
+         */
+        len++;
+        /*
+         * If there is ISID present with the registration and *format code == 1
+         * 1, use iSCSI Initiator port TransportID format.
+         *
+         * Otherwise use iSCSI Initiator device TransportID format that
+         * does not contain the ASCII encoded iSCSI Initiator iSID value
+         * provied by the iSCSi Initiator during the iSCSI login process.
+         */
+        if ((*format_code == 1) && (pr_reg->isid_present_at_reg)) {
+                /*
+                 * Set FORMAT CODE 01b for iSCSI Initiator port TransportID
+                 * format.
+                 */
+                buf[0] |= 0x40;
+                /*
+                 * From spc4r17 Section 7.5.4.6: TransportID for initiator
+                 * ports using SCSI over iSCSI.  Table 390
+                 *
+                 * The SEPARATOR field shall contain the five ASCII
+                 * characters ",i,0x".
+                 *
+                 * The null-terminated, null-padded ISCSI INITIATOR SESSION ID
+                 * field shall contain the iSCSI initiator session identifier
+                 * (see RFC 3720) in the form of ASCII characters that are the
+                 * hexadecimal digits converted from the binary iSCSI initiator
+                 * session identifier value. The first ISCSI INITIATOR SESSION
+                 * ID field byte containing an ASCII null character
+                 */
+                buf[off+len] = 0x2c; off++; /* ASCII Character: "," */
+                buf[off+len] = 0x69; off++; /* ASCII Character: "i" */
+                buf[off+len] = 0x2c; off++; /* ASCII Character: "," */
+                buf[off+len] = 0x30; off++; /* ASCII Character: "0" */
+                buf[off+len] = 0x78; off++; /* ASCII Character: "x" */
+                len += 5;
+                buf[off+len] = pr_reg->pr_reg_isid[0]; off++;
+                buf[off+len] = pr_reg->pr_reg_isid[1]; off++;
+                buf[off+len] = pr_reg->pr_reg_isid[2]; off++;
+                buf[off+len] = pr_reg->pr_reg_isid[3]; off++;
+                buf[off+len] = pr_reg->pr_reg_isid[4]; off++;
+                buf[off+len] = pr_reg->pr_reg_isid[5]; off++;
+                buf[off+len] = '\0'; off++;
+                len += 7;
+        }
+        spin_unlock_irq(&se_nacl->nacl_sess_lock);
+        /*
+         * The ADDITIONAL LENGTH field specifies the number of bytes that follow
+         * in the TransportID. The additional length shall be at least 20 and
+         * shall be a multiple of four.
+        */
+        padding = ((-len) & 3);
+        if (padding != 0)
+                len += padding;
+
+        buf[2] = ((len >> 8) & 0xff);
+        buf[3] = (len & 0xff);
+        /*
+         * Increment value for total payload + header length for
+         * full status descriptor
+         */
+        len += 4;
+
+        return len;
+}
+EXPORT_SYMBOL(iscsi_get_pr_transport_id);
+
+u32 iscsi_get_pr_transport_id_len(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int *format_code)
+{
+        u32 len = 0, padding = 0;
+
+        spin_lock_irq(&se_nacl->nacl_sess_lock);
+        len = strlen(se_nacl->initiatorname);
+        /*
+         * Add extra byte for NULL terminator
+         */
+        len++;
+        /*
+         * If there is ISID present with the registration, use format code:
+         * 01b: iSCSI Initiator port TransportID format
+         *
+         * If there is not an active iSCSI session, use format code:
+         * 00b: iSCSI Initiator device TransportID format
+         */
+        if (pr_reg->isid_present_at_reg) {
+                len += 5; /* For ",i,0x" ASCII seperator */
+                len += 7; /* For iSCSI Initiator Session ID + Null terminator */
+                *format_code = 1;
+        } else
+                *format_code = 0;
+        spin_unlock_irq(&se_nacl->nacl_sess_lock);
+        /*
+         * The ADDITIONAL LENGTH field specifies the number of bytes that follow
+         * in the TransportID. The additional length shall be at least 20 and
+         * shall be a multiple of four.
+         */
+        padding = ((-len) & 3);
+        if (padding != 0)
+                len += padding;
+        /*
+         * Increment value for total payload + header length for
+         * full status descriptor
+         */
+        len += 4;
+
+        return len;
+}
+EXPORT_SYMBOL(iscsi_get_pr_transport_id_len);
+
+char *iscsi_parse_pr_out_transport_id(
+        struct se_portal_group *se_tpg,
+        const char *buf,
+        u32 *out_tid_len,
+        char **port_nexus_ptr)
+{
+        char *p;
+        u32 tid_len, padding;
+        int i;
+        u16 add_len;
+        u8 format_code = (buf[0] & 0xc0);
+        /*
+         * Check for FORMAT CODE 00b or 01b from spc4r17, section 7.5.4.6:
+         *
+         *       TransportID for initiator ports using SCSI over iSCSI,
+         *       from Table 388 -- iSCSI TransportID formats.
+         *
+         *    00b     Initiator port is identified using the world wide unique
+         *            SCSI device name of the iSCSI initiator
+         *            device containing the initiator port (see table 389).
+         *    01b     Initiator port is identified using the world wide unique
+         *            initiator port identifier (see table 390).10b to 11b
+         *            Reserved
+         */
+        if ((format_code != 0x00) && (format_code != 0x40)) {
+                printk(KERN_ERR "Illegal format code: 0x%02x for iSCSI"
+                        " Initiator Transport ID\n", format_code);
+                return NULL;
+        }
+        /*
+         * If the caller wants the TransportID Length, we set that value for the
+         * entire iSCSI Tarnsport ID now.
+         */
+         if (out_tid_len != NULL) {
+                add_len = ((buf[2] >> 8) & 0xff);
+                add_len |= (buf[3] & 0xff);
+
+                tid_len = strlen((char *)&buf[4]);
+                tid_len += 4; /* Add four bytes for iSCSI Transport ID header */
+                tid_len += 1; /* Add one byte for NULL terminator */
+                padding = ((-tid_len) & 3);
+                if (padding != 0)
+                        tid_len += padding;
+
+                if ((add_len + 4) != tid_len) {
+                        printk(KERN_INFO "LIO-Target Extracted add_len: %hu "
+                                "does not match calculated tid_len: %u,"
+                                " using tid_len instead\n", add_len+4, tid_len);
+                        *out_tid_len = tid_len;
+                } else
+                        *out_tid_len = (add_len + 4);
+        }
+        /*
+         * Check for ',i,0x' seperator between iSCSI Name and iSCSI Initiator
+         * Session ID as defined in Table 390 - iSCSI initiator port TransportID
+         * format.
+         */
+        if (format_code == 0x40) {
+                p = strstr((char *)&buf[4], ",i,0x");
+                if (!(p)) {
+                        printk(KERN_ERR "Unable to locate \",i,0x\" seperator"
+                                " for Initiator port identifier: %s\n",
+                                (char *)&buf[4]);
+                        return NULL;
+                }
+                *p = '\0'; /* Terminate iSCSI Name */
+                p += 5; /* Skip over ",i,0x" seperator */
+
+                *port_nexus_ptr = p;
+                /*
+                 * Go ahead and do the lower case conversion of the received
+                 * 12 ASCII characters representing the ISID in the TransportID
+                 * for comparision against the running iSCSI session's ISID from
+                 * iscsi_target.c:lio_sess_get_initiator_sid()
+                 */
+                for (i = 0; i < 12; i++) {
+                        if (isdigit(*p)) {
+                                p++;
+                                continue;
+                        }
+                        *p = tolower(*p);
+                        p++;
+                }
+        }
+
+        return (char *)&buf[4];
+}
+EXPORT_SYMBOL(iscsi_parse_pr_out_transport_id);
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
new file mode 100644
index 000000000000..0aaca885668f
--- /dev/null
+++ b/drivers/target/target_core_file.c
@@ -0,0 +1,688 @@
+/*******************************************************************************
+ * Filename:  target_core_file.c
+ *
+ * This file contains the Storage Engine <-> FILEIO transport specific functions
+ *
+ * Copyright (c) 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005-2006 SBE, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/string.h>
+#include <linux/parser.h>
+#include <linux/timer.h>
+#include <linux/blkdev.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+
+#include "target_core_file.h"
+
+#if 1
+#define DEBUG_FD_CACHE(x...) printk(x)
+#else
+#define DEBUG_FD_CACHE(x...)
+#endif
+
+#if 1
+#define DEBUG_FD_FUA(x...) printk(x)
+#else
+#define DEBUG_FD_FUA(x...)
+#endif
+
+static struct se_subsystem_api fileio_template;
+
+/*      fd_attach_hba(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int fd_attach_hba(struct se_hba *hba, u32 host_id)
+{
+        struct fd_host *fd_host;
+
+        fd_host = kzalloc(sizeof(struct fd_host), GFP_KERNEL);
+        if (!(fd_host)) {
+                printk(KERN_ERR "Unable to allocate memory for struct fd_host\n");
+                return -1;
+        }
+
+        fd_host->fd_host_id = host_id;
+
+        atomic_set(&hba->left_queue_depth, FD_HBA_QUEUE_DEPTH);
+        atomic_set(&hba->max_queue_depth, FD_HBA_QUEUE_DEPTH);
+        hba->hba_ptr = (void *) fd_host;
+
+        printk(KERN_INFO "CORE_HBA[%d] - TCM FILEIO HBA Driver %s on Generic"
+                " Target Core Stack %s\n", hba->hba_id, FD_VERSION,
+                TARGET_CORE_MOD_VERSION);
+        printk(KERN_INFO "CORE_HBA[%d] - Attached FILEIO HBA: %u to Generic"
+                " Target Core with TCQ Depth: %d MaxSectors: %u\n",
+                hba->hba_id, fd_host->fd_host_id,
+                atomic_read(&hba->max_queue_depth), FD_MAX_SECTORS);
+
+        return 0;
+}
+
+static void fd_detach_hba(struct se_hba *hba)
+{
+        struct fd_host *fd_host = hba->hba_ptr;
+
+        printk(KERN_INFO "CORE_HBA[%d] - Detached FILEIO HBA: %u from Generic"
+                " Target Core\n", hba->hba_id, fd_host->fd_host_id);
+
+        kfree(fd_host);
+        hba->hba_ptr = NULL;
+}
+
+static void *fd_allocate_virtdevice(struct se_hba *hba, const char *name)
+{
+        struct fd_dev *fd_dev;
+        struct fd_host *fd_host = (struct fd_host *) hba->hba_ptr;
+
+        fd_dev = kzalloc(sizeof(struct fd_dev), GFP_KERNEL);
+        if (!(fd_dev)) {
+                printk(KERN_ERR "Unable to allocate memory for struct fd_dev\n");
+                return NULL;
+        }
+
+        fd_dev->fd_host = fd_host;
+
+        printk(KERN_INFO "FILEIO: Allocated fd_dev for %p\n", name);
+
+        return fd_dev;
+}
+
+/*      fd_create_virtdevice(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static struct se_device *fd_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p)
+{
+        char *dev_p = NULL;
+        struct se_device *dev;
+        struct se_dev_limits dev_limits;
+        struct queue_limits *limits;
+        struct fd_dev *fd_dev = (struct fd_dev *) p;
+        struct fd_host *fd_host = (struct fd_host *) hba->hba_ptr;
+        mm_segment_t old_fs;
+        struct file *file;
+        struct inode *inode = NULL;
+        int dev_flags = 0, flags;
+
+        memset(&dev_limits, 0, sizeof(struct se_dev_limits));
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        dev_p = getname(fd_dev->fd_dev_name);
+        set_fs(old_fs);
+
+        if (IS_ERR(dev_p)) {
+                printk(KERN_ERR "getname(%s) failed: %lu\n",
+                        fd_dev->fd_dev_name, IS_ERR(dev_p));
+                goto fail;
+        }
+#if 0
+        if (di->no_create_file)
+                flags = O_RDWR | O_LARGEFILE;
+        else
+                flags = O_RDWR | O_CREAT | O_LARGEFILE;
+#else
+        flags = O_RDWR | O_CREAT | O_LARGEFILE;
+#endif
+/*      flags |= O_DIRECT; */
+        /*
+         * If fd_buffered_io=1 has not been set explictly (the default),
+         * use O_SYNC to force FILEIO writes to disk.
+         */
+        if (!(fd_dev->fbd_flags & FDBD_USE_BUFFERED_IO))
+                flags |= O_SYNC;
+
+        file = filp_open(dev_p, flags, 0600);
+
+        if (IS_ERR(file) || !file || !file->f_dentry) {
+                printk(KERN_ERR "filp_open(%s) failed\n", dev_p);
+                goto fail;
+        }
+        fd_dev->fd_file = file;
+        /*
+         * If using a block backend with this struct file, we extract
+         * fd_dev->fd_[block,dev]_size from struct block_device.
+         *
+         * Otherwise, we use the passed fd_size= from configfs
+         */
+        inode = file->f_mapping->host;
+        if (S_ISBLK(inode->i_mode)) {
+                struct request_queue *q;
+                /*
+                 * Setup the local scope queue_limits from struct request_queue->limits
+                 * to pass into transport_add_device_to_core_hba() as struct se_dev_limits.
+                 */
+                q = bdev_get_queue(inode->i_bdev);
+                limits = &dev_limits.limits;
+                limits->logical_block_size = bdev_logical_block_size(inode->i_bdev);
+                limits->max_hw_sectors = queue_max_hw_sectors(q);
+                limits->max_sectors = queue_max_sectors(q);
+                /*
+                 * Determine the number of bytes from i_size_read() minus
+                 * one (1) logical sector from underlying struct block_device
+                 */
+                fd_dev->fd_block_size = bdev_logical_block_size(inode->i_bdev);
+                fd_dev->fd_dev_size = (i_size_read(file->f_mapping->host) -
+                                       fd_dev->fd_block_size);
+
+                printk(KERN_INFO "FILEIO: Using size: %llu bytes from struct"
+                        " block_device blocks: %llu logical_block_size: %d\n",
+                        fd_dev->fd_dev_size,
+                        div_u64(fd_dev->fd_dev_size, fd_dev->fd_block_size),
+                        fd_dev->fd_block_size);
+        } else {
+                if (!(fd_dev->fbd_flags & FBDF_HAS_SIZE)) {
+                        printk(KERN_ERR "FILEIO: Missing fd_dev_size="
+                                " parameter, and no backing struct"
+                                " block_device\n");
+                        goto fail;
+                }
+
+                limits = &dev_limits.limits;
+                limits->logical_block_size = FD_BLOCKSIZE;
+                limits->max_hw_sectors = FD_MAX_SECTORS;
+                limits->max_sectors = FD_MAX_SECTORS;
+                fd_dev->fd_block_size = FD_BLOCKSIZE;
+        }
+
+        dev_limits.hw_queue_depth = FD_MAX_DEVICE_QUEUE_DEPTH;
+        dev_limits.queue_depth = FD_DEVICE_QUEUE_DEPTH;
+
+        dev = transport_add_device_to_core_hba(hba, &fileio_template,
+                                se_dev, dev_flags, (void *)fd_dev,
+                                &dev_limits, "FILEIO", FD_VERSION);
+        if (!(dev))
+                goto fail;
+
+        fd_dev->fd_dev_id = fd_host->fd_host_dev_id_count++;
+        fd_dev->fd_queue_depth = dev->queue_depth;
+
+        printk(KERN_INFO "CORE_FILE[%u] - Added TCM FILEIO Device ID: %u at %s,"
+                " %llu total bytes\n", fd_host->fd_host_id, fd_dev->fd_dev_id,
+                        fd_dev->fd_dev_name, fd_dev->fd_dev_size);
+
+        putname(dev_p);
+        return dev;
+fail:
+        if (fd_dev->fd_file) {
+                filp_close(fd_dev->fd_file, NULL);
+                fd_dev->fd_file = NULL;
+        }
+        putname(dev_p);
+        return NULL;
+}
+
+/*      fd_free_device(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static void fd_free_device(void *p)
+{
+        struct fd_dev *fd_dev = (struct fd_dev *) p;
+
+        if (fd_dev->fd_file) {
+                filp_close(fd_dev->fd_file, NULL);
+                fd_dev->fd_file = NULL;
+        }
+
+        kfree(fd_dev);
+}
+
+static inline struct fd_request *FILE_REQ(struct se_task *task)
+{
+        return container_of(task, struct fd_request, fd_task);
+}
+
+
+static struct se_task *
+fd_alloc_task(struct se_cmd *cmd)
+{
+        struct fd_request *fd_req;
+
+        fd_req = kzalloc(sizeof(struct fd_request), GFP_KERNEL);
+        if (!(fd_req)) {
+                printk(KERN_ERR "Unable to allocate struct fd_request\n");
+                return NULL;
+        }
+
+        fd_req->fd_dev = SE_DEV(cmd)->dev_ptr;
+
+        return &fd_req->fd_task;
+}
+
+static int fd_do_readv(struct se_task *task)
+{
+        struct fd_request *req = FILE_REQ(task);
+        struct file *fd = req->fd_dev->fd_file;
+        struct scatterlist *sg = task->task_sg;
+        struct iovec *iov;
+        mm_segment_t old_fs;
+        loff_t pos = (task->task_lba * DEV_ATTRIB(task->se_dev)->block_size);
+        int ret = 0, i;
+
+        iov = kzalloc(sizeof(struct iovec) * task->task_sg_num, GFP_KERNEL);
+        if (!(iov)) {
+                printk(KERN_ERR "Unable to allocate fd_do_readv iov[]\n");
+                return -1;
+        }
+
+        for (i = 0; i < task->task_sg_num; i++) {
+                iov[i].iov_len = sg[i].length;
+                iov[i].iov_base = sg_virt(&sg[i]);
+        }
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        ret = vfs_readv(fd, &iov[0], task->task_sg_num, &pos);
+        set_fs(old_fs);
+
+        kfree(iov);
+        /*
+         * Return zeros and GOOD status even if the READ did not return
+         * the expected virt_size for struct file w/o a backing struct
+         * block_device.
+         */
+        if (S_ISBLK(fd->f_dentry->d_inode->i_mode)) {
+                if (ret < 0 || ret != task->task_size) {
+                        printk(KERN_ERR "vfs_readv() returned %d,"
+                                " expecting %d for S_ISBLK\n", ret,
+                                (int)task->task_size);
+                        return -1;
+                }
+        } else {
+                if (ret < 0) {
+                        printk(KERN_ERR "vfs_readv() returned %d for non"
+                                " S_ISBLK\n", ret);
+                        return -1;
+                }
+        }
+
+        return 1;
+}
+
+static int fd_do_writev(struct se_task *task)
+{
+        struct fd_request *req = FILE_REQ(task);
+        struct file *fd = req->fd_dev->fd_file;
+        struct scatterlist *sg = task->task_sg;
+        struct iovec *iov;
+        mm_segment_t old_fs;
+        loff_t pos = (task->task_lba * DEV_ATTRIB(task->se_dev)->block_size);
+        int ret, i = 0;
+
+        iov = kzalloc(sizeof(struct iovec) * task->task_sg_num, GFP_KERNEL);
+        if (!(iov)) {
+                printk(KERN_ERR "Unable to allocate fd_do_writev iov[]\n");
+                return -1;
+        }
+
+        for (i = 0; i < task->task_sg_num; i++) {
+                iov[i].iov_len = sg[i].length;
+                iov[i].iov_base = sg_virt(&sg[i]);
+        }
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        ret = vfs_writev(fd, &iov[0], task->task_sg_num, &pos);
+        set_fs(old_fs);
+
+        kfree(iov);
+
+        if (ret < 0 || ret != task->task_size) {
+                printk(KERN_ERR "vfs_writev() returned %d\n", ret);
+                return -1;
+        }
+
+        return 1;
+}
+
+static void fd_emulate_sync_cache(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct se_device *dev = cmd->se_dev;
+        struct fd_dev *fd_dev = dev->dev_ptr;
+        int immed = (cmd->t_task->t_task_cdb[1] & 0x2);
+        loff_t start, end;
+        int ret;
+
+        /*
+         * If the Immediate bit is set, queue up the GOOD response
+         * for this SYNCHRONIZE_CACHE op
+         */
+        if (immed)
+                transport_complete_sync_cache(cmd, 1);
+
+        /*
+         * Determine if we will be flushing the entire device.
+         */
+        if (cmd->t_task->t_task_lba == 0 && cmd->data_length == 0) {
+                start = 0;
+                end = LLONG_MAX;
+        } else {
+                start = cmd->t_task->t_task_lba * DEV_ATTRIB(dev)->block_size;
+                if (cmd->data_length)
+                        end = start + cmd->data_length;
+                else
+                        end = LLONG_MAX;
+        }
+
+        ret = vfs_fsync_range(fd_dev->fd_file, start, end, 1);
+        if (ret != 0)
+                printk(KERN_ERR "FILEIO: vfs_fsync_range() failed: %d\n", ret);
+
+        if (!immed)
+                transport_complete_sync_cache(cmd, ret == 0);
+}
+
+/*
+ * Tell TCM Core that we are capable of WriteCache emulation for
+ * an underlying struct se_device.
+ */
+static int fd_emulated_write_cache(struct se_device *dev)
+{
+        return 1;
+}
+
+static int fd_emulated_dpo(struct se_device *dev)
+{
+        return 0;
+}
+/*
+ * Tell TCM Core that we will be emulating Forced Unit Access (FUA) for WRITEs
+ * for TYPE_DISK.
+ */
+static int fd_emulated_fua_write(struct se_device *dev)
+{
+        return 1;
+}
+
+static int fd_emulated_fua_read(struct se_device *dev)
+{
+        return 0;
+}
+
+/*
+ * WRITE Force Unit Access (FUA) emulation on a per struct se_task
+ * LBA range basis..
+ */
+static void fd_emulate_write_fua(struct se_cmd *cmd, struct se_task *task)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct fd_dev *fd_dev = dev->dev_ptr;
+        loff_t start = task->task_lba * DEV_ATTRIB(dev)->block_size;
+        loff_t end = start + task->task_size;
+        int ret;
+
+        DEBUG_FD_CACHE("FILEIO: FUA WRITE LBA: %llu, bytes: %u\n",
+                        task->task_lba, task->task_size);
+
+        ret = vfs_fsync_range(fd_dev->fd_file, start, end, 1);
+        if (ret != 0)
+                printk(KERN_ERR "FILEIO: vfs_fsync_range() failed: %d\n", ret);
+}
+
+static int fd_do_task(struct se_task *task)
+{
+        struct se_cmd *cmd = task->task_se_cmd;
+        struct se_device *dev = cmd->se_dev;
+        int ret = 0;
+
+        /*
+         * Call vectorized fileio functions to map struct scatterlist
+         * physical memory addresses to struct iovec virtual memory.
+         */
+        if (task->task_data_direction == DMA_FROM_DEVICE) {
+                ret = fd_do_readv(task);
+        } else {
+                ret = fd_do_writev(task);
+
+                if (ret > 0 &&
+                    DEV_ATTRIB(dev)->emulate_write_cache > 0 &&
+                    DEV_ATTRIB(dev)->emulate_fua_write > 0 &&
+                    T_TASK(cmd)->t_tasks_fua) {
+                        /*
+                         * We might need to be a bit smarter here
+                         * and return some sense data to let the initiator
+                         * know the FUA WRITE cache sync failed..?
+                         */
+                        fd_emulate_write_fua(cmd, task);
+                }
+
+        }
+
+        if (ret < 0)
+                return ret;
+        if (ret) {
+                task->task_scsi_status = GOOD;
+                transport_complete_task(task, 1);
+        }
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+/*      fd_free_task(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static void fd_free_task(struct se_task *task)
+{
+        struct fd_request *req = FILE_REQ(task);
+
+        kfree(req);
+}
+
+enum {
+        Opt_fd_dev_name, Opt_fd_dev_size, Opt_fd_buffered_io, Opt_err
+};
+
+static match_table_t tokens = {
+        {Opt_fd_dev_name, "fd_dev_name=%s"},
+        {Opt_fd_dev_size, "fd_dev_size=%s"},
+        {Opt_fd_buffered_io, "fd_buffered_id=%d"},
+        {Opt_err, NULL}
+};
+
+static ssize_t fd_set_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        const char *page, ssize_t count)
+{
+        struct fd_dev *fd_dev = se_dev->se_dev_su_ptr;
+        char *orig, *ptr, *arg_p, *opts;
+        substring_t args[MAX_OPT_ARGS];
+        int ret = 0, arg, token;
+
+        opts = kstrdup(page, GFP_KERNEL);
+        if (!opts)
+                return -ENOMEM;
+
+        orig = opts;
+
+        while ((ptr = strsep(&opts, ",")) != NULL) {
+                if (!*ptr)
+                        continue;
+
+                token = match_token(ptr, tokens, args);
+                switch (token) {
+                case Opt_fd_dev_name:
+                        snprintf(fd_dev->fd_dev_name, FD_MAX_DEV_NAME,
+                                        "%s", match_strdup(&args[0]));
+                        printk(KERN_INFO "FILEIO: Referencing Path: %s\n",
+                                        fd_dev->fd_dev_name);
+                        fd_dev->fbd_flags |= FBDF_HAS_PATH;
+                        break;
+                case Opt_fd_dev_size:
+                        arg_p = match_strdup(&args[0]);
+                        ret = strict_strtoull(arg_p, 0, &fd_dev->fd_dev_size);
+                        if (ret < 0) {
+                                printk(KERN_ERR "strict_strtoull() failed for"
+                                                " fd_dev_size=\n");
+                                goto out;
+                        }
+                        printk(KERN_INFO "FILEIO: Referencing Size: %llu"
+                                        " bytes\n", fd_dev->fd_dev_size);
+                        fd_dev->fbd_flags |= FBDF_HAS_SIZE;
+                        break;
+                case Opt_fd_buffered_io:
+                        match_int(args, &arg);
+                        if (arg != 1) {
+                                printk(KERN_ERR "bogus fd_buffered_io=%d value\n", arg);
+                                ret = -EINVAL;
+                                goto out;
+                        }
+
+                        printk(KERN_INFO "FILEIO: Using buffered I/O"
+                                " operations for struct fd_dev\n");
+
+                        fd_dev->fbd_flags |= FDBD_USE_BUFFERED_IO;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+out:
+        kfree(orig);
+        return (!ret) ? count : ret;
+}
+
+static ssize_t fd_check_configfs_dev_params(struct se_hba *hba, struct se_subsystem_dev *se_dev)
+{
+        struct fd_dev *fd_dev = (struct fd_dev *) se_dev->se_dev_su_ptr;
+
+        if (!(fd_dev->fbd_flags & FBDF_HAS_PATH)) {
+                printk(KERN_ERR "Missing fd_dev_name=\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static ssize_t fd_show_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        char *b)
+{
+        struct fd_dev *fd_dev = se_dev->se_dev_su_ptr;
+        ssize_t bl = 0;
+
+        bl = sprintf(b + bl, "TCM FILEIO ID: %u", fd_dev->fd_dev_id);
+        bl += sprintf(b + bl, "        File: %s  Size: %llu  Mode: %s\n",
+                fd_dev->fd_dev_name, fd_dev->fd_dev_size,
+                (fd_dev->fbd_flags & FDBD_USE_BUFFERED_IO) ?
+                "Buffered" : "Synchronous");
+        return bl;
+}
+
+/*      fd_get_cdb(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static unsigned char *fd_get_cdb(struct se_task *task)
+{
+        struct fd_request *req = FILE_REQ(task);
+
+        return req->fd_scsi_cdb;
+}
+
+/*      fd_get_device_rev(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static u32 fd_get_device_rev(struct se_device *dev)
+{
+        return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */
+}
+
+/*      fd_get_device_type(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static u32 fd_get_device_type(struct se_device *dev)
+{
+        return TYPE_DISK;
+}
+
+static sector_t fd_get_blocks(struct se_device *dev)
+{
+        struct fd_dev *fd_dev = dev->dev_ptr;
+        unsigned long long blocks_long = div_u64(fd_dev->fd_dev_size,
+                        DEV_ATTRIB(dev)->block_size);
+
+        return blocks_long;
+}
+
+static struct se_subsystem_api fileio_template = {
+        .name                   = "fileio",
+        .owner                  = THIS_MODULE,
+        .transport_type         = TRANSPORT_PLUGIN_VHBA_PDEV,
+        .attach_hba             = fd_attach_hba,
+        .detach_hba             = fd_detach_hba,
+        .allocate_virtdevice    = fd_allocate_virtdevice,
+        .create_virtdevice      = fd_create_virtdevice,
+        .free_device            = fd_free_device,
+        .dpo_emulated           = fd_emulated_dpo,
+        .fua_write_emulated     = fd_emulated_fua_write,
+        .fua_read_emulated      = fd_emulated_fua_read,
+        .write_cache_emulated   = fd_emulated_write_cache,
+        .alloc_task             = fd_alloc_task,
+        .do_task                = fd_do_task,
+        .do_sync_cache          = fd_emulate_sync_cache,
+        .free_task              = fd_free_task,
+        .check_configfs_dev_params = fd_check_configfs_dev_params,
+        .set_configfs_dev_params = fd_set_configfs_dev_params,
+        .show_configfs_dev_params = fd_show_configfs_dev_params,
+        .get_cdb                = fd_get_cdb,
+        .get_device_rev         = fd_get_device_rev,
+        .get_device_type        = fd_get_device_type,
+        .get_blocks             = fd_get_blocks,
+};
+
+static int __init fileio_module_init(void)
+{
+        return transport_subsystem_register(&fileio_template);
+}
+
+static void fileio_module_exit(void)
+{
+        transport_subsystem_release(&fileio_template);
+}
+
+MODULE_DESCRIPTION("TCM FILEIO subsystem plugin");
+MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_LICENSE("GPL");
+
+module_init(fileio_module_init);
+module_exit(fileio_module_exit);
diff --git a/drivers/target/target_core_file.h b/drivers/target/target_core_file.h
new file mode 100644
index 000000000000..ef4de2b4bd46
--- /dev/null
+++ b/drivers/target/target_core_file.h
@@ -0,0 +1,50 @@
+#ifndef TARGET_CORE_FILE_H
+#define TARGET_CORE_FILE_H
+
+#define FD_VERSION              "4.0"
+
+#define FD_MAX_DEV_NAME         256
+/* Maximum queuedepth for the FILEIO HBA */
+#define FD_HBA_QUEUE_DEPTH      256
+#define FD_DEVICE_QUEUE_DEPTH   32
+#define FD_MAX_DEVICE_QUEUE_DEPTH 128
+#define FD_BLOCKSIZE            512
+#define FD_MAX_SECTORS          1024
+
+#define RRF_EMULATE_CDB         0x01
+#define RRF_GOT_LBA             0x02
+
+struct fd_request {
+        struct se_task  fd_task;
+        /* SCSI CDB from iSCSI Command PDU */
+        unsigned char   fd_scsi_cdb[TCM_MAX_COMMAND_SIZE];
+        /* FILEIO device */
+        struct fd_dev   *fd_dev;
+} ____cacheline_aligned;
+
+#define FBDF_HAS_PATH           0x01
+#define FBDF_HAS_SIZE           0x02
+#define FDBD_USE_BUFFERED_IO    0x04
+
+struct fd_dev {
+        u32             fbd_flags;
+        unsigned char   fd_dev_name[FD_MAX_DEV_NAME];
+        /* Unique Ramdisk Device ID in Ramdisk HBA */
+        u32             fd_dev_id;
+        /* Number of SG tables in sg_table_array */
+        u32             fd_table_count;
+        u32             fd_queue_depth;
+        u32             fd_block_size;
+        unsigned long long fd_dev_size;
+        struct file     *fd_file;
+        /* FILEIO HBA device is connected to */
+        struct fd_host *fd_host;
+} ____cacheline_aligned;
+
+struct fd_host {
+        u32             fd_host_dev_id_count;
+        /* Unique FILEIO Host ID */
+        u32             fd_host_id;
+} ____cacheline_aligned;
+
+#endif /* TARGET_CORE_FILE_H */
diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
new file mode 100644
index 000000000000..4bbe8208b241
--- /dev/null
+++ b/drivers/target/target_core_hba.c
@@ -0,0 +1,185 @@
+/*******************************************************************************
+ * Filename:  target_core_hba.c
+ *
+ * This file copntains the iSCSI HBA Transport related functions.
+ *
+ * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/net.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/in.h>
+#include <net/sock.h>
+#include <net/tcp.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+
+#include "target_core_hba.h"
+
+static LIST_HEAD(subsystem_list);
+static DEFINE_MUTEX(subsystem_mutex);
+
+int transport_subsystem_register(struct se_subsystem_api *sub_api)
+{
+        struct se_subsystem_api *s;
+
+        INIT_LIST_HEAD(&sub_api->sub_api_list);
+
+        mutex_lock(&subsystem_mutex);
+        list_for_each_entry(s, &subsystem_list, sub_api_list) {
+                if (!(strcmp(s->name, sub_api->name))) {
+                        printk(KERN_ERR "%p is already registered with"
+                                " duplicate name %s, unable to process"
+                                " request\n", s, s->name);
+                        mutex_unlock(&subsystem_mutex);
+                        return -EEXIST;
+                }
+        }
+        list_add_tail(&sub_api->sub_api_list, &subsystem_list);
+        mutex_unlock(&subsystem_mutex);
+
+        printk(KERN_INFO "TCM: Registered subsystem plugin: %s struct module:"
+                        " %p\n", sub_api->name, sub_api->owner);
+        return 0;
+}
+EXPORT_SYMBOL(transport_subsystem_register);
+
+void transport_subsystem_release(struct se_subsystem_api *sub_api)
+{
+        mutex_lock(&subsystem_mutex);
+        list_del(&sub_api->sub_api_list);
+        mutex_unlock(&subsystem_mutex);
+}
+EXPORT_SYMBOL(transport_subsystem_release);
+
+static struct se_subsystem_api *core_get_backend(const char *sub_name)
+{
+        struct se_subsystem_api *s;
+
+        mutex_lock(&subsystem_mutex);
+        list_for_each_entry(s, &subsystem_list, sub_api_list) {
+                if (!strcmp(s->name, sub_name))
+                        goto found;
+        }
+        mutex_unlock(&subsystem_mutex);
+        return NULL;
+found:
+        if (s->owner && !try_module_get(s->owner))
+                s = NULL;
+        mutex_unlock(&subsystem_mutex);
+        return s;
+}
+
+struct se_hba *
+core_alloc_hba(const char *plugin_name, u32 plugin_dep_id, u32 hba_flags)
+{
+        struct se_hba *hba;
+        int ret = 0;
+
+        hba = kzalloc(sizeof(*hba), GFP_KERNEL);
+        if (!hba) {
+                printk(KERN_ERR "Unable to allocate struct se_hba\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        INIT_LIST_HEAD(&hba->hba_dev_list);
+        spin_lock_init(&hba->device_lock);
+        spin_lock_init(&hba->hba_queue_lock);
+        mutex_init(&hba->hba_access_mutex);
+
+        hba->hba_index = scsi_get_new_index(SCSI_INST_INDEX);
+        hba->hba_flags |= hba_flags;
+
+        atomic_set(&hba->max_queue_depth, 0);
+        atomic_set(&hba->left_queue_depth, 0);
+
+        hba->transport = core_get_backend(plugin_name);
+        if (!hba->transport) {
+                ret = -EINVAL;
+                goto out_free_hba;
+        }
+
+        ret = hba->transport->attach_hba(hba, plugin_dep_id);
+        if (ret < 0)
+                goto out_module_put;
+
+        spin_lock(&se_global->hba_lock);
+        hba->hba_id = se_global->g_hba_id_counter++;
+        list_add_tail(&hba->hba_list, &se_global->g_hba_list);
+        spin_unlock(&se_global->hba_lock);
+
+        printk(KERN_INFO "CORE_HBA[%d] - Attached HBA to Generic Target"
+                        " Core\n", hba->hba_id);
+
+        return hba;
+
+out_module_put:
+        if (hba->transport->owner)
+                module_put(hba->transport->owner);
+        hba->transport = NULL;
+out_free_hba:
+        kfree(hba);
+        return ERR_PTR(ret);
+}
+
+int
+core_delete_hba(struct se_hba *hba)
+{
+        struct se_device *dev, *dev_tmp;
+
+        spin_lock(&hba->device_lock);
+        list_for_each_entry_safe(dev, dev_tmp, &hba->hba_dev_list, dev_list) {
+
+                se_clear_dev_ports(dev);
+                spin_unlock(&hba->device_lock);
+
+                se_release_device_for_hba(dev);
+
+                spin_lock(&hba->device_lock);
+        }
+        spin_unlock(&hba->device_lock);
+
+        hba->transport->detach_hba(hba);
+
+        spin_lock(&se_global->hba_lock);
+        list_del(&hba->hba_list);
+        spin_unlock(&se_global->hba_lock);
+
+        printk(KERN_INFO "CORE_HBA[%d] - Detached HBA from Generic Target"
+                        " Core\n", hba->hba_id);
+
+        if (hba->transport->owner)
+                module_put(hba->transport->owner);
+
+        hba->transport = NULL;
+        kfree(hba);
+        return 0;
+}
diff --git a/drivers/target/target_core_hba.h b/drivers/target/target_core_hba.h
new file mode 100644
index 000000000000..bb0fea5f730c
--- /dev/null
+++ b/drivers/target/target_core_hba.h
@@ -0,0 +1,7 @@
+#ifndef TARGET_CORE_HBA_H
+#define TARGET_CORE_HBA_H
+
+extern struct se_hba *core_alloc_hba(const char *, u32, u32);
+extern int core_delete_hba(struct se_hba *);
+
+#endif /* TARGET_CORE_HBA_H */
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
new file mode 100644
index 000000000000..c6e0d757e76e
--- /dev/null
+++ b/drivers/target/target_core_iblock.c
@@ -0,0 +1,808 @@
+/*******************************************************************************
+ * Filename:  target_core_iblock.c
+ *
+ * This file contains the Storage Engine  <-> Linux BlockIO transport
+ * specific functions.
+ *
+ * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/string.h>
+#include <linux/parser.h>
+#include <linux/timer.h>
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/bio.h>
+#include <linux/genhd.h>
+#include <linux/file.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+
+#include "target_core_iblock.h"
+
+#if 0
+#define DEBUG_IBLOCK(x...) printk(x)
+#else
+#define DEBUG_IBLOCK(x...)
+#endif
+
+static struct se_subsystem_api iblock_template;
+
+static void iblock_bio_done(struct bio *, int);
+
+/*      iblock_attach_hba(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int iblock_attach_hba(struct se_hba *hba, u32 host_id)
+{
+        struct iblock_hba *ib_host;
+
+        ib_host = kzalloc(sizeof(struct iblock_hba), GFP_KERNEL);
+        if (!(ib_host)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " struct iblock_hba\n");
+                return -ENOMEM;
+        }
+
+        ib_host->iblock_host_id = host_id;
+
+        atomic_set(&hba->left_queue_depth, IBLOCK_HBA_QUEUE_DEPTH);
+        atomic_set(&hba->max_queue_depth, IBLOCK_HBA_QUEUE_DEPTH);
+        hba->hba_ptr = (void *) ib_host;
+
+        printk(KERN_INFO "CORE_HBA[%d] - TCM iBlock HBA Driver %s on"
+                " Generic Target Core Stack %s\n", hba->hba_id,
+                IBLOCK_VERSION, TARGET_CORE_MOD_VERSION);
+
+        printk(KERN_INFO "CORE_HBA[%d] - Attached iBlock HBA: %u to Generic"
+                " Target Core TCQ Depth: %d\n", hba->hba_id,
+                ib_host->iblock_host_id, atomic_read(&hba->max_queue_depth));
+
+        return 0;
+}
+
+static void iblock_detach_hba(struct se_hba *hba)
+{
+        struct iblock_hba *ib_host = hba->hba_ptr;
+
+        printk(KERN_INFO "CORE_HBA[%d] - Detached iBlock HBA: %u from Generic"
+                " Target Core\n", hba->hba_id, ib_host->iblock_host_id);
+
+        kfree(ib_host);
+        hba->hba_ptr = NULL;
+}
+
+static void *iblock_allocate_virtdevice(struct se_hba *hba, const char *name)
+{
+        struct iblock_dev *ib_dev = NULL;
+        struct iblock_hba *ib_host = hba->hba_ptr;
+
+        ib_dev = kzalloc(sizeof(struct iblock_dev), GFP_KERNEL);
+        if (!(ib_dev)) {
+                printk(KERN_ERR "Unable to allocate struct iblock_dev\n");
+                return NULL;
+        }
+        ib_dev->ibd_host = ib_host;
+
+        printk(KERN_INFO  "IBLOCK: Allocated ib_dev for %s\n", name);
+
+        return ib_dev;
+}
+
+static struct se_device *iblock_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p)
+{
+        struct iblock_dev *ib_dev = p;
+        struct se_device *dev;
+        struct se_dev_limits dev_limits;
+        struct block_device *bd = NULL;
+        struct request_queue *q;
+        struct queue_limits *limits;
+        u32 dev_flags = 0;
+
+        if (!(ib_dev)) {
+                printk(KERN_ERR "Unable to locate struct iblock_dev parameter\n");
+                return 0;
+        }
+        memset(&dev_limits, 0, sizeof(struct se_dev_limits));
+        /*
+         * These settings need to be made tunable..
+         */
+        ib_dev->ibd_bio_set = bioset_create(32, 64);
+        if (!(ib_dev->ibd_bio_set)) {
+                printk(KERN_ERR "IBLOCK: Unable to create bioset()\n");
+                return 0;
+        }
+        printk(KERN_INFO "IBLOCK: Created bio_set()\n");
+        /*
+         * iblock_check_configfs_dev_params() ensures that ib_dev->ibd_udev_path
+         * must already have been set in order for echo 1 > $HBA/$DEV/enable to run.
+         */
+        printk(KERN_INFO  "IBLOCK: Claiming struct block_device: %s\n",
+                        ib_dev->ibd_udev_path);
+
+        bd = blkdev_get_by_path(ib_dev->ibd_udev_path,
+                                FMODE_WRITE|FMODE_READ|FMODE_EXCL, ib_dev);
+        if (!(bd))
+                goto failed;
+        /*
+         * Setup the local scope queue_limits from struct request_queue->limits
+         * to pass into transport_add_device_to_core_hba() as struct se_dev_limits.
+         */
+        q = bdev_get_queue(bd);
+        limits = &dev_limits.limits;
+        limits->logical_block_size = bdev_logical_block_size(bd);
+        limits->max_hw_sectors = queue_max_hw_sectors(q);
+        limits->max_sectors = queue_max_sectors(q);
+        dev_limits.hw_queue_depth = IBLOCK_MAX_DEVICE_QUEUE_DEPTH;
+        dev_limits.queue_depth = IBLOCK_DEVICE_QUEUE_DEPTH;
+
+        ib_dev->ibd_major = MAJOR(bd->bd_dev);
+        ib_dev->ibd_minor = MINOR(bd->bd_dev);
+        ib_dev->ibd_bd = bd;
+
+        dev = transport_add_device_to_core_hba(hba,
+                        &iblock_template, se_dev, dev_flags, (void *)ib_dev,
+                        &dev_limits, "IBLOCK", IBLOCK_VERSION);
+        if (!(dev))
+                goto failed;
+
+        ib_dev->ibd_depth = dev->queue_depth;
+
+        /*
+         * Check if the underlying struct block_device request_queue supports
+         * the QUEUE_FLAG_DISCARD bit for UNMAP/WRITE_SAME in SCSI + TRIM
+         * in ATA and we need to set TPE=1
+         */
+        if (blk_queue_discard(bdev_get_queue(bd))) {
+                struct request_queue *q = bdev_get_queue(bd);
+
+                DEV_ATTRIB(dev)->max_unmap_lba_count =
+                                q->limits.max_discard_sectors;
+                /*
+                 * Currently hardcoded to 1 in Linux/SCSI code..
+                 */
+                DEV_ATTRIB(dev)->max_unmap_block_desc_count = 1;
+                DEV_ATTRIB(dev)->unmap_granularity =
+                                q->limits.discard_granularity;
+                DEV_ATTRIB(dev)->unmap_granularity_alignment =
+                                q->limits.discard_alignment;
+
+                printk(KERN_INFO "IBLOCK: BLOCK Discard support available,"
+                                " disabled by default\n");
+        }
+
+        return dev;
+
+failed:
+        if (ib_dev->ibd_bio_set) {
+                bioset_free(ib_dev->ibd_bio_set);
+                ib_dev->ibd_bio_set = NULL;
+        }
+        ib_dev->ibd_bd = NULL;
+        ib_dev->ibd_major = 0;
+        ib_dev->ibd_minor = 0;
+        return NULL;
+}
+
+static void iblock_free_device(void *p)
+{
+        struct iblock_dev *ib_dev = p;
+
+        blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
+        bioset_free(ib_dev->ibd_bio_set);
+        kfree(ib_dev);
+}
+
+static inline struct iblock_req *IBLOCK_REQ(struct se_task *task)
+{
+        return container_of(task, struct iblock_req, ib_task);
+}
+
+static struct se_task *
+iblock_alloc_task(struct se_cmd *cmd)
+{
+        struct iblock_req *ib_req;
+
+        ib_req = kzalloc(sizeof(struct iblock_req), GFP_KERNEL);
+        if (!(ib_req)) {
+                printk(KERN_ERR "Unable to allocate memory for struct iblock_req\n");
+                return NULL;
+        }
+
+        ib_req->ib_dev = SE_DEV(cmd)->dev_ptr;
+        atomic_set(&ib_req->ib_bio_cnt, 0);
+        return &ib_req->ib_task;
+}
+
+static unsigned long long iblock_emulate_read_cap_with_block_size(
+        struct se_device *dev,
+        struct block_device *bd,
+        struct request_queue *q)
+{
+        unsigned long long blocks_long = (div_u64(i_size_read(bd->bd_inode),
+                                        bdev_logical_block_size(bd)) - 1);
+        u32 block_size = bdev_logical_block_size(bd);
+
+        if (block_size == DEV_ATTRIB(dev)->block_size)
+                return blocks_long;
+
+        switch (block_size) {
+        case 4096:
+                switch (DEV_ATTRIB(dev)->block_size) {
+                case 2048:
+                        blocks_long <<= 1;
+                        break;
+                case 1024:
+                        blocks_long <<= 2;
+                        break;
+                case 512:
+                        blocks_long <<= 3;
+                default:
+                        break;
+                }
+                break;
+        case 2048:
+                switch (DEV_ATTRIB(dev)->block_size) {
+                case 4096:
+                        blocks_long >>= 1;
+                        break;
+                case 1024:
+                        blocks_long <<= 1;
+                        break;
+                case 512:
+                        blocks_long <<= 2;
+                        break;
+                default:
+                        break;
+                }
+                break;
+        case 1024:
+                switch (DEV_ATTRIB(dev)->block_size) {
+                case 4096:
+                        blocks_long >>= 2;
+                        break;
+                case 2048:
+                        blocks_long >>= 1;
+                        break;
+                case 512:
+                        blocks_long <<= 1;
+                        break;
+                default:
+                        break;
+                }
+                break;
+        case 512:
+                switch (DEV_ATTRIB(dev)->block_size) {
+                case 4096:
+                        blocks_long >>= 3;
+                        break;
+                case 2048:
+                        blocks_long >>= 2;
+                        break;
+                case 1024:
+                        blocks_long >>= 1;
+                        break;
+                default:
+                        break;
+                }
+                break;
+        default:
+                break;
+        }
+
+        return blocks_long;
+}
+
+/*
+ * Emulate SYCHRONIZE_CACHE_*
+ */
+static void iblock_emulate_sync_cache(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct iblock_dev *ib_dev = cmd->se_dev->dev_ptr;
+        int immed = (T_TASK(cmd)->t_task_cdb[1] & 0x2);
+        sector_t error_sector;
+        int ret;
+
+        /*
+         * If the Immediate bit is set, queue up the GOOD response
+         * for this SYNCHRONIZE_CACHE op
+         */
+        if (immed)
+                transport_complete_sync_cache(cmd, 1);
+
+        /*
+         * blkdev_issue_flush() does not support a specifying a range, so
+         * we have to flush the entire cache.
+         */
+        ret = blkdev_issue_flush(ib_dev->ibd_bd, GFP_KERNEL, &error_sector);
+        if (ret != 0) {
+                printk(KERN_ERR "IBLOCK: block_issue_flush() failed: %d "
+                        " error_sector: %llu\n", ret,
+                        (unsigned long long)error_sector);
+        }
+
+        if (!immed)
+                transport_complete_sync_cache(cmd, ret == 0);
+}
+
+/*
+ * Tell TCM Core that we are capable of WriteCache emulation for
+ * an underlying struct se_device.
+ */
+static int iblock_emulated_write_cache(struct se_device *dev)
+{
+        return 1;
+}
+
+static int iblock_emulated_dpo(struct se_device *dev)
+{
+        return 0;
+}
+
+/*
+ * Tell TCM Core that we will be emulating Forced Unit Access (FUA) for WRITEs
+ * for TYPE_DISK.
+ */
+static int iblock_emulated_fua_write(struct se_device *dev)
+{
+        return 1;
+}
+
+static int iblock_emulated_fua_read(struct se_device *dev)
+{
+        return 0;
+}
+
+static int iblock_do_task(struct se_task *task)
+{
+        struct se_device *dev = task->task_se_cmd->se_dev;
+        struct iblock_req *req = IBLOCK_REQ(task);
+        struct iblock_dev *ibd = (struct iblock_dev *)req->ib_dev;
+        struct request_queue *q = bdev_get_queue(ibd->ibd_bd);
+        struct bio *bio = req->ib_bio, *nbio = NULL;
+        int rw;
+
+        if (task->task_data_direction == DMA_TO_DEVICE) {
+                /*
+                 * Force data to disk if we pretend to not have a volatile
+                 * write cache, or the initiator set the Force Unit Access bit.
+                 */
+                if (DEV_ATTRIB(dev)->emulate_write_cache == 0 ||
+                    (DEV_ATTRIB(dev)->emulate_fua_write > 0 &&
+                     T_TASK(task->task_se_cmd)->t_tasks_fua))
+                        rw = WRITE_FUA;
+                else
+                        rw = WRITE;
+        } else {
+                rw = READ;
+        }
+
+        while (bio) {
+                nbio = bio->bi_next;
+                bio->bi_next = NULL;
+                DEBUG_IBLOCK("Calling submit_bio() task: %p bio: %p"
+                        " bio->bi_sector: %llu\n", task, bio, bio->bi_sector);
+
+                submit_bio(rw, bio);
+                bio = nbio;
+        }
+
+        if (q->unplug_fn)
+                q->unplug_fn(q);
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+static int iblock_do_discard(struct se_device *dev, sector_t lba, u32 range)
+{
+        struct iblock_dev *ibd = dev->dev_ptr;
+        struct block_device *bd = ibd->ibd_bd;
+        int barrier = 0;
+
+        return blkdev_issue_discard(bd, lba, range, GFP_KERNEL, barrier);
+}
+
+static void iblock_free_task(struct se_task *task)
+{
+        struct iblock_req *req = IBLOCK_REQ(task);
+        struct bio *bio, *hbio = req->ib_bio;
+        /*
+         * We only release the bio(s) here if iblock_bio_done() has not called
+         * bio_put() -> iblock_bio_destructor().
+         */
+        while (hbio != NULL) {
+                bio = hbio;
+                hbio = hbio->bi_next;
+                bio->bi_next = NULL;
+                bio_put(bio);
+        }
+
+        kfree(req);
+}
+
+enum {
+        Opt_udev_path, Opt_force, Opt_err
+};
+
+static match_table_t tokens = {
+        {Opt_udev_path, "udev_path=%s"},
+        {Opt_force, "force=%d"},
+        {Opt_err, NULL}
+};
+
+static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba,
+                                               struct se_subsystem_dev *se_dev,
+                                               const char *page, ssize_t count)
+{
+        struct iblock_dev *ib_dev = se_dev->se_dev_su_ptr;
+        char *orig, *ptr, *opts;
+        substring_t args[MAX_OPT_ARGS];
+        int ret = 0, arg, token;
+
+        opts = kstrdup(page, GFP_KERNEL);
+        if (!opts)
+                return -ENOMEM;
+
+        orig = opts;
+
+        while ((ptr = strsep(&opts, ",")) != NULL) {
+                if (!*ptr)
+                        continue;
+
+                token = match_token(ptr, tokens, args);
+                switch (token) {
+                case Opt_udev_path:
+                        if (ib_dev->ibd_bd) {
+                                printk(KERN_ERR "Unable to set udev_path= while"
+                                        " ib_dev->ibd_bd exists\n");
+                                ret = -EEXIST;
+                                goto out;
+                        }
+
+                        ret = snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,
+                                "%s", match_strdup(&args[0]));
+                        printk(KERN_INFO "IBLOCK: Referencing UDEV path: %s\n",
+                                        ib_dev->ibd_udev_path);
+                        ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH;
+                        break;
+                case Opt_force:
+                        match_int(args, &arg);
+                        ib_dev->ibd_force = arg;
+                        printk(KERN_INFO "IBLOCK: Set force=%d\n",
+                                ib_dev->ibd_force);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+out:
+        kfree(orig);
+        return (!ret) ? count : ret;
+}
+
+static ssize_t iblock_check_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev)
+{
+        struct iblock_dev *ibd = se_dev->se_dev_su_ptr;
+
+        if (!(ibd->ibd_flags & IBDF_HAS_UDEV_PATH)) {
+                printk(KERN_ERR "Missing udev_path= parameters for IBLOCK\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static ssize_t iblock_show_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        char *b)
+{
+        struct iblock_dev *ibd = se_dev->se_dev_su_ptr;
+        struct block_device *bd = ibd->ibd_bd;
+        char buf[BDEVNAME_SIZE];
+        ssize_t bl = 0;
+
+        if (bd)
+                bl += sprintf(b + bl, "iBlock device: %s",
+                                bdevname(bd, buf));
+        if (ibd->ibd_flags & IBDF_HAS_UDEV_PATH) {
+                bl += sprintf(b + bl, "  UDEV PATH: %s\n",
+                                ibd->ibd_udev_path);
+        } else
+                bl += sprintf(b + bl, "\n");
+
+        bl += sprintf(b + bl, "        ");
+        if (bd) {
+                bl += sprintf(b + bl, "Major: %d Minor: %d  %s\n",
+                        ibd->ibd_major, ibd->ibd_minor, (!bd->bd_contains) ?
+                        "" : (bd->bd_holder == (struct iblock_dev *)ibd) ?
+                        "CLAIMED: IBLOCK" : "CLAIMED: OS");
+        } else {
+                bl += sprintf(b + bl, "Major: %d Minor: %d\n",
+                        ibd->ibd_major, ibd->ibd_minor);
+        }
+
+        return bl;
+}
+
+static void iblock_bio_destructor(struct bio *bio)
+{
+        struct se_task *task = bio->bi_private;
+        struct iblock_dev *ib_dev = task->se_dev->dev_ptr;
+
+        bio_free(bio, ib_dev->ibd_bio_set);
+}
+
+static struct bio *iblock_get_bio(
+        struct se_task *task,
+        struct iblock_req *ib_req,
+        struct iblock_dev *ib_dev,
+        int *ret,
+        sector_t lba,
+        u32 sg_num)
+{
+        struct bio *bio;
+
+        bio = bio_alloc_bioset(GFP_NOIO, sg_num, ib_dev->ibd_bio_set);
+        if (!(bio)) {
+                printk(KERN_ERR "Unable to allocate memory for bio\n");
+                *ret = PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+                return NULL;
+        }
+
+        DEBUG_IBLOCK("Allocated bio: %p task_sg_num: %u using ibd_bio_set:"
+                " %p\n", bio, task->task_sg_num, ib_dev->ibd_bio_set);
+        DEBUG_IBLOCK("Allocated bio: %p task_size: %u\n", bio, task->task_size);
+
+        bio->bi_bdev = ib_dev->ibd_bd;
+        bio->bi_private = (void *) task;
+        bio->bi_destructor = iblock_bio_destructor;
+        bio->bi_end_io = &iblock_bio_done;
+        bio->bi_sector = lba;
+        atomic_inc(&ib_req->ib_bio_cnt);
+
+        DEBUG_IBLOCK("Set bio->bi_sector: %llu\n", bio->bi_sector);
+        DEBUG_IBLOCK("Set ib_req->ib_bio_cnt: %d\n",
+                        atomic_read(&ib_req->ib_bio_cnt));
+        return bio;
+}
+
+static int iblock_map_task_SG(struct se_task *task)
+{
+        struct se_cmd *cmd = task->task_se_cmd;
+        struct se_device *dev = SE_DEV(cmd);
+        struct iblock_dev *ib_dev = task->se_dev->dev_ptr;
+        struct iblock_req *ib_req = IBLOCK_REQ(task);
+        struct bio *bio = NULL, *hbio = NULL, *tbio = NULL;
+        struct scatterlist *sg;
+        int ret = 0;
+        u32 i, sg_num = task->task_sg_num;
+        sector_t block_lba;
+        /*
+         * Do starting conversion up from non 512-byte blocksize with
+         * struct se_task SCSI blocksize into Linux/Block 512 units for BIO.
+         */
+        if (DEV_ATTRIB(dev)->block_size == 4096)
+                block_lba = (task->task_lba << 3);
+        else if (DEV_ATTRIB(dev)->block_size == 2048)
+                block_lba = (task->task_lba << 2);
+        else if (DEV_ATTRIB(dev)->block_size == 1024)
+                block_lba = (task->task_lba << 1);
+        else if (DEV_ATTRIB(dev)->block_size == 512)
+                block_lba = task->task_lba;
+        else {
+                printk(KERN_ERR "Unsupported SCSI -> BLOCK LBA conversion:"
+                                " %u\n", DEV_ATTRIB(dev)->block_size);
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+
+        bio = iblock_get_bio(task, ib_req, ib_dev, &ret, block_lba, sg_num);
+        if (!(bio))
+                return ret;
+
+        ib_req->ib_bio = bio;
+        hbio = tbio = bio;
+        /*
+         * Use fs/bio.c:bio_add_pages() to setup the bio_vec maplist
+         * from TCM struct se_mem -> task->task_sg -> struct scatterlist memory.
+         */
+        for_each_sg(task->task_sg, sg, task->task_sg_num, i) {
+                DEBUG_IBLOCK("task: %p bio: %p Calling bio_add_page(): page:"
+                        " %p len: %u offset: %u\n", task, bio, sg_page(sg),
+                                sg->length, sg->offset);
+again:
+                ret = bio_add_page(bio, sg_page(sg), sg->length, sg->offset);
+                if (ret != sg->length) {
+
+                        DEBUG_IBLOCK("*** Set bio->bi_sector: %llu\n",
+                                        bio->bi_sector);
+                        DEBUG_IBLOCK("** task->task_size: %u\n",
+                                        task->task_size);
+                        DEBUG_IBLOCK("*** bio->bi_max_vecs: %u\n",
+                                        bio->bi_max_vecs);
+                        DEBUG_IBLOCK("*** bio->bi_vcnt: %u\n",
+                                        bio->bi_vcnt);
+
+                        bio = iblock_get_bio(task, ib_req, ib_dev, &ret,
+                                                block_lba, sg_num);
+                        if (!(bio))
+                                goto fail;
+
+                        tbio = tbio->bi_next = bio;
+                        DEBUG_IBLOCK("-----------------> Added +1 bio: %p to"
+                                " list, Going to again\n", bio);
+                        goto again;
+                }
+                /* Always in 512 byte units for Linux/Block */
+                block_lba += sg->length >> IBLOCK_LBA_SHIFT;
+                sg_num--;
+                DEBUG_IBLOCK("task: %p bio-add_page() passed!, decremented"
+                        " sg_num to %u\n", task, sg_num);
+                DEBUG_IBLOCK("task: %p bio_add_page() passed!, increased lba"
+                                " to %llu\n", task, block_lba);
+                DEBUG_IBLOCK("task: %p bio_add_page() passed!, bio->bi_vcnt:"
+                                " %u\n", task, bio->bi_vcnt);
+        }
+
+        return 0;
+fail:
+        while (hbio) {
+                bio = hbio;
+                hbio = hbio->bi_next;
+                bio->bi_next = NULL;
+                bio_put(bio);
+        }
+        return ret;
+}
+
+static unsigned char *iblock_get_cdb(struct se_task *task)
+{
+        return IBLOCK_REQ(task)->ib_scsi_cdb;
+}
+
+static u32 iblock_get_device_rev(struct se_device *dev)
+{
+        return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */
+}
+
+static u32 iblock_get_device_type(struct se_device *dev)
+{
+        return TYPE_DISK;
+}
+
+static sector_t iblock_get_blocks(struct se_device *dev)
+{
+        struct iblock_dev *ibd = dev->dev_ptr;
+        struct block_device *bd = ibd->ibd_bd;
+        struct request_queue *q = bdev_get_queue(bd);
+
+        return iblock_emulate_read_cap_with_block_size(dev, bd, q);
+}
+
+static void iblock_bio_done(struct bio *bio, int err)
+{
+        struct se_task *task = bio->bi_private;
+        struct iblock_req *ibr = IBLOCK_REQ(task);
+        /*
+         * Set -EIO if !BIO_UPTODATE and the passed is still err=0
+         */
+        if (!(test_bit(BIO_UPTODATE, &bio->bi_flags)) && !(err))
+                err = -EIO;
+
+        if (err != 0) {
+                printk(KERN_ERR "test_bit(BIO_UPTODATE) failed for bio: %p,"
+                        " err: %d\n", bio, err);
+                /*
+                 * Bump the ib_bio_err_cnt and release bio.
+                 */
+                atomic_inc(&ibr->ib_bio_err_cnt);
+                smp_mb__after_atomic_inc();
+                bio_put(bio);
+                /*
+                 * Wait to complete the task until the last bio as completed.
+                 */
+                if (!(atomic_dec_and_test(&ibr->ib_bio_cnt)))
+                        return;
+
+                ibr->ib_bio = NULL;
+                transport_complete_task(task, 0);
+                return;
+        }
+        DEBUG_IBLOCK("done[%p] bio: %p task_lba: %llu bio_lba: %llu err=%d\n",
+                task, bio, task->task_lba, bio->bi_sector, err);
+        /*
+         * bio_put() will call iblock_bio_destructor() to release the bio back
+         * to ibr->ib_bio_set.
+         */
+        bio_put(bio);
+        /*
+         * Wait to complete the task until the last bio as completed.
+         */
+        if (!(atomic_dec_and_test(&ibr->ib_bio_cnt)))
+                return;
+        /*
+         * Return GOOD status for task if zero ib_bio_err_cnt exists.
+         */
+        ibr->ib_bio = NULL;
+        transport_complete_task(task, (!atomic_read(&ibr->ib_bio_err_cnt)));
+}
+
+static struct se_subsystem_api iblock_template = {
+        .name                   = "iblock",
+        .owner                  = THIS_MODULE,
+        .transport_type         = TRANSPORT_PLUGIN_VHBA_PDEV,
+        .map_task_SG            = iblock_map_task_SG,
+        .attach_hba             = iblock_attach_hba,
+        .detach_hba             = iblock_detach_hba,
+        .allocate_virtdevice    = iblock_allocate_virtdevice,
+        .create_virtdevice      = iblock_create_virtdevice,
+        .free_device            = iblock_free_device,
+        .dpo_emulated           = iblock_emulated_dpo,
+        .fua_write_emulated     = iblock_emulated_fua_write,
+        .fua_read_emulated      = iblock_emulated_fua_read,
+        .write_cache_emulated   = iblock_emulated_write_cache,
+        .alloc_task             = iblock_alloc_task,
+        .do_task                = iblock_do_task,
+        .do_discard             = iblock_do_discard,
+        .do_sync_cache          = iblock_emulate_sync_cache,
+        .free_task              = iblock_free_task,
+        .check_configfs_dev_params = iblock_check_configfs_dev_params,
+        .set_configfs_dev_params = iblock_set_configfs_dev_params,
+        .show_configfs_dev_params = iblock_show_configfs_dev_params,
+        .get_cdb                = iblock_get_cdb,
+        .get_device_rev         = iblock_get_device_rev,
+        .get_device_type        = iblock_get_device_type,
+        .get_blocks             = iblock_get_blocks,
+};
+
+static int __init iblock_module_init(void)
+{
+        return transport_subsystem_register(&iblock_template);
+}
+
+static void iblock_module_exit(void)
+{
+        transport_subsystem_release(&iblock_template);
+}
+
+MODULE_DESCRIPTION("TCM IBLOCK subsystem plugin");
+MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_LICENSE("GPL");
+
+module_init(iblock_module_init);
+module_exit(iblock_module_exit);
diff --git a/drivers/target/target_core_iblock.h b/drivers/target/target_core_iblock.h
new file mode 100644
index 000000000000..64c1f4d69f76
--- /dev/null
+++ b/drivers/target/target_core_iblock.h
@@ -0,0 +1,40 @@
+#ifndef TARGET_CORE_IBLOCK_H
+#define TARGET_CORE_IBLOCK_H
+
+#define IBLOCK_VERSION          "4.0"
+
+#define IBLOCK_HBA_QUEUE_DEPTH  512
+#define IBLOCK_DEVICE_QUEUE_DEPTH       32
+#define IBLOCK_MAX_DEVICE_QUEUE_DEPTH   128
+#define IBLOCK_MAX_CDBS         16
+#define IBLOCK_LBA_SHIFT        9
+
+struct iblock_req {
+        struct se_task ib_task;
+        unsigned char ib_scsi_cdb[TCM_MAX_COMMAND_SIZE];
+        atomic_t ib_bio_cnt;
+        atomic_t ib_bio_err_cnt;
+        struct bio *ib_bio;
+        struct iblock_dev *ib_dev;
+} ____cacheline_aligned;
+
+#define IBDF_HAS_UDEV_PATH              0x01
+#define IBDF_HAS_FORCE                  0x02
+
+struct iblock_dev {
+        unsigned char ibd_udev_path[SE_UDEV_PATH_LEN];
+        int     ibd_force;
+        int     ibd_major;
+        int     ibd_minor;
+        u32     ibd_depth;
+        u32     ibd_flags;
+        struct bio_set  *ibd_bio_set;
+        struct block_device *ibd_bd;
+        struct iblock_hba *ibd_host;
+} ____cacheline_aligned;
+
+struct iblock_hba {
+        int             iblock_host_id;
+} ____cacheline_aligned;
+
+#endif /* TARGET_CORE_IBLOCK_H */
diff --git a/drivers/target/target_core_mib.c b/drivers/target/target_core_mib.c
new file mode 100644
index 000000000000..d5a48aa0d2d1
--- /dev/null
+++ b/drivers/target/target_core_mib.c
@@ -0,0 +1,1078 @@
+/*******************************************************************************
+ * Filename:  target_core_mib.c
+ *
+ * Copyright (c) 2006-2007 SBE, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@linux-iscsi.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/kernel.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/timer.h>
+#include <linux/string.h>
+#include <linux/version.h>
+#include <generated/utsrelease.h>
+#include <linux/utsname.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/blkdev.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_hba.h"
+#include "target_core_mib.h"
+
+/* SCSI mib table index */
+static struct scsi_index_table scsi_index_table;
+
+#ifndef INITIAL_JIFFIES
+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
+#endif
+
+/* SCSI Instance Table */
+#define SCSI_INST_SW_INDEX              1
+#define SCSI_TRANSPORT_INDEX            1
+
+#define NONE            "None"
+#define ISPRINT(a)   ((a >= ' ') && (a <= '~'))
+
+static inline int list_is_first(const struct list_head *list,
+                                const struct list_head *head)
+{
+        return list->prev == head;
+}
+
+static void *locate_hba_start(
+        struct seq_file *seq,
+        loff_t *pos)
+{
+        spin_lock(&se_global->g_device_lock);
+        return seq_list_start(&se_global->g_se_dev_list, *pos);
+}
+
+static void *locate_hba_next(
+        struct seq_file *seq,
+        void *v,
+        loff_t *pos)
+{
+        return seq_list_next(v, &se_global->g_se_dev_list, pos);
+}
+
+static void locate_hba_stop(struct seq_file *seq, void *v)
+{
+        spin_unlock(&se_global->g_device_lock);
+}
+
+/****************************************************************************
+ * SCSI MIB Tables
+ ****************************************************************************/
+
+/*
+ * SCSI Instance Table
+ */
+static void *scsi_inst_seq_start(
+        struct seq_file *seq,
+        loff_t *pos)
+{
+        spin_lock(&se_global->hba_lock);
+        return seq_list_start(&se_global->g_hba_list, *pos);
+}
+
+static void *scsi_inst_seq_next(
+        struct seq_file *seq,
+        void *v,
+        loff_t *pos)
+{
+        return seq_list_next(v, &se_global->g_hba_list, pos);
+}
+
+static void scsi_inst_seq_stop(struct seq_file *seq, void *v)
+{
+        spin_unlock(&se_global->hba_lock);
+}
+
+static int scsi_inst_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba = list_entry(v, struct se_hba, hba_list);
+
+        if (list_is_first(&hba->hba_list, &se_global->g_hba_list))
+                seq_puts(seq, "inst sw_indx\n");
+
+        seq_printf(seq, "%u %u\n", hba->hba_index, SCSI_INST_SW_INDEX);
+        seq_printf(seq, "plugin: %s version: %s\n",
+                        hba->transport->name, TARGET_CORE_VERSION);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_inst_seq_ops = {
+        .start  = scsi_inst_seq_start,
+        .next   = scsi_inst_seq_next,
+        .stop   = scsi_inst_seq_stop,
+        .show   = scsi_inst_seq_show
+};
+
+static int scsi_inst_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_inst_seq_ops);
+}
+
+static const struct file_operations scsi_inst_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_inst_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Device Table
+ */
+static void *scsi_dev_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_dev_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+static int scsi_dev_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        char str[28];
+        int k;
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst indx role ports\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        seq_printf(seq, "%u %u %s %u\n", hba->hba_index,
+                   dev->dev_index, "Target", dev->dev_port_count);
+
+        memcpy(&str[0], (void *)DEV_T10_WWN(dev), 28);
+
+        /* vendor */
+        for (k = 0; k < 8; k++)
+                str[k] = ISPRINT(DEV_T10_WWN(dev)->vendor[k]) ?
+                                DEV_T10_WWN(dev)->vendor[k] : 0x20;
+        str[k] = 0x20;
+
+        /* model */
+        for (k = 0; k < 16; k++)
+                str[k+9] = ISPRINT(DEV_T10_WWN(dev)->model[k]) ?
+                                DEV_T10_WWN(dev)->model[k] : 0x20;
+        str[k + 9] = 0;
+
+        seq_printf(seq, "dev_alias: %s\n", str);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_dev_seq_ops = {
+        .start  = scsi_dev_seq_start,
+        .next   = scsi_dev_seq_next,
+        .stop   = scsi_dev_seq_stop,
+        .show   = scsi_dev_seq_show
+};
+
+static int scsi_dev_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_dev_seq_ops);
+}
+
+static const struct file_operations scsi_dev_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_dev_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Port Table
+ */
+static void *scsi_port_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_port_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_port_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+static int scsi_port_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        struct se_port *sep, *sep_tmp;
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst device indx role busy_count\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        /* FIXME: scsiPortBusyStatuses count */
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry_safe(sep, sep_tmp, &dev->dev_sep_list, sep_list) {
+                seq_printf(seq, "%u %u %u %s%u %u\n", hba->hba_index,
+                        dev->dev_index, sep->sep_index, "Device",
+                        dev->dev_index, 0);
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_port_seq_ops = {
+        .start  = scsi_port_seq_start,
+        .next   = scsi_port_seq_next,
+        .stop   = scsi_port_seq_stop,
+        .show   = scsi_port_seq_show
+};
+
+static int scsi_port_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_port_seq_ops);
+}
+
+static const struct file_operations scsi_port_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_port_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Transport Table
+ */
+static void *scsi_transport_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_transport_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_transport_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+static int scsi_transport_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        struct se_port *se, *se_tmp;
+        struct se_portal_group *tpg;
+        struct t10_wwn *wwn;
+        char buf[64];
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst device indx dev_name\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        wwn = DEV_T10_WWN(dev);
+
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry_safe(se, se_tmp, &dev->dev_sep_list, sep_list) {
+                tpg = se->sep_tpg;
+                sprintf(buf, "scsiTransport%s",
+                                TPG_TFO(tpg)->get_fabric_name());
+
+                seq_printf(seq, "%u %s %u %s+%s\n",
+                        hba->hba_index, /* scsiTransportIndex */
+                        buf,  /* scsiTransportType */
+                        (TPG_TFO(tpg)->tpg_get_inst_index != NULL) ?
+                        TPG_TFO(tpg)->tpg_get_inst_index(tpg) :
+                        0,
+                        TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                        (strlen(wwn->unit_serial)) ?
+                        /* scsiTransportDevName */
+                        wwn->unit_serial : wwn->vendor);
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_transport_seq_ops = {
+        .start  = scsi_transport_seq_start,
+        .next   = scsi_transport_seq_next,
+        .stop   = scsi_transport_seq_stop,
+        .show   = scsi_transport_seq_show
+};
+
+static int scsi_transport_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_transport_seq_ops);
+}
+
+static const struct file_operations scsi_transport_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_transport_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Target Device Table
+ */
+static void *scsi_tgt_dev_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_tgt_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_tgt_dev_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+
+#define LU_COUNT        1  /* for now */
+static int scsi_tgt_dev_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        int non_accessible_lus = 0;
+        char status[16];
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst indx num_LUs status non_access_LUs"
+                        " resets\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        switch (dev->dev_status) {
+        case TRANSPORT_DEVICE_ACTIVATED:
+                strcpy(status, "activated");
+                break;
+        case TRANSPORT_DEVICE_DEACTIVATED:
+                strcpy(status, "deactivated");
+                non_accessible_lus = 1;
+                break;
+        case TRANSPORT_DEVICE_SHUTDOWN:
+                strcpy(status, "shutdown");
+                non_accessible_lus = 1;
+                break;
+        case TRANSPORT_DEVICE_OFFLINE_ACTIVATED:
+        case TRANSPORT_DEVICE_OFFLINE_DEACTIVATED:
+                strcpy(status, "offline");
+                non_accessible_lus = 1;
+                break;
+        default:
+                sprintf(status, "unknown(%d)", dev->dev_status);
+                non_accessible_lus = 1;
+        }
+
+        seq_printf(seq, "%u %u %u %s %u %u\n",
+                   hba->hba_index, dev->dev_index, LU_COUNT,
+                   status, non_accessible_lus, dev->num_resets);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_tgt_dev_seq_ops = {
+        .start  = scsi_tgt_dev_seq_start,
+        .next   = scsi_tgt_dev_seq_next,
+        .stop   = scsi_tgt_dev_seq_stop,
+        .show   = scsi_tgt_dev_seq_show
+};
+
+static int scsi_tgt_dev_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_tgt_dev_seq_ops);
+}
+
+static const struct file_operations scsi_tgt_dev_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_tgt_dev_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Target Port Table
+ */
+static void *scsi_tgt_port_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_tgt_port_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_tgt_port_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+static int scsi_tgt_port_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        struct se_port *sep, *sep_tmp;
+        struct se_portal_group *tpg;
+        u32 rx_mbytes, tx_mbytes;
+        unsigned long long num_cmds;
+        char buf[64];
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst device indx name port_index in_cmds"
+                        " write_mbytes read_mbytes hs_in_cmds\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry_safe(sep, sep_tmp, &dev->dev_sep_list, sep_list) {
+                tpg = sep->sep_tpg;
+                sprintf(buf, "%sPort#",
+                        TPG_TFO(tpg)->get_fabric_name());
+
+                seq_printf(seq, "%u %u %u %s%d %s%s%d ",
+                     hba->hba_index,
+                     dev->dev_index,
+                     sep->sep_index,
+                     buf, sep->sep_index,
+                     TPG_TFO(tpg)->tpg_get_wwn(tpg), "+t+",
+                     TPG_TFO(tpg)->tpg_get_tag(tpg));
+
+                spin_lock(&sep->sep_lun->lun_sep_lock);
+                num_cmds = sep->sep_stats.cmd_pdus;
+                rx_mbytes = (sep->sep_stats.rx_data_octets >> 20);
+                tx_mbytes = (sep->sep_stats.tx_data_octets >> 20);
+                spin_unlock(&sep->sep_lun->lun_sep_lock);
+
+                seq_printf(seq, "%llu %u %u %u\n", num_cmds,
+                        rx_mbytes, tx_mbytes, 0);
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_tgt_port_seq_ops = {
+        .start  = scsi_tgt_port_seq_start,
+        .next   = scsi_tgt_port_seq_next,
+        .stop   = scsi_tgt_port_seq_stop,
+        .show   = scsi_tgt_port_seq_show
+};
+
+static int scsi_tgt_port_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_tgt_port_seq_ops);
+}
+
+static const struct file_operations scsi_tgt_port_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_tgt_port_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Authorized Initiator Table:
+ * It contains the SCSI Initiators authorized to be attached to one of the
+ * local Target ports.
+ * Iterates through all active TPGs and extracts the info from the ACLs
+ */
+static void *scsi_auth_intr_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        spin_lock_bh(&se_global->se_tpg_lock);
+        return seq_list_start(&se_global->g_se_tpg_list, *pos);
+}
+
+static void *scsi_auth_intr_seq_next(struct seq_file *seq, void *v,
+                                         loff_t *pos)
+{
+        return seq_list_next(v, &se_global->g_se_tpg_list, pos);
+}
+
+static void scsi_auth_intr_seq_stop(struct seq_file *seq, void *v)
+{
+        spin_unlock_bh(&se_global->se_tpg_lock);
+}
+
+static int scsi_auth_intr_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_portal_group *se_tpg = list_entry(v, struct se_portal_group,
+                                                se_tpg_list);
+        struct se_dev_entry *deve;
+        struct se_lun *lun;
+        struct se_node_acl *se_nacl;
+        int j;
+
+        if (list_is_first(&se_tpg->se_tpg_list,
+                          &se_global->g_se_tpg_list))
+                seq_puts(seq, "inst dev port indx dev_or_port intr_name "
+                         "map_indx att_count num_cmds read_mbytes "
+                         "write_mbytes hs_num_cmds creation_time row_status\n");
+
+        if (!(se_tpg))
+                return 0;
+
+        spin_lock(&se_tpg->acl_node_lock);
+        list_for_each_entry(se_nacl, &se_tpg->acl_node_list, acl_list) {
+
+                atomic_inc(&se_nacl->mib_ref_count);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&se_tpg->acl_node_lock);
+
+                spin_lock_irq(&se_nacl->device_list_lock);
+                for (j = 0; j < TRANSPORT_MAX_LUNS_PER_TPG; j++) {
+                        deve = &se_nacl->device_list[j];
+                        if (!(deve->lun_flags &
+                                        TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) ||
+                            (!deve->se_lun))
+                                continue;
+                        lun = deve->se_lun;
+                        if (!lun->lun_se_dev)
+                                continue;
+
+                        seq_printf(seq, "%u %u %u %u %u %s %u %u %u %u %u %u"
+                                        " %u %s\n",
+                                /* scsiInstIndex */
+                                (TPG_TFO(se_tpg)->tpg_get_inst_index != NULL) ?
+                                TPG_TFO(se_tpg)->tpg_get_inst_index(se_tpg) :
+                                0,
+                                /* scsiDeviceIndex */
+                                lun->lun_se_dev->dev_index,
+                                /* scsiAuthIntrTgtPortIndex */
+                                TPG_TFO(se_tpg)->tpg_get_tag(se_tpg),
+                                /* scsiAuthIntrIndex */
+                                se_nacl->acl_index,
+                                /* scsiAuthIntrDevOrPort */
+                                1,
+                                /* scsiAuthIntrName */
+                                se_nacl->initiatorname[0] ?
+                                        se_nacl->initiatorname : NONE,
+                                /* FIXME: scsiAuthIntrLunMapIndex */
+                                0,
+                                /* scsiAuthIntrAttachedTimes */
+                                deve->attach_count,
+                                /* scsiAuthIntrOutCommands */
+                                deve->total_cmds,
+                                /* scsiAuthIntrReadMegaBytes */
+                                (u32)(deve->read_bytes >> 20),
+                                /* scsiAuthIntrWrittenMegaBytes */
+                                (u32)(deve->write_bytes >> 20),
+                                /* FIXME: scsiAuthIntrHSOutCommands */
+                                0,
+                                /* scsiAuthIntrLastCreation */
+                                (u32)(((u32)deve->creation_time -
+                                            INITIAL_JIFFIES) * 100 / HZ),
+                                /* FIXME: scsiAuthIntrRowStatus */
+                                "Ready");
+                }
+                spin_unlock_irq(&se_nacl->device_list_lock);
+
+                spin_lock(&se_tpg->acl_node_lock);
+                atomic_dec(&se_nacl->mib_ref_count);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&se_tpg->acl_node_lock);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_auth_intr_seq_ops = {
+        .start  = scsi_auth_intr_seq_start,
+        .next   = scsi_auth_intr_seq_next,
+        .stop   = scsi_auth_intr_seq_stop,
+        .show   = scsi_auth_intr_seq_show
+};
+
+static int scsi_auth_intr_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_auth_intr_seq_ops);
+}
+
+static const struct file_operations scsi_auth_intr_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_auth_intr_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Attached Initiator Port Table:
+ * It lists the SCSI Initiators attached to one of the local Target ports.
+ * Iterates through all active TPGs and use active sessions from each TPG
+ * to list the info fo this table.
+ */
+static void *scsi_att_intr_port_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        spin_lock_bh(&se_global->se_tpg_lock);
+        return seq_list_start(&se_global->g_se_tpg_list, *pos);
+}
+
+static void *scsi_att_intr_port_seq_next(struct seq_file *seq, void *v,
+                                         loff_t *pos)
+{
+        return seq_list_next(v, &se_global->g_se_tpg_list, pos);
+}
+
+static void scsi_att_intr_port_seq_stop(struct seq_file *seq, void *v)
+{
+        spin_unlock_bh(&se_global->se_tpg_lock);
+}
+
+static int scsi_att_intr_port_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_portal_group *se_tpg = list_entry(v, struct se_portal_group,
+                                                se_tpg_list);
+        struct se_dev_entry *deve;
+        struct se_lun *lun;
+        struct se_node_acl *se_nacl;
+        struct se_session *se_sess;
+        unsigned char buf[64];
+        int j;
+
+        if (list_is_first(&se_tpg->se_tpg_list,
+                          &se_global->g_se_tpg_list))
+                seq_puts(seq, "inst dev port indx port_auth_indx port_name"
+                        " port_ident\n");
+
+        if (!(se_tpg))
+                return 0;
+
+        spin_lock(&se_tpg->session_lock);
+        list_for_each_entry(se_sess, &se_tpg->tpg_sess_list, sess_list) {
+                if ((TPG_TFO(se_tpg)->sess_logged_in(se_sess)) ||
+                    (!se_sess->se_node_acl) ||
+                    (!se_sess->se_node_acl->device_list))
+                        continue;
+
+                atomic_inc(&se_sess->mib_ref_count);
+                smp_mb__after_atomic_inc();
+                se_nacl = se_sess->se_node_acl;
+                atomic_inc(&se_nacl->mib_ref_count);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&se_tpg->session_lock);
+
+                spin_lock_irq(&se_nacl->device_list_lock);
+                for (j = 0; j < TRANSPORT_MAX_LUNS_PER_TPG; j++) {
+                        deve = &se_nacl->device_list[j];
+                        if (!(deve->lun_flags &
+                                        TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) ||
+                           (!deve->se_lun))
+                                continue;
+
+                        lun = deve->se_lun;
+                        if (!lun->lun_se_dev)
+                                continue;
+
+                        memset(buf, 0, 64);
+                        if (TPG_TFO(se_tpg)->sess_get_initiator_sid != NULL)
+                                TPG_TFO(se_tpg)->sess_get_initiator_sid(
+                                        se_sess, (unsigned char *)&buf[0], 64);
+
+                        seq_printf(seq, "%u %u %u %u %u %s+i+%s\n",
+                                /* scsiInstIndex */
+                                (TPG_TFO(se_tpg)->tpg_get_inst_index != NULL) ?
+                                TPG_TFO(se_tpg)->tpg_get_inst_index(se_tpg) :
+                                0,
+                                /* scsiDeviceIndex */
+                                lun->lun_se_dev->dev_index,
+                                /* scsiPortIndex */
+                                TPG_TFO(se_tpg)->tpg_get_tag(se_tpg),
+                                /* scsiAttIntrPortIndex */
+                                (TPG_TFO(se_tpg)->sess_get_index != NULL) ?
+                                TPG_TFO(se_tpg)->sess_get_index(se_sess) :
+                                0,
+                                /* scsiAttIntrPortAuthIntrIdx */
+                                se_nacl->acl_index,
+                                /* scsiAttIntrPortName */
+                                se_nacl->initiatorname[0] ?
+                                        se_nacl->initiatorname : NONE,
+                                /* scsiAttIntrPortIdentifier */
+                                buf);
+                }
+                spin_unlock_irq(&se_nacl->device_list_lock);
+
+                spin_lock(&se_tpg->session_lock);
+                atomic_dec(&se_nacl->mib_ref_count);
+                smp_mb__after_atomic_dec();
+                atomic_dec(&se_sess->mib_ref_count);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&se_tpg->session_lock);
+
+        return 0;
+}
+
+static const struct seq_operations scsi_att_intr_port_seq_ops = {
+        .start  = scsi_att_intr_port_seq_start,
+        .next   = scsi_att_intr_port_seq_next,
+        .stop   = scsi_att_intr_port_seq_stop,
+        .show   = scsi_att_intr_port_seq_show
+};
+
+static int scsi_att_intr_port_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_att_intr_port_seq_ops);
+}
+
+static const struct file_operations scsi_att_intr_port_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_att_intr_port_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/*
+ * SCSI Logical Unit Table
+ */
+static void *scsi_lu_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        return locate_hba_start(seq, pos);
+}
+
+static void *scsi_lu_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        return locate_hba_next(seq, v, pos);
+}
+
+static void scsi_lu_seq_stop(struct seq_file *seq, void *v)
+{
+        locate_hba_stop(seq, v);
+}
+
+#define SCSI_LU_INDEX           1
+static int scsi_lu_seq_show(struct seq_file *seq, void *v)
+{
+        struct se_hba *hba;
+        struct se_subsystem_dev *se_dev = list_entry(v, struct se_subsystem_dev,
+                                                g_se_dev_list);
+        struct se_device *dev = se_dev->se_dev_ptr;
+        int j;
+        char str[28];
+
+        if (list_is_first(&se_dev->g_se_dev_list, &se_global->g_se_dev_list))
+                seq_puts(seq, "inst dev indx LUN lu_name vend prod rev"
+                " dev_type status state-bit num_cmds read_mbytes"
+                " write_mbytes resets full_stat hs_num_cmds creation_time\n");
+
+        if (!(dev))
+                return 0;
+
+        hba = dev->se_hba;
+        if (!(hba)) {
+                /* Log error ? */
+                return 0;
+        }
+
+        /* Fix LU state, if we can read it from the device */
+        seq_printf(seq, "%u %u %u %llu %s", hba->hba_index,
+                        dev->dev_index, SCSI_LU_INDEX,
+                        (unsigned long long)0, /* FIXME: scsiLuDefaultLun */
+                        (strlen(DEV_T10_WWN(dev)->unit_serial)) ?
+                        /* scsiLuWwnName */
+                        (char *)&DEV_T10_WWN(dev)->unit_serial[0] :
+                        "None");
+
+        memcpy(&str[0], (void *)DEV_T10_WWN(dev), 28);
+        /* scsiLuVendorId */
+        for (j = 0; j < 8; j++)
+                str[j] = ISPRINT(DEV_T10_WWN(dev)->vendor[j]) ?
+                        DEV_T10_WWN(dev)->vendor[j] : 0x20;
+        str[8] = 0;
+        seq_printf(seq, " %s", str);
+
+        /* scsiLuProductId */
+        for (j = 0; j < 16; j++)
+                str[j] = ISPRINT(DEV_T10_WWN(dev)->model[j]) ?
+                        DEV_T10_WWN(dev)->model[j] : 0x20;
+        str[16] = 0;
+        seq_printf(seq, " %s", str);
+
+        /* scsiLuRevisionId */
+        for (j = 0; j < 4; j++)
+                str[j] = ISPRINT(DEV_T10_WWN(dev)->revision[j]) ?
+                        DEV_T10_WWN(dev)->revision[j] : 0x20;
+        str[4] = 0;
+        seq_printf(seq, " %s", str);
+
+        seq_printf(seq, " %u %s %s %llu %u %u %u %u %u %u\n",
+                /* scsiLuPeripheralType */
+                   TRANSPORT(dev)->get_device_type(dev),
+                   (dev->dev_status == TRANSPORT_DEVICE_ACTIVATED) ?
+                "available" : "notavailable", /* scsiLuStatus */
+                "exposed",      /* scsiLuState */
+                (unsigned long long)dev->num_cmds,
+                /* scsiLuReadMegaBytes */
+                (u32)(dev->read_bytes >> 20),
+                /* scsiLuWrittenMegaBytes */
+                (u32)(dev->write_bytes >> 20),
+                dev->num_resets, /* scsiLuInResets */
+                0, /* scsiLuOutTaskSetFullStatus */
+                0, /* scsiLuHSInCommands */
+                (u32)(((u32)dev->creation_time - INITIAL_JIFFIES) *
+                                                        100 / HZ));
+
+        return 0;
+}
+
+static const struct seq_operations scsi_lu_seq_ops = {
+        .start  = scsi_lu_seq_start,
+        .next   = scsi_lu_seq_next,
+        .stop   = scsi_lu_seq_stop,
+        .show   = scsi_lu_seq_show
+};
+
+static int scsi_lu_seq_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &scsi_lu_seq_ops);
+}
+
+static const struct file_operations scsi_lu_seq_fops = {
+        .owner   = THIS_MODULE,
+        .open    = scsi_lu_seq_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+/****************************************************************************/
+
+/*
+ * Remove proc fs entries
+ */
+void remove_scsi_target_mib(void)
+{
+        remove_proc_entry("scsi_target/mib/scsi_inst", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_dev", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_port", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_transport", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_tgt_dev", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_tgt_port", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_auth_intr", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_att_intr_port", NULL);
+        remove_proc_entry("scsi_target/mib/scsi_lu", NULL);
+        remove_proc_entry("scsi_target/mib", NULL);
+}
+
+/*
+ * Create proc fs entries for the mib tables
+ */
+int init_scsi_target_mib(void)
+{
+        struct proc_dir_entry *dir_entry;
+        struct proc_dir_entry *scsi_inst_entry;
+        struct proc_dir_entry *scsi_dev_entry;
+        struct proc_dir_entry *scsi_port_entry;
+        struct proc_dir_entry *scsi_transport_entry;
+        struct proc_dir_entry *scsi_tgt_dev_entry;
+        struct proc_dir_entry *scsi_tgt_port_entry;
+        struct proc_dir_entry *scsi_auth_intr_entry;
+        struct proc_dir_entry *scsi_att_intr_port_entry;
+        struct proc_dir_entry *scsi_lu_entry;
+
+        dir_entry = proc_mkdir("scsi_target/mib", NULL);
+        if (!(dir_entry)) {
+                printk(KERN_ERR "proc_mkdir() failed.\n");
+                return -1;
+        }
+
+        scsi_inst_entry =
+                create_proc_entry("scsi_target/mib/scsi_inst", 0, NULL);
+        if (scsi_inst_entry)
+                scsi_inst_entry->proc_fops = &scsi_inst_seq_fops;
+        else
+                goto error;
+
+        scsi_dev_entry =
+                create_proc_entry("scsi_target/mib/scsi_dev", 0, NULL);
+        if (scsi_dev_entry)
+                scsi_dev_entry->proc_fops = &scsi_dev_seq_fops;
+        else
+                goto error;
+
+        scsi_port_entry =
+                create_proc_entry("scsi_target/mib/scsi_port", 0, NULL);
+        if (scsi_port_entry)
+                scsi_port_entry->proc_fops = &scsi_port_seq_fops;
+        else
+                goto error;
+
+        scsi_transport_entry =
+                create_proc_entry("scsi_target/mib/scsi_transport", 0, NULL);
+        if (scsi_transport_entry)
+                scsi_transport_entry->proc_fops = &scsi_transport_seq_fops;
+        else
+                goto error;
+
+        scsi_tgt_dev_entry =
+                create_proc_entry("scsi_target/mib/scsi_tgt_dev", 0, NULL);
+        if (scsi_tgt_dev_entry)
+                scsi_tgt_dev_entry->proc_fops = &scsi_tgt_dev_seq_fops;
+        else
+                goto error;
+
+        scsi_tgt_port_entry =
+                create_proc_entry("scsi_target/mib/scsi_tgt_port", 0, NULL);
+        if (scsi_tgt_port_entry)
+                scsi_tgt_port_entry->proc_fops = &scsi_tgt_port_seq_fops;
+        else
+                goto error;
+
+        scsi_auth_intr_entry =
+                create_proc_entry("scsi_target/mib/scsi_auth_intr", 0, NULL);
+        if (scsi_auth_intr_entry)
+                scsi_auth_intr_entry->proc_fops = &scsi_auth_intr_seq_fops;
+        else
+                goto error;
+
+        scsi_att_intr_port_entry =
+              create_proc_entry("scsi_target/mib/scsi_att_intr_port", 0, NULL);
+        if (scsi_att_intr_port_entry)
+                scsi_att_intr_port_entry->proc_fops =
+                                &scsi_att_intr_port_seq_fops;
+        else
+                goto error;
+
+        scsi_lu_entry = create_proc_entry("scsi_target/mib/scsi_lu", 0, NULL);
+        if (scsi_lu_entry)
+                scsi_lu_entry->proc_fops = &scsi_lu_seq_fops;
+        else
+                goto error;
+
+        return 0;
+
+error:
+        printk(KERN_ERR "create_proc_entry() failed.\n");
+        remove_scsi_target_mib();
+        return -1;
+}
+
+/*
+ * Initialize the index table for allocating unique row indexes to various mib
+ * tables
+ */
+void init_scsi_index_table(void)
+{
+        memset(&scsi_index_table, 0, sizeof(struct scsi_index_table));
+        spin_lock_init(&scsi_index_table.lock);
+}
+
+/*
+ * Allocate a new row index for the entry type specified
+ */
+u32 scsi_get_new_index(scsi_index_t type)
+{
+        u32 new_index;
+
+        if ((type < 0) || (type >= SCSI_INDEX_TYPE_MAX)) {
+                printk(KERN_ERR "Invalid index type %d\n", type);
+                return -1;
+        }
+
+        spin_lock(&scsi_index_table.lock);
+        new_index = ++scsi_index_table.scsi_mib_index[type];
+        if (new_index == 0)
+                new_index = ++scsi_index_table.scsi_mib_index[type];
+        spin_unlock(&scsi_index_table.lock);
+
+        return new_index;
+}
+EXPORT_SYMBOL(scsi_get_new_index);
diff --git a/drivers/target/target_core_mib.h b/drivers/target/target_core_mib.h
new file mode 100644
index 000000000000..277204633850
--- /dev/null
+++ b/drivers/target/target_core_mib.h
@@ -0,0 +1,28 @@
+#ifndef TARGET_CORE_MIB_H
+#define TARGET_CORE_MIB_H
+
+typedef enum {
+        SCSI_INST_INDEX,
+        SCSI_DEVICE_INDEX,
+        SCSI_AUTH_INTR_INDEX,
+        SCSI_INDEX_TYPE_MAX
+} scsi_index_t;
+
+struct scsi_index_table {
+        spinlock_t      lock;
+        u32             scsi_mib_index[SCSI_INDEX_TYPE_MAX];
+} ____cacheline_aligned;
+
+/* SCSI Port stats */
+struct scsi_port_stats {
+        u64     cmd_pdus;
+        u64     tx_data_octets;
+        u64     rx_data_octets;
+} ____cacheline_aligned;
+
+extern int init_scsi_target_mib(void);
+extern void remove_scsi_target_mib(void);
+extern void init_scsi_index_table(void);
+extern u32 scsi_get_new_index(scsi_index_t);
+
+#endif   /*** TARGET_CORE_MIB_H ***/
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
new file mode 100644
index 000000000000..2521f75362c3
--- /dev/null
+++ b/drivers/target/target_core_pr.c
@@ -0,0 +1,4252 @@
+/*******************************************************************************
+ * Filename:  target_core_pr.c
+ *
+ * This file contains SPC-3 compliant persistent reservations and
+ * legacy SPC-2 reservations with compatible reservation handling (CRH=1)
+ *
+ * Copyright (c) 2009, 2010 Rising Tide Systems
+ * Copyright (c) 2009, 2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <asm/unaligned.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tmr.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+#include "target_core_ua.h"
+
+/*
+ * Used for Specify Initiator Ports Capable Bit (SPEC_I_PT)
+ */
+struct pr_transport_id_holder {
+        int dest_local_nexus;
+        struct t10_pr_registration *dest_pr_reg;
+        struct se_portal_group *dest_tpg;
+        struct se_node_acl *dest_node_acl;
+        struct se_dev_entry *dest_se_deve;
+        struct list_head dest_list;
+};
+
+int core_pr_dump_initiator_port(
+        struct t10_pr_registration *pr_reg,
+        char *buf,
+        u32 size)
+{
+        if (!(pr_reg->isid_present_at_reg))
+                return 0;
+
+        snprintf(buf, size, ",i,0x%s", &pr_reg->pr_reg_isid[0]);
+        return 1;
+}
+
+static void __core_scsi3_complete_pro_release(struct se_device *, struct se_node_acl *,
+                        struct t10_pr_registration *, int);
+
+static int core_scsi2_reservation_seq_non_holder(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u32 pr_reg_type)
+{
+        switch (cdb[0]) {
+        case INQUIRY:
+        case RELEASE:
+        case RELEASE_10:
+                return 0;
+        default:
+                return 1;
+        }
+
+        return 1;
+}
+
+static int core_scsi2_reservation_check(struct se_cmd *cmd, u32 *pr_reg_type)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        int ret;
+
+        if (!(sess))
+                return 0;
+
+        spin_lock(&dev->dev_reservation_lock);
+        if (!dev->dev_reserved_node_acl || !sess) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+        if (dev->dev_reserved_node_acl != sess->se_node_acl) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return -1;
+        }
+        if (!(dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID)) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+        ret = (dev->dev_res_bin_isid == sess->sess_bin_isid) ? 0 : -1;
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return ret;
+}
+
+static int core_scsi2_reservation_release(struct se_cmd *cmd)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        struct se_portal_group *tpg = sess->se_tpg;
+
+        if (!(sess) || !(tpg))
+                return 0;
+
+        spin_lock(&dev->dev_reservation_lock);
+        if (!dev->dev_reserved_node_acl || !sess) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+
+        if (dev->dev_reserved_node_acl != sess->se_node_acl) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+        dev->dev_reserved_node_acl = NULL;
+        dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
+        if (dev->dev_flags & DF_SPC2_RESERVATIONS_WITH_ISID) {
+                dev->dev_res_bin_isid = 0;
+                dev->dev_flags &= ~DF_SPC2_RESERVATIONS_WITH_ISID;
+        }
+        printk(KERN_INFO "SCSI-2 Released reservation for %s LUN: %u ->"
+                " MAPPED LUN: %u for %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                SE_LUN(cmd)->unpacked_lun, cmd->se_deve->mapped_lun,
+                sess->se_node_acl->initiatorname);
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return 0;
+}
+
+static int core_scsi2_reservation_reserve(struct se_cmd *cmd)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        struct se_portal_group *tpg = sess->se_tpg;
+
+        if ((T_TASK(cmd)->t_task_cdb[1] & 0x01) &&
+            (T_TASK(cmd)->t_task_cdb[1] & 0x02)) {
+                printk(KERN_ERR "LongIO and Obselete Bits set, returning"
+                                " ILLEGAL_REQUEST\n");
+                return PYX_TRANSPORT_ILLEGAL_REQUEST;
+        }
+        /*
+         * This is currently the case for target_core_mod passthrough struct se_cmd
+         * ops
+         */
+        if (!(sess) || !(tpg))
+                return 0;
+
+        spin_lock(&dev->dev_reservation_lock);
+        if (dev->dev_reserved_node_acl &&
+           (dev->dev_reserved_node_acl != sess->se_node_acl)) {
+                printk(KERN_ERR "SCSI-2 RESERVATION CONFLIFT for %s fabric\n",
+                        TPG_TFO(tpg)->get_fabric_name());
+                printk(KERN_ERR "Original reserver LUN: %u %s\n",
+                        SE_LUN(cmd)->unpacked_lun,
+                        dev->dev_reserved_node_acl->initiatorname);
+                printk(KERN_ERR "Current attempt - LUN: %u -> MAPPED LUN: %u"
+                        " from %s \n", SE_LUN(cmd)->unpacked_lun,
+                        cmd->se_deve->mapped_lun,
+                        sess->se_node_acl->initiatorname);
+                spin_unlock(&dev->dev_reservation_lock);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+
+        dev->dev_reserved_node_acl = sess->se_node_acl;
+        dev->dev_flags |= DF_SPC2_RESERVATIONS;
+        if (sess->sess_bin_isid != 0) {
+                dev->dev_res_bin_isid = sess->sess_bin_isid;
+                dev->dev_flags |= DF_SPC2_RESERVATIONS_WITH_ISID;
+        }
+        printk(KERN_INFO "SCSI-2 Reserved %s LUN: %u -> MAPPED LUN: %u"
+                " for %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                SE_LUN(cmd)->unpacked_lun, cmd->se_deve->mapped_lun,
+                sess->se_node_acl->initiatorname);
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return 0;
+}
+
+static struct t10_pr_registration *core_scsi3_locate_pr_reg(struct se_device *,
+                                        struct se_node_acl *, struct se_session *);
+static void core_scsi3_put_pr_reg(struct t10_pr_registration *);
+
+/*
+ * Setup in target_core_transport.c:transport_generic_cmd_sequencer()
+ * and called via struct se_cmd->transport_emulate_cdb() in TCM processing
+ * thread context.
+ */
+int core_scsi2_emulate_crh(struct se_cmd *cmd)
+{
+        struct se_session *se_sess = cmd->se_sess;
+        struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
+        struct t10_pr_registration *pr_reg;
+        struct t10_reservation_template *pr_tmpl = &su_dev->t10_reservation;
+        unsigned char *cdb = &T_TASK(cmd)->t_task_cdb[0];
+        int crh = (T10_RES(su_dev)->res_type == SPC3_PERSISTENT_RESERVATIONS);
+        int conflict = 0;
+
+        if (!(se_sess))
+                return 0;
+
+        if (!(crh))
+                goto after_crh;
+
+        pr_reg = core_scsi3_locate_pr_reg(cmd->se_dev, se_sess->se_node_acl,
+                        se_sess);
+        if (pr_reg) {
+                /*
+                 * From spc4r17 5.7.3 Exceptions to SPC-2 RESERVE and RELEASE
+                 * behavior
+                 *
+                 * A RESERVE(6) or RESERVE(10) command shall complete with GOOD
+                 * status, but no reservation shall be established and the
+                 * persistent reservation shall not be changed, if the command
+                 * is received from a) and b) below.
+                 *
+                 * A RELEASE(6) or RELEASE(10) command shall complete with GOOD
+                 * status, but the persistent reservation shall not be released,
+                 * if the command is received from a) and b)
+                 *
+                 * a) An I_T nexus that is a persistent reservation holder; or
+                 * b) An I_T nexus that is registered if a registrants only or
+                 *    all registrants type persistent reservation is present.
+                 *
+                 * In all other cases, a RESERVE(6) command, RESERVE(10) command,
+                 * RELEASE(6) command, or RELEASE(10) command shall be processed
+                 * as defined in SPC-2.
+                 */
+                if (pr_reg->pr_res_holder) {
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return 0;
+                }
+                if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) ||
+                    (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) ||
+                    (pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+                    (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return 0;
+                }
+                core_scsi3_put_pr_reg(pr_reg);
+                conflict = 1;
+        } else {
+                /*
+                 * Following spc2r20 5.5.1 Reservations overview:
+                 *
+                 * If a logical unit has executed a PERSISTENT RESERVE OUT
+                 * command with the REGISTER or the REGISTER AND IGNORE
+                 * EXISTING KEY service action and is still registered by any
+                 * initiator, all RESERVE commands and all RELEASE commands
+                 * regardless of initiator shall conflict and shall terminate
+                 * with a RESERVATION CONFLICT status.
+                 */
+                spin_lock(&pr_tmpl->registration_lock);
+                conflict = (list_empty(&pr_tmpl->registration_list)) ? 0 : 1;
+                spin_unlock(&pr_tmpl->registration_lock);
+        }
+
+        if (conflict) {
+                printk(KERN_ERR "Received legacy SPC-2 RESERVE/RELEASE"
+                        " while active SPC-3 registrations exist,"
+                        " returning RESERVATION_CONFLICT\n");
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+
+after_crh:
+        if ((cdb[0] == RESERVE) || (cdb[0] == RESERVE_10))
+                return core_scsi2_reservation_reserve(cmd);
+        else if ((cdb[0] == RELEASE) || (cdb[0] == RELEASE_10))
+                return core_scsi2_reservation_release(cmd);
+        else
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+}
+
+/*
+ * Begin SPC-3/SPC-4 Persistent Reservations emulation support
+ *
+ * This function is called by those initiator ports who are *NOT*
+ * the active PR reservation holder when a reservation is present.
+ */
+static int core_scsi3_pr_seq_non_holder(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u32 pr_reg_type)
+{
+        struct se_dev_entry *se_deve;
+        struct se_session *se_sess = SE_SESS(cmd);
+        int other_cdb = 0, ignore_reg;
+        int registered_nexus = 0, ret = 1; /* Conflict by default */
+        int all_reg = 0, reg_only = 0; /* ALL_REG, REG_ONLY */
+        int we = 0; /* Write Exclusive */
+        int legacy = 0; /* Act like a legacy device and return
+                         * RESERVATION CONFLICT on some CDBs */
+        /*
+         * A legacy SPC-2 reservation is being held.
+         */
+        if (cmd->se_dev->dev_flags & DF_SPC2_RESERVATIONS)
+                return core_scsi2_reservation_seq_non_holder(cmd,
+                                        cdb, pr_reg_type);
+
+        se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+        /*
+         * Determine if the registration should be ignored due to
+         * non-matching ISIDs in core_scsi3_pr_reservation_check().
+         */
+        ignore_reg = (pr_reg_type & 0x80000000);
+        if (ignore_reg)
+                pr_reg_type &= ~0x80000000;
+
+        switch (pr_reg_type) {
+        case PR_TYPE_WRITE_EXCLUSIVE:
+                we = 1;
+        case PR_TYPE_EXCLUSIVE_ACCESS:
+                /*
+                 * Some commands are only allowed for the persistent reservation
+                 * holder.
+                 */
+                if ((se_deve->def_pr_registered) && !(ignore_reg))
+                        registered_nexus = 1;
+                break;
+        case PR_TYPE_WRITE_EXCLUSIVE_REGONLY:
+                we = 1;
+        case PR_TYPE_EXCLUSIVE_ACCESS_REGONLY:
+                /*
+                 * Some commands are only allowed for registered I_T Nexuses.
+                 */
+                reg_only = 1;
+                if ((se_deve->def_pr_registered) && !(ignore_reg))
+                        registered_nexus = 1;
+                break;
+        case PR_TYPE_WRITE_EXCLUSIVE_ALLREG:
+                we = 1;
+        case PR_TYPE_EXCLUSIVE_ACCESS_ALLREG:
+                /*
+                 * Each registered I_T Nexus is a reservation holder.
+                 */
+                all_reg = 1;
+                if ((se_deve->def_pr_registered) && !(ignore_reg))
+                        registered_nexus = 1;
+                break;
+        default:
+                return -1;
+        }
+        /*
+         * Referenced from spc4r17 table 45 for *NON* PR holder access
+         */
+        switch (cdb[0]) {
+        case SECURITY_PROTOCOL_IN:
+                if (registered_nexus)
+                        return 0;
+                ret = (we) ? 0 : 1;
+                break;
+        case MODE_SENSE:
+        case MODE_SENSE_10:
+        case READ_ATTRIBUTE:
+        case READ_BUFFER:
+        case RECEIVE_DIAGNOSTIC:
+                if (legacy) {
+                        ret = 1;
+                        break;
+                }
+                if (registered_nexus) {
+                        ret = 0;
+                        break;
+                }
+                ret = (we) ? 0 : 1; /* Allowed Write Exclusive */
+                break;
+        case PERSISTENT_RESERVE_OUT:
+                /*
+                 * This follows PERSISTENT_RESERVE_OUT service actions that
+                 * are allowed in the presence of various reservations.
+                 * See spc4r17, table 46
+                 */
+                switch (cdb[1] & 0x1f) {
+                case PRO_CLEAR:
+                case PRO_PREEMPT:
+                case PRO_PREEMPT_AND_ABORT:
+                        ret = (registered_nexus) ? 0 : 1;
+                        break;
+                case PRO_REGISTER:
+                case PRO_REGISTER_AND_IGNORE_EXISTING_KEY:
+                        ret = 0;
+                        break;
+                case PRO_REGISTER_AND_MOVE:
+                case PRO_RESERVE:
+                        ret = 1;
+                        break;
+                case PRO_RELEASE:
+                        ret = (registered_nexus) ? 0 : 1;
+                        break;
+                default:
+                        printk(KERN_ERR "Unknown PERSISTENT_RESERVE_OUT service"
+                                " action: 0x%02x\n", cdb[1] & 0x1f);
+                        return -1;
+                }
+                break;
+        case RELEASE:
+        case RELEASE_10:
+                /* Handled by CRH=1 in core_scsi2_emulate_crh() */
+                ret = 0;
+                break;
+        case RESERVE:
+        case RESERVE_10:
+                /* Handled by CRH=1 in core_scsi2_emulate_crh() */
+                ret = 0;
+                break;
+        case TEST_UNIT_READY:
+                ret = (legacy) ? 1 : 0; /* Conflict for legacy */
+                break;
+        case MAINTENANCE_IN:
+                switch (cdb[1] & 0x1f) {
+                case MI_MANAGEMENT_PROTOCOL_IN:
+                        if (registered_nexus) {
+                                ret = 0;
+                                break;
+                        }
+                        ret = (we) ? 0 : 1; /* Allowed Write Exclusive */
+                        break;
+                case MI_REPORT_SUPPORTED_OPERATION_CODES:
+                case MI_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS:
+                        if (legacy) {
+                                ret = 1;
+                                break;
+                        }
+                        if (registered_nexus) {
+                                ret = 0;
+                                break;
+                        }
+                        ret = (we) ? 0 : 1; /* Allowed Write Exclusive */
+                        break;
+                case MI_REPORT_ALIASES:
+                case MI_REPORT_IDENTIFYING_INFORMATION:
+                case MI_REPORT_PRIORITY:
+                case MI_REPORT_TARGET_PGS:
+                case MI_REPORT_TIMESTAMP:
+                        ret = 0; /* Allowed */
+                        break;
+                default:
+                        printk(KERN_ERR "Unknown MI Service Action: 0x%02x\n",
+                                (cdb[1] & 0x1f));
+                        return -1;
+                }
+                break;
+        case ACCESS_CONTROL_IN:
+        case ACCESS_CONTROL_OUT:
+        case INQUIRY:
+        case LOG_SENSE:
+        case READ_MEDIA_SERIAL_NUMBER:
+        case REPORT_LUNS:
+        case REQUEST_SENSE:
+                ret = 0; /*/ Allowed CDBs */
+                break;
+        default:
+                other_cdb = 1;
+                break;
+        }
+        /*
+         * Case where the CDB is explictly allowed in the above switch
+         * statement.
+         */
+        if (!(ret) && !(other_cdb)) {
+#if 0
+                printk(KERN_INFO "Allowing explict CDB: 0x%02x for %s"
+                        " reservation holder\n", cdb[0],
+                        core_scsi3_pr_dump_type(pr_reg_type));
+#endif
+                return ret;
+        }
+        /*
+         * Check if write exclusive initiator ports *NOT* holding the
+         * WRITE_EXCLUSIVE_* reservation.
+         */
+        if ((we) && !(registered_nexus)) {
+                if (cmd->data_direction == DMA_TO_DEVICE) {
+                        /*
+                         * Conflict for write exclusive
+                         */
+                        printk(KERN_INFO "%s Conflict for unregistered nexus"
+                                " %s CDB: 0x%02x to %s reservation\n",
+                                transport_dump_cmd_direction(cmd),
+                                se_sess->se_node_acl->initiatorname, cdb[0],
+                                core_scsi3_pr_dump_type(pr_reg_type));
+                        return 1;
+                } else {
+                        /*
+                         * Allow non WRITE CDBs for all Write Exclusive
+                         * PR TYPEs to pass for registered and
+                         * non-registered_nexuxes NOT holding the reservation.
+                         *
+                         * We only make noise for the unregisterd nexuses,
+                         * as we expect registered non-reservation holding
+                         * nexuses to issue CDBs.
+                         */
+#if 0
+                        if (!(registered_nexus)) {
+                                printk(KERN_INFO "Allowing implict CDB: 0x%02x"
+                                        " for %s reservation on unregistered"
+                                        " nexus\n", cdb[0],
+                                        core_scsi3_pr_dump_type(pr_reg_type));
+                        }
+#endif
+                        return 0;
+                }
+        } else if ((reg_only) || (all_reg)) {
+                if (registered_nexus) {
+                        /*
+                         * For PR_*_REG_ONLY and PR_*_ALL_REG reservations,
+                         * allow commands from registered nexuses.
+                         */
+#if 0
+                        printk(KERN_INFO "Allowing implict CDB: 0x%02x for %s"
+                                " reservation\n", cdb[0],
+                                core_scsi3_pr_dump_type(pr_reg_type));
+#endif
+                        return 0;
+                }
+        }
+        printk(KERN_INFO "%s Conflict for %sregistered nexus %s CDB: 0x%2x"
+                " for %s reservation\n", transport_dump_cmd_direction(cmd),
+                (registered_nexus) ? "" : "un",
+                se_sess->se_node_acl->initiatorname, cdb[0],
+                core_scsi3_pr_dump_type(pr_reg_type));
+
+        return 1; /* Conflict by default */
+}
+
+static u32 core_scsi3_pr_generation(struct se_device *dev)
+{
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        u32 prg;
+        /*
+         * PRGeneration field shall contain the value of a 32-bit wrapping
+         * counter mainted by the device server.
+         *
+         * Note that this is done regardless of Active Persist across
+         * Target PowerLoss (APTPL)
+         *
+         * See spc4r17 section 6.3.12 READ_KEYS service action
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        prg = T10_RES(su_dev)->pr_generation++;
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return prg;
+}
+
+static int core_scsi3_pr_reservation_check(
+        struct se_cmd *cmd,
+        u32 *pr_reg_type)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *sess = cmd->se_sess;
+        int ret;
+
+        if (!(sess))
+                return 0;
+        /*
+         * A legacy SPC-2 reservation is being held.
+         */
+        if (dev->dev_flags & DF_SPC2_RESERVATIONS)
+                return core_scsi2_reservation_check(cmd, pr_reg_type);
+
+        spin_lock(&dev->dev_reservation_lock);
+        if (!(dev->dev_pr_res_holder)) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+        *pr_reg_type = dev->dev_pr_res_holder->pr_res_type;
+        cmd->pr_res_key = dev->dev_pr_res_holder->pr_res_key;
+        if (dev->dev_pr_res_holder->pr_reg_nacl != sess->se_node_acl) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return -1;
+        }
+        if (!(dev->dev_pr_res_holder->isid_present_at_reg)) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return 0;
+        }
+        ret = (dev->dev_pr_res_holder->pr_reg_bin_isid ==
+               sess->sess_bin_isid) ? 0 : -1;
+        /*
+         * Use bit in *pr_reg_type to notify ISID mismatch in
+         * core_scsi3_pr_seq_non_holder().
+         */
+        if (ret != 0)
+                *pr_reg_type |= 0x80000000;
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return ret;
+}
+
+static struct t10_pr_registration *__core_scsi3_do_alloc_registration(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct se_dev_entry *deve,
+        unsigned char *isid,
+        u64 sa_res_key,
+        int all_tg_pt,
+        int aptpl)
+{
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        struct t10_pr_registration *pr_reg;
+
+        pr_reg = kmem_cache_zalloc(t10_pr_reg_cache, GFP_ATOMIC);
+        if (!(pr_reg)) {
+                printk(KERN_ERR "Unable to allocate struct t10_pr_registration\n");
+                return NULL;
+        }
+
+        pr_reg->pr_aptpl_buf = kzalloc(T10_RES(su_dev)->pr_aptpl_buf_len,
+                                        GFP_ATOMIC);
+        if (!(pr_reg->pr_aptpl_buf)) {
+                printk(KERN_ERR "Unable to allocate pr_reg->pr_aptpl_buf\n");
+                kmem_cache_free(t10_pr_reg_cache, pr_reg);
+                return NULL;
+        }
+
+        INIT_LIST_HEAD(&pr_reg->pr_reg_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_abort_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_aptpl_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_atp_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_atp_mem_list);
+        atomic_set(&pr_reg->pr_res_holders, 0);
+        pr_reg->pr_reg_nacl = nacl;
+        pr_reg->pr_reg_deve = deve;
+        pr_reg->pr_res_mapped_lun = deve->mapped_lun;
+        pr_reg->pr_aptpl_target_lun = deve->se_lun->unpacked_lun;
+        pr_reg->pr_res_key = sa_res_key;
+        pr_reg->pr_reg_all_tg_pt = all_tg_pt;
+        pr_reg->pr_reg_aptpl = aptpl;
+        pr_reg->pr_reg_tg_pt_lun = deve->se_lun;
+        /*
+         * If an ISID value for this SCSI Initiator Port exists,
+         * save it to the registration now.
+         */
+        if (isid != NULL) {
+                pr_reg->pr_reg_bin_isid = get_unaligned_be64(isid);
+                snprintf(pr_reg->pr_reg_isid, PR_REG_ISID_LEN, "%s", isid);
+                pr_reg->isid_present_at_reg = 1;
+        }
+
+        return pr_reg;
+}
+
+static int core_scsi3_lunacl_depend_item(struct se_dev_entry *);
+static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *);
+
+/*
+ * Function used for handling PR registrations for ALL_TG_PT=1 and ALL_TG_PT=0
+ * modes.
+ */
+static struct t10_pr_registration *__core_scsi3_alloc_registration(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct se_dev_entry *deve,
+        unsigned char *isid,
+        u64 sa_res_key,
+        int all_tg_pt,
+        int aptpl)
+{
+        struct se_dev_entry *deve_tmp;
+        struct se_node_acl *nacl_tmp;
+        struct se_port *port, *port_tmp;
+        struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
+        struct t10_pr_registration *pr_reg, *pr_reg_atp, *pr_reg_tmp, *pr_reg_tmp_safe;
+        int ret;
+        /*
+         * Create a registration for the I_T Nexus upon which the
+         * PROUT REGISTER was received.
+         */
+        pr_reg = __core_scsi3_do_alloc_registration(dev, nacl, deve, isid,
+                        sa_res_key, all_tg_pt, aptpl);
+        if (!(pr_reg))
+                return NULL;
+        /*
+         * Return pointer to pr_reg for ALL_TG_PT=0
+         */
+        if (!(all_tg_pt))
+                return pr_reg;
+        /*
+         * Create list of matching SCSI Initiator Port registrations
+         * for ALL_TG_PT=1
+         */
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry_safe(port, port_tmp, &dev->dev_sep_list, sep_list) {
+                atomic_inc(&port->sep_tg_pt_ref_cnt);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&dev->se_port_lock);
+
+                spin_lock_bh(&port->sep_alua_lock);
+                list_for_each_entry(deve_tmp, &port->sep_alua_list,
+                                        alua_port_list) {
+                        /*
+                         * This pointer will be NULL for demo mode MappedLUNs
+                         * that have not been make explict via a ConfigFS
+                         * MappedLUN group for the SCSI Initiator Node ACL.
+                         */
+                        if (!(deve_tmp->se_lun_acl))
+                                continue;
+
+                        nacl_tmp = deve_tmp->se_lun_acl->se_lun_nacl;
+                        /*
+                         * Skip the matching struct se_node_acl that is allocated
+                         * above..
+                         */
+                        if (nacl == nacl_tmp)
+                                continue;
+                        /*
+                         * Only perform PR registrations for target ports on
+                         * the same fabric module as the REGISTER w/ ALL_TG_PT=1
+                         * arrived.
+                         */
+                        if (tfo != nacl_tmp->se_tpg->se_tpg_tfo)
+                                continue;
+                        /*
+                         * Look for a matching Initiator Node ACL in ASCII format
+                         */
+                        if (strcmp(nacl->initiatorname, nacl_tmp->initiatorname))
+                                continue;
+
+                        atomic_inc(&deve_tmp->pr_ref_count);
+                        smp_mb__after_atomic_inc();
+                        spin_unlock_bh(&port->sep_alua_lock);
+                        /*
+                         * Grab a configfs group dependency that is released
+                         * for the exception path at label out: below, or upon
+                         * completion of adding ALL_TG_PT=1 registrations in
+                         * __core_scsi3_add_registration()
+                         */
+                        ret = core_scsi3_lunacl_depend_item(deve_tmp);
+                        if (ret < 0) {
+                                printk(KERN_ERR "core_scsi3_lunacl_depend"
+                                                "_item() failed\n");
+                                atomic_dec(&port->sep_tg_pt_ref_cnt);
+                                smp_mb__after_atomic_dec();
+                                atomic_dec(&deve_tmp->pr_ref_count);
+                                smp_mb__after_atomic_dec();
+                                goto out;
+                        }
+                        /*
+                         * Located a matching SCSI Initiator Port on a different
+                         * port, allocate the pr_reg_atp and attach it to the
+                         * pr_reg->pr_reg_atp_list that will be processed once
+                         * the original *pr_reg is processed in
+                         * __core_scsi3_add_registration()
+                         */
+                        pr_reg_atp = __core_scsi3_do_alloc_registration(dev,
+                                                nacl_tmp, deve_tmp, NULL,
+                                                sa_res_key, all_tg_pt, aptpl);
+                        if (!(pr_reg_atp)) {
+                                atomic_dec(&port->sep_tg_pt_ref_cnt);
+                                smp_mb__after_atomic_dec();
+                                atomic_dec(&deve_tmp->pr_ref_count);
+                                smp_mb__after_atomic_dec();
+                                core_scsi3_lunacl_undepend_item(deve_tmp);
+                                goto out;
+                        }
+
+                        list_add_tail(&pr_reg_atp->pr_reg_atp_mem_list,
+                                      &pr_reg->pr_reg_atp_list);
+                        spin_lock_bh(&port->sep_alua_lock);
+                }
+                spin_unlock_bh(&port->sep_alua_lock);
+
+                spin_lock(&dev->se_port_lock);
+                atomic_dec(&port->sep_tg_pt_ref_cnt);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        return pr_reg;
+out:
+        list_for_each_entry_safe(pr_reg_tmp, pr_reg_tmp_safe,
+                        &pr_reg->pr_reg_atp_list, pr_reg_atp_mem_list) {
+                list_del(&pr_reg_tmp->pr_reg_atp_mem_list);
+                core_scsi3_lunacl_undepend_item(pr_reg_tmp->pr_reg_deve);
+                kmem_cache_free(t10_pr_reg_cache, pr_reg_tmp);
+        }
+        kmem_cache_free(t10_pr_reg_cache, pr_reg);
+        return NULL;
+}
+
+int core_scsi3_alloc_aptpl_registration(
+        struct t10_reservation_template *pr_tmpl,
+        u64 sa_res_key,
+        unsigned char *i_port,
+        unsigned char *isid,
+        u32 mapped_lun,
+        unsigned char *t_port,
+        u16 tpgt,
+        u32 target_lun,
+        int res_holder,
+        int all_tg_pt,
+        u8 type)
+{
+        struct t10_pr_registration *pr_reg;
+
+        if (!(i_port) || !(t_port) || !(sa_res_key)) {
+                printk(KERN_ERR "Illegal parameters for APTPL registration\n");
+                return -1;
+        }
+
+        pr_reg = kmem_cache_zalloc(t10_pr_reg_cache, GFP_KERNEL);
+        if (!(pr_reg)) {
+                printk(KERN_ERR "Unable to allocate struct t10_pr_registration\n");
+                return -1;
+        }
+        pr_reg->pr_aptpl_buf = kzalloc(pr_tmpl->pr_aptpl_buf_len, GFP_KERNEL);
+
+        INIT_LIST_HEAD(&pr_reg->pr_reg_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_abort_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_aptpl_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_atp_list);
+        INIT_LIST_HEAD(&pr_reg->pr_reg_atp_mem_list);
+        atomic_set(&pr_reg->pr_res_holders, 0);
+        pr_reg->pr_reg_nacl = NULL;
+        pr_reg->pr_reg_deve = NULL;
+        pr_reg->pr_res_mapped_lun = mapped_lun;
+        pr_reg->pr_aptpl_target_lun = target_lun;
+        pr_reg->pr_res_key = sa_res_key;
+        pr_reg->pr_reg_all_tg_pt = all_tg_pt;
+        pr_reg->pr_reg_aptpl = 1;
+        pr_reg->pr_reg_tg_pt_lun = NULL;
+        pr_reg->pr_res_scope = 0; /* Always LUN_SCOPE */
+        pr_reg->pr_res_type = type;
+        /*
+         * If an ISID value had been saved in APTPL metadata for this
+         * SCSI Initiator Port, restore it now.
+         */
+        if (isid != NULL) {
+                pr_reg->pr_reg_bin_isid = get_unaligned_be64(isid);
+                snprintf(pr_reg->pr_reg_isid, PR_REG_ISID_LEN, "%s", isid);
+                pr_reg->isid_present_at_reg = 1;
+        }
+        /*
+         * Copy the i_port and t_port information from caller.
+         */
+        snprintf(pr_reg->pr_iport, PR_APTPL_MAX_IPORT_LEN, "%s", i_port);
+        snprintf(pr_reg->pr_tport, PR_APTPL_MAX_TPORT_LEN, "%s", t_port);
+        pr_reg->pr_reg_tpgt = tpgt;
+        /*
+         * Set pr_res_holder from caller, the pr_reg who is the reservation
+         * holder will get it's pointer set in core_scsi3_aptpl_reserve() once
+         * the Initiator Node LUN ACL from the fabric module is created for
+         * this registration.
+         */
+        pr_reg->pr_res_holder = res_holder;
+
+        list_add_tail(&pr_reg->pr_reg_aptpl_list, &pr_tmpl->aptpl_reg_list);
+        printk(KERN_INFO "SPC-3 PR APTPL Successfully added registration%s from"
+                        " metadata\n", (res_holder) ? "+reservation" : "");
+        return 0;
+}
+
+static void core_scsi3_aptpl_reserve(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_node_acl *node_acl,
+        struct t10_pr_registration *pr_reg)
+{
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+
+        spin_lock(&dev->dev_reservation_lock);
+        dev->dev_pr_res_holder = pr_reg;
+        spin_unlock(&dev->dev_reservation_lock);
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: APTPL RESERVE created"
+                " new reservation holder TYPE: %s ALL_TG_PT: %d\n",
+                TPG_TFO(tpg)->get_fabric_name(),
+                core_scsi3_pr_dump_type(pr_reg->pr_res_type),
+                (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        printk(KERN_INFO "SPC-3 PR [%s] RESERVE Node: %s%s\n",
+                TPG_TFO(tpg)->get_fabric_name(), node_acl->initiatorname,
+                (prf_isid) ? &i_buf[0] : "");
+}
+
+static void __core_scsi3_add_registration(struct se_device *, struct se_node_acl *,
+                                struct t10_pr_registration *, int, int);
+
+static int __core_scsi3_check_aptpl_registration(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_lun *lun,
+        u32 target_lun,
+        struct se_node_acl *nacl,
+        struct se_dev_entry *deve)
+{
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        unsigned char i_port[PR_APTPL_MAX_IPORT_LEN];
+        unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
+        u16 tpgt;
+
+        memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN);
+        memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN);
+        /*
+         * Copy Initiator Port information from struct se_node_acl
+         */
+        snprintf(i_port, PR_APTPL_MAX_IPORT_LEN, "%s", nacl->initiatorname);
+        snprintf(t_port, PR_APTPL_MAX_TPORT_LEN, "%s",
+                        TPG_TFO(tpg)->tpg_get_wwn(tpg));
+        tpgt = TPG_TFO(tpg)->tpg_get_tag(tpg);
+        /*
+         * Look for the matching registrations+reservation from those
+         * created from APTPL metadata.  Note that multiple registrations
+         * may exist for fabrics that use ISIDs in their SCSI Initiator Port
+         * TransportIDs.
+         */
+        spin_lock(&pr_tmpl->aptpl_reg_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp, &pr_tmpl->aptpl_reg_list,
+                                pr_reg_aptpl_list) {
+                if (!(strcmp(pr_reg->pr_iport, i_port)) &&
+                     (pr_reg->pr_res_mapped_lun == deve->mapped_lun) &&
+                    !(strcmp(pr_reg->pr_tport, t_port)) &&
+                     (pr_reg->pr_reg_tpgt == tpgt) &&
+                     (pr_reg->pr_aptpl_target_lun == target_lun)) {
+
+                        pr_reg->pr_reg_nacl = nacl;
+                        pr_reg->pr_reg_deve = deve;
+                        pr_reg->pr_reg_tg_pt_lun = lun;
+
+                        list_del(&pr_reg->pr_reg_aptpl_list);
+                        spin_unlock(&pr_tmpl->aptpl_reg_lock);
+                        /*
+                         * At this point all of the pointers in *pr_reg will
+                         * be setup, so go ahead and add the registration.
+                         */
+
+                        __core_scsi3_add_registration(dev, nacl, pr_reg, 0, 0);
+                        /*
+                         * If this registration is the reservation holder,
+                         * make that happen now..
+                         */
+                        if (pr_reg->pr_res_holder)
+                                core_scsi3_aptpl_reserve(dev, tpg,
+                                                nacl, pr_reg);
+                        /*
+                         * Reenable pr_aptpl_active to accept new metadata
+                         * updates once the SCSI device is active again..
+                         */
+                        spin_lock(&pr_tmpl->aptpl_reg_lock);
+                        pr_tmpl->pr_aptpl_active = 1;
+                }
+        }
+        spin_unlock(&pr_tmpl->aptpl_reg_lock);
+
+        return 0;
+}
+
+int core_scsi3_check_aptpl_registration(
+        struct se_device *dev,
+        struct se_portal_group *tpg,
+        struct se_lun *lun,
+        struct se_lun_acl *lun_acl)
+{
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        struct se_node_acl *nacl = lun_acl->se_lun_nacl;
+        struct se_dev_entry *deve = &nacl->device_list[lun_acl->mapped_lun];
+
+        if (T10_RES(su_dev)->res_type != SPC3_PERSISTENT_RESERVATIONS)
+                return 0;
+
+        return __core_scsi3_check_aptpl_registration(dev, tpg, lun,
+                                lun->unpacked_lun, nacl, deve);
+}
+
+static void __core_scsi3_dump_registration(
+        struct target_core_fabric_ops *tfo,
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct t10_pr_registration *pr_reg,
+        int register_type)
+{
+        struct se_portal_group *se_tpg = nacl->se_tpg;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(&i_buf[0], 0, PR_REG_ISID_ID_LEN);
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: REGISTER%s Initiator"
+                " Node: %s%s\n", tfo->get_fabric_name(), (register_type == 2) ?
+                "_AND_MOVE" : (register_type == 1) ?
+                "_AND_IGNORE_EXISTING_KEY" : "", nacl->initiatorname,
+                (prf_isid) ? i_buf : "");
+        printk(KERN_INFO "SPC-3 PR [%s] registration on Target Port: %s,0x%04x\n",
+                 tfo->get_fabric_name(), tfo->tpg_get_wwn(se_tpg),
+                tfo->tpg_get_tag(se_tpg));
+        printk(KERN_INFO "SPC-3 PR [%s] for %s TCM Subsystem %s Object Target"
+                " Port(s)\n",  tfo->get_fabric_name(),
+                (pr_reg->pr_reg_all_tg_pt) ? "ALL" : "SINGLE",
+                TRANSPORT(dev)->name);
+        printk(KERN_INFO "SPC-3 PR [%s] SA Res Key: 0x%016Lx PRgeneration:"
+                " 0x%08x  APTPL: %d\n", tfo->get_fabric_name(),
+                pr_reg->pr_res_key, pr_reg->pr_res_generation,
+                pr_reg->pr_reg_aptpl);
+}
+
+/*
+ * this function can be called with struct se_device->dev_reservation_lock
+ * when register_move = 1
+ */
+static void __core_scsi3_add_registration(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct t10_pr_registration *pr_reg,
+        int register_type,
+        int register_move)
+{
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
+        struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+
+        /*
+         * Increment PRgeneration counter for struct se_device upon a successful
+         * REGISTER, see spc4r17 section 6.3.2 READ_KEYS service action
+         *
+         * Also, when register_move = 1 for PROUT REGISTER_AND_MOVE service
+         * action, the struct se_device->dev_reservation_lock will already be held,
+         * so we do not call core_scsi3_pr_generation() which grabs the lock
+         * for the REGISTER.
+         */
+        pr_reg->pr_res_generation = (register_move) ?
+                        T10_RES(su_dev)->pr_generation++ :
+                        core_scsi3_pr_generation(dev);
+
+        spin_lock(&pr_tmpl->registration_lock);
+        list_add_tail(&pr_reg->pr_reg_list, &pr_tmpl->registration_list);
+        pr_reg->pr_reg_deve->def_pr_registered = 1;
+
+        __core_scsi3_dump_registration(tfo, dev, nacl, pr_reg, register_type);
+        spin_unlock(&pr_tmpl->registration_lock);
+        /*
+         * Skip extra processing for ALL_TG_PT=0 or REGISTER_AND_MOVE.
+         */
+        if (!(pr_reg->pr_reg_all_tg_pt) || (register_move))
+                return;
+        /*
+         * Walk pr_reg->pr_reg_atp_list and add registrations for ALL_TG_PT=1
+         * allocated in __core_scsi3_alloc_registration()
+         */
+        list_for_each_entry_safe(pr_reg_tmp, pr_reg_tmp_safe,
+                        &pr_reg->pr_reg_atp_list, pr_reg_atp_mem_list) {
+                list_del(&pr_reg_tmp->pr_reg_atp_mem_list);
+
+                pr_reg_tmp->pr_res_generation = core_scsi3_pr_generation(dev);
+
+                spin_lock(&pr_tmpl->registration_lock);
+                list_add_tail(&pr_reg_tmp->pr_reg_list,
+                              &pr_tmpl->registration_list);
+                pr_reg_tmp->pr_reg_deve->def_pr_registered = 1;
+
+                __core_scsi3_dump_registration(tfo, dev,
+                                pr_reg_tmp->pr_reg_nacl, pr_reg_tmp,
+                                register_type);
+                spin_unlock(&pr_tmpl->registration_lock);
+                /*
+                 * Drop configfs group dependency reference from
+                 * __core_scsi3_alloc_registration()
+                 */
+                core_scsi3_lunacl_undepend_item(pr_reg_tmp->pr_reg_deve);
+        }
+}
+
+static int core_scsi3_alloc_registration(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct se_dev_entry *deve,
+        unsigned char *isid,
+        u64 sa_res_key,
+        int all_tg_pt,
+        int aptpl,
+        int register_type,
+        int register_move)
+{
+        struct t10_pr_registration *pr_reg;
+
+        pr_reg = __core_scsi3_alloc_registration(dev, nacl, deve, isid,
+                        sa_res_key, all_tg_pt, aptpl);
+        if (!(pr_reg))
+                return -1;
+
+        __core_scsi3_add_registration(dev, nacl, pr_reg,
+                        register_type, register_move);
+        return 0;
+}
+
+static struct t10_pr_registration *__core_scsi3_locate_pr_reg(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        unsigned char *isid)
+{
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp;
+        struct se_portal_group *tpg;
+
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+                /*
+                 * First look for a matching struct se_node_acl
+                 */
+                if (pr_reg->pr_reg_nacl != nacl)
+                        continue;
+
+                tpg = pr_reg->pr_reg_nacl->se_tpg;
+                /*
+                 * If this registration does NOT contain a fabric provided
+                 * ISID, then we have found a match.
+                 */
+                if (!(pr_reg->isid_present_at_reg)) {
+                        /*
+                         * Determine if this SCSI device server requires that
+                         * SCSI Intiatior TransportID w/ ISIDs is enforced
+                         * for fabric modules (iSCSI) requiring them.
+                         */
+                        if (TPG_TFO(tpg)->sess_get_initiator_sid != NULL) {
+                                if (DEV_ATTRIB(dev)->enforce_pr_isids)
+                                        continue;
+                        }
+                        atomic_inc(&pr_reg->pr_res_holders);
+                        smp_mb__after_atomic_inc();
+                        spin_unlock(&pr_tmpl->registration_lock);
+                        return pr_reg;
+                }
+                /*
+                 * If the *pr_reg contains a fabric defined ISID for multi-value
+                 * SCSI Initiator Port TransportIDs, then we expect a valid
+                 * matching ISID to be provided by the local SCSI Initiator Port.
+                 */
+                if (!(isid))
+                        continue;
+                if (strcmp(isid, pr_reg->pr_reg_isid))
+                        continue;
+
+                atomic_inc(&pr_reg->pr_res_holders);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&pr_tmpl->registration_lock);
+                return pr_reg;
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+
+        return NULL;
+}
+
+static struct t10_pr_registration *core_scsi3_locate_pr_reg(
+        struct se_device *dev,
+        struct se_node_acl *nacl,
+        struct se_session *sess)
+{
+        struct se_portal_group *tpg = nacl->se_tpg;
+        unsigned char buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
+
+        if (TPG_TFO(tpg)->sess_get_initiator_sid != NULL) {
+                memset(&buf[0], 0, PR_REG_ISID_LEN);
+                TPG_TFO(tpg)->sess_get_initiator_sid(sess, &buf[0],
+                                        PR_REG_ISID_LEN);
+                isid_ptr = &buf[0];
+        }
+
+        return __core_scsi3_locate_pr_reg(dev, nacl, isid_ptr);
+}
+
+static void core_scsi3_put_pr_reg(struct t10_pr_registration *pr_reg)
+{
+        atomic_dec(&pr_reg->pr_res_holders);
+        smp_mb__after_atomic_dec();
+}
+
+static int core_scsi3_check_implict_release(
+        struct se_device *dev,
+        struct t10_pr_registration *pr_reg)
+{
+        struct se_node_acl *nacl = pr_reg->pr_reg_nacl;
+        struct t10_pr_registration *pr_res_holder;
+        int ret = 0;
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (!(pr_res_holder)) {
+                spin_unlock(&dev->dev_reservation_lock);
+                return ret;
+        }
+        if (pr_res_holder == pr_reg) {
+                /*
+                 * Perform an implict RELEASE if the registration that
+                 * is being released is holding the reservation.
+                 *
+                 * From spc4r17, section 5.7.11.1:
+                 *
+                 * e) If the I_T nexus is the persistent reservation holder
+                 *    and the persistent reservation is not an all registrants
+                 *    type, then a PERSISTENT RESERVE OUT command with REGISTER
+                 *    service action or REGISTER AND  IGNORE EXISTING KEY
+                 *    service action with the SERVICE ACTION RESERVATION KEY
+                 *    field set to zero (see 5.7.11.3).
+                 */
+                __core_scsi3_complete_pro_release(dev, nacl, pr_reg, 0);
+                ret = 1;
+                /*
+                 * For 'All Registrants' reservation types, all existing
+                 * registrations are still processed as reservation holders
+                 * in core_scsi3_pr_seq_non_holder() after the initial
+                 * reservation holder is implictly released here.
+                 */
+        } else if (pr_reg->pr_reg_all_tg_pt &&
+                  (!strcmp(pr_res_holder->pr_reg_nacl->initiatorname,
+                          pr_reg->pr_reg_nacl->initiatorname)) &&
+                  (pr_res_holder->pr_res_key == pr_reg->pr_res_key)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to perform ALL_TG_PT=1"
+                        " UNREGISTER while existing reservation with matching"
+                        " key 0x%016Lx is present from another SCSI Initiator"
+                        " Port\n", pr_reg->pr_res_key);
+                ret = -1;
+        }
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return ret;
+}
+
+/*
+ * Called with struct t10_reservation_template->registration_lock held.
+ */
+static void __core_scsi3_free_registration(
+        struct se_device *dev,
+        struct t10_pr_registration *pr_reg,
+        struct list_head *preempt_and_abort_list,
+        int dec_holders)
+{
+        struct target_core_fabric_ops *tfo =
+                        pr_reg->pr_reg_nacl->se_tpg->se_tpg_tfo;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+
+        pr_reg->pr_reg_deve->def_pr_registered = 0;
+        pr_reg->pr_reg_deve->pr_res_key = 0;
+        list_del(&pr_reg->pr_reg_list);
+        /*
+         * Caller accessing *pr_reg using core_scsi3_locate_pr_reg(),
+         * so call core_scsi3_put_pr_reg() to decrement our reference.
+         */
+        if (dec_holders)
+                core_scsi3_put_pr_reg(pr_reg);
+        /*
+         * Wait until all reference from any other I_T nexuses for this
+         * *pr_reg have been released.  Because list_del() is called above,
+         * the last core_scsi3_put_pr_reg(pr_reg) will release this reference
+         * count back to zero, and we release *pr_reg.
+         */
+        while (atomic_read(&pr_reg->pr_res_holders) != 0) {
+                spin_unlock(&pr_tmpl->registration_lock);
+                printk("SPC-3 PR [%s] waiting for pr_res_holders\n",
+                                tfo->get_fabric_name());
+                cpu_relax();
+                spin_lock(&pr_tmpl->registration_lock);
+        }
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: UNREGISTER Initiator"
+                " Node: %s%s\n", tfo->get_fabric_name(),
+                pr_reg->pr_reg_nacl->initiatorname,
+                (prf_isid) ? &i_buf[0] : "");
+        printk(KERN_INFO "SPC-3 PR [%s] for %s TCM Subsystem %s Object Target"
+                " Port(s)\n", tfo->get_fabric_name(),
+                (pr_reg->pr_reg_all_tg_pt) ? "ALL" : "SINGLE",
+                TRANSPORT(dev)->name);
+        printk(KERN_INFO "SPC-3 PR [%s] SA Res Key: 0x%016Lx PRgeneration:"
+                " 0x%08x\n", tfo->get_fabric_name(), pr_reg->pr_res_key,
+                pr_reg->pr_res_generation);
+
+        if (!(preempt_and_abort_list)) {
+                pr_reg->pr_reg_deve = NULL;
+                pr_reg->pr_reg_nacl = NULL;
+                kfree(pr_reg->pr_aptpl_buf);
+                kmem_cache_free(t10_pr_reg_cache, pr_reg);
+                return;
+        }
+        /*
+         * For PREEMPT_AND_ABORT, the list of *pr_reg in preempt_and_abort_list
+         * are released once the ABORT_TASK_SET has completed..
+         */
+        list_add_tail(&pr_reg->pr_reg_abort_list, preempt_and_abort_list);
+}
+
+void core_scsi3_free_pr_reg_from_nacl(
+        struct se_device *dev,
+        struct se_node_acl *nacl)
+{
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_res_holder;
+        /*
+         * If the passed se_node_acl matches the reservation holder,
+         * release the reservation.
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if ((pr_res_holder != NULL) &&
+            (pr_res_holder->pr_reg_nacl == nacl))
+                __core_scsi3_complete_pro_release(dev, nacl, pr_res_holder, 0);
+        spin_unlock(&dev->dev_reservation_lock);
+        /*
+         * Release any registration associated with the struct se_node_acl.
+         */
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+
+                if (pr_reg->pr_reg_nacl != nacl)
+                        continue;
+
+                __core_scsi3_free_registration(dev, pr_reg, NULL, 0);
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+}
+
+void core_scsi3_free_all_registrations(
+        struct se_device *dev)
+{
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_res_holder;
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (pr_res_holder != NULL) {
+                struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
+                __core_scsi3_complete_pro_release(dev, pr_res_nacl,
+                                pr_res_holder, 0);
+        }
+        spin_unlock(&dev->dev_reservation_lock);
+
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+
+                __core_scsi3_free_registration(dev, pr_reg, NULL, 0);
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+
+        spin_lock(&pr_tmpl->aptpl_reg_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp, &pr_tmpl->aptpl_reg_list,
+                                pr_reg_aptpl_list) {
+                list_del(&pr_reg->pr_reg_aptpl_list);
+                kfree(pr_reg->pr_aptpl_buf);
+                kmem_cache_free(t10_pr_reg_cache, pr_reg);
+        }
+        spin_unlock(&pr_tmpl->aptpl_reg_lock);
+}
+
+static int core_scsi3_tpg_depend_item(struct se_portal_group *tpg)
+{
+        return configfs_depend_item(TPG_TFO(tpg)->tf_subsys,
+                        &tpg->tpg_group.cg_item);
+}
+
+static void core_scsi3_tpg_undepend_item(struct se_portal_group *tpg)
+{
+        configfs_undepend_item(TPG_TFO(tpg)->tf_subsys,
+                        &tpg->tpg_group.cg_item);
+
+        atomic_dec(&tpg->tpg_pr_ref_count);
+        smp_mb__after_atomic_dec();
+}
+
+static int core_scsi3_nodeacl_depend_item(struct se_node_acl *nacl)
+{
+        struct se_portal_group *tpg = nacl->se_tpg;
+
+        if (nacl->dynamic_node_acl)
+                return 0;
+
+        return configfs_depend_item(TPG_TFO(tpg)->tf_subsys,
+                        &nacl->acl_group.cg_item);
+}
+
+static void core_scsi3_nodeacl_undepend_item(struct se_node_acl *nacl)
+{
+        struct se_portal_group *tpg = nacl->se_tpg;
+
+        if (nacl->dynamic_node_acl) {
+                atomic_dec(&nacl->acl_pr_ref_count);
+                smp_mb__after_atomic_dec();
+                return;
+        }
+
+        configfs_undepend_item(TPG_TFO(tpg)->tf_subsys,
+                        &nacl->acl_group.cg_item);
+
+        atomic_dec(&nacl->acl_pr_ref_count);
+        smp_mb__after_atomic_dec();
+}
+
+static int core_scsi3_lunacl_depend_item(struct se_dev_entry *se_deve)
+{
+        struct se_lun_acl *lun_acl = se_deve->se_lun_acl;
+        struct se_node_acl *nacl;
+        struct se_portal_group *tpg;
+        /*
+         * For nacl->dynamic_node_acl=1
+         */
+        if (!(lun_acl))
+                return 0;
+
+        nacl = lun_acl->se_lun_nacl;
+        tpg = nacl->se_tpg;
+
+        return configfs_depend_item(TPG_TFO(tpg)->tf_subsys,
+                        &lun_acl->se_lun_group.cg_item);
+}
+
+static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve)
+{
+        struct se_lun_acl *lun_acl = se_deve->se_lun_acl;
+        struct se_node_acl *nacl;
+        struct se_portal_group *tpg;
+        /*
+         * For nacl->dynamic_node_acl=1
+         */
+        if (!(lun_acl)) {
+                atomic_dec(&se_deve->pr_ref_count);
+                smp_mb__after_atomic_dec();
+                return;
+        }
+        nacl = lun_acl->se_lun_nacl;
+        tpg = nacl->se_tpg;
+
+        configfs_undepend_item(TPG_TFO(tpg)->tf_subsys,
+                        &lun_acl->se_lun_group.cg_item);
+
+        atomic_dec(&se_deve->pr_ref_count);
+        smp_mb__after_atomic_dec();
+}
+
+static int core_scsi3_decode_spec_i_port(
+        struct se_cmd *cmd,
+        struct se_portal_group *tpg,
+        unsigned char *l_isid,
+        u64 sa_res_key,
+        int all_tg_pt,
+        int aptpl)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_port *tmp_port;
+        struct se_portal_group *dest_tpg = NULL, *tmp_tpg;
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct se_node_acl *dest_node_acl = NULL;
+        struct se_dev_entry *dest_se_deve = NULL, *local_se_deve;
+        struct t10_pr_registration *dest_pr_reg, *local_pr_reg, *pr_reg_e;
+        struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe;
+        struct list_head tid_dest_list;
+        struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp;
+        struct target_core_fabric_ops *tmp_tf_ops;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        unsigned char *ptr, *i_str = NULL, proto_ident, tmp_proto_ident;
+        char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
+        u32 tpdl, tid_len = 0;
+        int ret, dest_local_nexus, prf_isid;
+        u32 dest_rtpi = 0;
+
+        memset(dest_iport, 0, 64);
+        INIT_LIST_HEAD(&tid_dest_list);
+
+        local_se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+        /*
+         * Allocate a struct pr_transport_id_holder and setup the
+         * local_node_acl and local_se_deve pointers and add to
+         * struct list_head tid_dest_list for add registration
+         * processing in the loop of tid_dest_list below.
+         */
+        tidh_new = kzalloc(sizeof(struct pr_transport_id_holder), GFP_KERNEL);
+        if (!(tidh_new)) {
+                printk(KERN_ERR "Unable to allocate tidh_new\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        INIT_LIST_HEAD(&tidh_new->dest_list);
+        tidh_new->dest_tpg = tpg;
+        tidh_new->dest_node_acl = se_sess->se_node_acl;
+        tidh_new->dest_se_deve = local_se_deve;
+
+        local_pr_reg = __core_scsi3_alloc_registration(SE_DEV(cmd),
+                                se_sess->se_node_acl, local_se_deve, l_isid,
+                                sa_res_key, all_tg_pt, aptpl);
+        if (!(local_pr_reg)) {
+                kfree(tidh_new);
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        tidh_new->dest_pr_reg = local_pr_reg;
+        /*
+         * The local I_T nexus does not hold any configfs dependances,
+         * so we set tid_h->dest_local_nexus=1 to prevent the
+         * configfs_undepend_item() calls in the tid_dest_list loops below.
+         */
+        tidh_new->dest_local_nexus = 1;
+        list_add_tail(&tidh_new->dest_list, &tid_dest_list);
+        /*
+         * For a PERSISTENT RESERVE OUT specify initiator ports payload,
+         * first extract TransportID Parameter Data Length, and make sure
+         * the value matches up to the SCSI expected data transfer length.
+         */
+        tpdl = (buf[24] & 0xff) << 24;
+        tpdl |= (buf[25] & 0xff) << 16;
+        tpdl |= (buf[26] & 0xff) << 8;
+        tpdl |= buf[27] & 0xff;
+
+        if ((tpdl + 28) != cmd->data_length) {
+                printk(KERN_ERR "SPC-3 PR: Illegal tpdl: %u + 28 byte header"
+                        " does not equal CDB data_length: %u\n", tpdl,
+                        cmd->data_length);
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+        /*
+         * Start processing the received transport IDs using the
+         * receiving I_T Nexus portal's fabric dependent methods to
+         * obtain the SCSI Initiator Port/Device Identifiers.
+         */
+        ptr = &buf[28];
+
+        while (tpdl > 0) {
+                proto_ident = (ptr[0] & 0x0f);
+                dest_tpg = NULL;
+
+                spin_lock(&dev->se_port_lock);
+                list_for_each_entry(tmp_port, &dev->dev_sep_list, sep_list) {
+                        tmp_tpg = tmp_port->sep_tpg;
+                        if (!(tmp_tpg))
+                                continue;
+                        tmp_tf_ops = TPG_TFO(tmp_tpg);
+                        if (!(tmp_tf_ops))
+                                continue;
+                        if (!(tmp_tf_ops->get_fabric_proto_ident) ||
+                            !(tmp_tf_ops->tpg_parse_pr_out_transport_id))
+                                continue;
+                        /*
+                         * Look for the matching proto_ident provided by
+                         * the received TransportID
+                         */
+                        tmp_proto_ident = tmp_tf_ops->get_fabric_proto_ident(tmp_tpg);
+                        if (tmp_proto_ident != proto_ident)
+                                continue;
+                        dest_rtpi = tmp_port->sep_rtpi;
+
+                        i_str = tmp_tf_ops->tpg_parse_pr_out_transport_id(
+                                        tmp_tpg, (const char *)ptr, &tid_len,
+                                        &iport_ptr);
+                        if (!(i_str))
+                                continue;
+
+                        atomic_inc(&tmp_tpg->tpg_pr_ref_count);
+                        smp_mb__after_atomic_inc();
+                        spin_unlock(&dev->se_port_lock);
+
+                        ret = core_scsi3_tpg_depend_item(tmp_tpg);
+                        if (ret != 0) {
+                                printk(KERN_ERR " core_scsi3_tpg_depend_item()"
+                                        " for tmp_tpg\n");
+                                atomic_dec(&tmp_tpg->tpg_pr_ref_count);
+                                smp_mb__after_atomic_dec();
+                                ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                                goto out;
+                        }
+                        /*
+                         * Locate the desination initiator ACL to be registered
+                         * from the decoded fabric module specific TransportID
+                         * at *i_str.
+                         */
+                        spin_lock_bh(&tmp_tpg->acl_node_lock);
+                        dest_node_acl = __core_tpg_get_initiator_node_acl(
+                                                tmp_tpg, i_str);
+                        if (dest_node_acl) {
+                                atomic_inc(&dest_node_acl->acl_pr_ref_count);
+                                smp_mb__after_atomic_inc();
+                        }
+                        spin_unlock_bh(&tmp_tpg->acl_node_lock);
+
+                        if (!(dest_node_acl)) {
+                                core_scsi3_tpg_undepend_item(tmp_tpg);
+                                spin_lock(&dev->se_port_lock);
+                                continue;
+                        }
+
+                        ret = core_scsi3_nodeacl_depend_item(dest_node_acl);
+                        if (ret != 0) {
+                                printk(KERN_ERR "configfs_depend_item() failed"
+                                        " for dest_node_acl->acl_group\n");
+                                atomic_dec(&dest_node_acl->acl_pr_ref_count);
+                                smp_mb__after_atomic_dec();
+                                core_scsi3_tpg_undepend_item(tmp_tpg);
+                                ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                                goto out;
+                        }
+
+                        dest_tpg = tmp_tpg;
+                        printk(KERN_INFO "SPC-3 PR SPEC_I_PT: Located %s Node:"
+                                " %s Port RTPI: %hu\n",
+                                TPG_TFO(dest_tpg)->get_fabric_name(),
+                                dest_node_acl->initiatorname, dest_rtpi);
+
+                        spin_lock(&dev->se_port_lock);
+                        break;
+                }
+                spin_unlock(&dev->se_port_lock);
+
+                if (!(dest_tpg)) {
+                        printk(KERN_ERR "SPC-3 PR SPEC_I_PT: Unable to locate"
+                                        " dest_tpg\n");
+                        ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        goto out;
+                }
+#if 0
+                printk("SPC-3 PR SPEC_I_PT: Got %s data_length: %u tpdl: %u"
+                        " tid_len: %d for %s + %s\n",
+                        TPG_TFO(dest_tpg)->get_fabric_name(), cmd->data_length,
+                        tpdl, tid_len, i_str, iport_ptr);
+#endif
+                if (tid_len > tpdl) {
+                        printk(KERN_ERR "SPC-3 PR SPEC_I_PT: Illegal tid_len:"
+                                " %u for Transport ID: %s\n", tid_len, ptr);
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        goto out;
+                }
+                /*
+                 * Locate the desintation struct se_dev_entry pointer for matching
+                 * RELATIVE TARGET PORT IDENTIFIER on the receiving I_T Nexus
+                 * Target Port.
+                 */
+                dest_se_deve = core_get_se_deve_from_rtpi(dest_node_acl,
+                                        dest_rtpi);
+                if (!(dest_se_deve)) {
+                        printk(KERN_ERR "Unable to locate %s dest_se_deve"
+                                " from destination RTPI: %hu\n",
+                                TPG_TFO(dest_tpg)->get_fabric_name(),
+                                dest_rtpi);
+
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        goto out;
+                }
+
+                ret = core_scsi3_lunacl_depend_item(dest_se_deve);
+                if (ret < 0) {
+                        printk(KERN_ERR "core_scsi3_lunacl_depend_item()"
+                                        " failed\n");
+                        atomic_dec(&dest_se_deve->pr_ref_count);
+                        smp_mb__after_atomic_dec();
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                        goto out;
+                }
+#if 0
+                printk(KERN_INFO "SPC-3 PR SPEC_I_PT: Located %s Node: %s"
+                        " dest_se_deve mapped_lun: %u\n",
+                        TPG_TFO(dest_tpg)->get_fabric_name(),
+                        dest_node_acl->initiatorname, dest_se_deve->mapped_lun);
+#endif
+                /*
+                 * Skip any TransportIDs that already have a registration for
+                 * this target port.
+                 */
+                pr_reg_e = __core_scsi3_locate_pr_reg(dev, dest_node_acl,
+                                        iport_ptr);
+                if (pr_reg_e) {
+                        core_scsi3_put_pr_reg(pr_reg_e);
+                        core_scsi3_lunacl_undepend_item(dest_se_deve);
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        ptr += tid_len;
+                        tpdl -= tid_len;
+                        tid_len = 0;
+                        continue;
+                }
+                /*
+                 * Allocate a struct pr_transport_id_holder and setup
+                 * the dest_node_acl and dest_se_deve pointers for the
+                 * loop below.
+                 */
+                tidh_new = kzalloc(sizeof(struct pr_transport_id_holder),
+                                GFP_KERNEL);
+                if (!(tidh_new)) {
+                        printk(KERN_ERR "Unable to allocate tidh_new\n");
+                        core_scsi3_lunacl_undepend_item(dest_se_deve);
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                        goto out;
+                }
+                INIT_LIST_HEAD(&tidh_new->dest_list);
+                tidh_new->dest_tpg = dest_tpg;
+                tidh_new->dest_node_acl = dest_node_acl;
+                tidh_new->dest_se_deve = dest_se_deve;
+
+                /*
+                 * Allocate, but do NOT add the registration for the
+                 * TransportID referenced SCSI Initiator port.  This
+                 * done because of the following from spc4r17 in section
+                 * 6.14.3 wrt SPEC_I_PT:
+                 *
+                 * "If a registration fails for any initiator port (e.g., if th
+                 * logical unit does not have enough resources available to
+                 * hold the registration information), no registrations shall be
+                 * made, and the command shall be terminated with
+                 * CHECK CONDITION status."
+                 *
+                 * That means we call __core_scsi3_alloc_registration() here,
+                 * and then call __core_scsi3_add_registration() in the
+                 * 2nd loop which will never fail.
+                 */
+                dest_pr_reg = __core_scsi3_alloc_registration(SE_DEV(cmd),
+                                dest_node_acl, dest_se_deve, iport_ptr,
+                                sa_res_key, all_tg_pt, aptpl);
+                if (!(dest_pr_reg)) {
+                        core_scsi3_lunacl_undepend_item(dest_se_deve);
+                        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                        core_scsi3_tpg_undepend_item(dest_tpg);
+                        kfree(tidh_new);
+                        ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        goto out;
+                }
+                tidh_new->dest_pr_reg = dest_pr_reg;
+                list_add_tail(&tidh_new->dest_list, &tid_dest_list);
+
+                ptr += tid_len;
+                tpdl -= tid_len;
+                tid_len = 0;
+
+        }
+        /*
+         * Go ahead and create a registrations from tid_dest_list for the
+         * SPEC_I_PT provided TransportID for the *tidh referenced dest_node_acl
+         * and dest_se_deve.
+         *
+         * The SA Reservation Key from the PROUT is set for the
+         * registration, and ALL_TG_PT is also passed.  ALL_TG_PT=1
+         * means that the TransportID Initiator port will be
+         * registered on all of the target ports in the SCSI target device
+         * ALL_TG_PT=0 means the registration will only be for the
+         * SCSI target port the PROUT REGISTER with SPEC_I_PT=1
+         * was received.
+         */
+        list_for_each_entry_safe(tidh, tidh_tmp, &tid_dest_list, dest_list) {
+                dest_tpg = tidh->dest_tpg;
+                dest_node_acl = tidh->dest_node_acl;
+                dest_se_deve = tidh->dest_se_deve;
+                dest_pr_reg = tidh->dest_pr_reg;
+                dest_local_nexus = tidh->dest_local_nexus;
+
+                list_del(&tidh->dest_list);
+                kfree(tidh);
+
+                memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+                prf_isid = core_pr_dump_initiator_port(dest_pr_reg, &i_buf[0],
+                                                PR_REG_ISID_ID_LEN);
+
+                __core_scsi3_add_registration(SE_DEV(cmd), dest_node_acl,
+                                        dest_pr_reg, 0, 0);
+
+                printk(KERN_INFO "SPC-3 PR [%s] SPEC_I_PT: Successfully"
+                        " registered Transport ID for Node: %s%s Mapped LUN:"
+                        " %u\n", TPG_TFO(dest_tpg)->get_fabric_name(),
+                        dest_node_acl->initiatorname, (prf_isid) ?
+                        &i_buf[0] : "", dest_se_deve->mapped_lun);
+
+                if (dest_local_nexus)
+                        continue;
+
+                core_scsi3_lunacl_undepend_item(dest_se_deve);
+                core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                core_scsi3_tpg_undepend_item(dest_tpg);
+        }
+
+        return 0;
+out:
+        /*
+         * For the failure case, release everything from tid_dest_list
+         * including *dest_pr_reg and the configfs dependances..
+         */
+        list_for_each_entry_safe(tidh, tidh_tmp, &tid_dest_list, dest_list) {
+                dest_tpg = tidh->dest_tpg;
+                dest_node_acl = tidh->dest_node_acl;
+                dest_se_deve = tidh->dest_se_deve;
+                dest_pr_reg = tidh->dest_pr_reg;
+                dest_local_nexus = tidh->dest_local_nexus;
+
+                list_del(&tidh->dest_list);
+                kfree(tidh);
+                /*
+                 * Release any extra ALL_TG_PT=1 registrations for
+                 * the SPEC_I_PT=1 case.
+                 */
+                list_for_each_entry_safe(pr_reg_tmp, pr_reg_tmp_safe,
+                                &dest_pr_reg->pr_reg_atp_list,
+                                pr_reg_atp_mem_list) {
+                        list_del(&pr_reg_tmp->pr_reg_atp_mem_list);
+                        core_scsi3_lunacl_undepend_item(pr_reg_tmp->pr_reg_deve);
+                        kmem_cache_free(t10_pr_reg_cache, pr_reg_tmp);
+                }
+
+                kfree(dest_pr_reg->pr_aptpl_buf);
+                kmem_cache_free(t10_pr_reg_cache, dest_pr_reg);
+
+                if (dest_local_nexus)
+                        continue;
+
+                core_scsi3_lunacl_undepend_item(dest_se_deve);
+                core_scsi3_nodeacl_undepend_item(dest_node_acl);
+                core_scsi3_tpg_undepend_item(dest_tpg);
+        }
+        return ret;
+}
+
+/*
+ * Called with struct se_device->dev_reservation_lock held
+ */
+static int __core_scsi3_update_aptpl_buf(
+        struct se_device *dev,
+        unsigned char *buf,
+        u32 pr_aptpl_buf_len,
+        int clear_aptpl_metadata)
+{
+        struct se_lun *lun;
+        struct se_portal_group *tpg;
+        struct se_subsystem_dev *su_dev = SU_DEV(dev);
+        struct t10_pr_registration *pr_reg;
+        unsigned char tmp[512], isid_buf[32];
+        ssize_t len = 0;
+        int reg_count = 0;
+
+        memset(buf, 0, pr_aptpl_buf_len);
+        /*
+         * Called to clear metadata once APTPL has been deactivated.
+         */
+        if (clear_aptpl_metadata) {
+                snprintf(buf, pr_aptpl_buf_len,
+                                "No Registrations or Reservations\n");
+                return 0;
+        }
+        /*
+         * Walk the registration list..
+         */
+        spin_lock(&T10_RES(su_dev)->registration_lock);
+        list_for_each_entry(pr_reg, &T10_RES(su_dev)->registration_list,
+                        pr_reg_list) {
+
+                tmp[0] = '\0';
+                isid_buf[0] = '\0';
+                tpg = pr_reg->pr_reg_nacl->se_tpg;
+                lun = pr_reg->pr_reg_tg_pt_lun;
+                /*
+                 * Write out any ISID value to APTPL metadata that was included
+                 * in the original registration.
+                 */
+                if (pr_reg->isid_present_at_reg)
+                        snprintf(isid_buf, 32, "initiator_sid=%s\n",
+                                        pr_reg->pr_reg_isid);
+                /*
+                 * Include special metadata if the pr_reg matches the
+                 * reservation holder.
+                 */
+                if (dev->dev_pr_res_holder == pr_reg) {
+                        snprintf(tmp, 512, "PR_REG_START: %d"
+                                "\ninitiator_fabric=%s\n"
+                                "initiator_node=%s\n%s"
+                                "sa_res_key=%llu\n"
+                                "res_holder=1\nres_type=%02x\n"
+                                "res_scope=%02x\nres_all_tg_pt=%d\n"
+                                "mapped_lun=%u\n", reg_count,
+                                TPG_TFO(tpg)->get_fabric_name(),
+                                pr_reg->pr_reg_nacl->initiatorname, isid_buf,
+                                pr_reg->pr_res_key, pr_reg->pr_res_type,
+                                pr_reg->pr_res_scope, pr_reg->pr_reg_all_tg_pt,
+                                pr_reg->pr_res_mapped_lun);
+                } else {
+                        snprintf(tmp, 512, "PR_REG_START: %d\n"
+                                "initiator_fabric=%s\ninitiator_node=%s\n%s"
+                                "sa_res_key=%llu\nres_holder=0\n"
+                                "res_all_tg_pt=%d\nmapped_lun=%u\n",
+                                reg_count, TPG_TFO(tpg)->get_fabric_name(),
+                                pr_reg->pr_reg_nacl->initiatorname, isid_buf,
+                                pr_reg->pr_res_key, pr_reg->pr_reg_all_tg_pt,
+                                pr_reg->pr_res_mapped_lun);
+                }
+
+                if ((len + strlen(tmp) > pr_aptpl_buf_len)) {
+                        printk(KERN_ERR "Unable to update renaming"
+                                " APTPL metadata\n");
+                        spin_unlock(&T10_RES(su_dev)->registration_lock);
+                        return -1;
+                }
+                len += sprintf(buf+len, "%s", tmp);
+
+                /*
+                 * Include information about the associated SCSI target port.
+                 */
+                snprintf(tmp, 512, "target_fabric=%s\ntarget_node=%s\n"
+                        "tpgt=%hu\nport_rtpi=%hu\ntarget_lun=%u\nPR_REG_END:"
+                        " %d\n", TPG_TFO(tpg)->get_fabric_name(),
+                        TPG_TFO(tpg)->tpg_get_wwn(tpg),
+                        TPG_TFO(tpg)->tpg_get_tag(tpg),
+                        lun->lun_sep->sep_rtpi, lun->unpacked_lun, reg_count);
+
+                if ((len + strlen(tmp) > pr_aptpl_buf_len)) {
+                        printk(KERN_ERR "Unable to update renaming"
+                                " APTPL metadata\n");
+                        spin_unlock(&T10_RES(su_dev)->registration_lock);
+                        return -1;
+                }
+                len += sprintf(buf+len, "%s", tmp);
+                reg_count++;
+        }
+        spin_unlock(&T10_RES(su_dev)->registration_lock);
+
+        if (!(reg_count))
+                len += sprintf(buf+len, "No Registrations or Reservations");
+
+        return 0;
+}
+
+static int core_scsi3_update_aptpl_buf(
+        struct se_device *dev,
+        unsigned char *buf,
+        u32 pr_aptpl_buf_len,
+        int clear_aptpl_metadata)
+{
+        int ret;
+
+        spin_lock(&dev->dev_reservation_lock);
+        ret = __core_scsi3_update_aptpl_buf(dev, buf, pr_aptpl_buf_len,
+                                clear_aptpl_metadata);
+        spin_unlock(&dev->dev_reservation_lock);
+
+        return ret;
+}
+
+/*
+ * Called with struct se_device->aptpl_file_mutex held
+ */
+static int __core_scsi3_write_aptpl_to_file(
+        struct se_device *dev,
+        unsigned char *buf,
+        u32 pr_aptpl_buf_len)
+{
+        struct t10_wwn *wwn = &SU_DEV(dev)->t10_wwn;
+        struct file *file;
+        struct iovec iov[1];
+        mm_segment_t old_fs;
+        int flags = O_RDWR | O_CREAT | O_TRUNC;
+        char path[512];
+        int ret;
+
+        memset(iov, 0, sizeof(struct iovec));
+        memset(path, 0, 512);
+
+        if (strlen(&wwn->unit_serial[0]) > 512) {
+                printk(KERN_ERR "WWN value for struct se_device does not fit"
+                        " into path buffer\n");
+                return -1;
+        }
+
+        snprintf(path, 512, "/var/target/pr/aptpl_%s", &wwn->unit_serial[0]);
+        file = filp_open(path, flags, 0600);
+        if (IS_ERR(file) || !file || !file->f_dentry) {
+                printk(KERN_ERR "filp_open(%s) for APTPL metadata"
+                        " failed\n", path);
+                return -1;
+        }
+
+        iov[0].iov_base = &buf[0];
+        if (!(pr_aptpl_buf_len))
+                iov[0].iov_len = (strlen(&buf[0]) + 1); /* Add extra for NULL */
+        else
+                iov[0].iov_len = pr_aptpl_buf_len;
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        ret = vfs_writev(file, &iov[0], 1, &file->f_pos);
+        set_fs(old_fs);
+
+        if (ret < 0) {
+                printk("Error writing APTPL metadata file: %s\n", path);
+                filp_close(file, NULL);
+                return -1;
+        }
+        filp_close(file, NULL);
+
+        return 0;
+}
+
+static int core_scsi3_update_and_write_aptpl(
+        struct se_device *dev,
+        unsigned char *in_buf,
+        u32 in_pr_aptpl_buf_len)
+{
+        unsigned char null_buf[64], *buf;
+        u32 pr_aptpl_buf_len;
+        int ret, clear_aptpl_metadata = 0;
+        /*
+         * Can be called with a NULL pointer from PROUT service action CLEAR
+         */
+        if (!(in_buf)) {
+                memset(null_buf, 0, 64);
+                buf = &null_buf[0];
+                /*
+                 * This will clear the APTPL metadata to:
+                 * "No Registrations or Reservations" status
+                 */
+                pr_aptpl_buf_len = 64;
+                clear_aptpl_metadata = 1;
+        } else {
+                buf = in_buf;
+                pr_aptpl_buf_len = in_pr_aptpl_buf_len;
+        }
+
+        ret = core_scsi3_update_aptpl_buf(dev, buf, pr_aptpl_buf_len,
+                                clear_aptpl_metadata);
+        if (ret != 0)
+                return -1;
+        /*
+         * __core_scsi3_write_aptpl_to_file() will call strlen()
+         * on the passed buf to determine pr_aptpl_buf_len.
+         */
+        ret = __core_scsi3_write_aptpl_to_file(dev, buf, 0);
+        if (ret != 0)
+                return -1;
+
+        return ret;
+}
+
+static int core_scsi3_emulate_pro_register(
+        struct se_cmd *cmd,
+        u64 res_key,
+        u64 sa_res_key,
+        int aptpl,
+        int all_tg_pt,
+        int spec_i_pt,
+        int ignore_key)
+{
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_dev_entry *se_deve;
+        struct se_lun *se_lun = SE_LUN(cmd);
+        struct se_portal_group *se_tpg;
+        struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_reg_tmp, *pr_reg_e;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        /* Used for APTPL metadata w/ UNREGISTER */
+        unsigned char *pr_aptpl_buf = NULL;
+        unsigned char isid_buf[PR_REG_ISID_LEN], *isid_ptr = NULL;
+        int pr_holder = 0, ret = 0, type;
+
+        if (!(se_sess) || !(se_lun)) {
+                printk(KERN_ERR "SPC-3 PR: se_sess || struct se_lun is NULL!\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        se_tpg = se_sess->se_tpg;
+        se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+
+        if (TPG_TFO(se_tpg)->sess_get_initiator_sid != NULL) {
+                memset(&isid_buf[0], 0, PR_REG_ISID_LEN);
+                TPG_TFO(se_tpg)->sess_get_initiator_sid(se_sess, &isid_buf[0],
+                                PR_REG_ISID_LEN);
+                isid_ptr = &isid_buf[0];
+        }
+        /*
+         * Follow logic from spc4r17 Section 5.7.7, Register Behaviors Table 47
+         */
+        pr_reg_e = core_scsi3_locate_pr_reg(dev, se_sess->se_node_acl, se_sess);
+        if (!(pr_reg_e)) {
+                if (res_key) {
+                        printk(KERN_WARNING "SPC-3 PR: Reservation Key non-zero"
+                                " for SA REGISTER, returning CONFLICT\n");
+                        return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                }
+                /*
+                 * Do nothing but return GOOD status.
+                 */
+                if (!(sa_res_key))
+                        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+
+                if (!(spec_i_pt)) {
+                        /*
+                         * Perform the Service Action REGISTER on the Initiator
+                         * Port Endpoint that the PRO was received from on the
+                         * Logical Unit of the SCSI device server.
+                         */
+                        ret = core_scsi3_alloc_registration(SE_DEV(cmd),
+                                        se_sess->se_node_acl, se_deve, isid_ptr,
+                                        sa_res_key, all_tg_pt, aptpl,
+                                        ignore_key, 0);
+                        if (ret != 0) {
+                                printk(KERN_ERR "Unable to allocate"
+                                        " struct t10_pr_registration\n");
+                                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        }
+                } else {
+                        /*
+                         * Register both the Initiator port that received
+                         * PROUT SA REGISTER + SPEC_I_PT=1 and extract SCSI
+                         * TransportID from Parameter list and loop through
+                         * fabric dependent parameter list while calling
+                         * logic from of core_scsi3_alloc_registration() for
+                         * each TransportID provided SCSI Initiator Port/Device
+                         */
+                        ret = core_scsi3_decode_spec_i_port(cmd, se_tpg,
+                                        isid_ptr, sa_res_key, all_tg_pt, aptpl);
+                        if (ret != 0)
+                                return ret;
+                }
+                /*
+                 * Nothing left to do for the APTPL=0 case.
+                 */
+                if (!(aptpl)) {
+                        pr_tmpl->pr_aptpl_active = 0;
+                        core_scsi3_update_and_write_aptpl(SE_DEV(cmd), NULL, 0);
+                        printk("SPC-3 PR: Set APTPL Bit Deactivated for"
+                                        " REGISTER\n");
+                        return 0;
+                }
+                /*
+                 * Locate the newly allocated local I_T Nexus *pr_reg, and
+                 * update the APTPL metadata information using its
+                 * preallocated *pr_reg->pr_aptpl_buf.
+                 */
+                pr_reg = core_scsi3_locate_pr_reg(SE_DEV(cmd),
+                                se_sess->se_node_acl, se_sess);
+
+                ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                &pr_reg->pr_aptpl_buf[0],
+                                pr_tmpl->pr_aptpl_buf_len);
+                if (!(ret)) {
+                        pr_tmpl->pr_aptpl_active = 1;
+                        printk("SPC-3 PR: Set APTPL Bit Activated for REGISTER\n");
+                }
+
+                core_scsi3_put_pr_reg(pr_reg);
+                return ret;
+        } else {
+                /*
+                 * Locate the existing *pr_reg via struct se_node_acl pointers
+                 */
+                pr_reg = pr_reg_e;
+                type = pr_reg->pr_res_type;
+
+                if (!(ignore_key)) {
+                        if (res_key != pr_reg->pr_res_key) {
+                                printk(KERN_ERR "SPC-3 PR REGISTER: Received"
+                                        " res_key: 0x%016Lx does not match"
+                                        " existing SA REGISTER res_key:"
+                                        " 0x%016Lx\n", res_key,
+                                        pr_reg->pr_res_key);
+                                core_scsi3_put_pr_reg(pr_reg);
+                                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                        }
+                }
+                if (spec_i_pt) {
+                        printk(KERN_ERR "SPC-3 PR UNREGISTER: SPEC_I_PT"
+                                " set while sa_res_key=0\n");
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                }
+                /*
+                 * An existing ALL_TG_PT=1 registration being released
+                 * must also set ALL_TG_PT=1 in the incoming PROUT.
+                 */
+                if (pr_reg->pr_reg_all_tg_pt && !(all_tg_pt)) {
+                        printk(KERN_ERR "SPC-3 PR UNREGISTER: ALL_TG_PT=1"
+                                " registration exists, but ALL_TG_PT=1 bit not"
+                                " present in received PROUT\n");
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return PYX_TRANSPORT_INVALID_CDB_FIELD;
+                }
+                /*
+                 * Allocate APTPL metadata buffer used for UNREGISTER ops
+                 */
+                if (aptpl) {
+                        pr_aptpl_buf = kzalloc(pr_tmpl->pr_aptpl_buf_len,
+                                                GFP_KERNEL);
+                        if (!(pr_aptpl_buf)) {
+                                printk(KERN_ERR "Unable to allocate"
+                                        " pr_aptpl_buf\n");
+                                core_scsi3_put_pr_reg(pr_reg);
+                                return PYX_TRANSPORT_LU_COMM_FAILURE;
+                        }
+                }
+                /*
+                 * sa_res_key=0 Unregister Reservation Key for registered I_T
+                 * Nexus sa_res_key=1 Change Reservation Key for registered I_T
+                 * Nexus.
+                 */
+                if (!(sa_res_key)) {
+                        pr_holder = core_scsi3_check_implict_release(
+                                        SE_DEV(cmd), pr_reg);
+                        if (pr_holder < 0) {
+                                kfree(pr_aptpl_buf);
+                                core_scsi3_put_pr_reg(pr_reg);
+                                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                        }
+
+                        spin_lock(&pr_tmpl->registration_lock);
+                        /*
+                         * Release all ALL_TG_PT=1 for the matching SCSI Initiator Port
+                         * and matching pr_res_key.
+                         */
+                        if (pr_reg->pr_reg_all_tg_pt) {
+                                list_for_each_entry_safe(pr_reg_p, pr_reg_tmp,
+                                                &pr_tmpl->registration_list,
+                                                pr_reg_list) {
+
+                                        if (!(pr_reg_p->pr_reg_all_tg_pt))
+                                                continue;
+
+                                        if (pr_reg_p->pr_res_key != res_key)
+                                                continue;
+
+                                        if (pr_reg == pr_reg_p)
+                                                continue;
+
+                                        if (strcmp(pr_reg->pr_reg_nacl->initiatorname,
+                                                   pr_reg_p->pr_reg_nacl->initiatorname))
+                                                continue;
+
+                                        __core_scsi3_free_registration(dev,
+                                                        pr_reg_p, NULL, 0);
+                                }
+                        }
+                        /*
+                         * Release the calling I_T Nexus registration now..
+                         */
+                        __core_scsi3_free_registration(SE_DEV(cmd), pr_reg,
+                                                        NULL, 1);
+                        /*
+                         * From spc4r17, section 5.7.11.3 Unregistering
+                         *
+                         * If the persistent reservation is a registrants only
+                         * type, the device server shall establish a unit
+                         * attention condition for the initiator port associated
+                         * with every registered I_T nexus except for the I_T
+                         * nexus on which the PERSISTENT RESERVE OUT command was
+                         * received, with the additional sense code set to
+                         * RESERVATIONS RELEASED.
+                         */
+                        if (pr_holder &&
+                           ((type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) ||
+                            (type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY))) {
+                                list_for_each_entry(pr_reg_p,
+                                                &pr_tmpl->registration_list,
+                                                pr_reg_list) {
+
+                                        core_scsi3_ua_allocate(
+                                                pr_reg_p->pr_reg_nacl,
+                                                pr_reg_p->pr_res_mapped_lun,
+                                                0x2A,
+                                                ASCQ_2AH_RESERVATIONS_RELEASED);
+                                }
+                        }
+                        spin_unlock(&pr_tmpl->registration_lock);
+
+                        if (!(aptpl)) {
+                                pr_tmpl->pr_aptpl_active = 0;
+                                core_scsi3_update_and_write_aptpl(dev, NULL, 0);
+                                printk("SPC-3 PR: Set APTPL Bit Deactivated"
+                                                " for UNREGISTER\n");
+                                return 0;
+                        }
+
+                        ret = core_scsi3_update_and_write_aptpl(dev,
+                                        &pr_aptpl_buf[0],
+                                        pr_tmpl->pr_aptpl_buf_len);
+                        if (!(ret)) {
+                                pr_tmpl->pr_aptpl_active = 1;
+                                printk("SPC-3 PR: Set APTPL Bit Activated"
+                                                " for UNREGISTER\n");
+                        }
+
+                        kfree(pr_aptpl_buf);
+                        return ret;
+                } else {
+                        /*
+                         * Increment PRgeneration counter for struct se_device"
+                         * upon a successful REGISTER, see spc4r17 section 6.3.2
+                         * READ_KEYS service action.
+                         */
+                        pr_reg->pr_res_generation = core_scsi3_pr_generation(
+                                                        SE_DEV(cmd));
+                        pr_reg->pr_res_key = sa_res_key;
+                        printk("SPC-3 PR [%s] REGISTER%s: Changed Reservation"
+                                " Key for %s to: 0x%016Lx PRgeneration:"
+                                " 0x%08x\n", CMD_TFO(cmd)->get_fabric_name(),
+                                (ignore_key) ? "_AND_IGNORE_EXISTING_KEY" : "",
+                                pr_reg->pr_reg_nacl->initiatorname,
+                                pr_reg->pr_res_key, pr_reg->pr_res_generation);
+
+                        if (!(aptpl)) {
+                                pr_tmpl->pr_aptpl_active = 0;
+                                core_scsi3_update_and_write_aptpl(dev, NULL, 0);
+                                core_scsi3_put_pr_reg(pr_reg);
+                                printk("SPC-3 PR: Set APTPL Bit Deactivated"
+                                                " for REGISTER\n");
+                                return 0;
+                        }
+
+                        ret = core_scsi3_update_and_write_aptpl(dev,
+                                        &pr_aptpl_buf[0],
+                                        pr_tmpl->pr_aptpl_buf_len);
+                        if (!(ret)) {
+                                pr_tmpl->pr_aptpl_active = 1;
+                                printk("SPC-3 PR: Set APTPL Bit Activated"
+                                                " for REGISTER\n");
+                        }
+
+                        kfree(pr_aptpl_buf);
+                        core_scsi3_put_pr_reg(pr_reg);
+                }
+        }
+        return 0;
+}
+
+unsigned char *core_scsi3_pr_dump_type(int type)
+{
+        switch (type) {
+        case PR_TYPE_WRITE_EXCLUSIVE:
+                return "Write Exclusive Access";
+        case PR_TYPE_EXCLUSIVE_ACCESS:
+                return "Exclusive Access";
+        case PR_TYPE_WRITE_EXCLUSIVE_REGONLY:
+                return "Write Exclusive Access, Registrants Only";
+        case PR_TYPE_EXCLUSIVE_ACCESS_REGONLY:
+                return "Exclusive Access, Registrants Only";
+        case PR_TYPE_WRITE_EXCLUSIVE_ALLREG:
+                return "Write Exclusive Access, All Registrants";
+        case PR_TYPE_EXCLUSIVE_ACCESS_ALLREG:
+                return "Exclusive Access, All Registrants";
+        default:
+                break;
+        }
+
+        return "Unknown SPC-3 PR Type";
+}
+
+static int core_scsi3_pro_reserve(
+        struct se_cmd *cmd,
+        struct se_device *dev,
+        int type,
+        int scope,
+        u64 res_key)
+{
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct se_dev_entry *se_deve;
+        struct se_lun *se_lun = SE_LUN(cmd);
+        struct se_portal_group *se_tpg;
+        struct t10_pr_registration *pr_reg, *pr_res_holder;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int ret, prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+
+        if (!(se_sess) || !(se_lun)) {
+                printk(KERN_ERR "SPC-3 PR: se_sess || struct se_lun is NULL!\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        se_tpg = se_sess->se_tpg;
+        se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+        /*
+         * Locate the existing *pr_reg via struct se_node_acl pointers
+         */
+        pr_reg = core_scsi3_locate_pr_reg(SE_DEV(cmd), se_sess->se_node_acl,
+                                se_sess);
+        if (!(pr_reg)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to locate"
+                        " PR_REGISTERED *pr_reg for RESERVE\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * From spc4r17 Section 5.7.9: Reserving:
+         *
+         * An application client creates a persistent reservation by issuing
+         * a PERSISTENT RESERVE OUT command with RESERVE service action through
+         * a registered I_T nexus with the following parameters:
+         *    a) RESERVATION KEY set to the value of the reservation key that is
+         *       registered with the logical unit for the I_T nexus; and
+         */
+        if (res_key != pr_reg->pr_res_key) {
+                printk(KERN_ERR "SPC-3 PR RESERVE: Received res_key: 0x%016Lx"
+                        " does not match existing SA REGISTER res_key:"
+                        " 0x%016Lx\n", res_key, pr_reg->pr_res_key);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        /*
+         * From spc4r17 Section 5.7.9: Reserving:
+         *
+         * From above:
+         *  b) TYPE field and SCOPE field set to the persistent reservation
+         *     being created.
+         *
+         * Only one persistent reservation is allowed at a time per logical unit
+         * and that persistent reservation has a scope of LU_SCOPE.
+         */
+        if (scope != PR_SCOPE_LU_SCOPE) {
+                printk(KERN_ERR "SPC-3 PR: Illegal SCOPE: 0x%02x\n", scope);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        /*
+         * See if we have an existing PR reservation holder pointer at
+         * struct se_device->dev_pr_res_holder in the form struct t10_pr_registration
+         * *pr_res_holder.
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if ((pr_res_holder)) {
+                /*
+                 * From spc4r17 Section 5.7.9: Reserving:
+                 *
+                 * If the device server receives a PERSISTENT RESERVE OUT
+                 * command from an I_T nexus other than a persistent reservation
+                 * holder (see 5.7.10) that attempts to create a persistent
+                 * reservation when a persistent reservation already exists for
+                 * the logical unit, then the command shall be completed with
+                 * RESERVATION CONFLICT status.
+                 */
+                if (pr_res_holder != pr_reg) {
+                        struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
+                        printk(KERN_ERR "SPC-3 PR: Attempted RESERVE from"
+                                " [%s]: %s while reservation already held by"
+                                " [%s]: %s, returning RESERVATION_CONFLICT\n",
+                                CMD_TFO(cmd)->get_fabric_name(),
+                                se_sess->se_node_acl->initiatorname,
+                                TPG_TFO(pr_res_nacl->se_tpg)->get_fabric_name(),
+                                pr_res_holder->pr_reg_nacl->initiatorname);
+
+                        spin_unlock(&dev->dev_reservation_lock);
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                }
+                /*
+                 * From spc4r17 Section 5.7.9: Reserving:
+                 *
+                 * If a persistent reservation holder attempts to modify the
+                 * type or scope of an existing persistent reservation, the
+                 * command shall be completed with RESERVATION CONFLICT status.
+                 */
+                if ((pr_res_holder->pr_res_type != type) ||
+                    (pr_res_holder->pr_res_scope != scope)) {
+                        struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
+                        printk(KERN_ERR "SPC-3 PR: Attempted RESERVE from"
+                                " [%s]: %s trying to change TYPE and/or SCOPE,"
+                                " while reservation already held by [%s]: %s,"
+                                " returning RESERVATION_CONFLICT\n",
+                                CMD_TFO(cmd)->get_fabric_name(),
+                                se_sess->se_node_acl->initiatorname,
+                                TPG_TFO(pr_res_nacl->se_tpg)->get_fabric_name(),
+                                pr_res_holder->pr_reg_nacl->initiatorname);
+
+                        spin_unlock(&dev->dev_reservation_lock);
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                }
+                /*
+                 * From spc4r17 Section 5.7.9: Reserving:
+                 *
+                 * If the device server receives a PERSISTENT RESERVE OUT
+                 * command with RESERVE service action where the TYPE field and
+                 * the SCOPE field contain the same values as the existing type
+                 * and scope from a persistent reservation holder, it shall not
+                 * make any change to the existing persistent reservation and
+                 * shall completethe command with GOOD status.
+                 */
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+        }
+        /*
+         * Otherwise, our *pr_reg becomes the PR reservation holder for said
+         * TYPE/SCOPE.  Also set the received scope and type in *pr_reg.
+         */
+        pr_reg->pr_res_scope = scope;
+        pr_reg->pr_res_type = type;
+        pr_reg->pr_res_holder = 1;
+        dev->dev_pr_res_holder = pr_reg;
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: RESERVE created new"
+                " reservation holder TYPE: %s ALL_TG_PT: %d\n",
+                CMD_TFO(cmd)->get_fabric_name(), core_scsi3_pr_dump_type(type),
+                (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        printk(KERN_INFO "SPC-3 PR [%s] RESERVE Node: %s%s\n",
+                        CMD_TFO(cmd)->get_fabric_name(),
+                        se_sess->se_node_acl->initiatorname,
+                        (prf_isid) ? &i_buf[0] : "");
+        spin_unlock(&dev->dev_reservation_lock);
+
+        if (pr_tmpl->pr_aptpl_active) {
+                ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                &pr_reg->pr_aptpl_buf[0],
+                                pr_tmpl->pr_aptpl_buf_len);
+                if (!(ret))
+                        printk(KERN_INFO "SPC-3 PR: Updated APTPL metadata"
+                                        " for RESERVE\n");
+        }
+
+        core_scsi3_put_pr_reg(pr_reg);
+        return 0;
+}
+
+static int core_scsi3_emulate_pro_reserve(
+        struct se_cmd *cmd,
+        int type,
+        int scope,
+        u64 res_key)
+{
+        struct se_device *dev = cmd->se_dev;
+        int ret = 0;
+
+        switch (type) {
+        case PR_TYPE_WRITE_EXCLUSIVE:
+        case PR_TYPE_EXCLUSIVE_ACCESS:
+        case PR_TYPE_WRITE_EXCLUSIVE_REGONLY:
+        case PR_TYPE_EXCLUSIVE_ACCESS_REGONLY:
+        case PR_TYPE_WRITE_EXCLUSIVE_ALLREG:
+        case PR_TYPE_EXCLUSIVE_ACCESS_ALLREG:
+                ret = core_scsi3_pro_reserve(cmd, dev, type, scope, res_key);
+                break;
+        default:
+                printk(KERN_ERR "SPC-3 PR: Unknown Service Action RESERVE Type:"
+                        " 0x%02x\n", type);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        return ret;
+}
+
+/*
+ * Called with struct se_device->dev_reservation_lock held.
+ */
+static void __core_scsi3_complete_pro_release(
+        struct se_device *dev,
+        struct se_node_acl *se_nacl,
+        struct t10_pr_registration *pr_reg,
+        int explict)
+{
+        struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+        /*
+         * Go ahead and release the current PR reservation holder.
+         */
+        dev->dev_pr_res_holder = NULL;
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: %s RELEASE cleared"
+                " reservation holder TYPE: %s ALL_TG_PT: %d\n",
+                tfo->get_fabric_name(), (explict) ? "explict" : "implict",
+                core_scsi3_pr_dump_type(pr_reg->pr_res_type),
+                (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        printk(KERN_INFO "SPC-3 PR [%s] RELEASE Node: %s%s\n",
+                tfo->get_fabric_name(), se_nacl->initiatorname,
+                (prf_isid) ? &i_buf[0] : "");
+        /*
+         * Clear TYPE and SCOPE for the next PROUT Service Action: RESERVE
+         */
+        pr_reg->pr_res_holder = pr_reg->pr_res_type = pr_reg->pr_res_scope = 0;
+}
+
+static int core_scsi3_emulate_pro_release(
+        struct se_cmd *cmd,
+        int type,
+        int scope,
+        u64 res_key)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct se_lun *se_lun = SE_LUN(cmd);
+        struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_res_holder;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        int ret, all_reg = 0;
+
+        if (!(se_sess) || !(se_lun)) {
+                printk(KERN_ERR "SPC-3 PR: se_sess || struct se_lun is NULL!\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * Locate the existing *pr_reg via struct se_node_acl pointers
+         */
+        pr_reg = core_scsi3_locate_pr_reg(dev, se_sess->se_node_acl, se_sess);
+        if (!(pr_reg)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to locate"
+                        " PR_REGISTERED *pr_reg for RELEASE\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * From spc4r17 Section 5.7.11.2 Releasing:
+         *
+         * If there is no persistent reservation or in response to a persistent
+         * reservation release request from a registered I_T nexus that is not a
+         * persistent reservation holder (see 5.7.10), the device server shall
+         * do the following:
+         *
+         *     a) Not release the persistent reservation, if any;
+         *     b) Not remove any registrations; and
+         *     c) Complete the command with GOOD status.
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (!(pr_res_holder)) {
+                /*
+                 * No persistent reservation, return GOOD status.
+                 */
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+        }
+        if ((pr_res_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+            (pr_res_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG))
+                all_reg = 1;
+
+        if ((all_reg == 0) && (pr_res_holder != pr_reg)) {
+                /*
+                 * Non 'All Registrants' PR Type cases..
+                 * Release request from a registered I_T nexus that is not a
+                 * persistent reservation holder. return GOOD status.
+                 */
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+        }
+        /*
+         * From spc4r17 Section 5.7.11.2 Releasing:
+         *
+         * Only the persistent reservation holder (see 5.7.10) is allowed to
+         * release a persistent reservation.
+         *
+         * An application client releases the persistent reservation by issuing
+         * a PERSISTENT RESERVE OUT command with RELEASE service action through
+         * an I_T nexus that is a persistent reservation holder with the
+         * following parameters:
+         *
+         *     a) RESERVATION KEY field set to the value of the reservation key
+         *        that is registered with the logical unit for the I_T nexus;
+         */
+        if (res_key != pr_reg->pr_res_key) {
+                printk(KERN_ERR "SPC-3 PR RELEASE: Received res_key: 0x%016Lx"
+                        " does not match existing SA REGISTER res_key:"
+                        " 0x%016Lx\n", res_key, pr_reg->pr_res_key);
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        /*
+         * From spc4r17 Section 5.7.11.2 Releasing and above:
+         *
+         * b) TYPE field and SCOPE field set to match the persistent
+         *    reservation being released.
+         */
+        if ((pr_res_holder->pr_res_type != type) ||
+            (pr_res_holder->pr_res_scope != scope)) {
+                struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
+                printk(KERN_ERR "SPC-3 PR RELEASE: Attempted to release"
+                        " reservation from [%s]: %s with different TYPE "
+                        "and/or SCOPE  while reservation already held by"
+                        " [%s]: %s, returning RESERVATION_CONFLICT\n",
+                        CMD_TFO(cmd)->get_fabric_name(),
+                        se_sess->se_node_acl->initiatorname,
+                        TPG_TFO(pr_res_nacl->se_tpg)->get_fabric_name(),
+                        pr_res_holder->pr_reg_nacl->initiatorname);
+
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        /*
+         * In response to a persistent reservation release request from the
+         * persistent reservation holder the device server shall perform a
+         * release by doing the following as an uninterrupted series of actions:
+         * a) Release the persistent reservation;
+         * b) Not remove any registration(s);
+         * c) If the released persistent reservation is a registrants only type
+         * or all registrants type persistent reservation,
+         *    the device server shall establish a unit attention condition for
+         *    the initiator port associated with every regis-
+         *    tered I_T nexus other than I_T nexus on which the PERSISTENT
+         *    RESERVE OUT command with RELEASE service action was received,
+         *    with the additional sense code set to RESERVATIONS RELEASED; and
+         * d) If the persistent reservation is of any other type, the device
+         *    server shall not establish a unit attention condition.
+         */
+        __core_scsi3_complete_pro_release(dev, se_sess->se_node_acl,
+                        pr_reg, 1);
+
+        spin_unlock(&dev->dev_reservation_lock);
+
+        if ((type != PR_TYPE_WRITE_EXCLUSIVE_REGONLY) &&
+            (type != PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) &&
+            (type != PR_TYPE_WRITE_EXCLUSIVE_ALLREG) &&
+            (type != PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
+                /*
+                 * If no UNIT ATTENTION conditions will be established for
+                 * PR_TYPE_WRITE_EXCLUSIVE or PR_TYPE_EXCLUSIVE_ACCESS
+                 * go ahead and check for APTPL=1 update+write below
+                 */
+                goto write_aptpl;
+        }
+
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry(pr_reg_p, &pr_tmpl->registration_list,
+                        pr_reg_list) {
+                /*
+                 * Do not establish a UNIT ATTENTION condition
+                 * for the calling I_T Nexus
+                 */
+                if (pr_reg_p == pr_reg)
+                        continue;
+
+                core_scsi3_ua_allocate(pr_reg_p->pr_reg_nacl,
+                                pr_reg_p->pr_res_mapped_lun,
+                                0x2A, ASCQ_2AH_RESERVATIONS_RELEASED);
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+
+write_aptpl:
+        if (pr_tmpl->pr_aptpl_active) {
+                ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                &pr_reg->pr_aptpl_buf[0],
+                                pr_tmpl->pr_aptpl_buf_len);
+                if (!(ret))
+                        printk("SPC-3 PR: Updated APTPL metadata for RELEASE\n");
+        }
+
+        core_scsi3_put_pr_reg(pr_reg);
+        return 0;
+}
+
+static int core_scsi3_emulate_pro_clear(
+        struct se_cmd *cmd,
+        u64 res_key)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_node_acl *pr_reg_nacl;
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_reg_n, *pr_res_holder;
+        u32 pr_res_mapped_lun = 0;
+        int calling_it_nexus = 0;
+        /*
+         * Locate the existing *pr_reg via struct se_node_acl pointers
+         */
+        pr_reg_n = core_scsi3_locate_pr_reg(SE_DEV(cmd),
+                        se_sess->se_node_acl, se_sess);
+        if (!(pr_reg_n)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to locate"
+                        " PR_REGISTERED *pr_reg for CLEAR\n");
+                        return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * From spc4r17 section 5.7.11.6, Clearing:
+         *
+         * Any application client may release the persistent reservation and
+         * remove all registrations from a device server by issuing a
+         * PERSISTENT RESERVE OUT command with CLEAR service action through a
+         * registered I_T nexus with the following parameter:
+         *
+         *      a) RESERVATION KEY field set to the value of the reservation key
+         *         that is registered with the logical unit for the I_T nexus.
+         */
+        if (res_key != pr_reg_n->pr_res_key) {
+                printk(KERN_ERR "SPC-3 PR REGISTER: Received"
+                        " res_key: 0x%016Lx does not match"
+                        " existing SA REGISTER res_key:"
+                        " 0x%016Lx\n", res_key, pr_reg_n->pr_res_key);
+                core_scsi3_put_pr_reg(pr_reg_n);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        /*
+         * a) Release the persistent reservation, if any;
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (pr_res_holder) {
+                struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
+                __core_scsi3_complete_pro_release(dev, pr_res_nacl,
+                        pr_res_holder, 0);
+        }
+        spin_unlock(&dev->dev_reservation_lock);
+        /*
+         * b) Remove all registration(s) (see spc4r17 5.7.7);
+         */
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+
+                calling_it_nexus = (pr_reg_n == pr_reg) ? 1 : 0;
+                pr_reg_nacl = pr_reg->pr_reg_nacl;
+                pr_res_mapped_lun = pr_reg->pr_res_mapped_lun;
+                __core_scsi3_free_registration(dev, pr_reg, NULL,
+                                        calling_it_nexus);
+                /*
+                 * e) Establish a unit attention condition for the initiator
+                 *    port associated with every registered I_T nexus other
+                 *    than the I_T nexus on which the PERSISTENT RESERVE OUT
+                 *    command with CLEAR service action was received, with the
+                 *    additional sense code set to RESERVATIONS PREEMPTED.
+                 */
+                if (!(calling_it_nexus))
+                        core_scsi3_ua_allocate(pr_reg_nacl, pr_res_mapped_lun,
+                                0x2A, ASCQ_2AH_RESERVATIONS_PREEMPTED);
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: CLEAR complete\n",
+                CMD_TFO(cmd)->get_fabric_name());
+
+        if (pr_tmpl->pr_aptpl_active) {
+                core_scsi3_update_and_write_aptpl(SE_DEV(cmd), NULL, 0);
+                printk(KERN_INFO "SPC-3 PR: Updated APTPL metadata"
+                                " for CLEAR\n");
+        }
+
+        core_scsi3_pr_generation(dev);
+        return 0;
+}
+
+/*
+ * Called with struct se_device->dev_reservation_lock held.
+ */
+static void __core_scsi3_complete_pro_preempt(
+        struct se_device *dev,
+        struct t10_pr_registration *pr_reg,
+        struct list_head *preempt_and_abort_list,
+        int type,
+        int scope,
+        int abort)
+{
+        struct se_node_acl *nacl = pr_reg->pr_reg_nacl;
+        struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
+        char i_buf[PR_REG_ISID_ID_LEN];
+        int prf_isid;
+
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+        /*
+         * Do an implict RELEASE of the existing reservation.
+         */
+        if (dev->dev_pr_res_holder)
+                __core_scsi3_complete_pro_release(dev, nacl,
+                                dev->dev_pr_res_holder, 0);
+
+        dev->dev_pr_res_holder = pr_reg;
+        pr_reg->pr_res_holder = 1;
+        pr_reg->pr_res_type = type;
+        pr_reg->pr_res_scope = scope;
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: PREEMPT%s created new"
+                " reservation holder TYPE: %s ALL_TG_PT: %d\n",
+                tfo->get_fabric_name(), (abort) ? "_AND_ABORT" : "",
+                core_scsi3_pr_dump_type(type),
+                (pr_reg->pr_reg_all_tg_pt) ? 1 : 0);
+        printk(KERN_INFO "SPC-3 PR [%s] PREEMPT%s from Node: %s%s\n",
+                tfo->get_fabric_name(), (abort) ? "_AND_ABORT" : "",
+                nacl->initiatorname, (prf_isid) ? &i_buf[0] : "");
+        /*
+         * For PREEMPT_AND_ABORT, add the preempting reservation's
+         * struct t10_pr_registration to the list that will be compared
+         * against received CDBs..
+         */
+        if (preempt_and_abort_list)
+                list_add_tail(&pr_reg->pr_reg_abort_list,
+                                preempt_and_abort_list);
+}
+
+static void core_scsi3_release_preempt_and_abort(
+        struct list_head *preempt_and_abort_list,
+        struct t10_pr_registration *pr_reg_holder)
+{
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp;
+
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp, preempt_and_abort_list,
+                                pr_reg_abort_list) {
+
+                list_del(&pr_reg->pr_reg_abort_list);
+                if (pr_reg_holder == pr_reg)
+                        continue;
+                if (pr_reg->pr_res_holder) {
+                        printk(KERN_WARNING "pr_reg->pr_res_holder still set\n");
+                        continue;
+                }
+
+                pr_reg->pr_reg_deve = NULL;
+                pr_reg->pr_reg_nacl = NULL;
+                kfree(pr_reg->pr_aptpl_buf);
+                kmem_cache_free(t10_pr_reg_cache, pr_reg);
+        }
+}
+
+int core_scsi3_check_cdb_abort_and_preempt(
+        struct list_head *preempt_and_abort_list,
+        struct se_cmd *cmd)
+{
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp;
+
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp, preempt_and_abort_list,
+                                pr_reg_abort_list) {
+                if (pr_reg->pr_res_key == cmd->pr_res_key)
+                        return 0;
+        }
+
+        return 1;
+}
+
+static int core_scsi3_pro_preempt(
+        struct se_cmd *cmd,
+        int type,
+        int scope,
+        u64 res_key,
+        u64 sa_res_key,
+        int abort)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_dev_entry *se_deve;
+        struct se_node_acl *pr_reg_nacl;
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct list_head preempt_and_abort_list;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp, *pr_reg_n, *pr_res_holder;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        u32 pr_res_mapped_lun = 0;
+        int all_reg = 0, calling_it_nexus = 0, released_regs = 0;
+        int prh_type = 0, prh_scope = 0, ret;
+
+        if (!(se_sess))
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+
+        se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+        pr_reg_n = core_scsi3_locate_pr_reg(SE_DEV(cmd), se_sess->se_node_acl,
+                                se_sess);
+        if (!(pr_reg_n)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to locate"
+                        " PR_REGISTERED *pr_reg for PREEMPT%s\n",
+                        (abort) ? "_AND_ABORT" : "");
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        if (pr_reg_n->pr_res_key != res_key) {
+                core_scsi3_put_pr_reg(pr_reg_n);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        if (scope != PR_SCOPE_LU_SCOPE) {
+                printk(KERN_ERR "SPC-3 PR: Illegal SCOPE: 0x%02x\n", scope);
+                core_scsi3_put_pr_reg(pr_reg_n);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        INIT_LIST_HEAD(&preempt_and_abort_list);
+
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (pr_res_holder &&
+           ((pr_res_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+            (pr_res_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)))
+                all_reg = 1;
+
+        if (!(all_reg) && !(sa_res_key)) {
+                spin_unlock(&dev->dev_reservation_lock);
+                core_scsi3_put_pr_reg(pr_reg_n);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        /*
+         * From spc4r17, section 5.7.11.4.4 Removing Registrations:
+         *
+         * If the SERVICE ACTION RESERVATION KEY field does not identify a
+         * persistent reservation holder or there is no persistent reservation
+         * holder (i.e., there is no persistent reservation), then the device
+         * server shall perform a preempt by doing the following in an
+         * uninterrupted series of actions. (See below..)
+         */
+        if (!(pr_res_holder) || (pr_res_holder->pr_res_key != sa_res_key)) {
+                /*
+                 * No existing or SA Reservation Key matching reservations..
+                 *
+                 * PROUT SA PREEMPT with All Registrant type reservations are
+                 * allowed to be processed without a matching SA Reservation Key
+                 */
+                spin_lock(&pr_tmpl->registration_lock);
+                list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                                &pr_tmpl->registration_list, pr_reg_list) {
+                        /*
+                         * Removing of registrations in non all registrants
+                         * type reservations without a matching SA reservation
+                         * key.
+                         *
+                         * a) Remove the registrations for all I_T nexuses
+                         *    specified by the SERVICE ACTION RESERVATION KEY
+                         *    field;
+                         * b) Ignore the contents of the SCOPE and TYPE fields;
+                         * c) Process tasks as defined in 5.7.1; and
+                         * d) Establish a unit attention condition for the
+                         *    initiator port associated with every I_T nexus
+                         *    that lost its registration other than the I_T
+                         *    nexus on which the PERSISTENT RESERVE OUT command
+                         *    was received, with the additional sense code set
+                         *    to REGISTRATIONS PREEMPTED.
+                         */
+                        if (!(all_reg)) {
+                                if (pr_reg->pr_res_key != sa_res_key)
+                                        continue;
+
+                                calling_it_nexus = (pr_reg_n == pr_reg) ? 1 : 0;
+                                pr_reg_nacl = pr_reg->pr_reg_nacl;
+                                pr_res_mapped_lun = pr_reg->pr_res_mapped_lun;
+                                __core_scsi3_free_registration(dev, pr_reg,
+                                        (abort) ? &preempt_and_abort_list :
+                                                NULL, calling_it_nexus);
+                                released_regs++;
+                        } else {
+                                /*
+                                 * Case for any existing all registrants type
+                                 * reservation, follow logic in spc4r17 section
+                                 * 5.7.11.4 Preempting, Table 52 and Figure 7.
+                                 *
+                                 * For a ZERO SA Reservation key, release
+                                 * all other registrations and do an implict
+                                 * release of active persistent reservation.
+                                 *
+                                 * For a non-ZERO SA Reservation key, only
+                                 * release the matching reservation key from
+                                 * registrations.
+                                 */
+                                if ((sa_res_key) &&
+                                     (pr_reg->pr_res_key != sa_res_key))
+                                        continue;
+
+                                calling_it_nexus = (pr_reg_n == pr_reg) ? 1 : 0;
+                                if (calling_it_nexus)
+                                        continue;
+
+                                pr_reg_nacl = pr_reg->pr_reg_nacl;
+                                pr_res_mapped_lun = pr_reg->pr_res_mapped_lun;
+                                __core_scsi3_free_registration(dev, pr_reg,
+                                        (abort) ? &preempt_and_abort_list :
+                                                NULL, 0);
+                                released_regs++;
+                        }
+                        if (!(calling_it_nexus))
+                                core_scsi3_ua_allocate(pr_reg_nacl,
+                                        pr_res_mapped_lun, 0x2A,
+                                        ASCQ_2AH_RESERVATIONS_PREEMPTED);
+                }
+                spin_unlock(&pr_tmpl->registration_lock);
+                /*
+                 * If a PERSISTENT RESERVE OUT with a PREEMPT service action or
+                 * a PREEMPT AND ABORT service action sets the SERVICE ACTION
+                 * RESERVATION KEY field to a value that does not match any
+                 * registered reservation key, then the device server shall
+                 * complete the command with RESERVATION CONFLICT status.
+                 */
+                if (!(released_regs)) {
+                        spin_unlock(&dev->dev_reservation_lock);
+                        core_scsi3_put_pr_reg(pr_reg_n);
+                        return PYX_TRANSPORT_RESERVATION_CONFLICT;
+                }
+                /*
+                 * For an existing all registrants type reservation
+                 * with a zero SA rservation key, preempt the existing
+                 * reservation with the new PR type and scope.
+                 */
+                if (pr_res_holder && all_reg && !(sa_res_key)) {
+                        __core_scsi3_complete_pro_preempt(dev, pr_reg_n,
+                                (abort) ? &preempt_and_abort_list : NULL,
+                                type, scope, abort);
+
+                        if (abort)
+                                core_scsi3_release_preempt_and_abort(
+                                        &preempt_and_abort_list, pr_reg_n);
+                }
+                spin_unlock(&dev->dev_reservation_lock);
+
+                if (pr_tmpl->pr_aptpl_active) {
+                        ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                        &pr_reg_n->pr_aptpl_buf[0],
+                                        pr_tmpl->pr_aptpl_buf_len);
+                        if (!(ret))
+                                printk(KERN_INFO "SPC-3 PR: Updated APTPL"
+                                        " metadata for  PREEMPT%s\n", (abort) ?
+                                        "_AND_ABORT" : "");
+                }
+
+                core_scsi3_put_pr_reg(pr_reg_n);
+                core_scsi3_pr_generation(SE_DEV(cmd));
+                return 0;
+        }
+        /*
+         * The PREEMPTing SA reservation key matches that of the
+         * existing persistent reservation, first, we check if
+         * we are preempting our own reservation.
+         * From spc4r17, section 5.7.11.4.3 Preempting
+         * persistent reservations and registration handling
+         *
+         * If an all registrants persistent reservation is not
+         * present, it is not an error for the persistent
+         * reservation holder to preempt itself (i.e., a
+         * PERSISTENT RESERVE OUT with a PREEMPT service action
+         * or a PREEMPT AND ABORT service action with the
+         * SERVICE ACTION RESERVATION KEY value equal to the
+         * persistent reservation holder's reservation key that
+         * is received from the persistent reservation holder).
+         * In that case, the device server shall establish the
+         * new persistent reservation and maintain the
+         * registration.
+         */
+        prh_type = pr_res_holder->pr_res_type;
+        prh_scope = pr_res_holder->pr_res_scope;
+        /*
+         * If the SERVICE ACTION RESERVATION KEY field identifies a
+         * persistent reservation holder (see 5.7.10), the device
+         * server shall perform a preempt by doing the following as
+         * an uninterrupted series of actions:
+         *
+         * a) Release the persistent reservation for the holder
+         *    identified by the SERVICE ACTION RESERVATION KEY field;
+         */
+        if (pr_reg_n != pr_res_holder)
+                __core_scsi3_complete_pro_release(dev,
+                                pr_res_holder->pr_reg_nacl,
+                                dev->dev_pr_res_holder, 0);
+        /*
+         * b) Remove the registrations for all I_T nexuses identified
+         *    by the SERVICE ACTION RESERVATION KEY field, except the
+         *    I_T nexus that is being used for the PERSISTENT RESERVE
+         *    OUT command. If an all registrants persistent reservation
+         *    is present and the SERVICE ACTION RESERVATION KEY field
+         *    is set to zero, then all registrations shall be removed
+         *    except for that of the I_T nexus that is being used for
+         *    the PERSISTENT RESERVE OUT command;
+         */
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+
+                calling_it_nexus = (pr_reg_n == pr_reg) ? 1 : 0;
+                if (calling_it_nexus)
+                        continue;
+
+                if (pr_reg->pr_res_key != sa_res_key)
+                        continue;
+
+                pr_reg_nacl = pr_reg->pr_reg_nacl;
+                pr_res_mapped_lun = pr_reg->pr_res_mapped_lun;
+                __core_scsi3_free_registration(dev, pr_reg,
+                                (abort) ? &preempt_and_abort_list : NULL,
+                                calling_it_nexus);
+                /*
+                 * e) Establish a unit attention condition for the initiator
+                 *    port associated with every I_T nexus that lost its
+                 *    persistent reservation and/or registration, with the
+                 *    additional sense code set to REGISTRATIONS PREEMPTED;
+                 */
+                core_scsi3_ua_allocate(pr_reg_nacl, pr_res_mapped_lun, 0x2A,
+                                ASCQ_2AH_RESERVATIONS_PREEMPTED);
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+        /*
+         * c) Establish a persistent reservation for the preempting
+         *    I_T nexus using the contents of the SCOPE and TYPE fields;
+         */
+        __core_scsi3_complete_pro_preempt(dev, pr_reg_n,
+                        (abort) ? &preempt_and_abort_list : NULL,
+                        type, scope, abort);
+        /*
+         * d) Process tasks as defined in 5.7.1;
+         * e) See above..
+         * f) If the type or scope has changed, then for every I_T nexus
+         *    whose reservation key was not removed, except for the I_T
+         *    nexus on which the PERSISTENT RESERVE OUT command was
+         *    received, the device server shall establish a unit
+         *    attention condition for the initiator port associated with
+         *    that I_T nexus, with the additional sense code set to
+         *    RESERVATIONS RELEASED. If the type or scope have not
+         *    changed, then no unit attention condition(s) shall be
+         *    established for this reason.
+         */
+        if ((prh_type != type) || (prh_scope != scope)) {
+                spin_lock(&pr_tmpl->registration_lock);
+                list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                                &pr_tmpl->registration_list, pr_reg_list) {
+
+                        calling_it_nexus = (pr_reg_n == pr_reg) ? 1 : 0;
+                        if (calling_it_nexus)
+                                continue;
+
+                        core_scsi3_ua_allocate(pr_reg->pr_reg_nacl,
+                                        pr_reg->pr_res_mapped_lun, 0x2A,
+                                        ASCQ_2AH_RESERVATIONS_RELEASED);
+                }
+                spin_unlock(&pr_tmpl->registration_lock);
+        }
+        spin_unlock(&dev->dev_reservation_lock);
+        /*
+         * Call LUN_RESET logic upon list of struct t10_pr_registration,
+         * All received CDBs for the matching existing reservation and
+         * registrations undergo ABORT_TASK logic.
+         *
+         * From there, core_scsi3_release_preempt_and_abort() will
+         * release every registration in the list (which have already
+         * been removed from the primary pr_reg list), except the
+         * new persistent reservation holder, the calling Initiator Port.
+         */
+        if (abort) {
+                core_tmr_lun_reset(dev, NULL, &preempt_and_abort_list, cmd);
+                core_scsi3_release_preempt_and_abort(&preempt_and_abort_list,
+                                                pr_reg_n);
+        }
+
+        if (pr_tmpl->pr_aptpl_active) {
+                ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                &pr_reg_n->pr_aptpl_buf[0],
+                                pr_tmpl->pr_aptpl_buf_len);
+                if (!(ret))
+                        printk("SPC-3 PR: Updated APTPL metadata for PREEMPT"
+                                "%s\n", (abort) ? "_AND_ABORT" : "");
+        }
+
+        core_scsi3_put_pr_reg(pr_reg_n);
+        core_scsi3_pr_generation(SE_DEV(cmd));
+        return 0;
+}
+
+static int core_scsi3_emulate_pro_preempt(
+        struct se_cmd *cmd,
+        int type,
+        int scope,
+        u64 res_key,
+        u64 sa_res_key,
+        int abort)
+{
+        int ret = 0;
+
+        switch (type) {
+        case PR_TYPE_WRITE_EXCLUSIVE:
+        case PR_TYPE_EXCLUSIVE_ACCESS:
+        case PR_TYPE_WRITE_EXCLUSIVE_REGONLY:
+        case PR_TYPE_EXCLUSIVE_ACCESS_REGONLY:
+        case PR_TYPE_WRITE_EXCLUSIVE_ALLREG:
+        case PR_TYPE_EXCLUSIVE_ACCESS_ALLREG:
+                ret = core_scsi3_pro_preempt(cmd, type, scope,
+                                res_key, sa_res_key, abort);
+                break;
+        default:
+                printk(KERN_ERR "SPC-3 PR: Unknown Service Action PREEMPT%s"
+                        " Type: 0x%02x\n", (abort) ? "_AND_ABORT" : "", type);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        return ret;
+}
+
+
+static int core_scsi3_emulate_pro_register_and_move(
+        struct se_cmd *cmd,
+        u64 res_key,
+        u64 sa_res_key,
+        int aptpl,
+        int unreg)
+{
+        struct se_session *se_sess = SE_SESS(cmd);
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_dev_entry *se_deve, *dest_se_deve = NULL;
+        struct se_lun *se_lun = SE_LUN(cmd);
+        struct se_node_acl *pr_res_nacl, *pr_reg_nacl, *dest_node_acl = NULL;
+        struct se_port *se_port;
+        struct se_portal_group *se_tpg, *dest_se_tpg = NULL;
+        struct target_core_fabric_ops *dest_tf_ops = NULL, *tf_ops;
+        struct t10_pr_registration *pr_reg, *pr_res_holder, *dest_pr_reg;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        unsigned char *initiator_str;
+        char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
+        u32 tid_len, tmp_tid_len;
+        int new_reg = 0, type, scope, ret, matching_iname, prf_isid;
+        unsigned short rtpi;
+        unsigned char proto_ident;
+
+        if (!(se_sess) || !(se_lun)) {
+                printk(KERN_ERR "SPC-3 PR: se_sess || struct se_lun is NULL!\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        memset(dest_iport, 0, 64);
+        memset(i_buf, 0, PR_REG_ISID_ID_LEN);
+        se_tpg = se_sess->se_tpg;
+        tf_ops = TPG_TFO(se_tpg);
+        se_deve = &se_sess->se_node_acl->device_list[cmd->orig_fe_lun];
+        /*
+         * Follow logic from spc4r17 Section 5.7.8, Table 50 --
+         *      Register behaviors for a REGISTER AND MOVE service action
+         *
+         * Locate the existing *pr_reg via struct se_node_acl pointers
+         */
+        pr_reg = core_scsi3_locate_pr_reg(SE_DEV(cmd), se_sess->se_node_acl,
+                                se_sess);
+        if (!(pr_reg)) {
+                printk(KERN_ERR "SPC-3 PR: Unable to locate PR_REGISTERED"
+                        " *pr_reg for REGISTER_AND_MOVE\n");
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * The provided reservation key much match the existing reservation key
+         * provided during this initiator's I_T nexus registration.
+         */
+        if (res_key != pr_reg->pr_res_key) {
+                printk(KERN_WARNING "SPC-3 PR REGISTER_AND_MOVE: Received"
+                        " res_key: 0x%016Lx does not match existing SA REGISTER"
+                        " res_key: 0x%016Lx\n", res_key, pr_reg->pr_res_key);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+        /*
+         * The service active reservation key needs to be non zero
+         */
+        if (!(sa_res_key)) {
+                printk(KERN_WARNING "SPC-3 PR REGISTER_AND_MOVE: Received zero"
+                        " sa_res_key\n");
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        /*
+         * Determine the Relative Target Port Identifier where the reservation
+         * will be moved to for the TransportID containing SCSI initiator WWN
+         * information.
+         */
+        rtpi = (buf[18] & 0xff) << 8;
+        rtpi |= buf[19] & 0xff;
+        tid_len = (buf[20] & 0xff) << 24;
+        tid_len |= (buf[21] & 0xff) << 16;
+        tid_len |= (buf[22] & 0xff) << 8;
+        tid_len |= buf[23] & 0xff;
+
+        if ((tid_len + 24) != cmd->data_length) {
+                printk(KERN_ERR "SPC-3 PR: Illegal tid_len: %u + 24 byte header"
+                        " does not equal CDB data_length: %u\n", tid_len,
+                        cmd->data_length);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+
+        spin_lock(&dev->se_port_lock);
+        list_for_each_entry(se_port, &dev->dev_sep_list, sep_list) {
+                if (se_port->sep_rtpi != rtpi)
+                        continue;
+                dest_se_tpg = se_port->sep_tpg;
+                if (!(dest_se_tpg))
+                        continue;
+                dest_tf_ops = TPG_TFO(dest_se_tpg);
+                if (!(dest_tf_ops))
+                        continue;
+
+                atomic_inc(&dest_se_tpg->tpg_pr_ref_count);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&dev->se_port_lock);
+
+                ret = core_scsi3_tpg_depend_item(dest_se_tpg);
+                if (ret != 0) {
+                        printk(KERN_ERR "core_scsi3_tpg_depend_item() failed"
+                                " for dest_se_tpg\n");
+                        atomic_dec(&dest_se_tpg->tpg_pr_ref_count);
+                        smp_mb__after_atomic_dec();
+                        core_scsi3_put_pr_reg(pr_reg);
+                        return PYX_TRANSPORT_LU_COMM_FAILURE;
+                }
+
+                spin_lock(&dev->se_port_lock);
+                break;
+        }
+        spin_unlock(&dev->se_port_lock);
+
+        if (!(dest_se_tpg) || (!dest_tf_ops)) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: Unable to locate"
+                        " fabric ops from Relative Target Port Identifier:"
+                        " %hu\n", rtpi);
+                core_scsi3_put_pr_reg(pr_reg);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        proto_ident = (buf[24] & 0x0f);
+#if 0
+        printk("SPC-3 PR REGISTER_AND_MOVE: Extracted Protocol Identifier:"
+                        " 0x%02x\n", proto_ident);
+#endif
+        if (proto_ident != dest_tf_ops->get_fabric_proto_ident(dest_se_tpg)) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: Received"
+                        " proto_ident: 0x%02x does not match ident: 0x%02x"
+                        " from fabric: %s\n", proto_ident,
+                        dest_tf_ops->get_fabric_proto_ident(dest_se_tpg),
+                        dest_tf_ops->get_fabric_name());
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+        if (dest_tf_ops->tpg_parse_pr_out_transport_id == NULL) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: Fabric does not"
+                        " containg a valid tpg_parse_pr_out_transport_id"
+                        " function pointer\n");
+                ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                goto out;
+        }
+        initiator_str = dest_tf_ops->tpg_parse_pr_out_transport_id(dest_se_tpg,
+                        (const char *)&buf[24], &tmp_tid_len, &iport_ptr);
+        if (!(initiator_str)) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: Unable to locate"
+                        " initiator_str from Transport ID\n");
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+
+        printk(KERN_INFO "SPC-3 PR [%s] Extracted initiator %s identifier: %s"
+                " %s\n", dest_tf_ops->get_fabric_name(), (iport_ptr != NULL) ?
+                "port" : "device", initiator_str, (iport_ptr != NULL) ?
+                iport_ptr : "");
+        /*
+         * If a PERSISTENT RESERVE OUT command with a REGISTER AND MOVE service
+         * action specifies a TransportID that is the same as the initiator port
+         * of the I_T nexus for the command received, then the command shall
+         * be terminated with CHECK CONDITION status, with the sense key set to
+         * ILLEGAL REQUEST, and the additional sense code set to INVALID FIELD
+         * IN PARAMETER LIST.
+         */
+        pr_reg_nacl = pr_reg->pr_reg_nacl;
+        matching_iname = (!strcmp(initiator_str,
+                                  pr_reg_nacl->initiatorname)) ? 1 : 0;
+        if (!(matching_iname))
+                goto after_iport_check;
+
+        if (!(iport_ptr) || !(pr_reg->isid_present_at_reg)) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: TransportID: %s"
+                        " matches: %s on received I_T Nexus\n", initiator_str,
+                        pr_reg_nacl->initiatorname);
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+        if (!(strcmp(iport_ptr, pr_reg->pr_reg_isid))) {
+                printk(KERN_ERR "SPC-3 PR REGISTER_AND_MOVE: TransportID: %s %s"
+                        " matches: %s %s on received I_T Nexus\n",
+                        initiator_str, iport_ptr, pr_reg_nacl->initiatorname,
+                        pr_reg->pr_reg_isid);
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+after_iport_check:
+        /*
+         * Locate the destination struct se_node_acl from the received Transport ID
+         */
+        spin_lock_bh(&dest_se_tpg->acl_node_lock);
+        dest_node_acl = __core_tpg_get_initiator_node_acl(dest_se_tpg,
+                                initiator_str);
+        if (dest_node_acl) {
+                atomic_inc(&dest_node_acl->acl_pr_ref_count);
+                smp_mb__after_atomic_inc();
+        }
+        spin_unlock_bh(&dest_se_tpg->acl_node_lock);
+
+        if (!(dest_node_acl)) {
+                printk(KERN_ERR "Unable to locate %s dest_node_acl for"
+                        " TransportID%s\n", dest_tf_ops->get_fabric_name(),
+                        initiator_str);
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+        ret = core_scsi3_nodeacl_depend_item(dest_node_acl);
+        if (ret != 0) {
+                printk(KERN_ERR "core_scsi3_nodeacl_depend_item() for"
+                        " dest_node_acl\n");
+                atomic_dec(&dest_node_acl->acl_pr_ref_count);
+                smp_mb__after_atomic_dec();
+                dest_node_acl = NULL;
+                ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                goto out;
+        }
+#if 0
+        printk(KERN_INFO "SPC-3 PR REGISTER_AND_MOVE: Found %s dest_node_acl:"
+                " %s from TransportID\n", dest_tf_ops->get_fabric_name(),
+                dest_node_acl->initiatorname);
+#endif
+        /*
+         * Locate the struct se_dev_entry pointer for the matching RELATIVE TARGET
+         * PORT IDENTIFIER.
+         */
+        dest_se_deve = core_get_se_deve_from_rtpi(dest_node_acl, rtpi);
+        if (!(dest_se_deve)) {
+                printk(KERN_ERR "Unable to locate %s dest_se_deve from RTPI:"
+                        " %hu\n",  dest_tf_ops->get_fabric_name(), rtpi);
+                ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                goto out;
+        }
+
+        ret = core_scsi3_lunacl_depend_item(dest_se_deve);
+        if (ret < 0) {
+                printk(KERN_ERR "core_scsi3_lunacl_depend_item() failed\n");
+                atomic_dec(&dest_se_deve->pr_ref_count);
+                smp_mb__after_atomic_dec();
+                dest_se_deve = NULL;
+                ret = PYX_TRANSPORT_LU_COMM_FAILURE;
+                goto out;
+        }
+#if 0
+        printk(KERN_INFO "SPC-3 PR REGISTER_AND_MOVE: Located %s node %s LUN"
+                " ACL for dest_se_deve->mapped_lun: %u\n",
+                dest_tf_ops->get_fabric_name(), dest_node_acl->initiatorname,
+                dest_se_deve->mapped_lun);
+#endif
+        /*
+         * A persistent reservation needs to already existing in order to
+         * successfully complete the REGISTER_AND_MOVE service action..
+         */
+        spin_lock(&dev->dev_reservation_lock);
+        pr_res_holder = dev->dev_pr_res_holder;
+        if (!(pr_res_holder)) {
+                printk(KERN_WARNING "SPC-3 PR REGISTER_AND_MOVE: No reservation"
+                        " currently held\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                ret = PYX_TRANSPORT_INVALID_CDB_FIELD;
+                goto out;
+        }
+        /*
+         * The received on I_T Nexus must be the reservation holder.
+         *
+         * From spc4r17 section 5.7.8  Table 50 --
+         *      Register behaviors for a REGISTER AND MOVE service action
+         */
+        if (pr_res_holder != pr_reg) {
+                printk(KERN_WARNING "SPC-3 PR REGISTER_AND_MOVE: Calling I_T"
+                        " Nexus is not reservation holder\n");
+                spin_unlock(&dev->dev_reservation_lock);
+                ret = PYX_TRANSPORT_RESERVATION_CONFLICT;
+                goto out;
+        }
+        /*
+         * From spc4r17 section 5.7.8: registering and moving reservation
+         *
+         * If a PERSISTENT RESERVE OUT command with a REGISTER AND MOVE service
+         * action is received and the established persistent reservation is a
+         * Write Exclusive - All Registrants type or Exclusive Access -
+         * All Registrants type reservation, then the command shall be completed
+         * with RESERVATION CONFLICT status.
+         */
+        if ((pr_res_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+            (pr_res_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
+                printk(KERN_WARNING "SPC-3 PR REGISTER_AND_MOVE: Unable to move"
+                        " reservation for type: %s\n",
+                        core_scsi3_pr_dump_type(pr_res_holder->pr_res_type));
+                spin_unlock(&dev->dev_reservation_lock);
+                ret = PYX_TRANSPORT_RESERVATION_CONFLICT;
+                goto out;
+        }
+        pr_res_nacl = pr_res_holder->pr_reg_nacl;
+        /*
+         * b) Ignore the contents of the (received) SCOPE and TYPE fields;
+         */
+        type = pr_res_holder->pr_res_type;
+        scope = pr_res_holder->pr_res_type;
+        /*
+         * c) Associate the reservation key specified in the SERVICE ACTION
+         *    RESERVATION KEY field with the I_T nexus specified as the
+         *    destination of the register and move, where:
+         *    A) The I_T nexus is specified by the TransportID and the
+         *       RELATIVE TARGET PORT IDENTIFIER field (see 6.14.4); and
+         *    B) Regardless of the TransportID format used, the association for
+         *       the initiator port is based on either the initiator port name
+         *       (see 3.1.71) on SCSI transport protocols where port names are
+         *       required or the initiator port identifier (see 3.1.70) on SCSI
+         *       transport protocols where port names are not required;
+         * d) Register the reservation key specified in the SERVICE ACTION
+         *    RESERVATION KEY field;
+         * e) Retain the reservation key specified in the SERVICE ACTION
+         *    RESERVATION KEY field and associated information;
+         *
+         * Also, It is not an error for a REGISTER AND MOVE service action to
+         * register an I_T nexus that is already registered with the same
+         * reservation key or a different reservation key.
+         */
+        dest_pr_reg = __core_scsi3_locate_pr_reg(dev, dest_node_acl,
+                                        iport_ptr);
+        if (!(dest_pr_reg)) {
+                ret = core_scsi3_alloc_registration(SE_DEV(cmd),
+                                dest_node_acl, dest_se_deve, iport_ptr,
+                                sa_res_key, 0, aptpl, 2, 1);
+                if (ret != 0) {
+                        spin_unlock(&dev->dev_reservation_lock);
+                        ret = PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+                        goto out;
+                }
+                dest_pr_reg = __core_scsi3_locate_pr_reg(dev, dest_node_acl,
+                                                iport_ptr);
+                new_reg = 1;
+        }
+        /*
+         * f) Release the persistent reservation for the persistent reservation
+         *    holder (i.e., the I_T nexus on which the
+         */
+        __core_scsi3_complete_pro_release(dev, pr_res_nacl,
+                        dev->dev_pr_res_holder, 0);
+        /*
+         * g) Move the persistent reservation to the specified I_T nexus using
+         *    the same scope and type as the persistent reservation released in
+         *    item f); and
+         */
+        dev->dev_pr_res_holder = dest_pr_reg;
+        dest_pr_reg->pr_res_holder = 1;
+        dest_pr_reg->pr_res_type = type;
+        pr_reg->pr_res_scope = scope;
+        prf_isid = core_pr_dump_initiator_port(pr_reg, &i_buf[0],
+                                PR_REG_ISID_ID_LEN);
+        /*
+         * Increment PRGeneration for existing registrations..
+         */
+        if (!(new_reg))
+                dest_pr_reg->pr_res_generation = pr_tmpl->pr_generation++;
+        spin_unlock(&dev->dev_reservation_lock);
+
+        printk(KERN_INFO "SPC-3 PR [%s] Service Action: REGISTER_AND_MOVE"
+                " created new reservation holder TYPE: %s on object RTPI:"
+                " %hu  PRGeneration: 0x%08x\n", dest_tf_ops->get_fabric_name(),
+                core_scsi3_pr_dump_type(type), rtpi,
+                dest_pr_reg->pr_res_generation);
+        printk(KERN_INFO "SPC-3 PR Successfully moved reservation from"
+                " %s Fabric Node: %s%s -> %s Fabric Node: %s %s\n",
+                tf_ops->get_fabric_name(), pr_reg_nacl->initiatorname,
+                (prf_isid) ? &i_buf[0] : "", dest_tf_ops->get_fabric_name(),
+                dest_node_acl->initiatorname, (iport_ptr != NULL) ?
+                iport_ptr : "");
+        /*
+         * It is now safe to release configfs group dependencies for destination
+         * of Transport ID Initiator Device/Port Identifier
+         */
+        core_scsi3_lunacl_undepend_item(dest_se_deve);
+        core_scsi3_nodeacl_undepend_item(dest_node_acl);
+        core_scsi3_tpg_undepend_item(dest_se_tpg);
+        /*
+         * h) If the UNREG bit is set to one, unregister (see 5.7.11.3) the I_T
+         * nexus on which PERSISTENT RESERVE OUT command was received.
+         */
+        if (unreg) {
+                spin_lock(&pr_tmpl->registration_lock);
+                __core_scsi3_free_registration(dev, pr_reg, NULL, 1);
+                spin_unlock(&pr_tmpl->registration_lock);
+        } else
+                core_scsi3_put_pr_reg(pr_reg);
+
+        /*
+         * Clear the APTPL metadata if APTPL has been disabled, otherwise
+         * write out the updated metadata to struct file for this SCSI device.
+         */
+        if (!(aptpl)) {
+                pr_tmpl->pr_aptpl_active = 0;
+                core_scsi3_update_and_write_aptpl(SE_DEV(cmd), NULL, 0);
+                printk("SPC-3 PR: Set APTPL Bit Deactivated for"
+                                " REGISTER_AND_MOVE\n");
+        } else {
+                pr_tmpl->pr_aptpl_active = 1;
+                ret = core_scsi3_update_and_write_aptpl(SE_DEV(cmd),
+                                &dest_pr_reg->pr_aptpl_buf[0],
+                                pr_tmpl->pr_aptpl_buf_len);
+                if (!(ret))
+                        printk("SPC-3 PR: Set APTPL Bit Activated for"
+                                        " REGISTER_AND_MOVE\n");
+        }
+
+        core_scsi3_put_pr_reg(dest_pr_reg);
+        return 0;
+out:
+        if (dest_se_deve)
+                core_scsi3_lunacl_undepend_item(dest_se_deve);
+        if (dest_node_acl)
+                core_scsi3_nodeacl_undepend_item(dest_node_acl);
+        core_scsi3_tpg_undepend_item(dest_se_tpg);
+        core_scsi3_put_pr_reg(pr_reg);
+        return ret;
+}
+
+static unsigned long long core_scsi3_extract_reservation_key(unsigned char *cdb)
+{
+        unsigned int __v1, __v2;
+
+        __v1 = (cdb[0] << 24) | (cdb[1] << 16) | (cdb[2] << 8) | cdb[3];
+        __v2 = (cdb[4] << 24) | (cdb[5] << 16) | (cdb[6] << 8) | cdb[7];
+
+        return ((unsigned long long)__v2) | (unsigned long long)__v1 << 32;
+}
+
+/*
+ * See spc4r17 section 6.14 Table 170
+ */
+static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
+{
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u64 res_key, sa_res_key;
+        int sa, scope, type, aptpl;
+        int spec_i_pt = 0, all_tg_pt = 0, unreg = 0;
+        /*
+         * FIXME: A NULL struct se_session pointer means an this is not coming from
+         * a $FABRIC_MOD's nexus, but from internal passthrough ops.
+         */
+        if (!(SE_SESS(cmd)))
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+
+        if (cmd->data_length < 24) {
+                printk(KERN_WARNING "SPC-PR: Recieved PR OUT parameter list"
+                        " length too small: %u\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        /*
+         * From the PERSISTENT_RESERVE_OUT command descriptor block (CDB)
+         */
+        sa = (cdb[1] & 0x1f);
+        scope = (cdb[2] & 0xf0);
+        type = (cdb[2] & 0x0f);
+        /*
+         * From PERSISTENT_RESERVE_OUT parameter list (payload)
+         */
+        res_key = core_scsi3_extract_reservation_key(&buf[0]);
+        sa_res_key = core_scsi3_extract_reservation_key(&buf[8]);
+        /*
+         * REGISTER_AND_MOVE uses a different SA parameter list containing
+         * SCSI TransportIDs.
+         */
+        if (sa != PRO_REGISTER_AND_MOVE) {
+                spec_i_pt = (buf[20] & 0x08);
+                all_tg_pt = (buf[20] & 0x04);
+                aptpl = (buf[20] & 0x01);
+        } else {
+                aptpl = (buf[17] & 0x01);
+                unreg = (buf[17] & 0x02);
+        }
+        /*
+         * SPEC_I_PT=1 is only valid for Service action: REGISTER
+         */
+        if (spec_i_pt && ((cdb[1] & 0x1f) != PRO_REGISTER))
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        /*
+         * From spc4r17 section 6.14:
+         *
+         * If the SPEC_I_PT bit is set to zero, the service action is not
+         * REGISTER AND MOVE, and the parameter list length is not 24, then
+         * the command shall be terminated with CHECK CONDITION status, with
+         * the sense key set to ILLEGAL REQUEST, and the additional sense
+         * code set to PARAMETER LIST LENGTH ERROR.
+         */
+        if (!(spec_i_pt) && ((cdb[1] & 0x1f) != PRO_REGISTER_AND_MOVE) &&
+            (cmd->data_length != 24)) {
+                printk(KERN_WARNING "SPC-PR: Recieved PR OUT illegal parameter"
+                        " list length: %u\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
+        }
+        /*
+         * (core_scsi3_emulate_pro_* function parameters
+         * are defined by spc4r17 Table 174:
+         * PERSISTENT_RESERVE_OUT service actions and valid parameters.
+         */
+        switch (sa) {
+        case PRO_REGISTER:
+                return core_scsi3_emulate_pro_register(cmd,
+                        res_key, sa_res_key, aptpl, all_tg_pt, spec_i_pt, 0);
+        case PRO_RESERVE:
+                return core_scsi3_emulate_pro_reserve(cmd,
+                        type, scope, res_key);
+        case PRO_RELEASE:
+                return core_scsi3_emulate_pro_release(cmd,
+                        type, scope, res_key);
+        case PRO_CLEAR:
+                return core_scsi3_emulate_pro_clear(cmd, res_key);
+        case PRO_PREEMPT:
+                return core_scsi3_emulate_pro_preempt(cmd, type, scope,
+                                        res_key, sa_res_key, 0);
+        case PRO_PREEMPT_AND_ABORT:
+                return core_scsi3_emulate_pro_preempt(cmd, type, scope,
+                                        res_key, sa_res_key, 1);
+        case PRO_REGISTER_AND_IGNORE_EXISTING_KEY:
+                return core_scsi3_emulate_pro_register(cmd,
+                        0, sa_res_key, aptpl, all_tg_pt, spec_i_pt, 1);
+        case PRO_REGISTER_AND_MOVE:
+                return core_scsi3_emulate_pro_register_and_move(cmd, res_key,
+                                sa_res_key, aptpl, unreg);
+        default:
+                printk(KERN_ERR "Unknown PERSISTENT_RESERVE_OUT service"
+                        " action: 0x%02x\n", cdb[1] & 0x1f);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        return PYX_TRANSPORT_INVALID_CDB_FIELD;
+}
+
+/*
+ * PERSISTENT_RESERVE_IN Service Action READ_KEYS
+ *
+ * See spc4r17 section 5.7.6.2 and section 6.13.2, Table 160
+ */
+static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
+{
+        struct se_device *se_dev = SE_DEV(cmd);
+        struct se_subsystem_dev *su_dev = SU_DEV(se_dev);
+        struct t10_pr_registration *pr_reg;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u32 add_len = 0, off = 8;
+
+        if (cmd->data_length < 8) {
+                printk(KERN_ERR "PRIN SA READ_KEYS SCSI Data Length: %u"
+                        " too small\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        buf[0] = ((T10_RES(su_dev)->pr_generation >> 24) & 0xff);
+        buf[1] = ((T10_RES(su_dev)->pr_generation >> 16) & 0xff);
+        buf[2] = ((T10_RES(su_dev)->pr_generation >> 8) & 0xff);
+        buf[3] = (T10_RES(su_dev)->pr_generation & 0xff);
+
+        spin_lock(&T10_RES(su_dev)->registration_lock);
+        list_for_each_entry(pr_reg, &T10_RES(su_dev)->registration_list,
+                        pr_reg_list) {
+                /*
+                 * Check for overflow of 8byte PRI READ_KEYS payload and
+                 * next reservation key list descriptor.
+                 */
+                if ((add_len + 8) > (cmd->data_length - 8))
+                        break;
+
+                buf[off++] = ((pr_reg->pr_res_key >> 56) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 48) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 40) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 32) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 24) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 16) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 8) & 0xff);
+                buf[off++] = (pr_reg->pr_res_key & 0xff);
+
+                add_len += 8;
+        }
+        spin_unlock(&T10_RES(su_dev)->registration_lock);
+
+        buf[4] = ((add_len >> 24) & 0xff);
+        buf[5] = ((add_len >> 16) & 0xff);
+        buf[6] = ((add_len >> 8) & 0xff);
+        buf[7] = (add_len & 0xff);
+
+        return 0;
+}
+
+/*
+ * PERSISTENT_RESERVE_IN Service Action READ_RESERVATION
+ *
+ * See spc4r17 section 5.7.6.3 and section 6.13.3.2 Table 161 and 162
+ */
+static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
+{
+        struct se_device *se_dev = SE_DEV(cmd);
+        struct se_subsystem_dev *su_dev = SU_DEV(se_dev);
+        struct t10_pr_registration *pr_reg;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u64 pr_res_key;
+        u32 add_len = 16; /* Hardcoded to 16 when a reservation is held. */
+
+        if (cmd->data_length < 8) {
+                printk(KERN_ERR "PRIN SA READ_RESERVATIONS SCSI Data Length: %u"
+                        " too small\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        buf[0] = ((T10_RES(su_dev)->pr_generation >> 24) & 0xff);
+        buf[1] = ((T10_RES(su_dev)->pr_generation >> 16) & 0xff);
+        buf[2] = ((T10_RES(su_dev)->pr_generation >> 8) & 0xff);
+        buf[3] = (T10_RES(su_dev)->pr_generation & 0xff);
+
+        spin_lock(&se_dev->dev_reservation_lock);
+        pr_reg = se_dev->dev_pr_res_holder;
+        if ((pr_reg)) {
+                /*
+                 * Set the hardcoded Additional Length
+                 */
+                buf[4] = ((add_len >> 24) & 0xff);
+                buf[5] = ((add_len >> 16) & 0xff);
+                buf[6] = ((add_len >> 8) & 0xff);
+                buf[7] = (add_len & 0xff);
+
+                if (cmd->data_length < 22) {
+                        spin_unlock(&se_dev->dev_reservation_lock);
+                        return 0;
+                }
+                /*
+                 * Set the Reservation key.
+                 *
+                 * From spc4r17, section 5.7.10:
+                 * A persistent reservation holder has its reservation key
+                 * returned in the parameter data from a PERSISTENT
+                 * RESERVE IN command with READ RESERVATION service action as
+                 * follows:
+                 * a) For a persistent reservation of the type Write Exclusive
+                 *    - All Registrants or Exclusive Access ­ All Regitrants,
+                 *      the reservation key shall be set to zero; or
+                 * b) For all other persistent reservation types, the
+                 *    reservation key shall be set to the registered
+                 *    reservation key for the I_T nexus that holds the
+                 *    persistent reservation.
+                 */
+                if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
+                    (pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG))
+                        pr_res_key = 0;
+                else
+                        pr_res_key = pr_reg->pr_res_key;
+
+                buf[8] = ((pr_res_key >> 56) & 0xff);
+                buf[9] = ((pr_res_key >> 48) & 0xff);
+                buf[10] = ((pr_res_key >> 40) & 0xff);
+                buf[11] = ((pr_res_key >> 32) & 0xff);
+                buf[12] = ((pr_res_key >> 24) & 0xff);
+                buf[13] = ((pr_res_key >> 16) & 0xff);
+                buf[14] = ((pr_res_key >> 8) & 0xff);
+                buf[15] = (pr_res_key & 0xff);
+                /*
+                 * Set the SCOPE and TYPE
+                 */
+                buf[21] = (pr_reg->pr_res_scope & 0xf0) |
+                          (pr_reg->pr_res_type & 0x0f);
+        }
+        spin_unlock(&se_dev->dev_reservation_lock);
+
+        return 0;
+}
+
+/*
+ * PERSISTENT_RESERVE_IN Service Action REPORT_CAPABILITIES
+ *
+ * See spc4r17 section 6.13.4 Table 165
+ */
+static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(dev)->t10_reservation;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u16 add_len = 8; /* Hardcoded to 8. */
+
+        if (cmd->data_length < 6) {
+                printk(KERN_ERR "PRIN SA REPORT_CAPABILITIES SCSI Data Length:"
+                        " %u too small\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        buf[0] = ((add_len << 8) & 0xff);
+        buf[1] = (add_len & 0xff);
+        buf[2] |= 0x10; /* CRH: Compatible Reservation Hanlding bit. */
+        buf[2] |= 0x08; /* SIP_C: Specify Initiator Ports Capable bit */
+        buf[2] |= 0x04; /* ATP_C: All Target Ports Capable bit */
+        buf[2] |= 0x01; /* PTPL_C: Persistence across Target Power Loss bit */
+        /*
+         * We are filling in the PERSISTENT RESERVATION TYPE MASK below, so
+         * set the TMV: Task Mask Valid bit.
+         */
+        buf[3] |= 0x80;
+        /*
+         * Change ALLOW COMMANDs to 0x20 or 0x40 later from Table 166
+         */
+        buf[3] |= 0x10; /* ALLOW COMMANDs field 001b */
+        /*
+         * PTPL_A: Persistence across Target Power Loss Active bit
+         */
+        if (pr_tmpl->pr_aptpl_active)
+                buf[3] |= 0x01;
+        /*
+         * Setup the PERSISTENT RESERVATION TYPE MASK from Table 167
+         */
+        buf[4] |= 0x80; /* PR_TYPE_EXCLUSIVE_ACCESS_ALLREG */
+        buf[4] |= 0x40; /* PR_TYPE_EXCLUSIVE_ACCESS_REGONLY */
+        buf[4] |= 0x20; /* PR_TYPE_WRITE_EXCLUSIVE_REGONLY */
+        buf[4] |= 0x08; /* PR_TYPE_EXCLUSIVE_ACCESS */
+        buf[4] |= 0x02; /* PR_TYPE_WRITE_EXCLUSIVE */
+        buf[5] |= 0x01; /* PR_TYPE_EXCLUSIVE_ACCESS_ALLREG */
+
+        return 0;
+}
+
+/*
+ * PERSISTENT_RESERVE_IN Service Action READ_FULL_STATUS
+ *
+ * See spc4r17 section 6.13.5 Table 168 and 169
+ */
+static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
+{
+        struct se_device *se_dev = SE_DEV(cmd);
+        struct se_node_acl *se_nacl;
+        struct se_subsystem_dev *su_dev = SU_DEV(se_dev);
+        struct se_portal_group *se_tpg;
+        struct t10_pr_registration *pr_reg, *pr_reg_tmp;
+        struct t10_reservation_template *pr_tmpl = &SU_DEV(se_dev)->t10_reservation;
+        unsigned char *buf = (unsigned char *)T_TASK(cmd)->t_task_buf;
+        u32 add_desc_len = 0, add_len = 0, desc_len, exp_desc_len;
+        u32 off = 8; /* off into first Full Status descriptor */
+        int format_code = 0;
+
+        if (cmd->data_length < 8) {
+                printk(KERN_ERR "PRIN SA READ_FULL_STATUS SCSI Data Length: %u"
+                        " too small\n", cmd->data_length);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+        buf[0] = ((T10_RES(su_dev)->pr_generation >> 24) & 0xff);
+        buf[1] = ((T10_RES(su_dev)->pr_generation >> 16) & 0xff);
+        buf[2] = ((T10_RES(su_dev)->pr_generation >> 8) & 0xff);
+        buf[3] = (T10_RES(su_dev)->pr_generation & 0xff);
+
+        spin_lock(&pr_tmpl->registration_lock);
+        list_for_each_entry_safe(pr_reg, pr_reg_tmp,
+                        &pr_tmpl->registration_list, pr_reg_list) {
+
+                se_nacl = pr_reg->pr_reg_nacl;
+                se_tpg = pr_reg->pr_reg_nacl->se_tpg;
+                add_desc_len = 0;
+
+                atomic_inc(&pr_reg->pr_res_holders);
+                smp_mb__after_atomic_inc();
+                spin_unlock(&pr_tmpl->registration_lock);
+                /*
+                 * Determine expected length of $FABRIC_MOD specific
+                 * TransportID full status descriptor..
+                 */
+                exp_desc_len = TPG_TFO(se_tpg)->tpg_get_pr_transport_id_len(
+                                se_tpg, se_nacl, pr_reg, &format_code);
+
+                if ((exp_desc_len + add_len) > cmd->data_length) {
+                        printk(KERN_WARNING "SPC-3 PRIN READ_FULL_STATUS ran"
+                                " out of buffer: %d\n", cmd->data_length);
+                        spin_lock(&pr_tmpl->registration_lock);
+                        atomic_dec(&pr_reg->pr_res_holders);
+                        smp_mb__after_atomic_dec();
+                        break;
+                }
+                /*
+                 * Set RESERVATION KEY
+                 */
+                buf[off++] = ((pr_reg->pr_res_key >> 56) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 48) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 40) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 32) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 24) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 16) & 0xff);
+                buf[off++] = ((pr_reg->pr_res_key >> 8) & 0xff);
+                buf[off++] = (pr_reg->pr_res_key & 0xff);
+                off += 4; /* Skip Over Reserved area */
+
+                /*
+                 * Set ALL_TG_PT bit if PROUT SA REGISTER had this set.
+                 */
+                if (pr_reg->pr_reg_all_tg_pt)
+                        buf[off] = 0x02;
+                /*
+                 * The struct se_lun pointer will be present for the
+                 * reservation holder for PR_HOLDER bit.
+                 *
+                 * Also, if this registration is the reservation
+                 * holder, fill in SCOPE and TYPE in the next byte.
+                 */
+                if (pr_reg->pr_res_holder) {
+                        buf[off++] |= 0x01;
+                        buf[off++] = (pr_reg->pr_res_scope & 0xf0) |
+                                     (pr_reg->pr_res_type & 0x0f);
+                } else
+                        off += 2;
+
+                off += 4; /* Skip over reserved area */
+                /*
+                 * From spc4r17 6.3.15:
+                 *
+                 * If the ALL_TG_PT bit set to zero, the RELATIVE TARGET PORT
+                 * IDENTIFIER field contains the relative port identifier (see
+                 * 3.1.120) of the target port that is part of the I_T nexus
+                 * described by this full status descriptor. If the ALL_TG_PT
+                 * bit is set to one, the contents of the RELATIVE TARGET PORT
+                 * IDENTIFIER field are not defined by this standard.
+                 */
+                if (!(pr_reg->pr_reg_all_tg_pt)) {
+                        struct se_port *port = pr_reg->pr_reg_tg_pt_lun->lun_sep;
+
+                        buf[off++] = ((port->sep_rtpi >> 8) & 0xff);
+                        buf[off++] = (port->sep_rtpi & 0xff);
+                } else
+                        off += 2; /* Skip over RELATIVE TARGET PORT IDENTIFER */
+
+                /*
+                 * Now, have the $FABRIC_MOD fill in the protocol identifier
+                 */
+                desc_len = TPG_TFO(se_tpg)->tpg_get_pr_transport_id(se_tpg,
+                                se_nacl, pr_reg, &format_code, &buf[off+4]);
+
+                spin_lock(&pr_tmpl->registration_lock);
+                atomic_dec(&pr_reg->pr_res_holders);
+                smp_mb__after_atomic_dec();
+                /*
+                 * Set the ADDITIONAL DESCRIPTOR LENGTH
+                 */
+                buf[off++] = ((desc_len >> 24) & 0xff);
+                buf[off++] = ((desc_len >> 16) & 0xff);
+                buf[off++] = ((desc_len >> 8) & 0xff);
+                buf[off++] = (desc_len & 0xff);
+                /*
+                 * Size of full desctipor header minus TransportID
+                 * containing $FABRIC_MOD specific) initiator device/port
+                 * WWN information.
+                 *
+                 *  See spc4r17 Section 6.13.5 Table 169
+                 */
+                add_desc_len = (24 + desc_len);
+
+                off += desc_len;
+                add_len += add_desc_len;
+        }
+        spin_unlock(&pr_tmpl->registration_lock);
+        /*
+         * Set ADDITIONAL_LENGTH
+         */
+        buf[4] = ((add_len >> 24) & 0xff);
+        buf[5] = ((add_len >> 16) & 0xff);
+        buf[6] = ((add_len >> 8) & 0xff);
+        buf[7] = (add_len & 0xff);
+
+        return 0;
+}
+
+static int core_scsi3_emulate_pr_in(struct se_cmd *cmd, unsigned char *cdb)
+{
+        switch (cdb[1] & 0x1f) {
+        case PRI_READ_KEYS:
+                return core_scsi3_pri_read_keys(cmd);
+        case PRI_READ_RESERVATION:
+                return core_scsi3_pri_read_reservation(cmd);
+        case PRI_REPORT_CAPABILITIES:
+                return core_scsi3_pri_report_capabilities(cmd);
+        case PRI_READ_FULL_STATUS:
+                return core_scsi3_pri_read_full_status(cmd);
+        default:
+                printk(KERN_ERR "Unknown PERSISTENT_RESERVE_IN service"
+                        " action: 0x%02x\n", cdb[1] & 0x1f);
+                return PYX_TRANSPORT_INVALID_CDB_FIELD;
+        }
+
+}
+
+int core_scsi3_emulate_pr(struct se_cmd *cmd)
+{
+        unsigned char *cdb = &T_TASK(cmd)->t_task_cdb[0];
+        struct se_device *dev = cmd->se_dev;
+        /*
+         * Following spc2r20 5.5.1 Reservations overview:
+         *
+         * If a logical unit has been reserved by any RESERVE command and is
+         * still reserved by any initiator, all PERSISTENT RESERVE IN and all
+         * PERSISTENT RESERVE OUT commands shall conflict regardless of
+         * initiator or service action and shall terminate with a RESERVATION
+         * CONFLICT status.
+         */
+        if (dev->dev_flags & DF_SPC2_RESERVATIONS) {
+                printk(KERN_ERR "Received PERSISTENT_RESERVE CDB while legacy"
+                        " SPC-2 reservation is held, returning"
+                        " RESERVATION_CONFLICT\n");
+                return PYX_TRANSPORT_RESERVATION_CONFLICT;
+        }
+
+        return (cdb[0] == PERSISTENT_RESERVE_OUT) ?
+               core_scsi3_emulate_pr_out(cmd, cdb) :
+               core_scsi3_emulate_pr_in(cmd, cdb);
+}
+
+static int core_pt_reservation_check(struct se_cmd *cmd, u32 *pr_res_type)
+{
+        return 0;
+}
+
+static int core_pt_seq_non_holder(
+        struct se_cmd *cmd,
+        unsigned char *cdb,
+        u32 pr_reg_type)
+{
+        return 0;
+}
+
+int core_setup_reservations(struct se_device *dev, int force_pt)
+{
+        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
+        struct t10_reservation_template *rest = &su_dev->t10_reservation;
+        /*
+         * If this device is from Target_Core_Mod/pSCSI, use the reservations
+         * of the Underlying SCSI hardware.  In Linux/SCSI terms, this can
+         * cause a problem because libata and some SATA RAID HBAs appear
+         * under Linux/SCSI, but to emulate reservations themselves.
+         */
+        if (((TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) &&
+            !(DEV_ATTRIB(dev)->emulate_reservations)) || force_pt) {
+                rest->res_type = SPC_PASSTHROUGH;
+                rest->pr_ops.t10_reservation_check = &core_pt_reservation_check;
+                rest->pr_ops.t10_seq_non_holder = &core_pt_seq_non_holder;
+                printk(KERN_INFO "%s: Using SPC_PASSTHROUGH, no reservation"
+                        " emulation\n", TRANSPORT(dev)->name);
+                return 0;
+        }
+        /*
+         * If SPC-3 or above is reported by real or emulated struct se_device,
+         * use emulated Persistent Reservations.
+         */
+        if (TRANSPORT(dev)->get_device_rev(dev) >= SCSI_3) {
+                rest->res_type = SPC3_PERSISTENT_RESERVATIONS;
+                rest->pr_ops.t10_reservation_check = &core_scsi3_pr_reservation_check;
+                rest->pr_ops.t10_seq_non_holder = &core_scsi3_pr_seq_non_holder;
+                printk(KERN_INFO "%s: Using SPC3_PERSISTENT_RESERVATIONS"
+                        " emulation\n", TRANSPORT(dev)->name);
+        } else {
+                rest->res_type = SPC2_RESERVATIONS;
+                rest->pr_ops.t10_reservation_check = &core_scsi2_reservation_check;
+                rest->pr_ops.t10_seq_non_holder =
+                                &core_scsi2_reservation_seq_non_holder;
+                printk(KERN_INFO "%s: Using SPC2_RESERVATIONS emulation\n",
+                        TRANSPORT(dev)->name);
+        }
+
+        return 0;
+}
diff --git a/drivers/target/target_core_pr.h b/drivers/target/target_core_pr.h
new file mode 100644
index 000000000000..5603bcfd86d3
--- /dev/null
+++ b/drivers/target/target_core_pr.h
@@ -0,0 +1,67 @@
+#ifndef TARGET_CORE_PR_H
+#define TARGET_CORE_PR_H
+/*
+ * PERSISTENT_RESERVE_OUT service action codes
+ *
+ * spc4r17 section 6.14.2 Table 171
+ */
+#define PRO_REGISTER                            0x00
+#define PRO_RESERVE                             0x01
+#define PRO_RELEASE                             0x02
+#define PRO_CLEAR                               0x03
+#define PRO_PREEMPT                             0x04
+#define PRO_PREEMPT_AND_ABORT                   0x05
+#define PRO_REGISTER_AND_IGNORE_EXISTING_KEY    0x06
+#define PRO_REGISTER_AND_MOVE                   0x07
+/*
+ * PERSISTENT_RESERVE_IN service action codes
+ *
+ * spc4r17 section 6.13.1 Table 159
+ */
+#define PRI_READ_KEYS                           0x00
+#define PRI_READ_RESERVATION                    0x01
+#define PRI_REPORT_CAPABILITIES                 0x02
+#define PRI_READ_FULL_STATUS                    0x03
+/*
+ * PERSISTENT_RESERVE_ SCOPE field
+ *
+ * spc4r17 section 6.13.3.3 Table 163
+ */
+#define PR_SCOPE_LU_SCOPE                       0x00
+/*
+ * PERSISTENT_RESERVE_* TYPE field
+ *
+ * spc4r17 section 6.13.3.4 Table 164
+ */
+#define PR_TYPE_WRITE_EXCLUSIVE                 0x01
+#define PR_TYPE_EXCLUSIVE_ACCESS                0x03
+#define PR_TYPE_WRITE_EXCLUSIVE_REGONLY         0x05
+#define PR_TYPE_EXCLUSIVE_ACCESS_REGONLY        0x06
+#define PR_TYPE_WRITE_EXCLUSIVE_ALLREG          0x07
+#define PR_TYPE_EXCLUSIVE_ACCESS_ALLREG         0x08
+
+#define PR_APTPL_MAX_IPORT_LEN                  256
+#define PR_APTPL_MAX_TPORT_LEN                  256
+
+extern struct kmem_cache *t10_pr_reg_cache;
+
+extern int core_pr_dump_initiator_port(struct t10_pr_registration *,
+                        char *, u32);
+extern int core_scsi2_emulate_crh(struct se_cmd *);
+extern int core_scsi3_alloc_aptpl_registration(
+                        struct t10_reservation_template *, u64,
+                        unsigned char *, unsigned char *, u32,
+                        unsigned char *, u16, u32, int, int, u8);
+extern int core_scsi3_check_aptpl_registration(struct se_device *,
+                        struct se_portal_group *, struct se_lun *,
+                        struct se_lun_acl *);
+extern void core_scsi3_free_pr_reg_from_nacl(struct se_device *,
+                                             struct se_node_acl *);
+extern void core_scsi3_free_all_registrations(struct se_device *);
+extern unsigned char *core_scsi3_pr_dump_type(int);
+extern int core_scsi3_check_cdb_abort_and_preempt(struct list_head *,
+                                                  struct se_cmd *);
+extern int core_scsi3_emulate_pr(struct se_cmd *);
+extern int core_setup_reservations(struct se_device *, int);
+
+#endif /* TARGET_CORE_PR_H */
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
new file mode 100644
index 000000000000..742d24609a9b
--- /dev/null
+++ b/drivers/target/target_core_pscsi.c
@@ -0,0 +1,1470 @@
+/*******************************************************************************
+ * Filename:  target_core_pscsi.c
+ *
+ * This file contains the generic target mode <-> Linux SCSI subsystem plugin.
+ *
+ * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/string.h>
+#include <linux/parser.h>
+#include <linux/timer.h>
+#include <linux/blkdev.h>
+#include <linux/blk_types.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/genhd.h>
+#include <linux/cdrom.h>
+#include <linux/file.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_host.h>
+#include <scsi/libsas.h> /* For TASK_ATTR_* */
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+
+#include "target_core_pscsi.h"
+
+#define ISPRINT(a)  ((a >= ' ') && (a <= '~'))
+
+static struct se_subsystem_api pscsi_template;
+
+static void pscsi_req_done(struct request *, int);
+
+/*      pscsi_get_sh():
+ *
+ *
+ */
+static struct Scsi_Host *pscsi_get_sh(u32 host_no)
+{
+        struct Scsi_Host *sh = NULL;
+
+        sh = scsi_host_lookup(host_no);
+        if (IS_ERR(sh)) {
+                printk(KERN_ERR "Unable to locate SCSI HBA with Host ID:"
+                                " %u\n", host_no);
+                return NULL;
+        }
+
+        return sh;
+}
+
+/*      pscsi_attach_hba():
+ *
+ *      pscsi_get_sh() used scsi_host_lookup() to locate struct Scsi_Host.
+ *      from the passed SCSI Host ID.
+ */
+static int pscsi_attach_hba(struct se_hba *hba, u32 host_id)
+{
+        int hba_depth;
+        struct pscsi_hba_virt *phv;
+
+        phv = kzalloc(sizeof(struct pscsi_hba_virt), GFP_KERNEL);
+        if (!(phv)) {
+                printk(KERN_ERR "Unable to allocate struct pscsi_hba_virt\n");
+                return -1;
+        }
+        phv->phv_host_id = host_id;
+        phv->phv_mode = PHV_VIRUTAL_HOST_ID;
+        hba_depth = PSCSI_VIRTUAL_HBA_DEPTH;
+        atomic_set(&hba->left_queue_depth, hba_depth);
+        atomic_set(&hba->max_queue_depth, hba_depth);
+
+        hba->hba_ptr = (void *)phv;
+
+        printk(KERN_INFO "CORE_HBA[%d] - TCM SCSI HBA Driver %s on"
+                " Generic Target Core Stack %s\n", hba->hba_id,
+                PSCSI_VERSION, TARGET_CORE_MOD_VERSION);
+        printk(KERN_INFO "CORE_HBA[%d] - Attached SCSI HBA to Generic"
+                " Target Core with TCQ Depth: %d\n", hba->hba_id,
+                atomic_read(&hba->max_queue_depth));
+
+        return 0;
+}
+
+static void pscsi_detach_hba(struct se_hba *hba)
+{
+        struct pscsi_hba_virt *phv = hba->hba_ptr;
+        struct Scsi_Host *scsi_host = phv->phv_lld_host;
+
+        if (scsi_host) {
+                scsi_host_put(scsi_host);
+
+                printk(KERN_INFO "CORE_HBA[%d] - Detached SCSI HBA: %s from"
+                        " Generic Target Core\n", hba->hba_id,
+                        (scsi_host->hostt->name) ? (scsi_host->hostt->name) :
+                        "Unknown");
+        } else
+                printk(KERN_INFO "CORE_HBA[%d] - Detached Virtual SCSI HBA"
+                        " from Generic Target Core\n", hba->hba_id);
+
+        kfree(phv);
+        hba->hba_ptr = NULL;
+}
+
+static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag)
+{
+        struct pscsi_hba_virt *phv = (struct pscsi_hba_virt *)hba->hba_ptr;
+        struct Scsi_Host *sh = phv->phv_lld_host;
+        int hba_depth = PSCSI_VIRTUAL_HBA_DEPTH;
+        /*
+         * Release the struct Scsi_Host
+         */
+        if (!(mode_flag)) {
+                if (!(sh))
+                        return 0;
+
+                phv->phv_lld_host = NULL;
+                phv->phv_mode = PHV_VIRUTAL_HOST_ID;
+                atomic_set(&hba->left_queue_depth, hba_depth);
+                atomic_set(&hba->max_queue_depth, hba_depth);
+
+                printk(KERN_INFO "CORE_HBA[%d] - Disabled pSCSI HBA Passthrough"
+                        " %s\n", hba->hba_id, (sh->hostt->name) ?
+                        (sh->hostt->name) : "Unknown");
+
+                scsi_host_put(sh);
+                return 0;
+        }
+        /*
+         * Otherwise, locate struct Scsi_Host from the original passed
+         * pSCSI Host ID and enable for phba mode
+         */
+        sh = pscsi_get_sh(phv->phv_host_id);
+        if (!(sh)) {
+                printk(KERN_ERR "pSCSI: Unable to locate SCSI Host for"
+                        " phv_host_id: %d\n", phv->phv_host_id);
+                return -1;
+        }
+        /*
+         * Usually the SCSI LLD will use the hostt->can_queue value to define
+         * its HBA TCQ depth.  Some other drivers (like 2.6 megaraid) don't set
+         * this at all and set sh->can_queue at runtime.
+         */
+        hba_depth = (sh->hostt->can_queue > sh->can_queue) ?
+                sh->hostt->can_queue : sh->can_queue;
+
+        atomic_set(&hba->left_queue_depth, hba_depth);
+        atomic_set(&hba->max_queue_depth, hba_depth);
+
+        phv->phv_lld_host = sh;
+        phv->phv_mode = PHV_LLD_SCSI_HOST_NO;
+
+        printk(KERN_INFO "CORE_HBA[%d] - Enabled pSCSI HBA Passthrough %s\n",
+                hba->hba_id, (sh->hostt->name) ? (sh->hostt->name) : "Unknown");
+
+        return 1;
+}
+
+static void pscsi_tape_read_blocksize(struct se_device *dev,
+                struct scsi_device *sdev)
+{
+        unsigned char cdb[MAX_COMMAND_SIZE], *buf;
+        int ret;
+
+        buf = kzalloc(12, GFP_KERNEL);
+        if (!buf)
+                return;
+
+        memset(cdb, 0, MAX_COMMAND_SIZE);
+        cdb[0] = MODE_SENSE;
+        cdb[4] = 0x0c; /* 12 bytes */
+
+        ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf, 12, NULL,
+                        HZ, 1, NULL);
+        if (ret)
+                goto out_free;
+
+        /*
+         * If MODE_SENSE still returns zero, set the default value to 1024.
+         */
+        sdev->sector_size = (buf[9] << 16) | (buf[10] << 8) | (buf[11]);
+        if (!sdev->sector_size)
+                sdev->sector_size = 1024;
+out_free:
+        kfree(buf);
+}
+
+static void
+pscsi_set_inquiry_info(struct scsi_device *sdev, struct t10_wwn *wwn)
+{
+        unsigned char *buf;
+
+        if (sdev->inquiry_len < INQUIRY_LEN)
+                return;
+
+        buf = sdev->inquiry;
+        if (!buf)
+                return;
+        /*
+         * Use sdev->inquiry from drivers/scsi/scsi_scan.c:scsi_alloc_sdev()
+         */
+        memcpy(&wwn->vendor[0], &buf[8], sizeof(wwn->vendor));
+        memcpy(&wwn->model[0], &buf[16], sizeof(wwn->model));
+        memcpy(&wwn->revision[0], &buf[32], sizeof(wwn->revision));
+}
+
+static int
+pscsi_get_inquiry_vpd_serial(struct scsi_device *sdev, struct t10_wwn *wwn)
+{
+        unsigned char cdb[MAX_COMMAND_SIZE], *buf;
+        int ret;
+
+        buf = kzalloc(INQUIRY_VPD_SERIAL_LEN, GFP_KERNEL);
+        if (!buf)
+                return -1;
+
+        memset(cdb, 0, MAX_COMMAND_SIZE);
+        cdb[0] = INQUIRY;
+        cdb[1] = 0x01; /* Query VPD */
+        cdb[2] = 0x80; /* Unit Serial Number */
+        cdb[3] = (INQUIRY_VPD_SERIAL_LEN >> 8) & 0xff;
+        cdb[4] = (INQUIRY_VPD_SERIAL_LEN & 0xff);
+
+        ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,
+                              INQUIRY_VPD_SERIAL_LEN, NULL, HZ, 1, NULL);
+        if (ret)
+                goto out_free;
+
+        snprintf(&wwn->unit_serial[0], INQUIRY_VPD_SERIAL_LEN, "%s", &buf[4]);
+
+        wwn->t10_sub_dev->su_dev_flags |= SDF_FIRMWARE_VPD_UNIT_SERIAL;
+
+        kfree(buf);
+        return 0;
+
+out_free:
+        kfree(buf);
+        return -1;
+}
+
+static void
+pscsi_get_inquiry_vpd_device_ident(struct scsi_device *sdev,
+                struct t10_wwn *wwn)
+{
+        unsigned char cdb[MAX_COMMAND_SIZE], *buf, *page_83;
+        int ident_len, page_len, off = 4, ret;
+        struct t10_vpd *vpd;
+
+        buf = kzalloc(INQUIRY_VPD_SERIAL_LEN, GFP_KERNEL);
+        if (!buf)
+                return;
+
+        memset(cdb, 0, MAX_COMMAND_SIZE);
+        cdb[0] = INQUIRY;
+        cdb[1] = 0x01; /* Query VPD */
+        cdb[2] = 0x83; /* Device Identifier */
+        cdb[3] = (INQUIRY_VPD_DEVICE_IDENTIFIER_LEN >> 8) & 0xff;
+        cdb[4] = (INQUIRY_VPD_DEVICE_IDENTIFIER_LEN & 0xff);
+
+        ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,
+                              INQUIRY_VPD_DEVICE_IDENTIFIER_LEN,
+                              NULL, HZ, 1, NULL);
+        if (ret)
+                goto out;
+
+        page_len = (buf[2] << 8) | buf[3];
+        while (page_len > 0) {
+                /* Grab a pointer to the Identification descriptor */
+                page_83 = &buf[off];
+                ident_len = page_83[3];
+                if (!ident_len) {
+                        printk(KERN_ERR "page_83[3]: identifier"
+                                        " length zero!\n");
+                        break;
+                }
+                printk(KERN_INFO "T10 VPD Identifer Length: %d\n", ident_len);
+
+                vpd = kzalloc(sizeof(struct t10_vpd), GFP_KERNEL);
+                if (!vpd) {
+                        printk(KERN_ERR "Unable to allocate memory for"
+                                        " struct t10_vpd\n");
+                        goto out;
+                }
+                INIT_LIST_HEAD(&vpd->vpd_list);
+
+                transport_set_vpd_proto_id(vpd, page_83);
+                transport_set_vpd_assoc(vpd, page_83);
+
+                if (transport_set_vpd_ident_type(vpd, page_83) < 0) {
+                        off += (ident_len + 4);
+                        page_len -= (ident_len + 4);
+                        kfree(vpd);
+                        continue;
+                }
+                if (transport_set_vpd_ident(vpd, page_83) < 0) {
+                        off += (ident_len + 4);
+                        page_len -= (ident_len + 4);
+                        kfree(vpd);
+                        continue;
+                }
+
+                list_add_tail(&vpd->vpd_list, &wwn->t10_vpd_list);
+                off += (ident_len + 4);
+                page_len -= (ident_len + 4);
+        }
+
+out:
+        kfree(buf);
+}
+
+/*      pscsi_add_device_to_list():
+ *
+ *
+ */
+static struct se_device *pscsi_add_device_to_list(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        struct pscsi_dev_virt *pdv,
+        struct scsi_device *sd,
+        int dev_flags)
+{
+        struct se_device *dev;
+        struct se_dev_limits dev_limits;
+        struct request_queue *q;
+        struct queue_limits *limits;
+
+        memset(&dev_limits, 0, sizeof(struct se_dev_limits));
+
+        if (!sd->queue_depth) {
+                sd->queue_depth = PSCSI_DEFAULT_QUEUEDEPTH;
+
+                printk(KERN_ERR "Set broken SCSI Device %d:%d:%d"
+                        " queue_depth to %d\n", sd->channel, sd->id,
+                                sd->lun, sd->queue_depth);
+        }
+        /*
+         * Setup the local scope queue_limits from struct request_queue->limits
+         * to pass into transport_add_device_to_core_hba() as struct se_dev_limits.
+         */
+        q = sd->request_queue;
+        limits = &dev_limits.limits;
+        limits->logical_block_size = sd->sector_size;
+        limits->max_hw_sectors = (sd->host->max_sectors > queue_max_hw_sectors(q)) ?
+                                  queue_max_hw_sectors(q) : sd->host->max_sectors;
+        limits->max_sectors = (sd->host->max_sectors > queue_max_sectors(q)) ?
+                                  queue_max_sectors(q) : sd->host->max_sectors;
+        dev_limits.hw_queue_depth = sd->queue_depth;
+        dev_limits.queue_depth = sd->queue_depth;
+        /*
+         * Setup our standard INQUIRY info into se_dev->t10_wwn
+         */
+        pscsi_set_inquiry_info(sd, &se_dev->t10_wwn);
+
+        /*
+         * Set the pointer pdv->pdv_sd to from passed struct scsi_device,
+         * which has already been referenced with Linux SCSI code with
+         * scsi_device_get() in this file's pscsi_create_virtdevice().
+         *
+         * The passthrough operations called by the transport_add_device_*
+         * function below will require this pointer to be set for passthroug
+         *  ops.
+         *
+         * For the shutdown case in pscsi_free_device(), this struct
+         * scsi_device  reference is released with Linux SCSI code
+         * scsi_device_put() and the pdv->pdv_sd cleared.
+         */
+        pdv->pdv_sd = sd;
+
+        dev = transport_add_device_to_core_hba(hba, &pscsi_template,
+                                se_dev, dev_flags, (void *)pdv,
+                                &dev_limits, NULL, NULL);
+        if (!(dev)) {
+                pdv->pdv_sd = NULL;
+                return NULL;
+        }
+
+        /*
+         * Locate VPD WWN Information used for various purposes within
+         * the Storage Engine.
+         */
+        if (!pscsi_get_inquiry_vpd_serial(sd, &se_dev->t10_wwn)) {
+                /*
+                 * If VPD Unit Serial returned GOOD status, try
+                 * VPD Device Identification page (0x83).
+                 */
+                pscsi_get_inquiry_vpd_device_ident(sd, &se_dev->t10_wwn);
+        }
+
+        /*
+         * For TYPE_TAPE, attempt to determine blocksize with MODE_SENSE.
+         */
+        if (sd->type == TYPE_TAPE)
+                pscsi_tape_read_blocksize(dev, sd);
+        return dev;
+}
+
+static void *pscsi_allocate_virtdevice(struct se_hba *hba, const char *name)
+{
+        struct pscsi_dev_virt *pdv;
+
+        pdv = kzalloc(sizeof(struct pscsi_dev_virt), GFP_KERNEL);
+        if (!(pdv)) {
+                printk(KERN_ERR "Unable to allocate memory for struct pscsi_dev_virt\n");
+                return NULL;
+        }
+        pdv->pdv_se_hba = hba;
+
+        printk(KERN_INFO "PSCSI: Allocated pdv: %p for %s\n", pdv, name);
+        return (void *)pdv;
+}
+
+/*
+ * Called with struct Scsi_Host->host_lock called.
+ */
+static struct se_device *pscsi_create_type_disk(
+        struct scsi_device *sd,
+        struct pscsi_dev_virt *pdv,
+        struct se_subsystem_dev *se_dev,
+        struct se_hba *hba)
+{
+        struct se_device *dev;
+        struct pscsi_hba_virt *phv = (struct pscsi_hba_virt *)pdv->pdv_se_hba->hba_ptr;
+        struct Scsi_Host *sh = sd->host;
+        struct block_device *bd;
+        u32 dev_flags = 0;
+
+        if (scsi_device_get(sd)) {
+                printk(KERN_ERR "scsi_device_get() failed for %d:%d:%d:%d\n",
+                        sh->host_no, sd->channel, sd->id, sd->lun);
+                spin_unlock_irq(sh->host_lock);
+                return NULL;
+        }
+        spin_unlock_irq(sh->host_lock);
+        /*
+         * Claim exclusive struct block_device access to struct scsi_device
+         * for TYPE_DISK using supplied udev_path
+         */
+        bd = blkdev_get_by_path(se_dev->se_dev_udev_path,
+                                FMODE_WRITE|FMODE_READ|FMODE_EXCL, pdv);
+        if (!(bd)) {
+                printk("pSCSI: blkdev_get_by_path() failed\n");
+                scsi_device_put(sd);
+                return NULL;
+        }
+        pdv->pdv_bd = bd;
+
+        dev = pscsi_add_device_to_list(hba, se_dev, pdv, sd, dev_flags);
+        if (!(dev)) {
+                blkdev_put(pdv->pdv_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
+                scsi_device_put(sd);
+                return NULL;
+        }
+        printk(KERN_INFO "CORE_PSCSI[%d] - Added TYPE_DISK for %d:%d:%d:%d\n",
+                phv->phv_host_id, sh->host_no, sd->channel, sd->id, sd->lun);
+
+        return dev;
+}
+
+/*
+ * Called with struct Scsi_Host->host_lock called.
+ */
+static struct se_device *pscsi_create_type_rom(
+        struct scsi_device *sd,
+        struct pscsi_dev_virt *pdv,
+        struct se_subsystem_dev *se_dev,
+        struct se_hba *hba)
+{
+        struct se_device *dev;
+        struct pscsi_hba_virt *phv = (struct pscsi_hba_virt *)pdv->pdv_se_hba->hba_ptr;
+        struct Scsi_Host *sh = sd->host;
+        u32 dev_flags = 0;
+
+        if (scsi_device_get(sd)) {
+                printk(KERN_ERR "scsi_device_get() failed for %d:%d:%d:%d\n",
+                        sh->host_no, sd->channel, sd->id, sd->lun);
+                spin_unlock_irq(sh->host_lock);
+                return NULL;
+        }
+        spin_unlock_irq(sh->host_lock);
+
+        dev = pscsi_add_device_to_list(hba, se_dev, pdv, sd, dev_flags);
+        if (!(dev)) {
+                scsi_device_put(sd);
+                return NULL;
+        }
+        printk(KERN_INFO "CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%d\n",
+                phv->phv_host_id, scsi_device_type(sd->type), sh->host_no,
+                sd->channel, sd->id, sd->lun);
+
+        return dev;
+}
+
+/*
+ *Called with struct Scsi_Host->host_lock called.
+ */
+static struct se_device *pscsi_create_type_other(
+        struct scsi_device *sd,
+        struct pscsi_dev_virt *pdv,
+        struct se_subsystem_dev *se_dev,
+        struct se_hba *hba)
+{
+        struct se_device *dev;
+        struct pscsi_hba_virt *phv = (struct pscsi_hba_virt *)pdv->pdv_se_hba->hba_ptr;
+        struct Scsi_Host *sh = sd->host;
+        u32 dev_flags = 0;
+
+        spin_unlock_irq(sh->host_lock);
+        dev = pscsi_add_device_to_list(hba, se_dev, pdv, sd, dev_flags);
+        if (!(dev))
+                return NULL;
+
+        printk(KERN_INFO "CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%d\n",
+                phv->phv_host_id, scsi_device_type(sd->type), sh->host_no,
+                sd->channel, sd->id, sd->lun);
+
+        return dev;
+}
+
+static struct se_device *pscsi_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p)
+{
+        struct pscsi_dev_virt *pdv = (struct pscsi_dev_virt *)p;
+        struct se_device *dev;
+        struct scsi_device *sd;
+        struct pscsi_hba_virt *phv = (struct pscsi_hba_virt *)hba->hba_ptr;
+        struct Scsi_Host *sh = phv->phv_lld_host;
+        int legacy_mode_enable = 0;
+
+        if (!(pdv)) {
+                printk(KERN_ERR "Unable to locate struct pscsi_dev_virt"
+                                " parameter\n");
+                return NULL;
+        }
+        /*
+         * If not running in PHV_LLD_SCSI_HOST_NO mode, locate the
+         * struct Scsi_Host we will need to bring the TCM/pSCSI object online
+         */
+        if (!(sh)) {
+                if (phv->phv_mode == PHV_LLD_SCSI_HOST_NO) {
+                        printk(KERN_ERR "pSCSI: Unable to locate struct"
+                                " Scsi_Host for PHV_LLD_SCSI_HOST_NO\n");
+                        return NULL;
+                }
+                /*
+                 * For the newer PHV_VIRUTAL_HOST_ID struct scsi_device
+                 * reference, we enforce that udev_path has been set
+                 */
+                if (!(se_dev->su_dev_flags & SDF_USING_UDEV_PATH)) {
+                        printk(KERN_ERR "pSCSI: udev_path attribute has not"
+                                " been set before ENABLE=1\n");
+                        return NULL;
+                }
+                /*
+                 * If no scsi_host_id= was passed for PHV_VIRUTAL_HOST_ID,
+                 * use the original TCM hba ID to reference Linux/SCSI Host No
+                 * and enable for PHV_LLD_SCSI_HOST_NO mode.
+                 */
+                if (!(pdv->pdv_flags & PDF_HAS_VIRT_HOST_ID)) {
+                        spin_lock(&hba->device_lock);
+                        if (!(list_empty(&hba->hba_dev_list))) {
+                                printk(KERN_ERR "pSCSI: Unable to set hba_mode"
+                                        " with active devices\n");
+                                spin_unlock(&hba->device_lock);
+                                return NULL;
+                        }
+                        spin_unlock(&hba->device_lock);
+
+                        if (pscsi_pmode_enable_hba(hba, 1) != 1)
+                                return NULL;
+
+                        legacy_mode_enable = 1;
+                        hba->hba_flags |= HBA_FLAGS_PSCSI_MODE;
+                        sh = phv->phv_lld_host;
+                } else {
+                        sh = pscsi_get_sh(pdv->pdv_host_id);
+                        if (!(sh)) {
+                                printk(KERN_ERR "pSCSI: Unable to locate"
+                                        " pdv_host_id: %d\n", pdv->pdv_host_id);
+                                return NULL;
+                        }
+                }
+        } else {
+                if (phv->phv_mode == PHV_VIRUTAL_HOST_ID) {
+                        printk(KERN_ERR "pSCSI: PHV_VIRUTAL_HOST_ID set while"
+                                " struct Scsi_Host exists\n");
+                        return NULL;
+                }
+        }
+
+        spin_lock_irq(sh->host_lock);
+        list_for_each_entry(sd, &sh->__devices, siblings) {
+                if ((pdv->pdv_channel_id != sd->channel) ||
+                    (pdv->pdv_target_id != sd->id) ||
+                    (pdv->pdv_lun_id != sd->lun))
+                        continue;
+                /*
+                 * Functions will release the held struct scsi_host->host_lock
+                 * before calling calling pscsi_add_device_to_list() to register
+                 * struct scsi_device with target_core_mod.
+                 */
+                switch (sd->type) {
+                case TYPE_DISK:
+                        dev = pscsi_create_type_disk(sd, pdv, se_dev, hba);
+                        break;
+                case TYPE_ROM:
+                        dev = pscsi_create_type_rom(sd, pdv, se_dev, hba);
+                        break;
+                default:
+                        dev = pscsi_create_type_other(sd, pdv, se_dev, hba);
+                        break;
+                }
+
+                if (!(dev)) {
+                        if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
+                                scsi_host_put(sh);
+                        else if (legacy_mode_enable) {
+                                pscsi_pmode_enable_hba(hba, 0);
+                                hba->hba_flags &= ~HBA_FLAGS_PSCSI_MODE;
+                        }
+                        pdv->pdv_sd = NULL;
+                        return NULL;
+                }
+                return dev;
+        }
+        spin_unlock_irq(sh->host_lock);
+
+        printk(KERN_ERR "pSCSI: Unable to locate %d:%d:%d:%d\n", sh->host_no,
+                pdv->pdv_channel_id,  pdv->pdv_target_id, pdv->pdv_lun_id);
+
+        if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
+                scsi_host_put(sh);
+        else if (legacy_mode_enable) {
+                pscsi_pmode_enable_hba(hba, 0);
+                hba->hba_flags &= ~HBA_FLAGS_PSCSI_MODE;
+        }
+
+        return NULL;
+}
+
+/*      pscsi_free_device(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static void pscsi_free_device(void *p)
+{
+        struct pscsi_dev_virt *pdv = p;
+        struct pscsi_hba_virt *phv = pdv->pdv_se_hba->hba_ptr;
+        struct scsi_device *sd = pdv->pdv_sd;
+
+        if (sd) {
+                /*
+                 * Release exclusive pSCSI internal struct block_device claim for
+                 * struct scsi_device with TYPE_DISK from pscsi_create_type_disk()
+                 */
+                if ((sd->type == TYPE_DISK) && pdv->pdv_bd) {
+                        blkdev_put(pdv->pdv_bd,
+                                   FMODE_WRITE|FMODE_READ|FMODE_EXCL);
+                        pdv->pdv_bd = NULL;
+                }
+                /*
+                 * For HBA mode PHV_LLD_SCSI_HOST_NO, release the reference
+                 * to struct Scsi_Host now.
+                 */
+                if ((phv->phv_mode == PHV_LLD_SCSI_HOST_NO) &&
+                    (phv->phv_lld_host != NULL))
+                        scsi_host_put(phv->phv_lld_host);
+
+                if ((sd->type == TYPE_DISK) || (sd->type == TYPE_ROM))
+                        scsi_device_put(sd);
+
+                pdv->pdv_sd = NULL;
+        }
+
+        kfree(pdv);
+}
+
+static inline struct pscsi_plugin_task *PSCSI_TASK(struct se_task *task)
+{
+        return container_of(task, struct pscsi_plugin_task, pscsi_task);
+}
+
+
+/*      pscsi_transport_complete():
+ *
+ *
+ */
+static int pscsi_transport_complete(struct se_task *task)
+{
+        struct pscsi_dev_virt *pdv = task->se_dev->dev_ptr;
+        struct scsi_device *sd = pdv->pdv_sd;
+        int result;
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        unsigned char *cdb = &pt->pscsi_cdb[0];
+
+        result = pt->pscsi_result;
+        /*
+         * Hack to make sure that Write-Protect modepage is set if R/O mode is
+         * forced.
+         */
+        if (((cdb[0] == MODE_SENSE) || (cdb[0] == MODE_SENSE_10)) &&
+             (status_byte(result) << 1) == SAM_STAT_GOOD) {
+                if (!TASK_CMD(task)->se_deve)
+                        goto after_mode_sense;
+
+                if (TASK_CMD(task)->se_deve->lun_flags &
+                                TRANSPORT_LUNFLAGS_READ_ONLY) {
+                        unsigned char *buf = (unsigned char *)
+                                T_TASK(task->task_se_cmd)->t_task_buf;
+
+                        if (cdb[0] == MODE_SENSE_10) {
+                                if (!(buf[3] & 0x80))
+                                        buf[3] |= 0x80;
+                        } else {
+                                if (!(buf[2] & 0x80))
+                                        buf[2] |= 0x80;
+                        }
+                }
+        }
+after_mode_sense:
+
+        if (sd->type != TYPE_TAPE)
+                goto after_mode_select;
+
+        /*
+         * Hack to correctly obtain the initiator requested blocksize for
+         * TYPE_TAPE.  Since this value is dependent upon each tape media,
+         * struct scsi_device->sector_size will not contain the correct value
+         * by default, so we go ahead and set it so
+         * TRANSPORT(dev)->get_blockdev() returns the correct value to the
+         * storage engine.
+         */
+        if (((cdb[0] == MODE_SELECT) || (cdb[0] == MODE_SELECT_10)) &&
+              (status_byte(result) << 1) == SAM_STAT_GOOD) {
+                unsigned char *buf;
+                struct scatterlist *sg = task->task_sg;
+                u16 bdl;
+                u32 blocksize;
+
+                buf = sg_virt(&sg[0]);
+                if (!(buf)) {
+                        printk(KERN_ERR "Unable to get buf for scatterlist\n");
+                        goto after_mode_select;
+                }
+
+                if (cdb[0] == MODE_SELECT)
+                        bdl = (buf[3]);
+                else
+                        bdl = (buf[6] << 8) | (buf[7]);
+
+                if (!bdl)
+                        goto after_mode_select;
+
+                if (cdb[0] == MODE_SELECT)
+                        blocksize = (buf[9] << 16) | (buf[10] << 8) |
+                                        (buf[11]);
+                else
+                        blocksize = (buf[13] << 16) | (buf[14] << 8) |
+                                        (buf[15]);
+
+                sd->sector_size = blocksize;
+        }
+after_mode_select:
+
+        if (status_byte(result) & CHECK_CONDITION)
+                return 1;
+
+        return 0;
+}
+
+static struct se_task *
+pscsi_alloc_task(struct se_cmd *cmd)
+{
+        struct pscsi_plugin_task *pt;
+        unsigned char *cdb = T_TASK(cmd)->t_task_cdb;
+
+        pt = kzalloc(sizeof(struct pscsi_plugin_task), GFP_KERNEL);
+        if (!pt) {
+                printk(KERN_ERR "Unable to allocate struct pscsi_plugin_task\n");
+                return NULL;
+        }
+
+        /*
+         * If TCM Core is signaling a > TCM_MAX_COMMAND_SIZE allocation,
+         * allocate the extended CDB buffer for per struct se_task context
+         * pt->pscsi_cdb now.
+         */
+        if (T_TASK(cmd)->t_task_cdb != T_TASK(cmd)->__t_task_cdb) {
+
+                pt->pscsi_cdb = kzalloc(scsi_command_size(cdb), GFP_KERNEL);
+                if (!(pt->pscsi_cdb)) {
+                        printk(KERN_ERR "pSCSI: Unable to allocate extended"
+                                        " pt->pscsi_cdb\n");
+                        return NULL;
+                }
+        } else
+                pt->pscsi_cdb = &pt->__pscsi_cdb[0];
+
+        return &pt->pscsi_task;
+}
+
+static inline void pscsi_blk_init_request(
+        struct se_task *task,
+        struct pscsi_plugin_task *pt,
+        struct request *req,
+        int bidi_read)
+{
+        /*
+         * Defined as "scsi command" in include/linux/blkdev.h.
+         */
+        req->cmd_type = REQ_TYPE_BLOCK_PC;
+        /*
+         * For the extra BIDI-COMMAND READ struct request we do not
+         * need to setup the remaining structure members
+         */
+        if (bidi_read)
+                return;
+        /*
+         * Setup the done function pointer for struct request,
+         * also set the end_io_data pointer.to struct se_task.
+         */
+        req->end_io = pscsi_req_done;
+        req->end_io_data = (void *)task;
+        /*
+         * Load the referenced struct se_task's SCSI CDB into
+         * include/linux/blkdev.h:struct request->cmd
+         */
+        req->cmd_len = scsi_command_size(pt->pscsi_cdb);
+        req->cmd = &pt->pscsi_cdb[0];
+        /*
+         * Setup pointer for outgoing sense data.
+         */
+        req->sense = (void *)&pt->pscsi_sense[0];
+        req->sense_len = 0;
+}
+
+/*
+ * Used for pSCSI data payloads for all *NON* SCF_SCSI_DATA_SG_IO_CDB
+*/
+static int pscsi_blk_get_request(struct se_task *task)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        struct pscsi_dev_virt *pdv = task->se_dev->dev_ptr;
+
+        pt->pscsi_req = blk_get_request(pdv->pdv_sd->request_queue,
+                        (task->task_data_direction == DMA_TO_DEVICE),
+                        GFP_KERNEL);
+        if (!(pt->pscsi_req) || IS_ERR(pt->pscsi_req)) {
+                printk(KERN_ERR "PSCSI: blk_get_request() failed: %ld\n",
+                                IS_ERR(pt->pscsi_req));
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        /*
+         * Setup the newly allocated struct request for REQ_TYPE_BLOCK_PC,
+         * and setup rq callback, CDB and sense.
+         */
+        pscsi_blk_init_request(task, pt, pt->pscsi_req, 0);
+        return 0;
+}
+
+/*      pscsi_do_task(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int pscsi_do_task(struct se_task *task)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        struct pscsi_dev_virt *pdv = task->se_dev->dev_ptr;
+        /*
+         * Set the struct request->timeout value based on peripheral
+         * device type from SCSI.
+         */
+        if (pdv->pdv_sd->type == TYPE_DISK)
+                pt->pscsi_req->timeout = PS_TIMEOUT_DISK;
+        else
+                pt->pscsi_req->timeout = PS_TIMEOUT_OTHER;
+
+        pt->pscsi_req->retries = PS_RETRY;
+        /*
+         * Queue the struct request into the struct scsi_device->request_queue.
+         * Also check for HEAD_OF_QUEUE SAM TASK attr from received se_cmd
+         * descriptor
+         */
+        blk_execute_rq_nowait(pdv->pdv_sd->request_queue, NULL, pt->pscsi_req,
+                        (task->task_se_cmd->sam_task_attr == TASK_ATTR_HOQ),
+                        pscsi_req_done);
+
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+static void pscsi_free_task(struct se_task *task)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        struct se_cmd *cmd = task->task_se_cmd;
+
+        /*
+         * Release the extended CDB allocation from pscsi_alloc_task()
+         * if one exists.
+         */
+        if (T_TASK(cmd)->t_task_cdb != T_TASK(cmd)->__t_task_cdb)
+                kfree(pt->pscsi_cdb);
+        /*
+         * We do not release the bio(s) here associated with this task, as
+         * this is handled by bio_put() and pscsi_bi_endio().
+         */
+        kfree(pt);
+}
+
+enum {
+        Opt_scsi_host_id, Opt_scsi_channel_id, Opt_scsi_target_id,
+        Opt_scsi_lun_id, Opt_err
+};
+
+static match_table_t tokens = {
+        {Opt_scsi_host_id, "scsi_host_id=%d"},
+        {Opt_scsi_channel_id, "scsi_channel_id=%d"},
+        {Opt_scsi_target_id, "scsi_target_id=%d"},
+        {Opt_scsi_lun_id, "scsi_lun_id=%d"},
+        {Opt_err, NULL}
+};
+
+static ssize_t pscsi_set_configfs_dev_params(struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        const char *page,
+        ssize_t count)
+{
+        struct pscsi_dev_virt *pdv = se_dev->se_dev_su_ptr;
+        struct pscsi_hba_virt *phv = hba->hba_ptr;
+        char *orig, *ptr, *opts;
+        substring_t args[MAX_OPT_ARGS];
+        int ret = 0, arg, token;
+
+        opts = kstrdup(page, GFP_KERNEL);
+        if (!opts)
+                return -ENOMEM;
+
+        orig = opts;
+
+        while ((ptr = strsep(&opts, ",")) != NULL) {
+                if (!*ptr)
+                        continue;
+
+                token = match_token(ptr, tokens, args);
+                switch (token) {
+                case Opt_scsi_host_id:
+                        if (phv->phv_mode == PHV_LLD_SCSI_HOST_NO) {
+                                printk(KERN_ERR "PSCSI[%d]: Unable to accept"
+                                        " scsi_host_id while phv_mode =="
+                                        " PHV_LLD_SCSI_HOST_NO\n",
+                                        phv->phv_host_id);
+                                ret = -EINVAL;
+                                goto out;
+                        }
+                        match_int(args, &arg);
+                        pdv->pdv_host_id = arg;
+                        printk(KERN_INFO "PSCSI[%d]: Referencing SCSI Host ID:"
+                                " %d\n", phv->phv_host_id, pdv->pdv_host_id);
+                        pdv->pdv_flags |= PDF_HAS_VIRT_HOST_ID;
+                        break;
+                case Opt_scsi_channel_id:
+                        match_int(args, &arg);
+                        pdv->pdv_channel_id = arg;
+                        printk(KERN_INFO "PSCSI[%d]: Referencing SCSI Channel"
+                                " ID: %d\n",  phv->phv_host_id,
+                                pdv->pdv_channel_id);
+                        pdv->pdv_flags |= PDF_HAS_CHANNEL_ID;
+                        break;
+                case Opt_scsi_target_id:
+                        match_int(args, &arg);
+                        pdv->pdv_target_id = arg;
+                        printk(KERN_INFO "PSCSI[%d]: Referencing SCSI Target"
+                                " ID: %d\n", phv->phv_host_id,
+                                pdv->pdv_target_id);
+                        pdv->pdv_flags |= PDF_HAS_TARGET_ID;
+                        break;
+                case Opt_scsi_lun_id:
+                        match_int(args, &arg);
+                        pdv->pdv_lun_id = arg;
+                        printk(KERN_INFO "PSCSI[%d]: Referencing SCSI LUN ID:"
+                                " %d\n", phv->phv_host_id, pdv->pdv_lun_id);
+                        pdv->pdv_flags |= PDF_HAS_LUN_ID;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+out:
+        kfree(orig);
+        return (!ret) ? count : ret;
+}
+
+static ssize_t pscsi_check_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev)
+{
+        struct pscsi_dev_virt *pdv = se_dev->se_dev_su_ptr;
+
+        if (!(pdv->pdv_flags & PDF_HAS_CHANNEL_ID) ||
+            !(pdv->pdv_flags & PDF_HAS_TARGET_ID) ||
+            !(pdv->pdv_flags & PDF_HAS_LUN_ID)) {
+                printk(KERN_ERR "Missing scsi_channel_id=, scsi_target_id= and"
+                        " scsi_lun_id= parameters\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static ssize_t pscsi_show_configfs_dev_params(struct se_hba *hba,
+                                              struct se_subsystem_dev *se_dev,
+                                              char *b)
+{
+        struct pscsi_hba_virt *phv = hba->hba_ptr;
+        struct pscsi_dev_virt *pdv = se_dev->se_dev_su_ptr;
+        struct scsi_device *sd = pdv->pdv_sd;
+        unsigned char host_id[16];
+        ssize_t bl;
+        int i;
+
+        if (phv->phv_mode == PHV_VIRUTAL_HOST_ID)
+                snprintf(host_id, 16, "%d", pdv->pdv_host_id);
+        else
+                snprintf(host_id, 16, "PHBA Mode");
+
+        bl = sprintf(b, "SCSI Device Bus Location:"
+                " Channel ID: %d Target ID: %d LUN: %d Host ID: %s\n",
+                pdv->pdv_channel_id, pdv->pdv_target_id, pdv->pdv_lun_id,
+                host_id);
+
+        if (sd) {
+                bl += sprintf(b + bl, "        ");
+                bl += sprintf(b + bl, "Vendor: ");
+                for (i = 0; i < 8; i++) {
+                        if (ISPRINT(sd->vendor[i]))   /* printable character? */
+                                bl += sprintf(b + bl, "%c", sd->vendor[i]);
+                        else
+                                bl += sprintf(b + bl, " ");
+                }
+                bl += sprintf(b + bl, " Model: ");
+                for (i = 0; i < 16; i++) {
+                        if (ISPRINT(sd->model[i]))   /* printable character ? */
+                                bl += sprintf(b + bl, "%c", sd->model[i]);
+                        else
+                                bl += sprintf(b + bl, " ");
+                }
+                bl += sprintf(b + bl, " Rev: ");
+                for (i = 0; i < 4; i++) {
+                        if (ISPRINT(sd->rev[i]))   /* printable character ? */
+                                bl += sprintf(b + bl, "%c", sd->rev[i]);
+                        else
+                                bl += sprintf(b + bl, " ");
+                }
+                bl += sprintf(b + bl, "\n");
+        }
+        return bl;
+}
+
+static void pscsi_bi_endio(struct bio *bio, int error)
+{
+        bio_put(bio);
+}
+
+static inline struct bio *pscsi_get_bio(struct pscsi_dev_virt *pdv, int sg_num)
+{
+        struct bio *bio;
+        /*
+         * Use bio_malloc() following the comment in for bio -> struct request
+         * in block/blk-core.c:blk_make_request()
+         */
+        bio = bio_kmalloc(GFP_KERNEL, sg_num);
+        if (!(bio)) {
+                printk(KERN_ERR "PSCSI: bio_kmalloc() failed\n");
+                return NULL;
+        }
+        bio->bi_end_io = pscsi_bi_endio;
+
+        return bio;
+}
+
+#if 0
+#define DEBUG_PSCSI(x...) printk(x)
+#else
+#define DEBUG_PSCSI(x...)
+#endif
+
+static int __pscsi_map_task_SG(
+        struct se_task *task,
+        struct scatterlist *task_sg,
+        u32 task_sg_num,
+        int bidi_read)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        struct pscsi_dev_virt *pdv = task->se_dev->dev_ptr;
+        struct bio *bio = NULL, *hbio = NULL, *tbio = NULL;
+        struct page *page;
+        struct scatterlist *sg;
+        u32 data_len = task->task_size, i, len, bytes, off;
+        int nr_pages = (task->task_size + task_sg[0].offset +
+                        PAGE_SIZE - 1) >> PAGE_SHIFT;
+        int nr_vecs = 0, rc, ret = PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+        int rw = (task->task_data_direction == DMA_TO_DEVICE);
+
+        if (!task->task_size)
+                return 0;
+        /*
+         * For SCF_SCSI_DATA_SG_IO_CDB, Use fs/bio.c:bio_add_page() to setup
+         * the bio_vec maplist from TC< struct se_mem -> task->task_sg ->
+         * struct scatterlist memory.  The struct se_task->task_sg[] currently needs
+         * to be attached to struct bios for submission to Linux/SCSI using
+         * struct request to struct scsi_device->request_queue.
+         *
+         * Note that this will be changing post v2.6.28 as Target_Core_Mod/pSCSI
+         * is ported to upstream SCSI passthrough functionality that accepts
+         * struct scatterlist->page_link or struct page as a paraemeter.
+         */
+        DEBUG_PSCSI("PSCSI: nr_pages: %d\n", nr_pages);
+
+        for_each_sg(task_sg, sg, task_sg_num, i) {
+                page = sg_page(sg);
+                off = sg->offset;
+                len = sg->length;
+
+                DEBUG_PSCSI("PSCSI: i: %d page: %p len: %d off: %d\n", i,
+                        page, len, off);
+
+                while (len > 0 && data_len > 0) {
+                        bytes = min_t(unsigned int, len, PAGE_SIZE - off);
+                        bytes = min(bytes, data_len);
+
+                        if (!(bio)) {
+                                nr_vecs = min_t(int, BIO_MAX_PAGES, nr_pages);
+                                nr_pages -= nr_vecs;
+                                /*
+                                 * Calls bio_kmalloc() and sets bio->bi_end_io()
+                                 */
+                                bio = pscsi_get_bio(pdv, nr_vecs);
+                                if (!(bio))
+                                        goto fail;
+
+                                if (rw)
+                                        bio->bi_rw |= REQ_WRITE;
+
+                                DEBUG_PSCSI("PSCSI: Allocated bio: %p,"
+                                        " dir: %s nr_vecs: %d\n", bio,
+                                        (rw) ? "rw" : "r", nr_vecs);
+                                /*
+                                 * Set *hbio pointer to handle the case:
+                                 * nr_pages > BIO_MAX_PAGES, where additional
+                                 * bios need to be added to complete a given
+                                 * struct se_task
+                                 */
+                                if (!hbio)
+                                        hbio = tbio = bio;
+                                else
+                                        tbio = tbio->bi_next = bio;
+                        }
+
+                        DEBUG_PSCSI("PSCSI: Calling bio_add_pc_page() i: %d"
+                                " bio: %p page: %p len: %d off: %d\n", i, bio,
+                                page, len, off);
+
+                        rc = bio_add_pc_page(pdv->pdv_sd->request_queue,
+                                        bio, page, bytes, off);
+                        if (rc != bytes)
+                                goto fail;
+
+                        DEBUG_PSCSI("PSCSI: bio->bi_vcnt: %d nr_vecs: %d\n",
+                                bio->bi_vcnt, nr_vecs);
+
+                        if (bio->bi_vcnt > nr_vecs) {
+                                DEBUG_PSCSI("PSCSI: Reached bio->bi_vcnt max:"
+                                        " %d i: %d bio: %p, allocating another"
+                                        " bio\n", bio->bi_vcnt, i, bio);
+                                /*
+                                 * Clear the pointer so that another bio will
+                                 * be allocated with pscsi_get_bio() above, the
+                                 * current bio has already been set *tbio and
+                                 * bio->bi_next.
+                                 */
+                                bio = NULL;
+                        }
+
+                        page++;
+                        len -= bytes;
+                        data_len -= bytes;
+                        off = 0;
+                }
+        }
+        /*
+         * Setup the primary pt->pscsi_req used for non BIDI and BIDI-COMMAND
+         * primary SCSI WRITE poayload mapped for struct se_task->task_sg[]
+         */
+        if (!(bidi_read)) {
+                /*
+                 * Starting with v2.6.31, call blk_make_request() passing in *hbio to
+                 * allocate the pSCSI task a struct request.
+                 */
+                pt->pscsi_req = blk_make_request(pdv->pdv_sd->request_queue,
+                                        hbio, GFP_KERNEL);
+                if (!(pt->pscsi_req)) {
+                        printk(KERN_ERR "pSCSI: blk_make_request() failed\n");
+                        goto fail;
+                }
+                /*
+                 * Setup the newly allocated struct request for REQ_TYPE_BLOCK_PC,
+                 * and setup rq callback, CDB and sense.
+                 */
+                pscsi_blk_init_request(task, pt, pt->pscsi_req, 0);
+
+                return task->task_sg_num;
+        }
+        /*
+         * Setup the secondary pt->pscsi_req->next_rq used for the extra BIDI-COMMAND
+         * SCSI READ paylaod mapped for struct se_task->task_sg_bidi[]
+         */
+        pt->pscsi_req->next_rq = blk_make_request(pdv->pdv_sd->request_queue,
+                                        hbio, GFP_KERNEL);
+        if (!(pt->pscsi_req->next_rq)) {
+                printk(KERN_ERR "pSCSI: blk_make_request() failed for BIDI\n");
+                goto fail;
+        }
+        pscsi_blk_init_request(task, pt, pt->pscsi_req->next_rq, 1);
+
+        return task->task_sg_num;
+fail:
+        while (hbio) {
+                bio = hbio;
+                hbio = hbio->bi_next;
+                bio->bi_next = NULL;
+                bio_endio(bio, 0);
+        }
+        return ret;
+}
+
+static int pscsi_map_task_SG(struct se_task *task)
+{
+        int ret;
+
+        /*
+         * Setup the main struct request for the task->task_sg[] payload
+         */
+
+        ret = __pscsi_map_task_SG(task, task->task_sg, task->task_sg_num, 0);
+        if (ret >= 0 && task->task_sg_bidi) {
+                /*
+                 * If present, set up the extra BIDI-COMMAND SCSI READ
+                 * struct request and payload.
+                 */
+                ret = __pscsi_map_task_SG(task, task->task_sg_bidi,
+                                        task->task_sg_num, 1);
+        }
+
+        if (ret < 0)
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        return 0;
+}
+
+/*      pscsi_map_task_non_SG():
+ *
+ *
+ */
+static int pscsi_map_task_non_SG(struct se_task *task)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+        struct pscsi_dev_virt *pdv = task->se_dev->dev_ptr;
+        int ret = 0;
+
+        if (pscsi_blk_get_request(task) < 0)
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+
+        if (!task->task_size)
+                return 0;
+
+        ret = blk_rq_map_kern(pdv->pdv_sd->request_queue,
+                        pt->pscsi_req, T_TASK(cmd)->t_task_buf,
+                        task->task_size, GFP_KERNEL);
+        if (ret < 0) {
+                printk(KERN_ERR "PSCSI: blk_rq_map_kern() failed: %d\n", ret);
+                return PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+        return 0;
+}
+
+static int pscsi_CDB_none(struct se_task *task)
+{
+        return pscsi_blk_get_request(task);
+}
+
+/*      pscsi_get_cdb():
+ *
+ *
+ */
+static unsigned char *pscsi_get_cdb(struct se_task *task)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+
+        return pt->pscsi_cdb;
+}
+
+/*      pscsi_get_sense_buffer():
+ *
+ *
+ */
+static unsigned char *pscsi_get_sense_buffer(struct se_task *task)
+{
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+
+        return (unsigned char *)&pt->pscsi_sense[0];
+}
+
+/*      pscsi_get_device_rev():
+ *
+ *
+ */
+static u32 pscsi_get_device_rev(struct se_device *dev)
+{
+        struct pscsi_dev_virt *pdv = dev->dev_ptr;
+        struct scsi_device *sd = pdv->pdv_sd;
+
+        return (sd->scsi_level - 1) ? sd->scsi_level - 1 : 1;
+}
+
+/*      pscsi_get_device_type():
+ *
+ *
+ */
+static u32 pscsi_get_device_type(struct se_device *dev)
+{
+        struct pscsi_dev_virt *pdv = dev->dev_ptr;
+        struct scsi_device *sd = pdv->pdv_sd;
+
+        return sd->type;
+}
+
+static sector_t pscsi_get_blocks(struct se_device *dev)
+{
+        struct pscsi_dev_virt *pdv = dev->dev_ptr;
+
+        if (pdv->pdv_bd && pdv->pdv_bd->bd_part)
+                return pdv->pdv_bd->bd_part->nr_sects;
+
+        dump_stack();
+        return 0;
+}
+
+/*      pscsi_handle_SAM_STATUS_failures():
+ *
+ *
+ */
+static inline void pscsi_process_SAM_status(
+        struct se_task *task,
+        struct pscsi_plugin_task *pt)
+{
+        task->task_scsi_status = status_byte(pt->pscsi_result);
+        if ((task->task_scsi_status)) {
+                task->task_scsi_status <<= 1;
+                printk(KERN_INFO "PSCSI Status Byte exception at task: %p CDB:"
+                        " 0x%02x Result: 0x%08x\n", task, pt->pscsi_cdb[0],
+                        pt->pscsi_result);
+        }
+
+        switch (host_byte(pt->pscsi_result)) {
+        case DID_OK:
+                transport_complete_task(task, (!task->task_scsi_status));
+                break;
+        default:
+                printk(KERN_INFO "PSCSI Host Byte exception at task: %p CDB:"
+                        " 0x%02x Result: 0x%08x\n", task, pt->pscsi_cdb[0],
+                        pt->pscsi_result);
+                task->task_scsi_status = SAM_STAT_CHECK_CONDITION;
+                task->task_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                TASK_CMD(task)->transport_error_status =
+                                        PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                transport_complete_task(task, 0);
+                break;
+        }
+
+        return;
+}
+
+static void pscsi_req_done(struct request *req, int uptodate)
+{
+        struct se_task *task = req->end_io_data;
+        struct pscsi_plugin_task *pt = PSCSI_TASK(task);
+
+        pt->pscsi_result = req->errors;
+        pt->pscsi_resid = req->resid_len;
+
+        pscsi_process_SAM_status(task, pt);
+        /*
+         * Release BIDI-READ if present
+         */
+        if (req->next_rq != NULL)
+                __blk_put_request(req->q, req->next_rq);
+
+        __blk_put_request(req->q, req);
+        pt->pscsi_req = NULL;
+}
+
+static struct se_subsystem_api pscsi_template = {
+        .name                   = "pscsi",
+        .owner                  = THIS_MODULE,
+        .transport_type         = TRANSPORT_PLUGIN_PHBA_PDEV,
+        .cdb_none               = pscsi_CDB_none,
+        .map_task_non_SG        = pscsi_map_task_non_SG,
+        .map_task_SG            = pscsi_map_task_SG,
+        .attach_hba             = pscsi_attach_hba,
+        .detach_hba             = pscsi_detach_hba,
+        .pmode_enable_hba       = pscsi_pmode_enable_hba,
+        .allocate_virtdevice    = pscsi_allocate_virtdevice,
+        .create_virtdevice      = pscsi_create_virtdevice,
+        .free_device            = pscsi_free_device,
+        .transport_complete     = pscsi_transport_complete,
+        .alloc_task             = pscsi_alloc_task,
+        .do_task                = pscsi_do_task,
+        .free_task              = pscsi_free_task,
+        .check_configfs_dev_params = pscsi_check_configfs_dev_params,
+        .set_configfs_dev_params = pscsi_set_configfs_dev_params,
+        .show_configfs_dev_params = pscsi_show_configfs_dev_params,
+        .get_cdb                = pscsi_get_cdb,
+        .get_sense_buffer       = pscsi_get_sense_buffer,
+        .get_device_rev         = pscsi_get_device_rev,
+        .get_device_type        = pscsi_get_device_type,
+        .get_blocks             = pscsi_get_blocks,
+};
+
+static int __init pscsi_module_init(void)
+{
+        return transport_subsystem_register(&pscsi_template);
+}
+
+static void pscsi_module_exit(void)
+{
+        transport_subsystem_release(&pscsi_template);
+}
+
+MODULE_DESCRIPTION("TCM PSCSI subsystem plugin");
+MODULE_AUTHOR("nab@Linux-iSCSI.org");
+MODULE_LICENSE("GPL");
+
+module_init(pscsi_module_init);
+module_exit(pscsi_module_exit);
diff --git a/drivers/target/target_core_pscsi.h b/drivers/target/target_core_pscsi.h
new file mode 100644
index 000000000000..a4cd5d352c3a
--- /dev/null
+++ b/drivers/target/target_core_pscsi.h
@@ -0,0 +1,65 @@
+#ifndef TARGET_CORE_PSCSI_H
+#define TARGET_CORE_PSCSI_H
+
+#define PSCSI_VERSION           "v4.0"
+#define PSCSI_VIRTUAL_HBA_DEPTH 2048
+
+/* used in pscsi_find_alloc_len() */
+#ifndef INQUIRY_DATA_SIZE
+#define INQUIRY_DATA_SIZE       0x24
+#endif
+
+/* used in pscsi_add_device_to_list() */
+#define PSCSI_DEFAULT_QUEUEDEPTH        1
+
+#define PS_RETRY                5
+#define PS_TIMEOUT_DISK         (15*HZ)
+#define PS_TIMEOUT_OTHER        (500*HZ)
+
+#include <linux/device.h>
+#include <scsi/scsi_driver.h>
+#include <scsi/scsi_device.h>
+#include <linux/kref.h>
+#include <linux/kobject.h>
+
+struct pscsi_plugin_task {
+        struct se_task pscsi_task;
+        unsigned char *pscsi_cdb;
+        unsigned char __pscsi_cdb[TCM_MAX_COMMAND_SIZE];
+        unsigned char pscsi_sense[SCSI_SENSE_BUFFERSIZE];
+        int     pscsi_direction;
+        int     pscsi_result;
+        u32     pscsi_resid;
+        struct request *pscsi_req;
+} ____cacheline_aligned;
+
+#define PDF_HAS_CHANNEL_ID      0x01
+#define PDF_HAS_TARGET_ID       0x02
+#define PDF_HAS_LUN_ID          0x04
+#define PDF_HAS_VPD_UNIT_SERIAL 0x08
+#define PDF_HAS_VPD_DEV_IDENT   0x10
+#define PDF_HAS_VIRT_HOST_ID    0x20
+
+struct pscsi_dev_virt {
+        int     pdv_flags;
+        int     pdv_host_id;
+        int     pdv_channel_id;
+        int     pdv_target_id;
+        int     pdv_lun_id;
+        struct block_device *pdv_bd;
+        struct scsi_device *pdv_sd;
+        struct se_hba *pdv_se_hba;
+} ____cacheline_aligned;
+
+typedef enum phv_modes {
+        PHV_VIRUTAL_HOST_ID,
+        PHV_LLD_SCSI_HOST_NO
+} phv_modes_t;
+
+struct pscsi_hba_virt {
+        int                     phv_host_id;
+        phv_modes_t             phv_mode;
+        struct Scsi_Host        *phv_lld_host;
+} ____cacheline_aligned;
+
+#endif   /*** TARGET_CORE_PSCSI_H ***/
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
new file mode 100644
index 000000000000..979aebf20019
--- /dev/null
+++ b/drivers/target/target_core_rd.c
@@ -0,0 +1,1091 @@
+/*******************************************************************************
+ * Filename:  target_core_rd.c
+ *
+ * This file contains the Storage Engine <-> Ramdisk transport
+ * specific functions.
+ *
+ * Copyright (c) 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/string.h>
+#include <linux/parser.h>
+#include <linux/timer.h>
+#include <linux/blkdev.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+
+#include "target_core_rd.h"
+
+static struct se_subsystem_api rd_dr_template;
+static struct se_subsystem_api rd_mcp_template;
+
+/* #define DEBUG_RAMDISK_MCP */
+/* #define DEBUG_RAMDISK_DR */
+
+/*      rd_attach_hba(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int rd_attach_hba(struct se_hba *hba, u32 host_id)
+{
+        struct rd_host *rd_host;
+
+        rd_host = kzalloc(sizeof(struct rd_host), GFP_KERNEL);
+        if (!(rd_host)) {
+                printk(KERN_ERR "Unable to allocate memory for struct rd_host\n");
+                return -ENOMEM;
+        }
+
+        rd_host->rd_host_id = host_id;
+
+        atomic_set(&hba->left_queue_depth, RD_HBA_QUEUE_DEPTH);
+        atomic_set(&hba->max_queue_depth, RD_HBA_QUEUE_DEPTH);
+        hba->hba_ptr = (void *) rd_host;
+
+        printk(KERN_INFO "CORE_HBA[%d] - TCM Ramdisk HBA Driver %s on"
+                " Generic Target Core Stack %s\n", hba->hba_id,
+                RD_HBA_VERSION, TARGET_CORE_MOD_VERSION);
+        printk(KERN_INFO "CORE_HBA[%d] - Attached Ramdisk HBA: %u to Generic"
+                " Target Core TCQ Depth: %d MaxSectors: %u\n", hba->hba_id,
+                rd_host->rd_host_id, atomic_read(&hba->max_queue_depth),
+                RD_MAX_SECTORS);
+
+        return 0;
+}
+
+static void rd_detach_hba(struct se_hba *hba)
+{
+        struct rd_host *rd_host = hba->hba_ptr;
+
+        printk(KERN_INFO "CORE_HBA[%d] - Detached Ramdisk HBA: %u from"
+                " Generic Target Core\n", hba->hba_id, rd_host->rd_host_id);
+
+        kfree(rd_host);
+        hba->hba_ptr = NULL;
+}
+
+/*      rd_release_device_space():
+ *
+ *
+ */
+static void rd_release_device_space(struct rd_dev *rd_dev)
+{
+        u32 i, j, page_count = 0, sg_per_table;
+        struct rd_dev_sg_table *sg_table;
+        struct page *pg;
+        struct scatterlist *sg;
+
+        if (!rd_dev->sg_table_array || !rd_dev->sg_table_count)
+                return;
+
+        sg_table = rd_dev->sg_table_array;
+
+        for (i = 0; i < rd_dev->sg_table_count; i++) {
+                sg = sg_table[i].sg_table;
+                sg_per_table = sg_table[i].rd_sg_count;
+
+                for (j = 0; j < sg_per_table; j++) {
+                        pg = sg_page(&sg[j]);
+                        if ((pg)) {
+                                __free_page(pg);
+                                page_count++;
+                        }
+                }
+
+                kfree(sg);
+        }
+
+        printk(KERN_INFO "CORE_RD[%u] - Released device space for Ramdisk"
+                " Device ID: %u, pages %u in %u tables total bytes %lu\n",
+                rd_dev->rd_host->rd_host_id, rd_dev->rd_dev_id, page_count,
+                rd_dev->sg_table_count, (unsigned long)page_count * PAGE_SIZE);
+
+        kfree(sg_table);
+        rd_dev->sg_table_array = NULL;
+        rd_dev->sg_table_count = 0;
+}
+
+
+/*      rd_build_device_space():
+ *
+ *
+ */
+static int rd_build_device_space(struct rd_dev *rd_dev)
+{
+        u32 i = 0, j, page_offset = 0, sg_per_table, sg_tables, total_sg_needed;
+        u32 max_sg_per_table = (RD_MAX_ALLOCATION_SIZE /
+                                sizeof(struct scatterlist));
+        struct rd_dev_sg_table *sg_table;
+        struct page *pg;
+        struct scatterlist *sg;
+
+        if (rd_dev->rd_page_count <= 0) {
+                printk(KERN_ERR "Illegal page count: %u for Ramdisk device\n",
+                        rd_dev->rd_page_count);
+                return -1;
+        }
+        total_sg_needed = rd_dev->rd_page_count;
+
+        sg_tables = (total_sg_needed / max_sg_per_table) + 1;
+
+        sg_table = kzalloc(sg_tables * sizeof(struct rd_dev_sg_table), GFP_KERNEL);
+        if (!(sg_table)) {
+                printk(KERN_ERR "Unable to allocate memory for Ramdisk"
+                        " scatterlist tables\n");
+                return -1;
+        }
+
+        rd_dev->sg_table_array = sg_table;
+        rd_dev->sg_table_count = sg_tables;
+
+        while (total_sg_needed) {
+                sg_per_table = (total_sg_needed > max_sg_per_table) ?
+                        max_sg_per_table : total_sg_needed;
+
+                sg = kzalloc(sg_per_table * sizeof(struct scatterlist),
+                                GFP_KERNEL);
+                if (!(sg)) {
+                        printk(KERN_ERR "Unable to allocate scatterlist array"
+                                " for struct rd_dev\n");
+                        return -1;
+                }
+
+                sg_init_table((struct scatterlist *)&sg[0], sg_per_table);
+
+                sg_table[i].sg_table = sg;
+                sg_table[i].rd_sg_count = sg_per_table;
+                sg_table[i].page_start_offset = page_offset;
+                sg_table[i++].page_end_offset = (page_offset + sg_per_table)
+                                                - 1;
+
+                for (j = 0; j < sg_per_table; j++) {
+                        pg = alloc_pages(GFP_KERNEL, 0);
+                        if (!(pg)) {
+                                printk(KERN_ERR "Unable to allocate scatterlist"
+                                        " pages for struct rd_dev_sg_table\n");
+                                return -1;
+                        }
+                        sg_assign_page(&sg[j], pg);
+                        sg[j].length = PAGE_SIZE;
+                }
+
+                page_offset += sg_per_table;
+                total_sg_needed -= sg_per_table;
+        }
+
+        printk(KERN_INFO "CORE_RD[%u] - Built Ramdisk Device ID: %u space of"
+                " %u pages in %u tables\n", rd_dev->rd_host->rd_host_id,
+                rd_dev->rd_dev_id, rd_dev->rd_page_count,
+                rd_dev->sg_table_count);
+
+        return 0;
+}
+
+static void *rd_allocate_virtdevice(
+        struct se_hba *hba,
+        const char *name,
+        int rd_direct)
+{
+        struct rd_dev *rd_dev;
+        struct rd_host *rd_host = hba->hba_ptr;
+
+        rd_dev = kzalloc(sizeof(struct rd_dev), GFP_KERNEL);
+        if (!(rd_dev)) {
+                printk(KERN_ERR "Unable to allocate memory for struct rd_dev\n");
+                return NULL;
+        }
+
+        rd_dev->rd_host = rd_host;
+        rd_dev->rd_direct = rd_direct;
+
+        return rd_dev;
+}
+
+static void *rd_DIRECT_allocate_virtdevice(struct se_hba *hba, const char *name)
+{
+        return rd_allocate_virtdevice(hba, name, 1);
+}
+
+static void *rd_MEMCPY_allocate_virtdevice(struct se_hba *hba, const char *name)
+{
+        return rd_allocate_virtdevice(hba, name, 0);
+}
+
+/*      rd_create_virtdevice():
+ *
+ *
+ */
+static struct se_device *rd_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p,
+        int rd_direct)
+{
+        struct se_device *dev;
+        struct se_dev_limits dev_limits;
+        struct rd_dev *rd_dev = p;
+        struct rd_host *rd_host = hba->hba_ptr;
+        int dev_flags = 0;
+        char prod[16], rev[4];
+
+        memset(&dev_limits, 0, sizeof(struct se_dev_limits));
+
+        if (rd_build_device_space(rd_dev) < 0)
+                goto fail;
+
+        snprintf(prod, 16, "RAMDISK-%s", (rd_dev->rd_direct) ? "DR" : "MCP");
+        snprintf(rev, 4, "%s", (rd_dev->rd_direct) ? RD_DR_VERSION :
+                                                RD_MCP_VERSION);
+
+        dev_limits.limits.logical_block_size = RD_BLOCKSIZE;
+        dev_limits.limits.max_hw_sectors = RD_MAX_SECTORS;
+        dev_limits.limits.max_sectors = RD_MAX_SECTORS;
+        dev_limits.hw_queue_depth = RD_MAX_DEVICE_QUEUE_DEPTH;
+        dev_limits.queue_depth = RD_DEVICE_QUEUE_DEPTH;
+
+        dev = transport_add_device_to_core_hba(hba,
+                        (rd_dev->rd_direct) ? &rd_dr_template :
+                        &rd_mcp_template, se_dev, dev_flags, (void *)rd_dev,
+                        &dev_limits, prod, rev);
+        if (!(dev))
+                goto fail;
+
+        rd_dev->rd_dev_id = rd_host->rd_host_dev_id_count++;
+        rd_dev->rd_queue_depth = dev->queue_depth;
+
+        printk(KERN_INFO "CORE_RD[%u] - Added TCM %s Ramdisk Device ID: %u of"
+                " %u pages in %u tables, %lu total bytes\n",
+                rd_host->rd_host_id, (!rd_dev->rd_direct) ? "MEMCPY" :
+                "DIRECT", rd_dev->rd_dev_id, rd_dev->rd_page_count,
+                rd_dev->sg_table_count,
+                (unsigned long)(rd_dev->rd_page_count * PAGE_SIZE));
+
+        return dev;
+
+fail:
+        rd_release_device_space(rd_dev);
+        return NULL;
+}
+
+static struct se_device *rd_DIRECT_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p)
+{
+        return rd_create_virtdevice(hba, se_dev, p, 1);
+}
+
+static struct se_device *rd_MEMCPY_create_virtdevice(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        void *p)
+{
+        return rd_create_virtdevice(hba, se_dev, p, 0);
+}
+
+/*      rd_free_device(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static void rd_free_device(void *p)
+{
+        struct rd_dev *rd_dev = p;
+
+        rd_release_device_space(rd_dev);
+        kfree(rd_dev);
+}
+
+static inline struct rd_request *RD_REQ(struct se_task *task)
+{
+        return container_of(task, struct rd_request, rd_task);
+}
+
+static struct se_task *
+rd_alloc_task(struct se_cmd *cmd)
+{
+        struct rd_request *rd_req;
+
+        rd_req = kzalloc(sizeof(struct rd_request), GFP_KERNEL);
+        if (!rd_req) {
+                printk(KERN_ERR "Unable to allocate struct rd_request\n");
+                return NULL;
+        }
+        rd_req->rd_dev = SE_DEV(cmd)->dev_ptr;
+
+        return &rd_req->rd_task;
+}
+
+/*      rd_get_sg_table():
+ *
+ *
+ */
+static struct rd_dev_sg_table *rd_get_sg_table(struct rd_dev *rd_dev, u32 page)
+{
+        u32 i;
+        struct rd_dev_sg_table *sg_table;
+
+        for (i = 0; i < rd_dev->sg_table_count; i++) {
+                sg_table = &rd_dev->sg_table_array[i];
+                if ((sg_table->page_start_offset <= page) &&
+                    (sg_table->page_end_offset >= page))
+                        return sg_table;
+        }
+
+        printk(KERN_ERR "Unable to locate struct rd_dev_sg_table for page: %u\n",
+                        page);
+
+        return NULL;
+}
+
+/*      rd_MEMCPY_read():
+ *
+ *
+ */
+static int rd_MEMCPY_read(struct rd_request *req)
+{
+        struct se_task *task = &req->rd_task;
+        struct rd_dev *dev = req->rd_dev;
+        struct rd_dev_sg_table *table;
+        struct scatterlist *sg_d, *sg_s;
+        void *dst, *src;
+        u32 i = 0, j = 0, dst_offset = 0, src_offset = 0;
+        u32 length, page_end = 0, table_sg_end;
+        u32 rd_offset = req->rd_offset;
+
+        table = rd_get_sg_table(dev, req->rd_page);
+        if (!(table))
+                return -1;
+
+        table_sg_end = (table->page_end_offset - req->rd_page);
+        sg_d = task->task_sg;
+        sg_s = &table->sg_table[req->rd_page - table->page_start_offset];
+#ifdef DEBUG_RAMDISK_MCP
+        printk(KERN_INFO "RD[%u]: Read LBA: %llu, Size: %u Page: %u, Offset:"
+                " %u\n", dev->rd_dev_id, task->task_lba, req->rd_size,
+                req->rd_page, req->rd_offset);
+#endif
+        src_offset = rd_offset;
+
+        while (req->rd_size) {
+                if ((sg_d[i].length - dst_offset) <
+                    (sg_s[j].length - src_offset)) {
+                        length = (sg_d[i].length - dst_offset);
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "Step 1 - sg_d[%d]: %p length: %d"
+                                " offset: %u sg_s[%d].length: %u\n", i,
+                                &sg_d[i], sg_d[i].length, sg_d[i].offset, j,
+                                sg_s[j].length);
+                        printk(KERN_INFO "Step 1 - length: %u dst_offset: %u"
+                                " src_offset: %u\n", length, dst_offset,
+                                src_offset);
+#endif
+                        if (length > req->rd_size)
+                                length = req->rd_size;
+
+                        dst = sg_virt(&sg_d[i++]) + dst_offset;
+                        if (!dst)
+                                BUG();
+
+                        src = sg_virt(&sg_s[j]) + src_offset;
+                        if (!src)
+                                BUG();
+
+                        dst_offset = 0;
+                        src_offset = length;
+                        page_end = 0;
+                } else {
+                        length = (sg_s[j].length - src_offset);
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "Step 2 - sg_d[%d]: %p length: %d"
+                                " offset: %u sg_s[%d].length: %u\n", i,
+                                &sg_d[i], sg_d[i].length, sg_d[i].offset,
+                                j, sg_s[j].length);
+                        printk(KERN_INFO "Step 2 - length: %u dst_offset: %u"
+                                " src_offset: %u\n", length, dst_offset,
+                                src_offset);
+#endif
+                        if (length > req->rd_size)
+                                length = req->rd_size;
+
+                        dst = sg_virt(&sg_d[i]) + dst_offset;
+                        if (!dst)
+                                BUG();
+
+                        if (sg_d[i].length == length) {
+                                i++;
+                                dst_offset = 0;
+                        } else
+                                dst_offset = length;
+
+                        src = sg_virt(&sg_s[j++]) + src_offset;
+                        if (!src)
+                                BUG();
+
+                        src_offset = 0;
+                        page_end = 1;
+                }
+
+                memcpy(dst, src, length);
+
+#ifdef DEBUG_RAMDISK_MCP
+                printk(KERN_INFO "page: %u, remaining size: %u, length: %u,"
+                        " i: %u, j: %u\n", req->rd_page,
+                        (req->rd_size - length), length, i, j);
+#endif
+                req->rd_size -= length;
+                if (!(req->rd_size))
+                        return 0;
+
+                if (!page_end)
+                        continue;
+
+                if (++req->rd_page <= table->page_end_offset) {
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "page: %u in same page table\n",
+                                req->rd_page);
+#endif
+                        continue;
+                }
+#ifdef DEBUG_RAMDISK_MCP
+                printk(KERN_INFO "getting new page table for page: %u\n",
+                                req->rd_page);
+#endif
+                table = rd_get_sg_table(dev, req->rd_page);
+                if (!(table))
+                        return -1;
+
+                sg_s = &table->sg_table[j = 0];
+        }
+
+        return 0;
+}
+
+/*      rd_MEMCPY_write():
+ *
+ *
+ */
+static int rd_MEMCPY_write(struct rd_request *req)
+{
+        struct se_task *task = &req->rd_task;
+        struct rd_dev *dev = req->rd_dev;
+        struct rd_dev_sg_table *table;
+        struct scatterlist *sg_d, *sg_s;
+        void *dst, *src;
+        u32 i = 0, j = 0, dst_offset = 0, src_offset = 0;
+        u32 length, page_end = 0, table_sg_end;
+        u32 rd_offset = req->rd_offset;
+
+        table = rd_get_sg_table(dev, req->rd_page);
+        if (!(table))
+                return -1;
+
+        table_sg_end = (table->page_end_offset - req->rd_page);
+        sg_d = &table->sg_table[req->rd_page - table->page_start_offset];
+        sg_s = task->task_sg;
+#ifdef DEBUG_RAMDISK_MCP
+        printk(KERN_INFO "RD[%d] Write LBA: %llu, Size: %u, Page: %u,"
+                " Offset: %u\n", dev->rd_dev_id, task->task_lba, req->rd_size,
+                req->rd_page, req->rd_offset);
+#endif
+        dst_offset = rd_offset;
+
+        while (req->rd_size) {
+                if ((sg_s[i].length - src_offset) <
+                    (sg_d[j].length - dst_offset)) {
+                        length = (sg_s[i].length - src_offset);
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "Step 1 - sg_s[%d]: %p length: %d"
+                                " offset: %d sg_d[%d].length: %u\n", i,
+                                &sg_s[i], sg_s[i].length, sg_s[i].offset,
+                                j, sg_d[j].length);
+                        printk(KERN_INFO "Step 1 - length: %u src_offset: %u"
+                                " dst_offset: %u\n", length, src_offset,
+                                dst_offset);
+#endif
+                        if (length > req->rd_size)
+                                length = req->rd_size;
+
+                        src = sg_virt(&sg_s[i++]) + src_offset;
+                        if (!src)
+                                BUG();
+
+                        dst = sg_virt(&sg_d[j]) + dst_offset;
+                        if (!dst)
+                                BUG();
+
+                        src_offset = 0;
+                        dst_offset = length;
+                        page_end = 0;
+                } else {
+                        length = (sg_d[j].length - dst_offset);
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "Step 2 - sg_s[%d]: %p length: %d"
+                                " offset: %d sg_d[%d].length: %u\n", i,
+                                &sg_s[i], sg_s[i].length, sg_s[i].offset,
+                                j, sg_d[j].length);
+                        printk(KERN_INFO "Step 2 - length: %u src_offset: %u"
+                                " dst_offset: %u\n", length, src_offset,
+                                dst_offset);
+#endif
+                        if (length > req->rd_size)
+                                length = req->rd_size;
+
+                        src = sg_virt(&sg_s[i]) + src_offset;
+                        if (!src)
+                                BUG();
+
+                        if (sg_s[i].length == length) {
+                                i++;
+                                src_offset = 0;
+                        } else
+                                src_offset = length;
+
+                        dst = sg_virt(&sg_d[j++]) + dst_offset;
+                        if (!dst)
+                                BUG();
+
+                        dst_offset = 0;
+                        page_end = 1;
+                }
+
+                memcpy(dst, src, length);
+
+#ifdef DEBUG_RAMDISK_MCP
+                printk(KERN_INFO "page: %u, remaining size: %u, length: %u,"
+                        " i: %u, j: %u\n", req->rd_page,
+                        (req->rd_size - length), length, i, j);
+#endif
+                req->rd_size -= length;
+                if (!(req->rd_size))
+                        return 0;
+
+                if (!page_end)
+                        continue;
+
+                if (++req->rd_page <= table->page_end_offset) {
+#ifdef DEBUG_RAMDISK_MCP
+                        printk(KERN_INFO "page: %u in same page table\n",
+                                req->rd_page);
+#endif
+                        continue;
+                }
+#ifdef DEBUG_RAMDISK_MCP
+                printk(KERN_INFO "getting new page table for page: %u\n",
+                                req->rd_page);
+#endif
+                table = rd_get_sg_table(dev, req->rd_page);
+                if (!(table))
+                        return -1;
+
+                sg_d = &table->sg_table[j = 0];
+        }
+
+        return 0;
+}
+
+/*      rd_MEMCPY_do_task(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int rd_MEMCPY_do_task(struct se_task *task)
+{
+        struct se_device *dev = task->se_dev;
+        struct rd_request *req = RD_REQ(task);
+        unsigned long long lba;
+        int ret;
+
+        req->rd_page = (task->task_lba * DEV_ATTRIB(dev)->block_size) / PAGE_SIZE;
+        lba = task->task_lba;
+        req->rd_offset = (do_div(lba,
+                          (PAGE_SIZE / DEV_ATTRIB(dev)->block_size))) *
+                           DEV_ATTRIB(dev)->block_size;
+        req->rd_size = task->task_size;
+
+        if (task->task_data_direction == DMA_FROM_DEVICE)
+                ret = rd_MEMCPY_read(req);
+        else
+                ret = rd_MEMCPY_write(req);
+
+        if (ret != 0)
+                return ret;
+
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+/*      rd_DIRECT_with_offset():
+ *
+ *
+ */
+static int rd_DIRECT_with_offset(
+        struct se_task *task,
+        struct list_head *se_mem_list,
+        u32 *se_mem_cnt,
+        u32 *task_offset)
+{
+        struct rd_request *req = RD_REQ(task);
+        struct rd_dev *dev = req->rd_dev;
+        struct rd_dev_sg_table *table;
+        struct se_mem *se_mem;
+        struct scatterlist *sg_s;
+        u32 j = 0, set_offset = 1;
+        u32 get_next_table = 0, offset_length, table_sg_end;
+
+        table = rd_get_sg_table(dev, req->rd_page);
+        if (!(table))
+                return -1;
+
+        table_sg_end = (table->page_end_offset - req->rd_page);
+        sg_s = &table->sg_table[req->rd_page - table->page_start_offset];
+#ifdef DEBUG_RAMDISK_DR
+        printk(KERN_INFO "%s DIRECT LBA: %llu, Size: %u Page: %u, Offset: %u\n",
+                (task->task_data_direction == DMA_TO_DEVICE) ?
+                        "Write" : "Read",
+                task->task_lba, req->rd_size, req->rd_page, req->rd_offset);
+#endif
+        while (req->rd_size) {
+                se_mem = kmem_cache_zalloc(se_mem_cache, GFP_KERNEL);
+                if (!(se_mem)) {
+                        printk(KERN_ERR "Unable to allocate struct se_mem\n");
+                        return -1;
+                }
+                INIT_LIST_HEAD(&se_mem->se_list);
+
+                if (set_offset) {
+                        offset_length = sg_s[j].length - req->rd_offset;
+                        if (offset_length > req->rd_size)
+                                offset_length = req->rd_size;
+
+                        se_mem->se_page = sg_page(&sg_s[j++]);
+                        se_mem->se_off = req->rd_offset;
+                        se_mem->se_len = offset_length;
+
+                        set_offset = 0;
+                        get_next_table = (j > table_sg_end);
+                        goto check_eot;
+                }
+
+                offset_length = (req->rd_size < req->rd_offset) ?
+                        req->rd_size : req->rd_offset;
+
+                se_mem->se_page = sg_page(&sg_s[j]);
+                se_mem->se_len = offset_length;
+
+                set_offset = 1;
+
+check_eot:
+#ifdef DEBUG_RAMDISK_DR
+                printk(KERN_INFO "page: %u, size: %u, offset_length: %u, j: %u"
+                        " se_mem: %p, se_page: %p se_off: %u se_len: %u\n",
+                        req->rd_page, req->rd_size, offset_length, j, se_mem,
+                        se_mem->se_page, se_mem->se_off, se_mem->se_len);
+#endif
+                list_add_tail(&se_mem->se_list, se_mem_list);
+                (*se_mem_cnt)++;
+
+                req->rd_size -= offset_length;
+                if (!(req->rd_size))
+                        goto out;
+
+                if (!set_offset && !get_next_table)
+                        continue;
+
+                if (++req->rd_page <= table->page_end_offset) {
+#ifdef DEBUG_RAMDISK_DR
+                        printk(KERN_INFO "page: %u in same page table\n",
+                                        req->rd_page);
+#endif
+                        continue;
+                }
+#ifdef DEBUG_RAMDISK_DR
+                printk(KERN_INFO "getting new page table for page: %u\n",
+                                req->rd_page);
+#endif
+                table = rd_get_sg_table(dev, req->rd_page);
+                if (!(table))
+                        return -1;
+
+                sg_s = &table->sg_table[j = 0];
+        }
+
+out:
+        T_TASK(task->task_se_cmd)->t_tasks_se_num += *se_mem_cnt;
+#ifdef DEBUG_RAMDISK_DR
+        printk(KERN_INFO "RD_DR - Allocated %u struct se_mem segments for task\n",
+                        *se_mem_cnt);
+#endif
+        return 0;
+}
+
+/*      rd_DIRECT_without_offset():
+ *
+ *
+ */
+static int rd_DIRECT_without_offset(
+        struct se_task *task,
+        struct list_head *se_mem_list,
+        u32 *se_mem_cnt,
+        u32 *task_offset)
+{
+        struct rd_request *req = RD_REQ(task);
+        struct rd_dev *dev = req->rd_dev;
+        struct rd_dev_sg_table *table;
+        struct se_mem *se_mem;
+        struct scatterlist *sg_s;
+        u32 length, j = 0;
+
+        table = rd_get_sg_table(dev, req->rd_page);
+        if (!(table))
+                return -1;
+
+        sg_s = &table->sg_table[req->rd_page - table->page_start_offset];
+#ifdef DEBUG_RAMDISK_DR
+        printk(KERN_INFO "%s DIRECT LBA: %llu, Size: %u, Page: %u\n",
+                (task->task_data_direction == DMA_TO_DEVICE) ?
+                        "Write" : "Read",
+                task->task_lba, req->rd_size, req->rd_page);
+#endif
+        while (req->rd_size) {
+                se_mem = kmem_cache_zalloc(se_mem_cache, GFP_KERNEL);
+                if (!(se_mem)) {
+                        printk(KERN_ERR "Unable to allocate struct se_mem\n");
+                        return -1;
+                }
+                INIT_LIST_HEAD(&se_mem->se_list);
+
+                length = (req->rd_size < sg_s[j].length) ?
+                        req->rd_size : sg_s[j].length;
+
+                se_mem->se_page = sg_page(&sg_s[j++]);
+                se_mem->se_len = length;
+
+#ifdef DEBUG_RAMDISK_DR
+                printk(KERN_INFO "page: %u, size: %u, j: %u se_mem: %p,"
+                        " se_page: %p se_off: %u se_len: %u\n", req->rd_page,
+                        req->rd_size, j, se_mem, se_mem->se_page,
+                        se_mem->se_off, se_mem->se_len);
+#endif
+                list_add_tail(&se_mem->se_list, se_mem_list);
+                (*se_mem_cnt)++;
+
+                req->rd_size -= length;
+                if (!(req->rd_size))
+                        goto out;
+
+                if (++req->rd_page <= table->page_end_offset) {
+#ifdef DEBUG_RAMDISK_DR
+                        printk("page: %u in same page table\n",
+                                req->rd_page);
+#endif
+                        continue;
+                }
+#ifdef DEBUG_RAMDISK_DR
+                printk(KERN_INFO "getting new page table for page: %u\n",
+                                req->rd_page);
+#endif
+                table = rd_get_sg_table(dev, req->rd_page);
+                if (!(table))
+                        return -1;
+
+                sg_s = &table->sg_table[j = 0];
+        }
+
+out:
+        T_TASK(task->task_se_cmd)->t_tasks_se_num += *se_mem_cnt;
+#ifdef DEBUG_RAMDISK_DR
+        printk(KERN_INFO "RD_DR - Allocated %u struct se_mem segments for task\n",
+                        *se_mem_cnt);
+#endif
+        return 0;
+}
+
+/*      rd_DIRECT_do_se_mem_map():
+ *
+ *
+ */
+static int rd_DIRECT_do_se_mem_map(
+        struct se_task *task,
+        struct list_head *se_mem_list,
+        void *in_mem,
+        struct se_mem *in_se_mem,
+        struct se_mem **out_se_mem,
+        u32 *se_mem_cnt,
+        u32 *task_offset_in)
+{
+        struct se_cmd *cmd = task->task_se_cmd;
+        struct rd_request *req = RD_REQ(task);
+        u32 task_offset = *task_offset_in;
+        unsigned long long lba;
+        int ret;
+
+        req->rd_page = ((task->task_lba * DEV_ATTRIB(task->se_dev)->block_size) /
+                        PAGE_SIZE);
+        lba = task->task_lba;
+        req->rd_offset = (do_div(lba,
+                          (PAGE_SIZE / DEV_ATTRIB(task->se_dev)->block_size))) *
+                           DEV_ATTRIB(task->se_dev)->block_size;
+        req->rd_size = task->task_size;
+
+        if (req->rd_offset)
+                ret = rd_DIRECT_with_offset(task, se_mem_list, se_mem_cnt,
+                                task_offset_in);
+        else
+                ret = rd_DIRECT_without_offset(task, se_mem_list, se_mem_cnt,
+                                task_offset_in);
+
+        if (ret < 0)
+                return ret;
+
+        if (CMD_TFO(cmd)->task_sg_chaining == 0)
+                return 0;
+        /*
+         * Currently prevent writers from multiple HW fabrics doing
+         * pci_map_sg() to RD_DR's internal scatterlist memory.
+         */
+        if (cmd->data_direction == DMA_TO_DEVICE) {
+                printk(KERN_ERR "DMA_TO_DEVICE not supported for"
+                                " RAMDISK_DR with task_sg_chaining=1\n");
+                return -1;
+        }
+        /*
+         * Special case for if task_sg_chaining is enabled, then
+         * we setup struct se_task->task_sg[], as it will be used by
+         * transport_do_task_sg_chain() for creating chainged SGLs
+         * across multiple struct se_task->task_sg[].
+         */
+        if (!(transport_calc_sg_num(task,
+                        list_entry(T_TASK(cmd)->t_mem_list->next,
+                                   struct se_mem, se_list),
+                        task_offset)))
+                return -1;
+
+        return transport_map_mem_to_sg(task, se_mem_list, task->task_sg,
+                        list_entry(T_TASK(cmd)->t_mem_list->next,
+                                   struct se_mem, se_list),
+                        out_se_mem, se_mem_cnt, task_offset_in);
+}
+
+/*      rd_DIRECT_do_task(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static int rd_DIRECT_do_task(struct se_task *task)
+{
+        /*
+         * At this point the locally allocated RD tables have been mapped
+         * to struct se_mem elements in rd_DIRECT_do_se_mem_map().
+         */
+        task->task_scsi_status = GOOD;
+        transport_complete_task(task, 1);
+
+        return PYX_TRANSPORT_SENT_TO_TRANSPORT;
+}
+
+/*      rd_free_task(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static void rd_free_task(struct se_task *task)
+{
+        kfree(RD_REQ(task));
+}
+
+enum {
+        Opt_rd_pages, Opt_err
+};
+
+static match_table_t tokens = {
+        {Opt_rd_pages, "rd_pages=%d"},
+        {Opt_err, NULL}
+};
+
+static ssize_t rd_set_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        const char *page,
+        ssize_t count)
+{
+        struct rd_dev *rd_dev = se_dev->se_dev_su_ptr;
+        char *orig, *ptr, *opts;
+        substring_t args[MAX_OPT_ARGS];
+        int ret = 0, arg, token;
+
+        opts = kstrdup(page, GFP_KERNEL);
+        if (!opts)
+                return -ENOMEM;
+
+        orig = opts;
+
+        while ((ptr = strsep(&opts, ",")) != NULL) {
+                if (!*ptr)
+                        continue;
+
+                token = match_token(ptr, tokens, args);
+                switch (token) {
+                case Opt_rd_pages:
+                        match_int(args, &arg);
+                        rd_dev->rd_page_count = arg;
+                        printk(KERN_INFO "RAMDISK: Referencing Page"
+                                " Count: %u\n", rd_dev->rd_page_count);
+                        rd_dev->rd_flags |= RDF_HAS_PAGE_COUNT;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        kfree(orig);
+        return (!ret) ? count : ret;
+}
+
+static ssize_t rd_check_configfs_dev_params(struct se_hba *hba, struct se_subsystem_dev *se_dev)
+{
+        struct rd_dev *rd_dev = se_dev->se_dev_su_ptr;
+
+        if (!(rd_dev->rd_flags & RDF_HAS_PAGE_COUNT)) {
+                printk(KERN_INFO "Missing rd_pages= parameter\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static ssize_t rd_show_configfs_dev_params(
+        struct se_hba *hba,
+        struct se_subsystem_dev *se_dev,
+        char *b)
+{
+        struct rd_dev *rd_dev = se_dev->se_dev_su_ptr;
+        ssize_t bl = sprintf(b, "TCM RamDisk ID: %u  RamDisk Makeup: %s\n",
+                        rd_dev->rd_dev_id, (rd_dev->rd_direct) ?
+                        "rd_direct" : "rd_mcp");
+        bl += sprintf(b + bl, "        PAGES/PAGE_SIZE: %u*%lu"
+                        "  SG_table_count: %u\n", rd_dev->rd_page_count,
+                        PAGE_SIZE, rd_dev->sg_table_count);
+        return bl;
+}
+
+/*      rd_get_cdb(): (Part of se_subsystem_api_t template)
+ *
+ *
+ */
+static unsigned char *rd_get_cdb(struct se_task *task)
+{
+        struct rd_request *req = RD_REQ(task);
+
+        return req->rd_scsi_cdb;
+}
+
+static u32 rd_get_device_rev(struct se_device *dev)
+{
+        return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */
+}
+
+static u32 rd_get_device_type(struct se_device *dev)
+{
+        return TYPE_DISK;
+}
+
+static sector_t rd_get_blocks(struct se_device *dev)
+{
+        struct rd_dev *rd_dev = dev->dev_ptr;
+        unsigned long long blocks_long = ((rd_dev->rd_page_count * PAGE_SIZE) /
+                        DEV_ATTRIB(dev)->block_size) - 1;
+
+        return blocks_long;
+}
+
+static struct se_subsystem_api rd_dr_template = {
+        .name                   = "rd_dr",
+        .transport_type         = TRANSPORT_PLUGIN_VHBA_VDEV,
+        .attach_hba             = rd_attach_hba,
+        .detach_hba             = rd_detach_hba,
+        .allocate_virtdevice    = rd_DIRECT_allocate_virtdevice,
+        .create_virtdevice      = rd_DIRECT_create_virtdevice,
+        .free_device            = rd_free_device,
+        .alloc_task             = rd_alloc_task,
+        .do_task                = rd_DIRECT_do_task,
+        .free_task              = rd_free_task,
+        .check_configfs_dev_params = rd_check_configfs_dev_params,
+        .set_configfs_dev_params = rd_set_configfs_dev_params,
+        .show_configfs_dev_params = rd_show_configfs_dev_params,
+        .get_cdb                = rd_get_cdb,
+        .get_device_rev         = rd_get_device_rev,
+        .get_device_type        = rd_get_device_type,
+        .get_blocks             = rd_get_blocks,
+        .do_se_mem_map          = rd_DIRECT_do_se_mem_map,
+};
+
+static struct se_subsystem_api rd_mcp_template = {
+        .name                   = "rd_mcp",
+        .transport_type         = TRANSPORT_PLUGIN_VHBA_VDEV,
+        .attach_hba             = rd_attach_hba,
+        .detach_hba             = rd_detach_hba,
+        .allocate_virtdevice    = rd_MEMCPY_allocate_virtdevice,
+        .create_virtdevice      = rd_MEMCPY_create_virtdevice,
+        .free_device            = rd_free_device,
+        .alloc_task             = rd_alloc_task,
+        .do_task                = rd_MEMCPY_do_task,
+        .free_task              = rd_free_task,
+        .check_configfs_dev_params = rd_check_configfs_dev_params,
+        .set_configfs_dev_params = rd_set_configfs_dev_params,
+        .show_configfs_dev_params = rd_show_configfs_dev_params,
+        .get_cdb                = rd_get_cdb,
+        .get_device_rev         = rd_get_device_rev,
+        .get_device_type        = rd_get_device_type,
+        .get_blocks             = rd_get_blocks,
+};
+
+int __init rd_module_init(void)
+{
+        int ret;
+
+        ret = transport_subsystem_register(&rd_dr_template);
+        if (ret < 0)
+                return ret;
+
+        ret = transport_subsystem_register(&rd_mcp_template);
+        if (ret < 0) {
+                transport_subsystem_release(&rd_dr_template);
+                return ret;
+        }
+
+        return 0;
+}
+
+void rd_module_exit(void)
+{
+        transport_subsystem_release(&rd_dr_template);
+        transport_subsystem_release(&rd_mcp_template);
+}
diff --git a/drivers/target/target_core_rd.h b/drivers/target/target_core_rd.h
new file mode 100644
index 000000000000..13badfbaf9c0
--- /dev/null
+++ b/drivers/target/target_core_rd.h
@@ -0,0 +1,73 @@
+#ifndef TARGET_CORE_RD_H
+#define TARGET_CORE_RD_H
+
+#define RD_HBA_VERSION          "v4.0"
+#define RD_DR_VERSION           "4.0"
+#define RD_MCP_VERSION          "4.0"
+
+/* Largest piece of memory kmalloc can allocate */
+#define RD_MAX_ALLOCATION_SIZE  65536
+/* Maximum queuedepth for the Ramdisk HBA */
+#define RD_HBA_QUEUE_DEPTH      256
+#define RD_DEVICE_QUEUE_DEPTH   32
+#define RD_MAX_DEVICE_QUEUE_DEPTH 128
+#define RD_BLOCKSIZE            512
+#define RD_MAX_SECTORS          1024
+
+extern struct kmem_cache *se_mem_cache;
+
+/* Used in target_core_init_configfs() for virtual LUN 0 access */
+int __init rd_module_init(void);
+void rd_module_exit(void);
+
+#define RRF_EMULATE_CDB         0x01
+#define RRF_GOT_LBA             0x02
+
+struct rd_request {
+        struct se_task  rd_task;
+
+        /* SCSI CDB from iSCSI Command PDU */
+        unsigned char   rd_scsi_cdb[TCM_MAX_COMMAND_SIZE];
+        /* Offset from start of page */
+        u32             rd_offset;
+        /* Starting page in Ramdisk for request */
+        u32             rd_page;
+        /* Total number of pages needed for request */
+        u32             rd_page_count;
+        /* Scatterlist count */
+        u32             rd_size;
+        /* Ramdisk device */
+        struct rd_dev   *rd_dev;
+} ____cacheline_aligned;
+
+struct rd_dev_sg_table {
+        u32             page_start_offset;
+        u32             page_end_offset;
+        u32             rd_sg_count;
+        struct scatterlist *sg_table;
+} ____cacheline_aligned;
+
+#define RDF_HAS_PAGE_COUNT      0x01
+
+struct rd_dev {
+        int             rd_direct;
+        u32             rd_flags;
+        /* Unique Ramdisk Device ID in Ramdisk HBA */
+        u32             rd_dev_id;
+        /* Total page count for ramdisk device */
+        u32             rd_page_count;
+        /* Number of SG tables in sg_table_array */
+        u32             sg_table_count;
+        u32             rd_queue_depth;
+        /* Array of rd_dev_sg_table_t containing scatterlists */
+        struct rd_dev_sg_table *sg_table_array;
+        /* Ramdisk HBA device is connected to */
+        struct rd_host *rd_host;
+} ____cacheline_aligned;
+
+struct rd_host {
+        u32             rd_host_dev_id_count;
+        u32             rd_host_id;             /* Unique Ramdisk Host ID */
+} ____cacheline_aligned;
+
+#endif /* TARGET_CORE_RD_H */
diff --git a/drivers/target/target_core_scdb.c b/drivers/target/target_core_scdb.c
new file mode 100644
index 000000000000..dc6fed037ab3
--- /dev/null
+++ b/drivers/target/target_core_scdb.c
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Filename:  target_core_scdb.c
+ *
+ * This file contains the generic target engine Split CDB related functions.
+ *
+ * Copyright (c) 2004-2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/net.h>
+#include <linux/string.h>
+#include <scsi/scsi.h>
+#include <asm/unaligned.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_transport.h>
+
+#include "target_core_scdb.h"
+
+/*      split_cdb_XX_6():
+ *
+ *      21-bit LBA w/ 8-bit SECTORS
+ */
+void split_cdb_XX_6(
+        unsigned long long lba,
+        u32 *sectors,
+        unsigned char *cdb)
+{
+        cdb[1] = (lba >> 16) & 0x1f;
+        cdb[2] = (lba >> 8) & 0xff;
+        cdb[3] = lba & 0xff;
+        cdb[4] = *sectors & 0xff;
+}
+
+/*      split_cdb_XX_10():
+ *
+ *      32-bit LBA w/ 16-bit SECTORS
+ */
+void split_cdb_XX_10(
+        unsigned long long lba,
+        u32 *sectors,
+        unsigned char *cdb)
+{
+        put_unaligned_be32(lba, &cdb[2]);
+        put_unaligned_be16(*sectors, &cdb[7]);
+}
+
+/*      split_cdb_XX_12():
+ *
+ *      32-bit LBA w/ 32-bit SECTORS
+ */
+void split_cdb_XX_12(
+        unsigned long long lba,
+        u32 *sectors,
+        unsigned char *cdb)
+{
+        put_unaligned_be32(lba, &cdb[2]);
+        put_unaligned_be32(*sectors, &cdb[6]);
+}
+
+/*      split_cdb_XX_16():
+ *
+ *      64-bit LBA w/ 32-bit SECTORS
+ */
+void split_cdb_XX_16(
+        unsigned long long lba,
+        u32 *sectors,
+        unsigned char *cdb)
+{
+        put_unaligned_be64(lba, &cdb[2]);
+        put_unaligned_be32(*sectors, &cdb[10]);
+}
+
+/*
+ *      split_cdb_XX_32():
+ *
+ *      64-bit LBA w/ 32-bit SECTORS such as READ_32, WRITE_32 and emulated XDWRITEREAD_32
+ */
+void split_cdb_XX_32(
+        unsigned long long lba,
+        u32 *sectors,
+        unsigned char *cdb)
+{
+        put_unaligned_be64(lba, &cdb[12]);
+        put_unaligned_be32(*sectors, &cdb[28]);
+}
diff --git a/drivers/target/target_core_scdb.h b/drivers/target/target_core_scdb.h
new file mode 100644
index 000000000000..98cd1c01ed83
--- /dev/null
+++ b/drivers/target/target_core_scdb.h
@@ -0,0 +1,10 @@
+#ifndef TARGET_CORE_SCDB_H
+#define TARGET_CORE_SCDB_H
+
+extern void split_cdb_XX_6(unsigned long long, u32 *, unsigned char *);
+extern void split_cdb_XX_10(unsigned long long, u32 *, unsigned char *);
+extern void split_cdb_XX_12(unsigned long long, u32 *, unsigned char *);
+extern void split_cdb_XX_16(unsigned long long, u32 *, unsigned char *);
+extern void split_cdb_XX_32(unsigned long long, u32 *, unsigned char *);
+
+#endif /* TARGET_CORE_SCDB_H */
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
new file mode 100644
index 000000000000..158cecbec718
--- /dev/null
+++ b/drivers/target/target_core_tmr.c
@@ -0,0 +1,404 @@
+/*******************************************************************************
+ * Filename:  target_core_tmr.c
+ *
+ * This file contains SPC-3 task management infrastructure
+ *
+ * Copyright (c) 2009,2010 Rising Tide Systems
+ * Copyright (c) 2009,2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tmr.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_alua.h"
+#include "target_core_pr.h"
+
+#define DEBUG_LUN_RESET
+#ifdef DEBUG_LUN_RESET
+#define DEBUG_LR(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_LR(x...)
+#endif
+
+struct se_tmr_req *core_tmr_alloc_req(
+        struct se_cmd *se_cmd,
+        void *fabric_tmr_ptr,
+        u8 function)
+{
+        struct se_tmr_req *tmr;
+
+        tmr = kmem_cache_zalloc(se_tmr_req_cache, GFP_KERNEL);
+        if (!(tmr)) {
+                printk(KERN_ERR "Unable to allocate struct se_tmr_req\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        tmr->task_cmd = se_cmd;
+        tmr->fabric_tmr_ptr = fabric_tmr_ptr;
+        tmr->function = function;
+        INIT_LIST_HEAD(&tmr->tmr_list);
+
+        return tmr;
+}
+EXPORT_SYMBOL(core_tmr_alloc_req);
+
+void core_tmr_release_req(
+        struct se_tmr_req *tmr)
+{
+        struct se_device *dev = tmr->tmr_dev;
+
+        spin_lock(&dev->se_tmr_lock);
+        list_del(&tmr->tmr_list);
+        kmem_cache_free(se_tmr_req_cache, tmr);
+        spin_unlock(&dev->se_tmr_lock);
+}
+
+static void core_tmr_handle_tas_abort(
+        struct se_node_acl *tmr_nacl,
+        struct se_cmd *cmd,
+        int tas,
+        int fe_count)
+{
+        if (!(fe_count)) {
+                transport_cmd_finish_abort(cmd, 1);
+                return;
+        }
+        /*
+         * TASK ABORTED status (TAS) bit support
+        */
+        if (((tmr_nacl != NULL) &&
+             (tmr_nacl == cmd->se_sess->se_node_acl)) || tas)
+                transport_send_task_abort(cmd);
+
+        transport_cmd_finish_abort(cmd, 0);
+}
+
+int core_tmr_lun_reset(
+        struct se_device *dev,
+        struct se_tmr_req *tmr,
+        struct list_head *preempt_and_abort_list,
+        struct se_cmd *prout_cmd)
+{
+        struct se_cmd *cmd;
+        struct se_queue_req *qr, *qr_tmp;
+        struct se_node_acl *tmr_nacl = NULL;
+        struct se_portal_group *tmr_tpg = NULL;
+        struct se_queue_obj *qobj = dev->dev_queue_obj;
+        struct se_tmr_req *tmr_p, *tmr_pp;
+        struct se_task *task, *task_tmp;
+        unsigned long flags;
+        int fe_count, state, tas;
+        /*
+         * TASK_ABORTED status bit, this is configurable via ConfigFS
+         * struct se_device attributes.  spc4r17 section 7.4.6 Control mode page
+         *
+         * A task aborted status (TAS) bit set to zero specifies that aborted
+         * tasks shall be terminated by the device server without any response
+         * to the application client. A TAS bit set to one specifies that tasks
+         * aborted by the actions of an I_T nexus other than the I_T nexus on
+         * which the command was received shall be completed with TASK ABORTED
+         * status (see SAM-4).
+         */
+        tas = DEV_ATTRIB(dev)->emulate_tas;
+        /*
+         * Determine if this se_tmr is coming from a $FABRIC_MOD
+         * or struct se_device passthrough..
+         */
+        if (tmr && tmr->task_cmd && tmr->task_cmd->se_sess) {
+                tmr_nacl = tmr->task_cmd->se_sess->se_node_acl;
+                tmr_tpg = tmr->task_cmd->se_sess->se_tpg;
+                if (tmr_nacl && tmr_tpg) {
+                        DEBUG_LR("LUN_RESET: TMR caller fabric: %s"
+                                " initiator port %s\n",
+                                TPG_TFO(tmr_tpg)->get_fabric_name(),
+                                tmr_nacl->initiatorname);
+                }
+        }
+        DEBUG_LR("LUN_RESET: %s starting for [%s], tas: %d\n",
+                (preempt_and_abort_list) ? "Preempt" : "TMR",
+                TRANSPORT(dev)->name, tas);
+        /*
+         * Release all pending and outgoing TMRs aside from the received
+         * LUN_RESET tmr..
+         */
+        spin_lock(&dev->se_tmr_lock);
+        list_for_each_entry_safe(tmr_p, tmr_pp, &dev->dev_tmr_list, tmr_list) {
+                /*
+                 * Allow the received TMR to return with FUNCTION_COMPLETE.
+                 */
+                if (tmr && (tmr_p == tmr))
+                        continue;
+
+                cmd = tmr_p->task_cmd;
+                if (!(cmd)) {
+                        printk(KERN_ERR "Unable to locate struct se_cmd for TMR\n");
+                        continue;
+                }
+                /*
+                 * If this function was called with a valid pr_res_key
+                 * parameter (eg: for PROUT PREEMPT_AND_ABORT service action
+                 * skip non regisration key matching TMRs.
+                 */
+                if ((preempt_and_abort_list != NULL) &&
+                    (core_scsi3_check_cdb_abort_and_preempt(
+                                        preempt_and_abort_list, cmd) != 0))
+                        continue;
+                spin_unlock(&dev->se_tmr_lock);
+
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                if (!(atomic_read(&T_TASK(cmd)->t_transport_active))) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                        spin_lock(&dev->se_tmr_lock);
+                        continue;
+                }
+                if (cmd->t_state == TRANSPORT_ISTATE_PROCESSING) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                        spin_lock(&dev->se_tmr_lock);
+                        continue;
+                }
+                DEBUG_LR("LUN_RESET: %s releasing TMR %p Function: 0x%02x,"
+                        " Response: 0x%02x, t_state: %d\n",
+                        (preempt_and_abort_list) ? "Preempt" : "", tmr_p,
+                        tmr_p->function, tmr_p->response, cmd->t_state);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                transport_cmd_finish_abort_tmr(cmd);
+                spin_lock(&dev->se_tmr_lock);
+        }
+        spin_unlock(&dev->se_tmr_lock);
+        /*
+         * Complete outstanding struct se_task CDBs with TASK_ABORTED SAM status.
+         * This is following sam4r17, section 5.6 Aborting commands, Table 38
+         * for TMR LUN_RESET:
+         *
+         * a) "Yes" indicates that each command that is aborted on an I_T nexus
+         * other than the one that caused the SCSI device condition is
+         * completed with TASK ABORTED status, if the TAS bit is set to one in
+         * the Control mode page (see SPC-4). "No" indicates that no status is
+         * returned for aborted commands.
+         *
+         * d) If the logical unit reset is caused by a particular I_T nexus
+         * (e.g., by a LOGICAL UNIT RESET task management function), then "yes"
+         * (TASK_ABORTED status) applies.
+         *
+         * Otherwise (e.g., if triggered by a hard reset), "no"
+         * (no TASK_ABORTED SAM status) applies.
+         *
+         * Note that this seems to be independent of TAS (Task Aborted Status)
+         * in the Control Mode Page.
+         */
+        spin_lock_irqsave(&dev->execute_task_lock, flags);
+        list_for_each_entry_safe(task, task_tmp, &dev->state_task_list,
+                                t_state_list) {
+                if (!(TASK_CMD(task))) {
+                        printk(KERN_ERR "TASK_CMD(task) is NULL!\n");
+                        continue;
+                }
+                cmd = TASK_CMD(task);
+
+                if (!T_TASK(cmd)) {
+                        printk(KERN_ERR "T_TASK(cmd) is NULL for task: %p cmd:"
+                                " %p ITT: 0x%08x\n", task, cmd,
+                                CMD_TFO(cmd)->get_task_tag(cmd));
+                        continue;
+                }
+                /*
+                 * For PREEMPT_AND_ABORT usage, only process commands
+                 * with a matching reservation key.
+                 */
+                if ((preempt_and_abort_list != NULL) &&
+                    (core_scsi3_check_cdb_abort_and_preempt(
+                                        preempt_and_abort_list, cmd) != 0))
+                        continue;
+                /*
+                 * Not aborting PROUT PREEMPT_AND_ABORT CDB..
+                 */
+                if (prout_cmd == cmd)
+                        continue;
+
+                list_del(&task->t_state_list);
+                atomic_set(&task->task_state_active, 0);
+                spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                DEBUG_LR("LUN_RESET: %s cmd: %p task: %p"
+                        " ITT/CmdSN: 0x%08x/0x%08x, i_state: %d, t_state/"
+                        "def_t_state: %d/%d cdb: 0x%02x\n",
+                        (preempt_and_abort_list) ? "Preempt" : "", cmd, task,
+                        CMD_TFO(cmd)->get_task_tag(cmd), 0,
+                        CMD_TFO(cmd)->get_cmd_state(cmd), cmd->t_state,
+                        cmd->deferred_t_state, T_TASK(cmd)->t_task_cdb[0]);
+                DEBUG_LR("LUN_RESET: ITT[0x%08x] - pr_res_key: 0x%016Lx"
+                        " t_task_cdbs: %d t_task_cdbs_left: %d"
+                        " t_task_cdbs_sent: %d -- t_transport_active: %d"
+                        " t_transport_stop: %d t_transport_sent: %d\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
+                        T_TASK(cmd)->t_task_cdbs,
+                        atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
+                        atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
+                        atomic_read(&T_TASK(cmd)->t_transport_active),
+                        atomic_read(&T_TASK(cmd)->t_transport_stop),
+                        atomic_read(&T_TASK(cmd)->t_transport_sent));
+
+                if (atomic_read(&task->task_active)) {
+                        atomic_set(&task->task_stop, 1);
+                        spin_unlock_irqrestore(
+                                &T_TASK(cmd)->t_state_lock, flags);
+
+                        DEBUG_LR("LUN_RESET: Waiting for task: %p to shutdown"
+                                " for dev: %p\n", task, dev);
+                        wait_for_completion(&task->task_stop_comp);
+                        DEBUG_LR("LUN_RESET Completed task: %p shutdown for"
+                                " dev: %p\n", task, dev);
+                        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                        atomic_dec(&T_TASK(cmd)->t_task_cdbs_left);
+
+                        atomic_set(&task->task_active, 0);
+                        atomic_set(&task->task_stop, 0);
+                }
+                __transport_stop_task_timer(task, &flags);
+
+                if (!(atomic_dec_and_test(&T_TASK(cmd)->t_task_cdbs_ex_left))) {
+                        spin_unlock_irqrestore(
+                                        &T_TASK(cmd)->t_state_lock, flags);
+                        DEBUG_LR("LUN_RESET: Skipping task: %p, dev: %p for"
+                                " t_task_cdbs_ex_left: %d\n", task, dev,
+                                atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left));
+
+                        spin_lock_irqsave(&dev->execute_task_lock, flags);
+                        continue;
+                }
+                fe_count = atomic_read(&T_TASK(cmd)->t_fe_count);
+
+                if (atomic_read(&T_TASK(cmd)->t_transport_active)) {
+                        DEBUG_LR("LUN_RESET: got t_transport_active = 1 for"
+                                " task: %p, t_fe_count: %d dev: %p\n", task,
+                                fe_count, dev);
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                                flags);
+                        core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+
+                        spin_lock_irqsave(&dev->execute_task_lock, flags);
+                        continue;
+                }
+                DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p,"
+                        " t_fe_count: %d dev: %p\n", task, fe_count, dev);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
+
+                spin_lock_irqsave(&dev->execute_task_lock, flags);
+        }
+        spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+        /*
+         * Release all commands remaining in the struct se_device cmd queue.
+         *
+         * This follows the same logic as above for the struct se_device
+         * struct se_task state list, where commands are returned with
+         * TASK_ABORTED status, if there is an outstanding $FABRIC_MOD
+         * reference, otherwise the struct se_cmd is released.
+         */
+        spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
+        list_for_each_entry_safe(qr, qr_tmp, &qobj->qobj_list, qr_list) {
+                cmd = (struct se_cmd *)qr->cmd;
+                if (!(cmd)) {
+                        /*
+                         * Skip these for non PREEMPT_AND_ABORT usage..
+                         */
+                        if (preempt_and_abort_list != NULL)
+                                continue;
+
+                        atomic_dec(&qobj->queue_cnt);
+                        list_del(&qr->qr_list);
+                        kfree(qr);
+                        continue;
+                }
+                /*
+                 * For PREEMPT_AND_ABORT usage, only process commands
+                 * with a matching reservation key.
+                 */
+                if ((preempt_and_abort_list != NULL) &&
+                    (core_scsi3_check_cdb_abort_and_preempt(
+                                        preempt_and_abort_list, cmd) != 0))
+                        continue;
+                /*
+                 * Not aborting PROUT PREEMPT_AND_ABORT CDB..
+                 */
+                if (prout_cmd == cmd)
+                        continue;
+
+                atomic_dec(&T_TASK(cmd)->t_transport_queue_active);
+                atomic_dec(&qobj->queue_cnt);
+                list_del(&qr->qr_list);
+                spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+
+                state = qr->state;
+                kfree(qr);
+
+                DEBUG_LR("LUN_RESET: %s from Device Queue: cmd: %p t_state:"
+                        " %d t_fe_count: %d\n", (preempt_and_abort_list) ?
+                        "Preempt" : "", cmd, state,
+                        atomic_read(&T_TASK(cmd)->t_fe_count));
+                /*
+                 * Signal that the command has failed via cmd->se_cmd_flags,
+                 * and call TFO->new_cmd_failure() to wakeup any fabric
+                 * dependent code used to wait for unsolicited data out
+                 * allocation to complete.  The fabric module is expected
+                 * to dump any remaining unsolicited data out for the aborted
+                 * command at this point.
+                 */
+                transport_new_cmd_failure(cmd);
+
+                core_tmr_handle_tas_abort(tmr_nacl, cmd, tas,
+                                atomic_read(&T_TASK(cmd)->t_fe_count));
+                spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
+        }
+        spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+        /*
+         * Clear any legacy SPC-2 reservation when called during
+         * LOGICAL UNIT RESET
+         */
+        if (!(preempt_and_abort_list) &&
+             (dev->dev_flags & DF_SPC2_RESERVATIONS)) {
+                spin_lock(&dev->dev_reservation_lock);
+                dev->dev_reserved_node_acl = NULL;
+                dev->dev_flags &= ~DF_SPC2_RESERVATIONS;
+                spin_unlock(&dev->dev_reservation_lock);
+                printk(KERN_INFO "LUN_RESET: SCSI-2 Released reservation\n");
+        }
+
+        spin_lock(&dev->stats_lock);
+        dev->num_resets++;
+        spin_unlock(&dev->stats_lock);
+
+        DEBUG_LR("LUN_RESET: %s for [%s] Complete\n",
+                        (preempt_and_abort_list) ? "Preempt" : "TMR",
+                        TRANSPORT(dev)->name);
+        return 0;
+}
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
new file mode 100644
index 000000000000..abfa81a57115
--- /dev/null
+++ b/drivers/target/target_core_tpg.c
@@ -0,0 +1,826 @@
+/*******************************************************************************
+ * Filename:  target_core_tpg.c
+ *
+ * This file contains generic Target Portal Group related functions.
+ *
+ * Copyright (c) 2002, 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/net.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/in.h>
+#include <net/sock.h>
+#include <net/tcp.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+
+#include "target_core_hba.h"
+
+/*      core_clear_initiator_node_from_tpg():
+ *
+ *
+ */
+static void core_clear_initiator_node_from_tpg(
+        struct se_node_acl *nacl,
+        struct se_portal_group *tpg)
+{
+        int i;
+        struct se_dev_entry *deve;
+        struct se_lun *lun;
+        struct se_lun_acl *acl, *acl_tmp;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                deve = &nacl->device_list[i];
+
+                if (!(deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS))
+                        continue;
+
+                if (!deve->se_lun) {
+                        printk(KERN_ERR "%s device entries device pointer is"
+                                " NULL, but Initiator has access.\n",
+                                TPG_TFO(tpg)->get_fabric_name());
+                        continue;
+                }
+
+                lun = deve->se_lun;
+                spin_unlock_irq(&nacl->device_list_lock);
+                core_update_device_list_for_node(lun, NULL, deve->mapped_lun,
+                        TRANSPORT_LUNFLAGS_NO_ACCESS, nacl, tpg, 0);
+
+                spin_lock(&lun->lun_acl_lock);
+                list_for_each_entry_safe(acl, acl_tmp,
+                                        &lun->lun_acl_list, lacl_list) {
+                        if (!(strcmp(acl->initiatorname,
+                                        nacl->initiatorname)) &&
+                             (acl->mapped_lun == deve->mapped_lun))
+                                break;
+                }
+
+                if (!acl) {
+                        printk(KERN_ERR "Unable to locate struct se_lun_acl for %s,"
+                                " mapped_lun: %u\n", nacl->initiatorname,
+                                deve->mapped_lun);
+                        spin_unlock(&lun->lun_acl_lock);
+                        spin_lock_irq(&nacl->device_list_lock);
+                        continue;
+                }
+
+                list_del(&acl->lacl_list);
+                spin_unlock(&lun->lun_acl_lock);
+
+                spin_lock_irq(&nacl->device_list_lock);
+                kfree(acl);
+        }
+        spin_unlock_irq(&nacl->device_list_lock);
+}
+
+/*      __core_tpg_get_initiator_node_acl():
+ *
+ *      spin_lock_bh(&tpg->acl_node_lock); must be held when calling
+ */
+struct se_node_acl *__core_tpg_get_initiator_node_acl(
+        struct se_portal_group *tpg,
+        const char *initiatorname)
+{
+        struct se_node_acl *acl;
+
+        list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
+                if (!(strcmp(acl->initiatorname, initiatorname)))
+                        return acl;
+        }
+
+        return NULL;
+}
+
+/*      core_tpg_get_initiator_node_acl():
+ *
+ *
+ */
+struct se_node_acl *core_tpg_get_initiator_node_acl(
+        struct se_portal_group *tpg,
+        unsigned char *initiatorname)
+{
+        struct se_node_acl *acl;
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        list_for_each_entry(acl, &tpg->acl_node_list, acl_list) {
+                if (!(strcmp(acl->initiatorname, initiatorname)) &&
+                   (!(acl->dynamic_node_acl))) {
+                        spin_unlock_bh(&tpg->acl_node_lock);
+                        return acl;
+                }
+        }
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        return NULL;
+}
+
+/*      core_tpg_add_node_to_devs():
+ *
+ *
+ */
+void core_tpg_add_node_to_devs(
+        struct se_node_acl *acl,
+        struct se_portal_group *tpg)
+{
+        int i = 0;
+        u32 lun_access = 0;
+        struct se_lun *lun;
+        struct se_device *dev;
+
+        spin_lock(&tpg->tpg_lun_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                lun = &tpg->tpg_lun_list[i];
+                if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE)
+                        continue;
+
+                spin_unlock(&tpg->tpg_lun_lock);
+
+                dev = lun->lun_se_dev;
+                /*
+                 * By default in LIO-Target $FABRIC_MOD,
+                 * demo_mode_write_protect is ON, or READ_ONLY;
+                 */
+                if (!(TPG_TFO(tpg)->tpg_check_demo_mode_write_protect(tpg))) {
+                        if (dev->dev_flags & DF_READ_ONLY)
+                                lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
+                        else
+                                lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
+                } else {
+                        /*
+                         * Allow only optical drives to issue R/W in default RO
+                         * demo mode.
+                         */
+                        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_DISK)
+                                lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
+                        else
+                                lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
+                }
+
+                printk(KERN_INFO "TARGET_CORE[%s]->TPG[%u]_LUN[%u] - Adding %s"
+                        " access for LUN in Demo Mode\n",
+                        TPG_TFO(tpg)->get_fabric_name(),
+                        TPG_TFO(tpg)->tpg_get_tag(tpg), lun->unpacked_lun,
+                        (lun_access == TRANSPORT_LUNFLAGS_READ_WRITE) ?
+                        "READ-WRITE" : "READ-ONLY");
+
+                core_update_device_list_for_node(lun, NULL, lun->unpacked_lun,
+                                lun_access, acl, tpg, 1);
+                spin_lock(&tpg->tpg_lun_lock);
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+}
+
+/*      core_set_queue_depth_for_node():
+ *
+ *
+ */
+static int core_set_queue_depth_for_node(
+        struct se_portal_group *tpg,
+        struct se_node_acl *acl)
+{
+        if (!acl->queue_depth) {
+                printk(KERN_ERR "Queue depth for %s Initiator Node: %s is 0,"
+                        "defaulting to 1.\n", TPG_TFO(tpg)->get_fabric_name(),
+                        acl->initiatorname);
+                acl->queue_depth = 1;
+        }
+
+        return 0;
+}
+
+/*      core_create_device_list_for_node():
+ *
+ *
+ */
+static int core_create_device_list_for_node(struct se_node_acl *nacl)
+{
+        struct se_dev_entry *deve;
+        int i;
+
+        nacl->device_list = kzalloc(sizeof(struct se_dev_entry) *
+                                TRANSPORT_MAX_LUNS_PER_TPG, GFP_KERNEL);
+        if (!(nacl->device_list)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                        " struct se_node_acl->device_list\n");
+                return -1;
+        }
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                deve = &nacl->device_list[i];
+
+                atomic_set(&deve->ua_count, 0);
+                atomic_set(&deve->pr_ref_count, 0);
+                spin_lock_init(&deve->ua_lock);
+                INIT_LIST_HEAD(&deve->alua_port_list);
+                INIT_LIST_HEAD(&deve->ua_list);
+        }
+
+        return 0;
+}
+
+/*      core_tpg_check_initiator_node_acl()
+ *
+ *
+ */
+struct se_node_acl *core_tpg_check_initiator_node_acl(
+        struct se_portal_group *tpg,
+        unsigned char *initiatorname)
+{
+        struct se_node_acl *acl;
+
+        acl = core_tpg_get_initiator_node_acl(tpg, initiatorname);
+        if ((acl))
+                return acl;
+
+        if (!(TPG_TFO(tpg)->tpg_check_demo_mode(tpg)))
+                return NULL;
+
+        acl =  TPG_TFO(tpg)->tpg_alloc_fabric_acl(tpg);
+        if (!(acl))
+                return NULL;
+
+        INIT_LIST_HEAD(&acl->acl_list);
+        INIT_LIST_HEAD(&acl->acl_sess_list);
+        spin_lock_init(&acl->device_list_lock);
+        spin_lock_init(&acl->nacl_sess_lock);
+        atomic_set(&acl->acl_pr_ref_count, 0);
+        atomic_set(&acl->mib_ref_count, 0);
+        acl->queue_depth = TPG_TFO(tpg)->tpg_get_default_depth(tpg);
+        snprintf(acl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname);
+        acl->se_tpg = tpg;
+        acl->acl_index = scsi_get_new_index(SCSI_AUTH_INTR_INDEX);
+        spin_lock_init(&acl->stats_lock);
+        acl->dynamic_node_acl = 1;
+
+        TPG_TFO(tpg)->set_default_node_attributes(acl);
+
+        if (core_create_device_list_for_node(acl) < 0) {
+                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                return NULL;
+        }
+
+        if (core_set_queue_depth_for_node(tpg, acl) < 0) {
+                core_free_device_list_for_node(acl, tpg);
+                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                return NULL;
+        }
+
+        core_tpg_add_node_to_devs(acl, tpg);
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        list_add_tail(&acl->acl_list, &tpg->acl_node_list);
+        tpg->num_node_acls++;
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        printk("%s_TPG[%u] - Added DYNAMIC ACL with TCQ Depth: %d for %s"
+                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
+                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+
+        return acl;
+}
+EXPORT_SYMBOL(core_tpg_check_initiator_node_acl);
+
+void core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *nacl)
+{
+        while (atomic_read(&nacl->acl_pr_ref_count) != 0)
+                cpu_relax();
+}
+
+void core_tpg_wait_for_mib_ref(struct se_node_acl *nacl)
+{
+        while (atomic_read(&nacl->mib_ref_count) != 0)
+                cpu_relax();
+}
+
+void core_tpg_clear_object_luns(struct se_portal_group *tpg)
+{
+        int i, ret;
+        struct se_lun *lun;
+
+        spin_lock(&tpg->tpg_lun_lock);
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                lun = &tpg->tpg_lun_list[i];
+
+                if ((lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) ||
+                    (lun->lun_se_dev == NULL))
+                        continue;
+
+                spin_unlock(&tpg->tpg_lun_lock);
+                ret = core_dev_del_lun(tpg, lun->unpacked_lun);
+                spin_lock(&tpg->tpg_lun_lock);
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+}
+EXPORT_SYMBOL(core_tpg_clear_object_luns);
+
+/*      core_tpg_add_initiator_node_acl():
+ *
+ *
+ */
+struct se_node_acl *core_tpg_add_initiator_node_acl(
+        struct se_portal_group *tpg,
+        struct se_node_acl *se_nacl,
+        const char *initiatorname,
+        u32 queue_depth)
+{
+        struct se_node_acl *acl = NULL;
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname);
+        if ((acl)) {
+                if (acl->dynamic_node_acl) {
+                        acl->dynamic_node_acl = 0;
+                        printk(KERN_INFO "%s_TPG[%u] - Replacing dynamic ACL"
+                                " for %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                                TPG_TFO(tpg)->tpg_get_tag(tpg), initiatorname);
+                        spin_unlock_bh(&tpg->acl_node_lock);
+                        /*
+                         * Release the locally allocated struct se_node_acl
+                         * because * core_tpg_add_initiator_node_acl() returned
+                         * a pointer to an existing demo mode node ACL.
+                         */
+                        if (se_nacl)
+                                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg,
+                                                        se_nacl);
+                        goto done;
+                }
+
+                printk(KERN_ERR "ACL entry for %s Initiator"
+                        " Node %s already exists for TPG %u, ignoring"
+                        " request.\n",  TPG_TFO(tpg)->get_fabric_name(),
+                        initiatorname, TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock_bh(&tpg->acl_node_lock);
+                return ERR_PTR(-EEXIST);
+        }
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        if (!(se_nacl)) {
+                printk("struct se_node_acl pointer is NULL\n");
+                return ERR_PTR(-EINVAL);
+        }
+        /*
+         * For v4.x logic the se_node_acl_s is hanging off a fabric
+         * dependent structure allocated via
+         * struct target_core_fabric_ops->fabric_make_nodeacl()
+         */
+        acl = se_nacl;
+
+        INIT_LIST_HEAD(&acl->acl_list);
+        INIT_LIST_HEAD(&acl->acl_sess_list);
+        spin_lock_init(&acl->device_list_lock);
+        spin_lock_init(&acl->nacl_sess_lock);
+        atomic_set(&acl->acl_pr_ref_count, 0);
+        acl->queue_depth = queue_depth;
+        snprintf(acl->initiatorname, TRANSPORT_IQN_LEN, "%s", initiatorname);
+        acl->se_tpg = tpg;
+        acl->acl_index = scsi_get_new_index(SCSI_AUTH_INTR_INDEX);
+        spin_lock_init(&acl->stats_lock);
+
+        TPG_TFO(tpg)->set_default_node_attributes(acl);
+
+        if (core_create_device_list_for_node(acl) < 0) {
+                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        if (core_set_queue_depth_for_node(tpg, acl) < 0) {
+                core_free_device_list_for_node(acl, tpg);
+                TPG_TFO(tpg)->tpg_release_fabric_acl(tpg, acl);
+                return ERR_PTR(-EINVAL);
+        }
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        list_add_tail(&acl->acl_list, &tpg->acl_node_list);
+        tpg->num_node_acls++;
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+done:
+        printk(KERN_INFO "%s_TPG[%hu] - Added ACL with TCQ Depth: %d for %s"
+                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
+                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+
+        return acl;
+}
+EXPORT_SYMBOL(core_tpg_add_initiator_node_acl);
+
+/*      core_tpg_del_initiator_node_acl():
+ *
+ *
+ */
+int core_tpg_del_initiator_node_acl(
+        struct se_portal_group *tpg,
+        struct se_node_acl *acl,
+        int force)
+{
+        struct se_session *sess, *sess_tmp;
+        int dynamic_acl = 0;
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        if (acl->dynamic_node_acl) {
+                acl->dynamic_node_acl = 0;
+                dynamic_acl = 1;
+        }
+        list_del(&acl->acl_list);
+        tpg->num_node_acls--;
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        spin_lock_bh(&tpg->session_lock);
+        list_for_each_entry_safe(sess, sess_tmp,
+                                &tpg->tpg_sess_list, sess_list) {
+                if (sess->se_node_acl != acl)
+                        continue;
+                /*
+                 * Determine if the session needs to be closed by our context.
+                 */
+                if (!(TPG_TFO(tpg)->shutdown_session(sess)))
+                        continue;
+
+                spin_unlock_bh(&tpg->session_lock);
+                /*
+                 * If the $FABRIC_MOD session for the Initiator Node ACL exists,
+                 * forcefully shutdown the $FABRIC_MOD session/nexus.
+                 */
+                TPG_TFO(tpg)->close_session(sess);
+
+                spin_lock_bh(&tpg->session_lock);
+        }
+        spin_unlock_bh(&tpg->session_lock);
+
+        core_tpg_wait_for_nacl_pr_ref(acl);
+        core_tpg_wait_for_mib_ref(acl);
+        core_clear_initiator_node_from_tpg(acl, tpg);
+        core_free_device_list_for_node(acl, tpg);
+
+        printk(KERN_INFO "%s_TPG[%hu] - Deleted ACL with TCQ Depth: %d for %s"
+                " Initiator Node: %s\n", TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg), acl->queue_depth,
+                TPG_TFO(tpg)->get_fabric_name(), acl->initiatorname);
+
+        return 0;
+}
+EXPORT_SYMBOL(core_tpg_del_initiator_node_acl);
+
+/*      core_tpg_set_initiator_node_queue_depth():
+ *
+ *
+ */
+int core_tpg_set_initiator_node_queue_depth(
+        struct se_portal_group *tpg,
+        unsigned char *initiatorname,
+        u32 queue_depth,
+        int force)
+{
+        struct se_session *sess, *init_sess = NULL;
+        struct se_node_acl *acl;
+        int dynamic_acl = 0;
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        acl = __core_tpg_get_initiator_node_acl(tpg, initiatorname);
+        if (!(acl)) {
+                printk(KERN_ERR "Access Control List entry for %s Initiator"
+                        " Node %s does not exists for TPG %hu, ignoring"
+                        " request.\n", TPG_TFO(tpg)->get_fabric_name(),
+                        initiatorname, TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock_bh(&tpg->acl_node_lock);
+                return -ENODEV;
+        }
+        if (acl->dynamic_node_acl) {
+                acl->dynamic_node_acl = 0;
+                dynamic_acl = 1;
+        }
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        spin_lock_bh(&tpg->session_lock);
+        list_for_each_entry(sess, &tpg->tpg_sess_list, sess_list) {
+                if (sess->se_node_acl != acl)
+                        continue;
+
+                if (!force) {
+                        printk(KERN_ERR "Unable to change queue depth for %s"
+                                " Initiator Node: %s while session is"
+                                " operational.  To forcefully change the queue"
+                                " depth and force session reinstatement"
+                                " use the \"force=1\" parameter.\n",
+                                TPG_TFO(tpg)->get_fabric_name(), initiatorname);
+                        spin_unlock_bh(&tpg->session_lock);
+
+                        spin_lock_bh(&tpg->acl_node_lock);
+                        if (dynamic_acl)
+                                acl->dynamic_node_acl = 1;
+                        spin_unlock_bh(&tpg->acl_node_lock);
+                        return -EEXIST;
+                }
+                /*
+                 * Determine if the session needs to be closed by our context.
+                 */
+                if (!(TPG_TFO(tpg)->shutdown_session(sess)))
+                        continue;
+
+                init_sess = sess;
+                break;
+        }
+
+        /*
+         * User has requested to change the queue depth for a Initiator Node.
+         * Change the value in the Node's struct se_node_acl, and call
+         * core_set_queue_depth_for_node() to add the requested queue depth.
+         *
+         * Finally call  TPG_TFO(tpg)->close_session() to force session
+         * reinstatement to occur if there is an active session for the
+         * $FABRIC_MOD Initiator Node in question.
+         */
+        acl->queue_depth = queue_depth;
+
+        if (core_set_queue_depth_for_node(tpg, acl) < 0) {
+                spin_unlock_bh(&tpg->session_lock);
+                /*
+                 * Force session reinstatement if
+                 * core_set_queue_depth_for_node() failed, because we assume
+                 * the $FABRIC_MOD has already the set session reinstatement
+                 * bit from TPG_TFO(tpg)->shutdown_session() called above.
+                 */
+                if (init_sess)
+                        TPG_TFO(tpg)->close_session(init_sess);
+
+                spin_lock_bh(&tpg->acl_node_lock);
+                if (dynamic_acl)
+                        acl->dynamic_node_acl = 1;
+                spin_unlock_bh(&tpg->acl_node_lock);
+                return -EINVAL;
+        }
+        spin_unlock_bh(&tpg->session_lock);
+        /*
+         * If the $FABRIC_MOD session for the Initiator Node ACL exists,
+         * forcefully shutdown the $FABRIC_MOD session/nexus.
+         */
+        if (init_sess)
+                TPG_TFO(tpg)->close_session(init_sess);
+
+        printk(KERN_INFO "Successfuly changed queue depth to: %d for Initiator"
+                " Node: %s on %s Target Portal Group: %u\n", queue_depth,
+                initiatorname, TPG_TFO(tpg)->get_fabric_name(),
+                TPG_TFO(tpg)->tpg_get_tag(tpg));
+
+        spin_lock_bh(&tpg->acl_node_lock);
+        if (dynamic_acl)
+                acl->dynamic_node_acl = 1;
+        spin_unlock_bh(&tpg->acl_node_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(core_tpg_set_initiator_node_queue_depth);
+
+static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
+{
+        /* Set in core_dev_setup_virtual_lun0() */
+        struct se_device *dev = se_global->g_lun0_dev;
+        struct se_lun *lun = &se_tpg->tpg_virt_lun0;
+        u32 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
+        int ret;
+
+        lun->unpacked_lun = 0;
+        lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
+        atomic_set(&lun->lun_acl_count, 0);
+        init_completion(&lun->lun_shutdown_comp);
+        INIT_LIST_HEAD(&lun->lun_acl_list);
+        INIT_LIST_HEAD(&lun->lun_cmd_list);
+        spin_lock_init(&lun->lun_acl_lock);
+        spin_lock_init(&lun->lun_cmd_lock);
+        spin_lock_init(&lun->lun_sep_lock);
+
+        ret = core_tpg_post_addlun(se_tpg, lun, lun_access, dev);
+        if (ret < 0)
+                return -1;
+
+        return 0;
+}
+
+static void core_tpg_release_virtual_lun0(struct se_portal_group *se_tpg)
+{
+        struct se_lun *lun = &se_tpg->tpg_virt_lun0;
+
+        core_tpg_post_dellun(se_tpg, lun);
+}
+
+int core_tpg_register(
+        struct target_core_fabric_ops *tfo,
+        struct se_wwn *se_wwn,
+        struct se_portal_group *se_tpg,
+        void *tpg_fabric_ptr,
+        int se_tpg_type)
+{
+        struct se_lun *lun;
+        u32 i;
+
+        se_tpg->tpg_lun_list = kzalloc((sizeof(struct se_lun) *
+                                TRANSPORT_MAX_LUNS_PER_TPG), GFP_KERNEL);
+        if (!(se_tpg->tpg_lun_list)) {
+                printk(KERN_ERR "Unable to allocate struct se_portal_group->"
+                                "tpg_lun_list\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
+                lun = &se_tpg->tpg_lun_list[i];
+                lun->unpacked_lun = i;
+                lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
+                atomic_set(&lun->lun_acl_count, 0);
+                init_completion(&lun->lun_shutdown_comp);
+                INIT_LIST_HEAD(&lun->lun_acl_list);
+                INIT_LIST_HEAD(&lun->lun_cmd_list);
+                spin_lock_init(&lun->lun_acl_lock);
+                spin_lock_init(&lun->lun_cmd_lock);
+                spin_lock_init(&lun->lun_sep_lock);
+        }
+
+        se_tpg->se_tpg_type = se_tpg_type;
+        se_tpg->se_tpg_fabric_ptr = tpg_fabric_ptr;
+        se_tpg->se_tpg_tfo = tfo;
+        se_tpg->se_tpg_wwn = se_wwn;
+        atomic_set(&se_tpg->tpg_pr_ref_count, 0);
+        INIT_LIST_HEAD(&se_tpg->acl_node_list);
+        INIT_LIST_HEAD(&se_tpg->se_tpg_list);
+        INIT_LIST_HEAD(&se_tpg->tpg_sess_list);
+        spin_lock_init(&se_tpg->acl_node_lock);
+        spin_lock_init(&se_tpg->session_lock);
+        spin_lock_init(&se_tpg->tpg_lun_lock);
+
+        if (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) {
+                if (core_tpg_setup_virtual_lun0(se_tpg) < 0) {
+                        kfree(se_tpg);
+                        return -ENOMEM;
+                }
+        }
+
+        spin_lock_bh(&se_global->se_tpg_lock);
+        list_add_tail(&se_tpg->se_tpg_list, &se_global->g_se_tpg_list);
+        spin_unlock_bh(&se_global->se_tpg_lock);
+
+        printk(KERN_INFO "TARGET_CORE[%s]: Allocated %s struct se_portal_group for"
+                " endpoint: %s, Portal Tag: %u\n", tfo->get_fabric_name(),
+                (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) ?
+                "Normal" : "Discovery", (tfo->tpg_get_wwn(se_tpg) == NULL) ?
+                "None" : tfo->tpg_get_wwn(se_tpg), tfo->tpg_get_tag(se_tpg));
+
+        return 0;
+}
+EXPORT_SYMBOL(core_tpg_register);
+
+int core_tpg_deregister(struct se_portal_group *se_tpg)
+{
+        printk(KERN_INFO "TARGET_CORE[%s]: Deallocating %s struct se_portal_group"
+                " for endpoint: %s Portal Tag %u\n",
+                (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL) ?
+                "Normal" : "Discovery", TPG_TFO(se_tpg)->get_fabric_name(),
+                TPG_TFO(se_tpg)->tpg_get_wwn(se_tpg),
+                TPG_TFO(se_tpg)->tpg_get_tag(se_tpg));
+
+        spin_lock_bh(&se_global->se_tpg_lock);
+        list_del(&se_tpg->se_tpg_list);
+        spin_unlock_bh(&se_global->se_tpg_lock);
+
+        while (atomic_read(&se_tpg->tpg_pr_ref_count) != 0)
+                cpu_relax();
+
+        if (se_tpg->se_tpg_type == TRANSPORT_TPG_TYPE_NORMAL)
+                core_tpg_release_virtual_lun0(se_tpg);
+
+        se_tpg->se_tpg_fabric_ptr = NULL;
+        kfree(se_tpg->tpg_lun_list);
+        return 0;
+}
+EXPORT_SYMBOL(core_tpg_deregister);
+
+struct se_lun *core_tpg_pre_addlun(
+        struct se_portal_group *tpg,
+        u32 unpacked_lun)
+{
+        struct se_lun *lun;
+
+        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
+                printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
+                        "-1: %u for Target Portal Group: %u\n",
+                        TPG_TFO(tpg)->get_fabric_name(),
+                        unpacked_lun, TRANSPORT_MAX_LUNS_PER_TPG-1,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                return ERR_PTR(-EOVERFLOW);
+        }
+
+        spin_lock(&tpg->tpg_lun_lock);
+        lun = &tpg->tpg_lun_list[unpacked_lun];
+        if (lun->lun_status == TRANSPORT_LUN_STATUS_ACTIVE) {
+                printk(KERN_ERR "TPG Logical Unit Number: %u is already active"
+                        " on %s Target Portal Group: %u, ignoring request.\n",
+                        unpacked_lun, TPG_TFO(tpg)->get_fabric_name(),
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return ERR_PTR(-EINVAL);
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return lun;
+}
+
+int core_tpg_post_addlun(
+        struct se_portal_group *tpg,
+        struct se_lun *lun,
+        u32 lun_access,
+        void *lun_ptr)
+{
+        if (core_dev_export(lun_ptr, tpg, lun) < 0)
+                return -1;
+
+        spin_lock(&tpg->tpg_lun_lock);
+        lun->lun_access = lun_access;
+        lun->lun_status = TRANSPORT_LUN_STATUS_ACTIVE;
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return 0;
+}
+
+static void core_tpg_shutdown_lun(
+        struct se_portal_group *tpg,
+        struct se_lun *lun)
+{
+        core_clear_lun_from_tpg(lun, tpg);
+        transport_clear_lun_from_sessions(lun);
+}
+
+struct se_lun *core_tpg_pre_dellun(
+        struct se_portal_group *tpg,
+        u32 unpacked_lun,
+        int *ret)
+{
+        struct se_lun *lun;
+
+        if (unpacked_lun > (TRANSPORT_MAX_LUNS_PER_TPG-1)) {
+                printk(KERN_ERR "%s LUN: %u exceeds TRANSPORT_MAX_LUNS_PER_TPG"
+                        "-1: %u for Target Portal Group: %u\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TRANSPORT_MAX_LUNS_PER_TPG-1,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                return ERR_PTR(-EOVERFLOW);
+        }
+
+        spin_lock(&tpg->tpg_lun_lock);
+        lun = &tpg->tpg_lun_list[unpacked_lun];
+        if (lun->lun_status != TRANSPORT_LUN_STATUS_ACTIVE) {
+                printk(KERN_ERR "%s Logical Unit Number: %u is not active on"
+                        " Target Portal Group: %u, ignoring request.\n",
+                        TPG_TFO(tpg)->get_fabric_name(), unpacked_lun,
+                        TPG_TFO(tpg)->tpg_get_tag(tpg));
+                spin_unlock(&tpg->tpg_lun_lock);
+                return ERR_PTR(-ENODEV);
+        }
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return lun;
+}
+
+int core_tpg_post_dellun(
+        struct se_portal_group *tpg,
+        struct se_lun *lun)
+{
+        core_tpg_shutdown_lun(tpg, lun);
+
+        core_dev_unexport(lun->lun_se_dev, tpg, lun);
+
+        spin_lock(&tpg->tpg_lun_lock);
+        lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
+        spin_unlock(&tpg->tpg_lun_lock);
+
+        return 0;
+}
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
new file mode 100644
index 000000000000..28b6292ff298
--- /dev/null
+++ b/drivers/target/target_core_transport.c
@@ -0,0 +1,6134 @@
+/*******************************************************************************
+ * Filename:  target_core_transport.c
+ *
+ * This file contains the Generic Target Engine Core.
+ *
+ * Copyright (c) 2002, 2003, 2004, 2005 PyX Technologies, Inc.
+ * Copyright (c) 2005, 2006, 2007 SBE, Inc.
+ * Copyright (c) 2007-2010 Rising Tide Systems
+ * Copyright (c) 2008-2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/net.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/blkdev.h>
+#include <linux/spinlock.h>
+#include <linux/smp_lock.h>
+#include <linux/kthread.h>
+#include <linux/in.h>
+#include <linux/cdrom.h>
+#include <asm/unaligned.h>
+#include <net/sock.h>
+#include <net/tcp.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/libsas.h> /* For TASK_ATTR_* */
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_tmr.h>
+#include <target/target_core_tpg.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+#include "target_core_scdb.h"
+#include "target_core_ua.h"
+
+/* #define DEBUG_CDB_HANDLER */
+#ifdef DEBUG_CDB_HANDLER
+#define DEBUG_CDB_H(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_CDB_H(x...)
+#endif
+
+/* #define DEBUG_CMD_MAP */
+#ifdef DEBUG_CMD_MAP
+#define DEBUG_CMD_M(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_CMD_M(x...)
+#endif
+
+/* #define DEBUG_MEM_ALLOC */
+#ifdef DEBUG_MEM_ALLOC
+#define DEBUG_MEM(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_MEM(x...)
+#endif
+
+/* #define DEBUG_MEM2_ALLOC */
+#ifdef DEBUG_MEM2_ALLOC
+#define DEBUG_MEM2(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_MEM2(x...)
+#endif
+
+/* #define DEBUG_SG_CALC */
+#ifdef DEBUG_SG_CALC
+#define DEBUG_SC(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_SC(x...)
+#endif
+
+/* #define DEBUG_SE_OBJ */
+#ifdef DEBUG_SE_OBJ
+#define DEBUG_SO(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_SO(x...)
+#endif
+
+/* #define DEBUG_CMD_VOL */
+#ifdef DEBUG_CMD_VOL
+#define DEBUG_VOL(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_VOL(x...)
+#endif
+
+/* #define DEBUG_CMD_STOP */
+#ifdef DEBUG_CMD_STOP
+#define DEBUG_CS(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_CS(x...)
+#endif
+
+/* #define DEBUG_PASSTHROUGH */
+#ifdef DEBUG_PASSTHROUGH
+#define DEBUG_PT(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_PT(x...)
+#endif
+
+/* #define DEBUG_TASK_STOP */
+#ifdef DEBUG_TASK_STOP
+#define DEBUG_TS(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_TS(x...)
+#endif
+
+/* #define DEBUG_TRANSPORT_STOP */
+#ifdef DEBUG_TRANSPORT_STOP
+#define DEBUG_TRANSPORT_S(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_TRANSPORT_S(x...)
+#endif
+
+/* #define DEBUG_TASK_FAILURE */
+#ifdef DEBUG_TASK_FAILURE
+#define DEBUG_TF(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_TF(x...)
+#endif
+
+/* #define DEBUG_DEV_OFFLINE */
+#ifdef DEBUG_DEV_OFFLINE
+#define DEBUG_DO(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_DO(x...)
+#endif
+
+/* #define DEBUG_TASK_STATE */
+#ifdef DEBUG_TASK_STATE
+#define DEBUG_TSTATE(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_TSTATE(x...)
+#endif
+
+/* #define DEBUG_STATUS_THR */
+#ifdef DEBUG_STATUS_THR
+#define DEBUG_ST(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_ST(x...)
+#endif
+
+/* #define DEBUG_TASK_TIMEOUT */
+#ifdef DEBUG_TASK_TIMEOUT
+#define DEBUG_TT(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_TT(x...)
+#endif
+
+/* #define DEBUG_GENERIC_REQUEST_FAILURE */
+#ifdef DEBUG_GENERIC_REQUEST_FAILURE
+#define DEBUG_GRF(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_GRF(x...)
+#endif
+
+/* #define DEBUG_SAM_TASK_ATTRS */
+#ifdef DEBUG_SAM_TASK_ATTRS
+#define DEBUG_STA(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_STA(x...)
+#endif
+
+struct se_global *se_global;
+
+static struct kmem_cache *se_cmd_cache;
+static struct kmem_cache *se_sess_cache;
+struct kmem_cache *se_tmr_req_cache;
+struct kmem_cache *se_ua_cache;
+struct kmem_cache *se_mem_cache;
+struct kmem_cache *t10_pr_reg_cache;
+struct kmem_cache *t10_alua_lu_gp_cache;
+struct kmem_cache *t10_alua_lu_gp_mem_cache;
+struct kmem_cache *t10_alua_tg_pt_gp_cache;
+struct kmem_cache *t10_alua_tg_pt_gp_mem_cache;
+
+/* Used for transport_dev_get_map_*() */
+typedef int (*map_func_t)(struct se_task *, u32);
+
+static int transport_generic_write_pending(struct se_cmd *);
+static int transport_processing_thread(void *);
+static int __transport_execute_tasks(struct se_device *dev);
+static void transport_complete_task_attr(struct se_cmd *cmd);
+static void transport_direct_request_timeout(struct se_cmd *cmd);
+static void transport_free_dev_tasks(struct se_cmd *cmd);
+static u32 transport_generic_get_cdb_count(struct se_cmd *cmd,
+                unsigned long long starting_lba, u32 sectors,
+                enum dma_data_direction data_direction,
+                struct list_head *mem_list, int set_counts);
+static int transport_generic_get_mem(struct se_cmd *cmd, u32 length,
+                u32 dma_size);
+static int transport_generic_remove(struct se_cmd *cmd,
+                int release_to_pool, int session_reinstatement);
+static int transport_get_sectors(struct se_cmd *cmd);
+static struct list_head *transport_init_se_mem_list(void);
+static int transport_map_sg_to_mem(struct se_cmd *cmd,
+                struct list_head *se_mem_list, void *in_mem,
+                u32 *se_mem_cnt);
+static void transport_memcpy_se_mem_read_contig(struct se_cmd *cmd,
+                unsigned char *dst, struct list_head *se_mem_list);
+static void transport_release_fe_cmd(struct se_cmd *cmd);
+static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
+                struct se_queue_obj *qobj);
+static int transport_set_sense_codes(struct se_cmd *cmd, u8 asc, u8 ascq);
+static void transport_stop_all_task_timers(struct se_cmd *cmd);
+
+int transport_emulate_control_cdb(struct se_task *task);
+
+int init_se_global(void)
+{
+        struct se_global *global;
+
+        global = kzalloc(sizeof(struct se_global), GFP_KERNEL);
+        if (!(global)) {
+                printk(KERN_ERR "Unable to allocate memory for struct se_global\n");
+                return -1;
+        }
+
+        INIT_LIST_HEAD(&global->g_lu_gps_list);
+        INIT_LIST_HEAD(&global->g_se_tpg_list);
+        INIT_LIST_HEAD(&global->g_hba_list);
+        INIT_LIST_HEAD(&global->g_se_dev_list);
+        spin_lock_init(&global->g_device_lock);
+        spin_lock_init(&global->hba_lock);
+        spin_lock_init(&global->se_tpg_lock);
+        spin_lock_init(&global->lu_gps_lock);
+        spin_lock_init(&global->plugin_class_lock);
+
+        se_cmd_cache = kmem_cache_create("se_cmd_cache",
+                        sizeof(struct se_cmd), __alignof__(struct se_cmd), 0, NULL);
+        if (!(se_cmd_cache)) {
+                printk(KERN_ERR "kmem_cache_create for struct se_cmd failed\n");
+                goto out;
+        }
+        se_tmr_req_cache = kmem_cache_create("se_tmr_cache",
+                        sizeof(struct se_tmr_req), __alignof__(struct se_tmr_req),
+                        0, NULL);
+        if (!(se_tmr_req_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for struct se_tmr_req"
+                                " failed\n");
+                goto out;
+        }
+        se_sess_cache = kmem_cache_create("se_sess_cache",
+                        sizeof(struct se_session), __alignof__(struct se_session),
+                        0, NULL);
+        if (!(se_sess_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for struct se_session"
+                                " failed\n");
+                goto out;
+        }
+        se_ua_cache = kmem_cache_create("se_ua_cache",
+                        sizeof(struct se_ua), __alignof__(struct se_ua),
+                        0, NULL);
+        if (!(se_ua_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for struct se_ua failed\n");
+                goto out;
+        }
+        se_mem_cache = kmem_cache_create("se_mem_cache",
+                        sizeof(struct se_mem), __alignof__(struct se_mem), 0, NULL);
+        if (!(se_mem_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for struct se_mem failed\n");
+                goto out;
+        }
+        t10_pr_reg_cache = kmem_cache_create("t10_pr_reg_cache",
+                        sizeof(struct t10_pr_registration),
+                        __alignof__(struct t10_pr_registration), 0, NULL);
+        if (!(t10_pr_reg_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for struct t10_pr_registration"
+                                " failed\n");
+                goto out;
+        }
+        t10_alua_lu_gp_cache = kmem_cache_create("t10_alua_lu_gp_cache",
+                        sizeof(struct t10_alua_lu_gp), __alignof__(struct t10_alua_lu_gp),
+                        0, NULL);
+        if (!(t10_alua_lu_gp_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for t10_alua_lu_gp_cache"
+                                " failed\n");
+                goto out;
+        }
+        t10_alua_lu_gp_mem_cache = kmem_cache_create("t10_alua_lu_gp_mem_cache",
+                        sizeof(struct t10_alua_lu_gp_member),
+                        __alignof__(struct t10_alua_lu_gp_member), 0, NULL);
+        if (!(t10_alua_lu_gp_mem_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for t10_alua_lu_gp_mem_"
+                                "cache failed\n");
+                goto out;
+        }
+        t10_alua_tg_pt_gp_cache = kmem_cache_create("t10_alua_tg_pt_gp_cache",
+                        sizeof(struct t10_alua_tg_pt_gp),
+                        __alignof__(struct t10_alua_tg_pt_gp), 0, NULL);
+        if (!(t10_alua_tg_pt_gp_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for t10_alua_tg_pt_gp_"
+                                "cache failed\n");
+                goto out;
+        }
+        t10_alua_tg_pt_gp_mem_cache = kmem_cache_create(
+                        "t10_alua_tg_pt_gp_mem_cache",
+                        sizeof(struct t10_alua_tg_pt_gp_member),
+                        __alignof__(struct t10_alua_tg_pt_gp_member),
+                        0, NULL);
+        if (!(t10_alua_tg_pt_gp_mem_cache)) {
+                printk(KERN_ERR "kmem_cache_create() for t10_alua_tg_pt_gp_"
+                                "mem_t failed\n");
+                goto out;
+        }
+
+        se_global = global;
+
+        return 0;
+out:
+        if (se_cmd_cache)
+                kmem_cache_destroy(se_cmd_cache);
+        if (se_tmr_req_cache)
+                kmem_cache_destroy(se_tmr_req_cache);
+        if (se_sess_cache)
+                kmem_cache_destroy(se_sess_cache);
+        if (se_ua_cache)
+                kmem_cache_destroy(se_ua_cache);
+        if (se_mem_cache)
+                kmem_cache_destroy(se_mem_cache);
+        if (t10_pr_reg_cache)
+                kmem_cache_destroy(t10_pr_reg_cache);
+        if (t10_alua_lu_gp_cache)
+                kmem_cache_destroy(t10_alua_lu_gp_cache);
+        if (t10_alua_lu_gp_mem_cache)
+                kmem_cache_destroy(t10_alua_lu_gp_mem_cache);
+        if (t10_alua_tg_pt_gp_cache)
+                kmem_cache_destroy(t10_alua_tg_pt_gp_cache);
+        if (t10_alua_tg_pt_gp_mem_cache)
+                kmem_cache_destroy(t10_alua_tg_pt_gp_mem_cache);
+        kfree(global);
+        return -1;
+}
+
+void release_se_global(void)
+{
+        struct se_global *global;
+
+        global = se_global;
+        if (!(global))
+                return;
+
+        kmem_cache_destroy(se_cmd_cache);
+        kmem_cache_destroy(se_tmr_req_cache);
+        kmem_cache_destroy(se_sess_cache);
+        kmem_cache_destroy(se_ua_cache);
+        kmem_cache_destroy(se_mem_cache);
+        kmem_cache_destroy(t10_pr_reg_cache);
+        kmem_cache_destroy(t10_alua_lu_gp_cache);
+        kmem_cache_destroy(t10_alua_lu_gp_mem_cache);
+        kmem_cache_destroy(t10_alua_tg_pt_gp_cache);
+        kmem_cache_destroy(t10_alua_tg_pt_gp_mem_cache);
+        kfree(global);
+
+        se_global = NULL;
+}
+
+void transport_init_queue_obj(struct se_queue_obj *qobj)
+{
+        atomic_set(&qobj->queue_cnt, 0);
+        INIT_LIST_HEAD(&qobj->qobj_list);
+        init_waitqueue_head(&qobj->thread_wq);
+        spin_lock_init(&qobj->cmd_queue_lock);
+}
+EXPORT_SYMBOL(transport_init_queue_obj);
+
+static int transport_subsystem_reqmods(void)
+{
+        int ret;
+
+        ret = request_module("target_core_iblock");
+        if (ret != 0)
+                printk(KERN_ERR "Unable to load target_core_iblock\n");
+
+        ret = request_module("target_core_file");
+        if (ret != 0)
+                printk(KERN_ERR "Unable to load target_core_file\n");
+
+        ret = request_module("target_core_pscsi");
+        if (ret != 0)
+                printk(KERN_ERR "Unable to load target_core_pscsi\n");
+
+        ret = request_module("target_core_stgt");
+        if (ret != 0)
+                printk(KERN_ERR "Unable to load target_core_stgt\n");
+
+        return 0;
+}
+
+int transport_subsystem_check_init(void)
+{
+        if (se_global->g_sub_api_initialized)
+                return 0;
+        /*
+         * Request the loading of known TCM subsystem plugins..
+         */
+        if (transport_subsystem_reqmods() < 0)
+                return -1;
+
+        se_global->g_sub_api_initialized = 1;
+        return 0;
+}
+
+struct se_session *transport_init_session(void)
+{
+        struct se_session *se_sess;
+
+        se_sess = kmem_cache_zalloc(se_sess_cache, GFP_KERNEL);
+        if (!(se_sess)) {
+                printk(KERN_ERR "Unable to allocate struct se_session from"
+                                " se_sess_cache\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        INIT_LIST_HEAD(&se_sess->sess_list);
+        INIT_LIST_HEAD(&se_sess->sess_acl_list);
+        atomic_set(&se_sess->mib_ref_count, 0);
+
+        return se_sess;
+}
+EXPORT_SYMBOL(transport_init_session);
+
+/*
+ * Called with spin_lock_bh(&struct se_portal_group->session_lock called.
+ */
+void __transport_register_session(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct se_session *se_sess,
+        void *fabric_sess_ptr)
+{
+        unsigned char buf[PR_REG_ISID_LEN];
+
+        se_sess->se_tpg = se_tpg;
+        se_sess->fabric_sess_ptr = fabric_sess_ptr;
+        /*
+         * Used by struct se_node_acl's under ConfigFS to locate active se_session-t
+         *
+         * Only set for struct se_session's that will actually be moving I/O.
+         * eg: *NOT* discovery sessions.
+         */
+        if (se_nacl) {
+                /*
+                 * If the fabric module supports an ISID based TransportID,
+                 * save this value in binary from the fabric I_T Nexus now.
+                 */
+                if (TPG_TFO(se_tpg)->sess_get_initiator_sid != NULL) {
+                        memset(&buf[0], 0, PR_REG_ISID_LEN);
+                        TPG_TFO(se_tpg)->sess_get_initiator_sid(se_sess,
+                                        &buf[0], PR_REG_ISID_LEN);
+                        se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]);
+                }
+                spin_lock_irq(&se_nacl->nacl_sess_lock);
+                /*
+                 * The se_nacl->nacl_sess pointer will be set to the
+                 * last active I_T Nexus for each struct se_node_acl.
+                 */
+                se_nacl->nacl_sess = se_sess;
+
+                list_add_tail(&se_sess->sess_acl_list,
+                              &se_nacl->acl_sess_list);
+                spin_unlock_irq(&se_nacl->nacl_sess_lock);
+        }
+        list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list);
+
+        printk(KERN_INFO "TARGET_CORE[%s]: Registered fabric_sess_ptr: %p\n",
+                TPG_TFO(se_tpg)->get_fabric_name(), se_sess->fabric_sess_ptr);
+}
+EXPORT_SYMBOL(__transport_register_session);
+
+void transport_register_session(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl,
+        struct se_session *se_sess,
+        void *fabric_sess_ptr)
+{
+        spin_lock_bh(&se_tpg->session_lock);
+        __transport_register_session(se_tpg, se_nacl, se_sess, fabric_sess_ptr);
+        spin_unlock_bh(&se_tpg->session_lock);
+}
+EXPORT_SYMBOL(transport_register_session);
+
+void transport_deregister_session_configfs(struct se_session *se_sess)
+{
+        struct se_node_acl *se_nacl;
+
+        /*
+         * Used by struct se_node_acl's under ConfigFS to locate active struct se_session
+         */
+        se_nacl = se_sess->se_node_acl;
+        if ((se_nacl)) {
+                spin_lock_irq(&se_nacl->nacl_sess_lock);
+                list_del(&se_sess->sess_acl_list);
+                /*
+                 * If the session list is empty, then clear the pointer.
+                 * Otherwise, set the struct se_session pointer from the tail
+                 * element of the per struct se_node_acl active session list.
+                 */
+                if (list_empty(&se_nacl->acl_sess_list))
+                        se_nacl->nacl_sess = NULL;
+                else {
+                        se_nacl->nacl_sess = container_of(
+                                        se_nacl->acl_sess_list.prev,
+                                        struct se_session, sess_acl_list);
+                }
+                spin_unlock_irq(&se_nacl->nacl_sess_lock);
+        }
+}
+EXPORT_SYMBOL(transport_deregister_session_configfs);
+
+void transport_free_session(struct se_session *se_sess)
+{
+        kmem_cache_free(se_sess_cache, se_sess);
+}
+EXPORT_SYMBOL(transport_free_session);
+
+void transport_deregister_session(struct se_session *se_sess)
+{
+        struct se_portal_group *se_tpg = se_sess->se_tpg;
+        struct se_node_acl *se_nacl;
+
+        if (!(se_tpg)) {
+                transport_free_session(se_sess);
+                return;
+        }
+        /*
+         * Wait for possible reference in drivers/target/target_core_mib.c:
+         * scsi_att_intr_port_seq_show()
+         */
+        while (atomic_read(&se_sess->mib_ref_count) != 0)
+                cpu_relax();
+
+        spin_lock_bh(&se_tpg->session_lock);
+        list_del(&se_sess->sess_list);
+        se_sess->se_tpg = NULL;
+        se_sess->fabric_sess_ptr = NULL;
+        spin_unlock_bh(&se_tpg->session_lock);
+
+        /*
+         * Determine if we need to do extra work for this initiator node's
+         * struct se_node_acl if it had been previously dynamically generated.
+         */
+        se_nacl = se_sess->se_node_acl;
+        if ((se_nacl)) {
+                spin_lock_bh(&se_tpg->acl_node_lock);
+                if (se_nacl->dynamic_node_acl) {
+                        if (!(TPG_TFO(se_tpg)->tpg_check_demo_mode_cache(
+                                        se_tpg))) {
+                                list_del(&se_nacl->acl_list);
+                                se_tpg->num_node_acls--;
+                                spin_unlock_bh(&se_tpg->acl_node_lock);
+
+                                core_tpg_wait_for_nacl_pr_ref(se_nacl);
+                                core_tpg_wait_for_mib_ref(se_nacl);
+                                core_free_device_list_for_node(se_nacl, se_tpg);
+                                TPG_TFO(se_tpg)->tpg_release_fabric_acl(se_tpg,
+                                                se_nacl);
+                                spin_lock_bh(&se_tpg->acl_node_lock);
+                        }
+                }
+                spin_unlock_bh(&se_tpg->acl_node_lock);
+        }
+
+        transport_free_session(se_sess);
+
+        printk(KERN_INFO "TARGET_CORE[%s]: Deregistered fabric_sess\n",
+                TPG_TFO(se_tpg)->get_fabric_name());
+}
+EXPORT_SYMBOL(transport_deregister_session);
+
+/*
+ * Called with T_TASK(cmd)->t_state_lock held.
+ */
+static void transport_all_task_dev_remove_state(struct se_cmd *cmd)
+{
+        struct se_device *dev;
+        struct se_task *task;
+        unsigned long flags;
+
+        if (!T_TASK(cmd))
+                return;
+
+        list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+                dev = task->se_dev;
+                if (!(dev))
+                        continue;
+
+                if (atomic_read(&task->task_active))
+                        continue;
+
+                if (!(atomic_read(&task->task_state_active)))
+                        continue;
+
+                spin_lock_irqsave(&dev->execute_task_lock, flags);
+                list_del(&task->t_state_list);
+                DEBUG_TSTATE("Removed ITT: 0x%08x dev: %p task[%p]\n",
+                        CMD_TFO(cmd)->tfo_get_task_tag(cmd), dev, task);
+                spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+
+                atomic_set(&task->task_state_active, 0);
+                atomic_dec(&T_TASK(cmd)->t_task_cdbs_ex_left);
+        }
+}
+
+/*      transport_cmd_check_stop():
+ *
+ *      'transport_off = 1' determines if t_transport_active should be cleared.
+ *      'transport_off = 2' determines if task_dev_state should be removed.
+ *
+ *      A non-zero u8 t_state sets cmd->t_state.
+ *      Returns 1 when command is stopped, else 0.
+ */
+static int transport_cmd_check_stop(
+        struct se_cmd *cmd,
+        int transport_off,
+        u8 t_state)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        /*
+         * Determine if IOCTL context caller in requesting the stopping of this
+         * command for LUN shutdown purposes.
+         */
+        if (atomic_read(&T_TASK(cmd)->transport_lun_stop)) {
+                DEBUG_CS("%s:%d atomic_read(&T_TASK(cmd)->transport_lun_stop)"
+                        " == TRUE for ITT: 0x%08x\n", __func__, __LINE__,
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+
+                cmd->deferred_t_state = cmd->t_state;
+                cmd->t_state = TRANSPORT_DEFERRED_CMD;
+                atomic_set(&T_TASK(cmd)->t_transport_active, 0);
+                if (transport_off == 2)
+                        transport_all_task_dev_remove_state(cmd);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                complete(&T_TASK(cmd)->transport_lun_stop_comp);
+                return 1;
+        }
+        /*
+         * Determine if frontend context caller is requesting the stopping of
+         * this command for frontend excpections.
+         */
+        if (atomic_read(&T_TASK(cmd)->t_transport_stop)) {
+                DEBUG_CS("%s:%d atomic_read(&T_TASK(cmd)->t_transport_stop) =="
+                        " TRUE for ITT: 0x%08x\n", __func__, __LINE__,
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+
+                cmd->deferred_t_state = cmd->t_state;
+                cmd->t_state = TRANSPORT_DEFERRED_CMD;
+                if (transport_off == 2)
+                        transport_all_task_dev_remove_state(cmd);
+
+                /*
+                 * Clear struct se_cmd->se_lun before the transport_off == 2 handoff
+                 * to FE.
+                 */
+                if (transport_off == 2)
+                        cmd->se_lun = NULL;
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                complete(&T_TASK(cmd)->t_transport_stop_comp);
+                return 1;
+        }
+        if (transport_off) {
+                atomic_set(&T_TASK(cmd)->t_transport_active, 0);
+                if (transport_off == 2) {
+                        transport_all_task_dev_remove_state(cmd);
+                        /*
+                         * Clear struct se_cmd->se_lun before the transport_off == 2
+                         * handoff to fabric module.
+                         */
+                        cmd->se_lun = NULL;
+                        /*
+                         * Some fabric modules like tcm_loop can release
+                         * their internally allocated I/O refrence now and
+                         * struct se_cmd now.
+                         */
+                        if (CMD_TFO(cmd)->check_stop_free != NULL) {
+                                spin_unlock_irqrestore(
+                                        &T_TASK(cmd)->t_state_lock, flags);
+
+                                CMD_TFO(cmd)->check_stop_free(cmd);
+                                return 1;
+                        }
+                }
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                return 0;
+        } else if (t_state)
+                cmd->t_state = t_state;
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        return 0;
+}
+
+static int transport_cmd_check_stop_to_fabric(struct se_cmd *cmd)
+{
+        return transport_cmd_check_stop(cmd, 2, 0);
+}
+
+static void transport_lun_remove_cmd(struct se_cmd *cmd)
+{
+        struct se_lun *lun = SE_LUN(cmd);
+        unsigned long flags;
+
+        if (!lun)
+                return;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (!(atomic_read(&T_TASK(cmd)->transport_dev_active))) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                goto check_lun;
+        }
+        atomic_set(&T_TASK(cmd)->transport_dev_active, 0);
+        transport_all_task_dev_remove_state(cmd);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_free_dev_tasks(cmd);
+
+check_lun:
+        spin_lock_irqsave(&lun->lun_cmd_lock, flags);
+        if (atomic_read(&T_TASK(cmd)->transport_lun_active)) {
+                list_del(&cmd->se_lun_list);
+                atomic_set(&T_TASK(cmd)->transport_lun_active, 0);
+#if 0
+                printk(KERN_INFO "Removed ITT: 0x%08x from LUN LIST[%d]\n"
+                        CMD_TFO(cmd)->get_task_tag(cmd), lun->unpacked_lun);
+#endif
+        }
+        spin_unlock_irqrestore(&lun->lun_cmd_lock, flags);
+}
+
+void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
+{
+        transport_remove_cmd_from_queue(cmd, SE_DEV(cmd)->dev_queue_obj);
+        transport_lun_remove_cmd(cmd);
+
+        if (transport_cmd_check_stop_to_fabric(cmd))
+                return;
+        if (remove)
+                transport_generic_remove(cmd, 0, 0);
+}
+
+void transport_cmd_finish_abort_tmr(struct se_cmd *cmd)
+{
+        transport_remove_cmd_from_queue(cmd, SE_DEV(cmd)->dev_queue_obj);
+
+        if (transport_cmd_check_stop_to_fabric(cmd))
+                return;
+
+        transport_generic_remove(cmd, 0, 0);
+}
+
+static int transport_add_cmd_to_queue(
+        struct se_cmd *cmd,
+        int t_state)
+{
+        struct se_device *dev = cmd->se_dev;
+        struct se_queue_obj *qobj = dev->dev_queue_obj;
+        struct se_queue_req *qr;
+        unsigned long flags;
+
+        qr = kzalloc(sizeof(struct se_queue_req), GFP_ATOMIC);
+        if (!(qr)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " struct se_queue_req\n");
+                return -1;
+        }
+        INIT_LIST_HEAD(&qr->qr_list);
+
+        qr->cmd = (void *)cmd;
+        qr->state = t_state;
+
+        if (t_state) {
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                cmd->t_state = t_state;
+                atomic_set(&T_TASK(cmd)->t_transport_active, 1);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+        }
+
+        spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
+        list_add_tail(&qr->qr_list, &qobj->qobj_list);
+        atomic_inc(&T_TASK(cmd)->t_transport_queue_active);
+        spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+
+        atomic_inc(&qobj->queue_cnt);
+        wake_up_interruptible(&qobj->thread_wq);
+        return 0;
+}
+
+/*
+ * Called with struct se_queue_obj->cmd_queue_lock held.
+ */
+static struct se_queue_req *
+__transport_get_qr_from_queue(struct se_queue_obj *qobj)
+{
+        struct se_cmd *cmd;
+        struct se_queue_req *qr = NULL;
+
+        if (list_empty(&qobj->qobj_list))
+                return NULL;
+
+        list_for_each_entry(qr, &qobj->qobj_list, qr_list)
+                break;
+
+        if (qr->cmd) {
+                cmd = (struct se_cmd *)qr->cmd;
+                atomic_dec(&T_TASK(cmd)->t_transport_queue_active);
+        }
+        list_del(&qr->qr_list);
+        atomic_dec(&qobj->queue_cnt);
+
+        return qr;
+}
+
+static struct se_queue_req *
+transport_get_qr_from_queue(struct se_queue_obj *qobj)
+{
+        struct se_cmd *cmd;
+        struct se_queue_req *qr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
+        if (list_empty(&qobj->qobj_list)) {
+                spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+                return NULL;
+        }
+
+        list_for_each_entry(qr, &qobj->qobj_list, qr_list)
+                break;
+
+        if (qr->cmd) {
+                cmd = (struct se_cmd *)qr->cmd;
+                atomic_dec(&T_TASK(cmd)->t_transport_queue_active);
+        }
+        list_del(&qr->qr_list);
+        atomic_dec(&qobj->queue_cnt);
+        spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+
+        return qr;
+}
+
+static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
+                struct se_queue_obj *qobj)
+{
+        struct se_cmd *q_cmd;
+        struct se_queue_req *qr = NULL, *qr_p = NULL;
+        unsigned long flags;
+
+        spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
+        if (!(atomic_read(&T_TASK(cmd)->t_transport_queue_active))) {
+                spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+                return;
+        }
+
+        list_for_each_entry_safe(qr, qr_p, &qobj->qobj_list, qr_list) {
+                q_cmd = (struct se_cmd *)qr->cmd;
+                if (q_cmd != cmd)
+                        continue;
+
+                atomic_dec(&T_TASK(q_cmd)->t_transport_queue_active);
+                atomic_dec(&qobj->queue_cnt);
+                list_del(&qr->qr_list);
+                kfree(qr);
+        }
+        spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
+
+        if (atomic_read(&T_TASK(cmd)->t_transport_queue_active)) {
+                printk(KERN_ERR "ITT: 0x%08x t_transport_queue_active: %d\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd),
+                        atomic_read(&T_TASK(cmd)->t_transport_queue_active));
+        }
+}
+
+/*
+ * Completion function used by TCM subsystem plugins (such as FILEIO)
+ * for queueing up response from struct se_subsystem_api->do_task()
+ */
+void transport_complete_sync_cache(struct se_cmd *cmd, int good)
+{
+        struct se_task *task = list_entry(T_TASK(cmd)->t_task_list.next,
+                                struct se_task, t_list);
+
+        if (good) {
+                cmd->scsi_status = SAM_STAT_GOOD;
+                task->task_scsi_status = GOOD;
+        } else {
+                task->task_scsi_status = SAM_STAT_CHECK_CONDITION;
+                task->task_error_status = PYX_TRANSPORT_ILLEGAL_REQUEST;
+                TASK_CMD(task)->transport_error_status =
+                                        PYX_TRANSPORT_ILLEGAL_REQUEST;
+        }
+
+        transport_complete_task(task, good);
+}
+EXPORT_SYMBOL(transport_complete_sync_cache);
+
+/*      transport_complete_task():
+ *
+ *      Called from interrupt and non interrupt context depending
+ *      on the transport plugin.
+ */
+void transport_complete_task(struct se_task *task, int success)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+        struct se_device *dev = task->se_dev;
+        int t_state;
+        unsigned long flags;
+#if 0
+        printk(KERN_INFO "task: %p CDB: 0x%02x obj_ptr: %p\n", task,
+                        T_TASK(cmd)->t_task_cdb[0], dev);
+#endif
+        if (dev) {
+                spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);
+                atomic_inc(&dev->depth_left);
+                atomic_inc(&SE_HBA(dev)->left_queue_depth);
+                spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
+        }
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        atomic_set(&task->task_active, 0);
+
+        /*
+         * See if any sense data exists, if so set the TASK_SENSE flag.
+         * Also check for any other post completion work that needs to be
+         * done by the plugins.
+         */
+        if (dev && dev->transport->transport_complete) {
+                if (dev->transport->transport_complete(task) != 0) {
+                        cmd->se_cmd_flags |= SCF_TRANSPORT_TASK_SENSE;
+                        task->task_sense = 1;
+                        success = 1;
+                }
+        }
+
+        /*
+         * See if we are waiting for outstanding struct se_task
+         * to complete for an exception condition
+         */
+        if (atomic_read(&task->task_stop)) {
+                /*
+                 * Decrement T_TASK(cmd)->t_se_count if this task had
+                 * previously thrown its timeout exception handler.
+                 */
+                if (atomic_read(&task->task_timeout)) {
+                        atomic_dec(&T_TASK(cmd)->t_se_count);
+                        atomic_set(&task->task_timeout, 0);
+                }
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                complete(&task->task_stop_comp);
+                return;
+        }
+        /*
+         * If the task's timeout handler has fired, use the t_task_cdbs_timeout
+         * left counter to determine when the struct se_cmd is ready to be queued to
+         * the processing thread.
+         */
+        if (atomic_read(&task->task_timeout)) {
+                if (!(atomic_dec_and_test(
+                                &T_TASK(cmd)->t_task_cdbs_timeout_left))) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                flags);
+                        return;
+                }
+                t_state = TRANSPORT_COMPLETE_TIMEOUT;
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                transport_add_cmd_to_queue(cmd, t_state);
+                return;
+        }
+        atomic_dec(&T_TASK(cmd)->t_task_cdbs_timeout_left);
+
+        /*
+         * Decrement the outstanding t_task_cdbs_left count.  The last
+         * struct se_task from struct se_cmd will complete itself into the
+         * device queue depending upon int success.
+         */
+        if (!(atomic_dec_and_test(&T_TASK(cmd)->t_task_cdbs_left))) {
+                if (!success)
+                        T_TASK(cmd)->t_tasks_failed = 1;
+
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+
+        if (!success || T_TASK(cmd)->t_tasks_failed) {
+                t_state = TRANSPORT_COMPLETE_FAILURE;
+                if (!task->task_error_status) {
+                        task->task_error_status =
+                                PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                        cmd->transport_error_status =
+                                PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
+                }
+        } else {
+                atomic_set(&T_TASK(cmd)->t_transport_complete, 1);
+                t_state = TRANSPORT_COMPLETE_OK;
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_add_cmd_to_queue(cmd, t_state);
+}
+EXPORT_SYMBOL(transport_complete_task);
+
+/*
+ * Called by transport_add_tasks_from_cmd() once a struct se_cmd's
+ * struct se_task list are ready to be added to the active execution list
+ * struct se_device
+
+ * Called with se_dev_t->execute_task_lock called.
+ */
+static inline int transport_add_task_check_sam_attr(
+        struct se_task *task,
+        struct se_task *task_prev,
+        struct se_device *dev)
+{
+        /*
+         * No SAM Task attribute emulation enabled, add to tail of
+         * execution queue
+         */
+        if (dev->dev_task_attr_type != SAM_TASK_ATTR_EMULATED) {
+                list_add_tail(&task->t_execute_list, &dev->execute_task_list);
+                return 0;
+        }
+        /*
+         * HEAD_OF_QUEUE attribute for received CDB, which means
+         * the first task that is associated with a struct se_cmd goes to
+         * head of the struct se_device->execute_task_list, and task_prev
+         * after that for each subsequent task
+         */
+        if (task->task_se_cmd->sam_task_attr == TASK_ATTR_HOQ) {
+                list_add(&task->t_execute_list,
+                                (task_prev != NULL) ?
+                                &task_prev->t_execute_list :
+                                &dev->execute_task_list);
+
+                DEBUG_STA("Set HEAD_OF_QUEUE for task CDB: 0x%02x"
+                                " in execution queue\n",
+                                T_TASK(task->task_se_cmd)->t_task_cdb[0]);
+                return 1;
+        }
+        /*
+         * For ORDERED, SIMPLE or UNTAGGED attribute tasks once they have been
+         * transitioned from Dermant -> Active state, and are added to the end
+         * of the struct se_device->execute_task_list
+         */
+        list_add_tail(&task->t_execute_list, &dev->execute_task_list);
+        return 0;
+}
+
+/*      __transport_add_task_to_execute_queue():
+ *
+ *      Called with se_dev_t->execute_task_lock called.
+ */
+static void __transport_add_task_to_execute_queue(
+        struct se_task *task,
+        struct se_task *task_prev,
+        struct se_device *dev)
+{
+        int head_of_queue;
+
+        head_of_queue = transport_add_task_check_sam_attr(task, task_prev, dev);
+        atomic_inc(&dev->execute_tasks);
+
+        if (atomic_read(&task->task_state_active))
+                return;
+        /*
+         * Determine if this task needs to go to HEAD_OF_QUEUE for the
+         * state list as well.  Running with SAM Task Attribute emulation
+         * will always return head_of_queue == 0 here
+         */
+        if (head_of_queue)
+                list_add(&task->t_state_list, (task_prev) ?
+                                &task_prev->t_state_list :
+                                &dev->state_task_list);
+        else
+                list_add_tail(&task->t_state_list, &dev->state_task_list);
+
+        atomic_set(&task->task_state_active, 1);
+
+        DEBUG_TSTATE("Added ITT: 0x%08x task[%p] to dev: %p\n",
+                CMD_TFO(task->task_se_cmd)->get_task_tag(task->task_se_cmd),
+                task, dev);
+}
+
+static void transport_add_tasks_to_state_queue(struct se_cmd *cmd)
+{
+        struct se_device *dev;
+        struct se_task *task;
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+                dev = task->se_dev;
+
+                if (atomic_read(&task->task_state_active))
+                        continue;
+
+                spin_lock(&dev->execute_task_lock);
+                list_add_tail(&task->t_state_list, &dev->state_task_list);
+                atomic_set(&task->task_state_active, 1);
+
+                DEBUG_TSTATE("Added ITT: 0x%08x task[%p] to dev: %p\n",
+                        CMD_TFO(task->task_se_cmd)->get_task_tag(
+                        task->task_se_cmd), task, dev);
+
+                spin_unlock(&dev->execute_task_lock);
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+}
+
+static void transport_add_tasks_from_cmd(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_task *task, *task_prev = NULL;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->execute_task_lock, flags);
+        list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+                if (atomic_read(&task->task_execute_queue))
+                        continue;
+                /*
+                 * __transport_add_task_to_execute_queue() handles the
+                 * SAM Task Attribute emulation if enabled
+                 */
+                __transport_add_task_to_execute_queue(task, task_prev, dev);
+                atomic_set(&task->task_execute_queue, 1);
+                task_prev = task;
+        }
+        spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+
+        return;
+}
+
+/*      transport_get_task_from_execute_queue():
+ *
+ *      Called with dev->execute_task_lock held.
+ */
+static struct se_task *
+transport_get_task_from_execute_queue(struct se_device *dev)
+{
+        struct se_task *task;
+
+        if (list_empty(&dev->execute_task_list))
+                return NULL;
+
+        list_for_each_entry(task, &dev->execute_task_list, t_execute_list)
+                break;
+
+        list_del(&task->t_execute_list);
+        atomic_dec(&dev->execute_tasks);
+
+        return task;
+}
+
+/*      transport_remove_task_from_execute_queue():
+ *
+ *
+ */
+static void transport_remove_task_from_execute_queue(
+        struct se_task *task,
+        struct se_device *dev)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->execute_task_lock, flags);
+        list_del(&task->t_execute_list);
+        atomic_dec(&dev->execute_tasks);
+        spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+}
+
+unsigned char *transport_dump_cmd_direction(struct se_cmd *cmd)
+{
+        switch (cmd->data_direction) {
+        case DMA_NONE:
+                return "NONE";
+        case DMA_FROM_DEVICE:
+                return "READ";
+        case DMA_TO_DEVICE:
+                return "WRITE";
+        case DMA_BIDIRECTIONAL:
+                return "BIDI";
+        default:
+                break;
+        }
+
+        return "UNKNOWN";
+}
+
+void transport_dump_dev_state(
+        struct se_device *dev,
+        char *b,
+        int *bl)
+{
+        *bl += sprintf(b + *bl, "Status: ");
+        switch (dev->dev_status) {
+        case TRANSPORT_DEVICE_ACTIVATED:
+                *bl += sprintf(b + *bl, "ACTIVATED");
+                break;
+        case TRANSPORT_DEVICE_DEACTIVATED:
+                *bl += sprintf(b + *bl, "DEACTIVATED");
+                break;
+        case TRANSPORT_DEVICE_SHUTDOWN:
+                *bl += sprintf(b + *bl, "SHUTDOWN");
+                break;
+        case TRANSPORT_DEVICE_OFFLINE_ACTIVATED:
+        case TRANSPORT_DEVICE_OFFLINE_DEACTIVATED:
+                *bl += sprintf(b + *bl, "OFFLINE");
+                break;
+        default:
+                *bl += sprintf(b + *bl, "UNKNOWN=%d", dev->dev_status);
+                break;
+        }
+
+        *bl += sprintf(b + *bl, "  Execute/Left/Max Queue Depth: %d/%d/%d",
+                atomic_read(&dev->execute_tasks), atomic_read(&dev->depth_left),
+                dev->queue_depth);
+        *bl += sprintf(b + *bl, "  SectorSize: %u  MaxSectors: %u\n",
+                DEV_ATTRIB(dev)->block_size, DEV_ATTRIB(dev)->max_sectors);
+        *bl += sprintf(b + *bl, "        ");
+}
+
+/*      transport_release_all_cmds():
+ *
+ *
+ */
+static void transport_release_all_cmds(struct se_device *dev)
+{
+        struct se_cmd *cmd = NULL;
+        struct se_queue_req *qr = NULL, *qr_p = NULL;
+        int bug_out = 0, t_state;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->dev_queue_obj->cmd_queue_lock, flags);
+        list_for_each_entry_safe(qr, qr_p, &dev->dev_queue_obj->qobj_list,
+                                qr_list) {
+
+                cmd = (struct se_cmd *)qr->cmd;
+                t_state = qr->state;
+                list_del(&qr->qr_list);
+                kfree(qr);
+                spin_unlock_irqrestore(&dev->dev_queue_obj->cmd_queue_lock,
+                                flags);
+
+                printk(KERN_ERR "Releasing ITT: 0x%08x, i_state: %u,"
+                        " t_state: %u directly\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd),
+                        CMD_TFO(cmd)->get_cmd_state(cmd), t_state);
+
+                transport_release_fe_cmd(cmd);
+                bug_out = 1;
+
+                spin_lock_irqsave(&dev->dev_queue_obj->cmd_queue_lock, flags);
+        }
+        spin_unlock_irqrestore(&dev->dev_queue_obj->cmd_queue_lock, flags);
+#if 0
+        if (bug_out)
+                BUG();
+#endif
+}
+
+void transport_dump_vpd_proto_id(
+        struct t10_vpd *vpd,
+        unsigned char *p_buf,
+        int p_buf_len)
+{
+        unsigned char buf[VPD_TMP_BUF_SIZE];
+        int len;
+
+        memset(buf, 0, VPD_TMP_BUF_SIZE);
+        len = sprintf(buf, "T10 VPD Protocol Identifier: ");
+
+        switch (vpd->protocol_identifier) {
+        case 0x00:
+                sprintf(buf+len, "Fibre Channel\n");
+                break;
+        case 0x10:
+                sprintf(buf+len, "Parallel SCSI\n");
+                break;
+        case 0x20:
+                sprintf(buf+len, "SSA\n");
+                break;
+        case 0x30:
+                sprintf(buf+len, "IEEE 1394\n");
+                break;
+        case 0x40:
+                sprintf(buf+len, "SCSI Remote Direct Memory Access"
+                                " Protocol\n");
+                break;
+        case 0x50:
+                sprintf(buf+len, "Internet SCSI (iSCSI)\n");
+                break;
+        case 0x60:
+                sprintf(buf+len, "SAS Serial SCSI Protocol\n");
+                break;
+        case 0x70:
+                sprintf(buf+len, "Automation/Drive Interface Transport"
+                                " Protocol\n");
+                break;
+        case 0x80:
+                sprintf(buf+len, "AT Attachment Interface ATA/ATAPI\n");
+                break;
+        default:
+                sprintf(buf+len, "Unknown 0x%02x\n",
+                                vpd->protocol_identifier);
+                break;
+        }
+
+        if (p_buf)
+                strncpy(p_buf, buf, p_buf_len);
+        else
+                printk(KERN_INFO "%s", buf);
+}
+
+void
+transport_set_vpd_proto_id(struct t10_vpd *vpd, unsigned char *page_83)
+{
+        /*
+         * Check if the Protocol Identifier Valid (PIV) bit is set..
+         *
+         * from spc3r23.pdf section 7.5.1
+         */
+         if (page_83[1] & 0x80) {
+                vpd->protocol_identifier = (page_83[0] & 0xf0);
+                vpd->protocol_identifier_set = 1;
+                transport_dump_vpd_proto_id(vpd, NULL, 0);
+        }
+}
+EXPORT_SYMBOL(transport_set_vpd_proto_id);
+
+int transport_dump_vpd_assoc(
+        struct t10_vpd *vpd,
+        unsigned char *p_buf,
+        int p_buf_len)
+{
+        unsigned char buf[VPD_TMP_BUF_SIZE];
+        int ret = 0, len;
+
+        memset(buf, 0, VPD_TMP_BUF_SIZE);
+        len = sprintf(buf, "T10 VPD Identifier Association: ");
+
+        switch (vpd->association) {
+        case 0x00:
+                sprintf(buf+len, "addressed logical unit\n");
+                break;
+        case 0x10:
+                sprintf(buf+len, "target port\n");
+                break;
+        case 0x20:
+                sprintf(buf+len, "SCSI target device\n");
+                break;
+        default:
+                sprintf(buf+len, "Unknown 0x%02x\n", vpd->association);
+                ret = -1;
+                break;
+        }
+
+        if (p_buf)
+                strncpy(p_buf, buf, p_buf_len);
+        else
+                printk("%s", buf);
+
+        return ret;
+}
+
+int transport_set_vpd_assoc(struct t10_vpd *vpd, unsigned char *page_83)
+{
+        /*
+         * The VPD identification association..
+         *
+         * from spc3r23.pdf Section 7.6.3.1 Table 297
+         */
+        vpd->association = (page_83[1] & 0x30);
+        return transport_dump_vpd_assoc(vpd, NULL, 0);
+}
+EXPORT_SYMBOL(transport_set_vpd_assoc);
+
+int transport_dump_vpd_ident_type(
+        struct t10_vpd *vpd,
+        unsigned char *p_buf,
+        int p_buf_len)
+{
+        unsigned char buf[VPD_TMP_BUF_SIZE];
+        int ret = 0, len;
+
+        memset(buf, 0, VPD_TMP_BUF_SIZE);
+        len = sprintf(buf, "T10 VPD Identifier Type: ");
+
+        switch (vpd->device_identifier_type) {
+        case 0x00:
+                sprintf(buf+len, "Vendor specific\n");
+                break;
+        case 0x01:
+                sprintf(buf+len, "T10 Vendor ID based\n");
+                break;
+        case 0x02:
+                sprintf(buf+len, "EUI-64 based\n");
+                break;
+        case 0x03:
+                sprintf(buf+len, "NAA\n");
+                break;
+        case 0x04:
+                sprintf(buf+len, "Relative target port identifier\n");
+                break;
+        case 0x08:
+                sprintf(buf+len, "SCSI name string\n");
+                break;
+        default:
+                sprintf(buf+len, "Unsupported: 0x%02x\n",
+                                vpd->device_identifier_type);
+                ret = -1;
+                break;
+        }
+
+        if (p_buf)
+                strncpy(p_buf, buf, p_buf_len);
+        else
+                printk("%s", buf);
+
+        return ret;
+}
+
+int transport_set_vpd_ident_type(struct t10_vpd *vpd, unsigned char *page_83)
+{
+        /*
+         * The VPD identifier type..
+         *
+         * from spc3r23.pdf Section 7.6.3.1 Table 298
+         */
+        vpd->device_identifier_type = (page_83[1] & 0x0f);
+        return transport_dump_vpd_ident_type(vpd, NULL, 0);
+}
+EXPORT_SYMBOL(transport_set_vpd_ident_type);
+
+int transport_dump_vpd_ident(
+        struct t10_vpd *vpd,
+        unsigned char *p_buf,
+        int p_buf_len)
+{
+        unsigned char buf[VPD_TMP_BUF_SIZE];
+        int ret = 0;
+
+        memset(buf, 0, VPD_TMP_BUF_SIZE);
+
+        switch (vpd->device_identifier_code_set) {
+        case 0x01: /* Binary */
+                sprintf(buf, "T10 VPD Binary Device Identifier: %s\n",
+                        &vpd->device_identifier[0]);
+                break;
+        case 0x02: /* ASCII */
+                sprintf(buf, "T10 VPD ASCII Device Identifier: %s\n",
+                        &vpd->device_identifier[0]);
+                break;
+        case 0x03: /* UTF-8 */
+                sprintf(buf, "T10 VPD UTF-8 Device Identifier: %s\n",
+                        &vpd->device_identifier[0]);
+                break;
+        default:
+                sprintf(buf, "T10 VPD Device Identifier encoding unsupported:"
+                        " 0x%02x", vpd->device_identifier_code_set);
+                ret = -1;
+                break;
+        }
+
+        if (p_buf)
+                strncpy(p_buf, buf, p_buf_len);
+        else
+                printk("%s", buf);
+
+        return ret;
+}
+
+int
+transport_set_vpd_ident(struct t10_vpd *vpd, unsigned char *page_83)
+{
+        static const char hex_str[] = "0123456789abcdef";
+        int j = 0, i = 4; /* offset to start of the identifer */
+
+        /*
+         * The VPD Code Set (encoding)
+         *
+         * from spc3r23.pdf Section 7.6.3.1 Table 296
+         */
+        vpd->device_identifier_code_set = (page_83[0] & 0x0f);
+        switch (vpd->device_identifier_code_set) {
+        case 0x01: /* Binary */
+                vpd->device_identifier[j++] =
+                                hex_str[vpd->device_identifier_type];
+                while (i < (4 + page_83[3])) {
+                        vpd->device_identifier[j++] =
+                                hex_str[(page_83[i] & 0xf0) >> 4];
+                        vpd->device_identifier[j++] =
+                                hex_str[page_83[i] & 0x0f];
+                        i++;
+                }
+                break;
+        case 0x02: /* ASCII */
+        case 0x03: /* UTF-8 */
+                while (i < (4 + page_83[3]))
+                        vpd->device_identifier[j++] = page_83[i++];
+                break;
+        default:
+                break;
+        }
+
+        return transport_dump_vpd_ident(vpd, NULL, 0);
+}
+EXPORT_SYMBOL(transport_set_vpd_ident);
+
+static void core_setup_task_attr_emulation(struct se_device *dev)
+{
+        /*
+         * If this device is from Target_Core_Mod/pSCSI, disable the
+         * SAM Task Attribute emulation.
+         *
+         * This is currently not available in upsream Linux/SCSI Target
+         * mode code, and is assumed to be disabled while using TCM/pSCSI.
+         */
+        if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                dev->dev_task_attr_type = SAM_TASK_ATTR_PASSTHROUGH;
+                return;
+        }
+
+        dev->dev_task_attr_type = SAM_TASK_ATTR_EMULATED;
+        DEBUG_STA("%s: Using SAM_TASK_ATTR_EMULATED for SPC: 0x%02x"
+                " device\n", TRANSPORT(dev)->name,
+                TRANSPORT(dev)->get_device_rev(dev));
+}
+
+static void scsi_dump_inquiry(struct se_device *dev)
+{
+        struct t10_wwn *wwn = DEV_T10_WWN(dev);
+        int i, device_type;
+        /*
+         * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
+         */
+        printk("  Vendor: ");
+        for (i = 0; i < 8; i++)
+                if (wwn->vendor[i] >= 0x20)
+                        printk("%c", wwn->vendor[i]);
+                else
+                        printk(" ");
+
+        printk("  Model: ");
+        for (i = 0; i < 16; i++)
+                if (wwn->model[i] >= 0x20)
+                        printk("%c", wwn->model[i]);
+                else
+                        printk(" ");
+
+        printk("  Revision: ");
+        for (i = 0; i < 4; i++)
+                if (wwn->revision[i] >= 0x20)
+                        printk("%c", wwn->revision[i]);
+                else
+                        printk(" ");
+
+        printk("\n");
+
+        device_type = TRANSPORT(dev)->get_device_type(dev);
+        printk("  Type:   %s ", scsi_device_type(device_type));
+        printk("                 ANSI SCSI revision: %02x\n",
+                                TRANSPORT(dev)->get_device_rev(dev));
+}
+
+struct se_device *transport_add_device_to_core_hba(
+        struct se_hba *hba,
+        struct se_subsystem_api *transport,
+        struct se_subsystem_dev *se_dev,
+        u32 device_flags,
+        void *transport_dev,
+        struct se_dev_limits *dev_limits,
+        const char *inquiry_prod,
+        const char *inquiry_rev)
+{
+        int ret = 0, force_pt;
+        struct se_device  *dev;
+
+        dev = kzalloc(sizeof(struct se_device), GFP_KERNEL);
+        if (!(dev)) {
+                printk(KERN_ERR "Unable to allocate memory for se_dev_t\n");
+                return NULL;
+        }
+        dev->dev_queue_obj = kzalloc(sizeof(struct se_queue_obj), GFP_KERNEL);
+        if (!(dev->dev_queue_obj)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " dev->dev_queue_obj\n");
+                kfree(dev);
+                return NULL;
+        }
+        transport_init_queue_obj(dev->dev_queue_obj);
+
+        dev->dev_status_queue_obj = kzalloc(sizeof(struct se_queue_obj),
+                                        GFP_KERNEL);
+        if (!(dev->dev_status_queue_obj)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " dev->dev_status_queue_obj\n");
+                kfree(dev->dev_queue_obj);
+                kfree(dev);
+                return NULL;
+        }
+        transport_init_queue_obj(dev->dev_status_queue_obj);
+
+        dev->dev_flags          = device_flags;
+        dev->dev_status         |= TRANSPORT_DEVICE_DEACTIVATED;
+        dev->dev_ptr            = (void *) transport_dev;
+        dev->se_hba             = hba;
+        dev->se_sub_dev         = se_dev;
+        dev->transport          = transport;
+        atomic_set(&dev->active_cmds, 0);
+        INIT_LIST_HEAD(&dev->dev_list);
+        INIT_LIST_HEAD(&dev->dev_sep_list);
+        INIT_LIST_HEAD(&dev->dev_tmr_list);
+        INIT_LIST_HEAD(&dev->execute_task_list);
+        INIT_LIST_HEAD(&dev->delayed_cmd_list);
+        INIT_LIST_HEAD(&dev->ordered_cmd_list);
+        INIT_LIST_HEAD(&dev->state_task_list);
+        spin_lock_init(&dev->execute_task_lock);
+        spin_lock_init(&dev->delayed_cmd_lock);
+        spin_lock_init(&dev->ordered_cmd_lock);
+        spin_lock_init(&dev->state_task_lock);
+        spin_lock_init(&dev->dev_alua_lock);
+        spin_lock_init(&dev->dev_reservation_lock);
+        spin_lock_init(&dev->dev_status_lock);
+        spin_lock_init(&dev->dev_status_thr_lock);
+        spin_lock_init(&dev->se_port_lock);
+        spin_lock_init(&dev->se_tmr_lock);
+
+        dev->queue_depth        = dev_limits->queue_depth;
+        atomic_set(&dev->depth_left, dev->queue_depth);
+        atomic_set(&dev->dev_ordered_id, 0);
+
+        se_dev_set_default_attribs(dev, dev_limits);
+
+        dev->dev_index = scsi_get_new_index(SCSI_DEVICE_INDEX);
+        dev->creation_time = get_jiffies_64();
+        spin_lock_init(&dev->stats_lock);
+
+        spin_lock(&hba->device_lock);
+        list_add_tail(&dev->dev_list, &hba->hba_dev_list);
+        hba->dev_count++;
+        spin_unlock(&hba->device_lock);
+        /*
+         * Setup the SAM Task Attribute emulation for struct se_device
+         */
+        core_setup_task_attr_emulation(dev);
+        /*
+         * Force PR and ALUA passthrough emulation with internal object use.
+         */
+        force_pt = (hba->hba_flags & HBA_FLAGS_INTERNAL_USE);
+        /*
+         * Setup the Reservations infrastructure for struct se_device
+         */
+        core_setup_reservations(dev, force_pt);
+        /*
+         * Setup the Asymmetric Logical Unit Assignment for struct se_device
+         */
+        if (core_setup_alua(dev, force_pt) < 0)
+                goto out;
+
+        /*
+         * Startup the struct se_device processing thread
+         */
+        dev->process_thread = kthread_run(transport_processing_thread, dev,
+                                          "LIO_%s", TRANSPORT(dev)->name);
+        if (IS_ERR(dev->process_thread)) {
+                printk(KERN_ERR "Unable to create kthread: LIO_%s\n",
+                        TRANSPORT(dev)->name);
+                goto out;
+        }
+
+        /*
+         * Preload the initial INQUIRY const values if we are doing
+         * anything virtual (IBLOCK, FILEIO, RAMDISK), but not for TCM/pSCSI
+         * passthrough because this is being provided by the backend LLD.
+         * This is required so that transport_get_inquiry() copies these
+         * originals once back into DEV_T10_WWN(dev) for the virtual device
+         * setup.
+         */
+        if (TRANSPORT(dev)->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV) {
+                if (!(inquiry_prod) || !(inquiry_prod)) {
+                        printk(KERN_ERR "All non TCM/pSCSI plugins require"
+                                " INQUIRY consts\n");
+                        goto out;
+                }
+
+                strncpy(&DEV_T10_WWN(dev)->vendor[0], "LIO-ORG", 8);
+                strncpy(&DEV_T10_WWN(dev)->model[0], inquiry_prod, 16);
+                strncpy(&DEV_T10_WWN(dev)->revision[0], inquiry_rev, 4);
+        }
+        scsi_dump_inquiry(dev);
+
+out:
+        if (!ret)
+                return dev;
+        kthread_stop(dev->process_thread);
+
+        spin_lock(&hba->device_lock);
+        list_del(&dev->dev_list);
+        hba->dev_count--;
+        spin_unlock(&hba->device_lock);
+
+        se_release_vpd_for_dev(dev);
+
+        kfree(dev->dev_status_queue_obj);
+        kfree(dev->dev_queue_obj);
+        kfree(dev);
+
+        return NULL;
+}
+EXPORT_SYMBOL(transport_add_device_to_core_hba);
+
+/*      transport_generic_prepare_cdb():
+ *
+ *      Since the Initiator sees iSCSI devices as LUNs,  the SCSI CDB will
+ *      contain the iSCSI LUN in bits 7-5 of byte 1 as per SAM-2.
+ *      The point of this is since we are mapping iSCSI LUNs to
+ *      SCSI Target IDs having a non-zero LUN in the CDB will throw the
+ *      devices and HBAs for a loop.
+ */
+static inline void transport_generic_prepare_cdb(
+        unsigned char *cdb)
+{
+        switch (cdb[0]) {
+        case READ_10: /* SBC - RDProtect */
+        case READ_12: /* SBC - RDProtect */
+        case READ_16: /* SBC - RDProtect */
+        case SEND_DIAGNOSTIC: /* SPC - SELF-TEST Code */
+        case VERIFY: /* SBC - VRProtect */
+        case VERIFY_16: /* SBC - VRProtect */
+        case WRITE_VERIFY: /* SBC - VRProtect */
+        case WRITE_VERIFY_12: /* SBC - VRProtect */
+                break;
+        default:
+                cdb[1] &= 0x1f; /* clear logical unit number */
+                break;
+        }
+}
+
+static struct se_task *
+transport_generic_get_task(struct se_cmd *cmd,
+                enum dma_data_direction data_direction)
+{
+        struct se_task *task;
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned long flags;
+
+        task = dev->transport->alloc_task(cmd);
+        if (!task) {
+                printk(KERN_ERR "Unable to allocate struct se_task\n");
+                return NULL;
+        }
+
+        INIT_LIST_HEAD(&task->t_list);
+        INIT_LIST_HEAD(&task->t_execute_list);
+        INIT_LIST_HEAD(&task->t_state_list);
+        init_completion(&task->task_stop_comp);
+        task->task_no = T_TASK(cmd)->t_tasks_no++;
+        task->task_se_cmd = cmd;
+        task->se_dev = dev;
+        task->task_data_direction = data_direction;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        list_add_tail(&task->t_list, &T_TASK(cmd)->t_task_list);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        return task;
+}
+
+static int transport_generic_cmd_sequencer(struct se_cmd *, unsigned char *);
+
+void transport_device_setup_cmd(struct se_cmd *cmd)
+{
+        cmd->se_dev = SE_LUN(cmd)->lun_se_dev;
+}
+EXPORT_SYMBOL(transport_device_setup_cmd);
+
+/*
+ * Used by fabric modules containing a local struct se_cmd within their
+ * fabric dependent per I/O descriptor.
+ */
+void transport_init_se_cmd(
+        struct se_cmd *cmd,
+        struct target_core_fabric_ops *tfo,
+        struct se_session *se_sess,
+        u32 data_length,
+        int data_direction,
+        int task_attr,
+        unsigned char *sense_buffer)
+{
+        INIT_LIST_HEAD(&cmd->se_lun_list);
+        INIT_LIST_HEAD(&cmd->se_delayed_list);
+        INIT_LIST_HEAD(&cmd->se_ordered_list);
+        /*
+         * Setup t_task pointer to t_task_backstore
+         */
+        cmd->t_task = &cmd->t_task_backstore;
+
+        INIT_LIST_HEAD(&T_TASK(cmd)->t_task_list);
+        init_completion(&T_TASK(cmd)->transport_lun_fe_stop_comp);
+        init_completion(&T_TASK(cmd)->transport_lun_stop_comp);
+        init_completion(&T_TASK(cmd)->t_transport_stop_comp);
+        spin_lock_init(&T_TASK(cmd)->t_state_lock);
+        atomic_set(&T_TASK(cmd)->transport_dev_active, 1);
+
+        cmd->se_tfo = tfo;
+        cmd->se_sess = se_sess;
+        cmd->data_length = data_length;
+        cmd->data_direction = data_direction;
+        cmd->sam_task_attr = task_attr;
+        cmd->sense_buffer = sense_buffer;
+}
+EXPORT_SYMBOL(transport_init_se_cmd);
+
+static int transport_check_alloc_task_attr(struct se_cmd *cmd)
+{
+        /*
+         * Check if SAM Task Attribute emulation is enabled for this
+         * struct se_device storage object
+         */
+        if (SE_DEV(cmd)->dev_task_attr_type != SAM_TASK_ATTR_EMULATED)
+                return 0;
+
+        if (cmd->sam_task_attr == TASK_ATTR_ACA) {
+                DEBUG_STA("SAM Task Attribute ACA"
+                        " emulation is not supported\n");
+                return -1;
+        }
+        /*
+         * Used to determine when ORDERED commands should go from
+         * Dormant to Active status.
+         */
+        cmd->se_ordered_id = atomic_inc_return(&SE_DEV(cmd)->dev_ordered_id);
+        smp_mb__after_atomic_inc();
+        DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
+                        cmd->se_ordered_id, cmd->sam_task_attr,
+                        TRANSPORT(cmd->se_dev)->name);
+        return 0;
+}
+
+void transport_free_se_cmd(
+        struct se_cmd *se_cmd)
+{
+        if (se_cmd->se_tmr_req)
+                core_tmr_release_req(se_cmd->se_tmr_req);
+        /*
+         * Check and free any extended CDB buffer that was allocated
+         */
+        if (T_TASK(se_cmd)->t_task_cdb != T_TASK(se_cmd)->__t_task_cdb)
+                kfree(T_TASK(se_cmd)->t_task_cdb);
+}
+EXPORT_SYMBOL(transport_free_se_cmd);
+
+static void transport_generic_wait_for_tasks(struct se_cmd *, int, int);
+
+/*      transport_generic_allocate_tasks():
+ *
+ *      Called from fabric RX Thread.
+ */
+int transport_generic_allocate_tasks(
+        struct se_cmd *cmd,
+        unsigned char *cdb)
+{
+        int ret;
+
+        transport_generic_prepare_cdb(cdb);
+
+        /*
+         * This is needed for early exceptions.
+         */
+        cmd->transport_wait_for_tasks = &transport_generic_wait_for_tasks;
+
+        transport_device_setup_cmd(cmd);
+        /*
+         * Ensure that the received CDB is less than the max (252 + 8) bytes
+         * for VARIABLE_LENGTH_CMD
+         */
+        if (scsi_command_size(cdb) > SCSI_MAX_VARLEN_CDB_SIZE) {
+                printk(KERN_ERR "Received SCSI CDB with command_size: %d that"
+                        " exceeds SCSI_MAX_VARLEN_CDB_SIZE: %d\n",
+                        scsi_command_size(cdb), SCSI_MAX_VARLEN_CDB_SIZE);
+                return -1;
+        }
+        /*
+         * If the received CDB is larger than TCM_MAX_COMMAND_SIZE,
+         * allocate the additional extended CDB buffer now..  Otherwise
+         * setup the pointer from __t_task_cdb to t_task_cdb.
+         */
+        if (scsi_command_size(cdb) > sizeof(T_TASK(cmd)->__t_task_cdb)) {
+                T_TASK(cmd)->t_task_cdb = kzalloc(scsi_command_size(cdb),
+                                                GFP_KERNEL);
+                if (!(T_TASK(cmd)->t_task_cdb)) {
+                        printk(KERN_ERR "Unable to allocate T_TASK(cmd)->t_task_cdb"
+                                " %u > sizeof(T_TASK(cmd)->__t_task_cdb): %lu ops\n",
+                                scsi_command_size(cdb),
+                                (unsigned long)sizeof(T_TASK(cmd)->__t_task_cdb));
+                        return -1;
+                }
+        } else
+                T_TASK(cmd)->t_task_cdb = &T_TASK(cmd)->__t_task_cdb[0];
+        /*
+         * Copy the original CDB into T_TASK(cmd).
+         */
+        memcpy(T_TASK(cmd)->t_task_cdb, cdb, scsi_command_size(cdb));
+        /*
+         * Setup the received CDB based on SCSI defined opcodes and
+         * perform unit attention, persistent reservations and ALUA
+         * checks for virtual device backends.  The T_TASK(cmd)->t_task_cdb
+         * pointer is expected to be setup before we reach this point.
+         */
+        ret = transport_generic_cmd_sequencer(cmd, cdb);
+        if (ret < 0)
+                return ret;
+        /*
+         * Check for SAM Task Attribute Emulation
+         */
+        if (transport_check_alloc_task_attr(cmd) < 0) {
+                cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+                return -2;
+        }
+        spin_lock(&cmd->se_lun->lun_sep_lock);
+        if (cmd->se_lun->lun_sep)
+                cmd->se_lun->lun_sep->sep_stats.cmd_pdus++;
+        spin_unlock(&cmd->se_lun->lun_sep_lock);
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_allocate_tasks);
+
+/*
+ * Used by fabric module frontends not defining a TFO->new_cmd_map()
+ * to queue up a newly setup se_cmd w/ TRANSPORT_NEW_CMD statis
+ */
+int transport_generic_handle_cdb(
+        struct se_cmd *cmd)
+{
+        if (!SE_LUN(cmd)) {
+                dump_stack();
+                printk(KERN_ERR "SE_LUN(cmd) is NULL\n");
+                return -1;
+        }
+
+        transport_add_cmd_to_queue(cmd, TRANSPORT_NEW_CMD);
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_handle_cdb);
+
+/*
+ * Used by fabric module frontends defining a TFO->new_cmd_map() caller
+ * to  queue up a newly setup se_cmd w/ TRANSPORT_NEW_CMD_MAP in order to
+ * complete setup in TCM process context w/ TFO->new_cmd_map().
+ */
+int transport_generic_handle_cdb_map(
+        struct se_cmd *cmd)
+{
+        if (!SE_LUN(cmd)) {
+                dump_stack();
+                printk(KERN_ERR "SE_LUN(cmd) is NULL\n");
+                return -1;
+        }
+
+        transport_add_cmd_to_queue(cmd, TRANSPORT_NEW_CMD_MAP);
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_handle_cdb_map);
+
+/*      transport_generic_handle_data():
+ *
+ *
+ */
+int transport_generic_handle_data(
+        struct se_cmd *cmd)
+{
+        /*
+         * For the software fabric case, then we assume the nexus is being
+         * failed/shutdown when signals are pending from the kthread context
+         * caller, so we return a failure.  For the HW target mode case running
+         * in interrupt code, the signal_pending() check is skipped.
+         */
+        if (!in_interrupt() && signal_pending(current))
+                return -1;
+        /*
+         * If the received CDB has aleady been ABORTED by the generic
+         * target engine, we now call transport_check_aborted_status()
+         * to queue any delated TASK_ABORTED status for the received CDB to the
+         * fabric module as we are expecting no futher incoming DATA OUT
+         * sequences at this point.
+         */
+        if (transport_check_aborted_status(cmd, 1) != 0)
+                return 0;
+
+        transport_add_cmd_to_queue(cmd, TRANSPORT_PROCESS_WRITE);
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_handle_data);
+
+/*      transport_generic_handle_tmr():
+ *
+ *
+ */
+int transport_generic_handle_tmr(
+        struct se_cmd *cmd)
+{
+        /*
+         * This is needed for early exceptions.
+         */
+        cmd->transport_wait_for_tasks = &transport_generic_wait_for_tasks;
+        transport_device_setup_cmd(cmd);
+
+        transport_add_cmd_to_queue(cmd, TRANSPORT_PROCESS_TMR);
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_handle_tmr);
+
+static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
+{
+        struct se_task *task, *task_tmp;
+        unsigned long flags;
+        int ret = 0;
+
+        DEBUG_TS("ITT[0x%08x] - Stopping tasks\n",
+                CMD_TFO(cmd)->get_task_tag(cmd));
+
+        /*
+         * No tasks remain in the execution queue
+         */
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        list_for_each_entry_safe(task, task_tmp,
+                                &T_TASK(cmd)->t_task_list, t_list) {
+                DEBUG_TS("task_no[%d] - Processing task %p\n",
+                                task->task_no, task);
+                /*
+                 * If the struct se_task has not been sent and is not active,
+                 * remove the struct se_task from the execution queue.
+                 */
+                if (!atomic_read(&task->task_sent) &&
+                    !atomic_read(&task->task_active)) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        flags);
+                        transport_remove_task_from_execute_queue(task,
+                                        task->se_dev);
+
+                        DEBUG_TS("task_no[%d] - Removed from execute queue\n",
+                                task->task_no);
+                        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                        continue;
+                }
+
+                /*
+                 * If the struct se_task is active, sleep until it is returned
+                 * from the plugin.
+                 */
+                if (atomic_read(&task->task_active)) {
+                        atomic_set(&task->task_stop, 1);
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        flags);
+
+                        DEBUG_TS("task_no[%d] - Waiting to complete\n",
+                                task->task_no);
+                        wait_for_completion(&task->task_stop_comp);
+                        DEBUG_TS("task_no[%d] - Stopped successfully\n",
+                                task->task_no);
+
+                        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                        atomic_dec(&T_TASK(cmd)->t_task_cdbs_left);
+
+                        atomic_set(&task->task_active, 0);
+                        atomic_set(&task->task_stop, 0);
+                } else {
+                        DEBUG_TS("task_no[%d] - Did nothing\n", task->task_no);
+                        ret++;
+                }
+
+                __transport_stop_task_timer(task, &flags);
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        return ret;
+}
+
+static void transport_failure_reset_queue_depth(struct se_device *dev)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);;
+        atomic_inc(&dev->depth_left);
+        atomic_inc(&SE_HBA(dev)->left_queue_depth);
+        spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
+}
+
+/*
+ * Handle SAM-esque emulation for generic transport request failures.
+ */
+static void transport_generic_request_failure(
+        struct se_cmd *cmd,
+        struct se_device *dev,
+        int complete,
+        int sc)
+{
+        DEBUG_GRF("-----[ Storage Engine Exception for cmd: %p ITT: 0x%08x"
+                " CDB: 0x%02x\n", cmd, CMD_TFO(cmd)->get_task_tag(cmd),
+                T_TASK(cmd)->t_task_cdb[0]);
+        DEBUG_GRF("-----[ i_state: %d t_state/def_t_state:"
+                " %d/%d transport_error_status: %d\n",
+                CMD_TFO(cmd)->get_cmd_state(cmd),
+                cmd->t_state, cmd->deferred_t_state,
+                cmd->transport_error_status);
+        DEBUG_GRF("-----[ t_task_cdbs: %d t_task_cdbs_left: %d"
+                " t_task_cdbs_sent: %d t_task_cdbs_ex_left: %d --"
+                " t_transport_active: %d t_transport_stop: %d"
+                " t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs,
+                atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
+                atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
+                atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left),
+                atomic_read(&T_TASK(cmd)->t_transport_active),
+                atomic_read(&T_TASK(cmd)->t_transport_stop),
+                atomic_read(&T_TASK(cmd)->t_transport_sent));
+
+        transport_stop_all_task_timers(cmd);
+
+        if (dev)
+                transport_failure_reset_queue_depth(dev);
+        /*
+         * For SAM Task Attribute emulation for failed struct se_cmd
+         */
+        if (cmd->se_dev->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
+                transport_complete_task_attr(cmd);
+
+        if (complete) {
+                transport_direct_request_timeout(cmd);
+                cmd->transport_error_status = PYX_TRANSPORT_LU_COMM_FAILURE;
+        }
+
+        switch (cmd->transport_error_status) {
+        case PYX_TRANSPORT_UNKNOWN_SAM_OPCODE:
+                cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
+                break;
+        case PYX_TRANSPORT_REQ_TOO_MANY_SECTORS:
+                cmd->scsi_sense_reason = TCM_SECTOR_COUNT_TOO_MANY;
+                break;
+        case PYX_TRANSPORT_INVALID_CDB_FIELD:
+                cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+                break;
+        case PYX_TRANSPORT_INVALID_PARAMETER_LIST:
+                cmd->scsi_sense_reason = TCM_INVALID_PARAMETER_LIST;
+                break;
+        case PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES:
+                if (!sc)
+                        transport_new_cmd_failure(cmd);
+                /*
+                 * Currently for PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES,
+                 * we force this session to fall back to session
+                 * recovery.
+                 */
+                CMD_TFO(cmd)->fall_back_to_erl0(cmd->se_sess);
+                CMD_TFO(cmd)->stop_session(cmd->se_sess, 0, 0);
+
+                goto check_stop;
+        case PYX_TRANSPORT_LU_COMM_FAILURE:
+        case PYX_TRANSPORT_ILLEGAL_REQUEST:
+                cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                break;
+        case PYX_TRANSPORT_UNKNOWN_MODE_PAGE:
+                cmd->scsi_sense_reason = TCM_UNKNOWN_MODE_PAGE;
+                break;
+        case PYX_TRANSPORT_WRITE_PROTECTED:
+                cmd->scsi_sense_reason = TCM_WRITE_PROTECTED;
+                break;
+        case PYX_TRANSPORT_RESERVATION_CONFLICT:
+                /*
+                 * No SENSE Data payload for this case, set SCSI Status
+                 * and queue the response to $FABRIC_MOD.
+                 *
+                 * Uses linux/include/scsi/scsi.h SAM status codes defs
+                 */
+                cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT;
+                /*
+                 * For UA Interlock Code 11b, a RESERVATION CONFLICT will
+                 * establish a UNIT ATTENTION with PREVIOUS RESERVATION
+                 * CONFLICT STATUS.
+                 *
+                 * See spc4r17, section 7.4.6 Control Mode Page, Table 349
+                 */
+                if (SE_SESS(cmd) &&
+                    DEV_ATTRIB(cmd->se_dev)->emulate_ua_intlck_ctrl == 2)
+                        core_scsi3_ua_allocate(SE_SESS(cmd)->se_node_acl,
+                                cmd->orig_fe_lun, 0x2C,
+                                ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS);
+
+                CMD_TFO(cmd)->queue_status(cmd);
+                goto check_stop;
+        case PYX_TRANSPORT_USE_SENSE_REASON:
+                /*
+                 * struct se_cmd->scsi_sense_reason already set
+                 */
+                break;
+        default:
+                printk(KERN_ERR "Unknown transport error for CDB 0x%02x: %d\n",
+                        T_TASK(cmd)->t_task_cdb[0],
+                        cmd->transport_error_status);
+                cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
+                break;
+        }
+
+        if (!sc)
+                transport_new_cmd_failure(cmd);
+        else
+                transport_send_check_condition_and_sense(cmd,
+                        cmd->scsi_sense_reason, 0);
+check_stop:
+        transport_lun_remove_cmd(cmd);
+        if (!(transport_cmd_check_stop_to_fabric(cmd)))
+                ;
+}
+
+static void transport_direct_request_timeout(struct se_cmd *cmd)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (!(atomic_read(&T_TASK(cmd)->t_transport_timeout))) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+        if (atomic_read(&T_TASK(cmd)->t_task_cdbs_timeout_left)) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+
+        atomic_sub(atomic_read(&T_TASK(cmd)->t_transport_timeout),
+                   &T_TASK(cmd)->t_se_count);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+}
+
+static void transport_generic_request_timeout(struct se_cmd *cmd)
+{
+        unsigned long flags;
+
+        /*
+         * Reset T_TASK(cmd)->t_se_count to allow transport_generic_remove()
+         * to allow last call to free memory resources.
+         */
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (atomic_read(&T_TASK(cmd)->t_transport_timeout) > 1) {
+                int tmp = (atomic_read(&T_TASK(cmd)->t_transport_timeout) - 1);
+
+                atomic_sub(tmp, &T_TASK(cmd)->t_se_count);
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_generic_remove(cmd, 0, 0);
+}
+
+static int
+transport_generic_allocate_buf(struct se_cmd *cmd, u32 data_length)
+{
+        unsigned char *buf;
+
+        buf = kzalloc(data_length, GFP_KERNEL);
+        if (!(buf)) {
+                printk(KERN_ERR "Unable to allocate memory for buffer\n");
+                return -1;
+        }
+
+        T_TASK(cmd)->t_tasks_se_num = 0;
+        T_TASK(cmd)->t_task_buf = buf;
+
+        return 0;
+}
+
+static inline u32 transport_lba_21(unsigned char *cdb)
+{
+        return ((cdb[1] & 0x1f) << 16) | (cdb[2] << 8) | cdb[3];
+}
+
+static inline u32 transport_lba_32(unsigned char *cdb)
+{
+        return (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+}
+
+static inline unsigned long long transport_lba_64(unsigned char *cdb)
+{
+        unsigned int __v1, __v2;
+
+        __v1 = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
+        __v2 = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
+
+        return ((unsigned long long)__v2) | (unsigned long long)__v1 << 32;
+}
+
+/*
+ * For VARIABLE_LENGTH_CDB w/ 32 byte extended CDBs
+ */
+static inline unsigned long long transport_lba_64_ext(unsigned char *cdb)
+{
+        unsigned int __v1, __v2;
+
+        __v1 = (cdb[12] << 24) | (cdb[13] << 16) | (cdb[14] << 8) | cdb[15];
+        __v2 = (cdb[16] << 24) | (cdb[17] << 16) | (cdb[18] << 8) | cdb[19];
+
+        return ((unsigned long long)__v2) | (unsigned long long)__v1 << 32;
+}
+
+static void transport_set_supported_SAM_opcode(struct se_cmd *se_cmd)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(se_cmd)->t_state_lock, flags);
+        se_cmd->se_cmd_flags |= SCF_SUPPORTED_SAM_OPCODE;
+        spin_unlock_irqrestore(&T_TASK(se_cmd)->t_state_lock, flags);
+}
+
+/*
+ * Called from interrupt context.
+ */
+static void transport_task_timeout_handler(unsigned long data)
+{
+        struct se_task *task = (struct se_task *)data;
+        struct se_cmd *cmd = TASK_CMD(task);
+        unsigned long flags;
+
+        DEBUG_TT("transport task timeout fired! task: %p cmd: %p\n", task, cmd);
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (task->task_flags & TF_STOP) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+        task->task_flags &= ~TF_RUNNING;
+
+        /*
+         * Determine if transport_complete_task() has already been called.
+         */
+        if (!(atomic_read(&task->task_active))) {
+                DEBUG_TT("transport task: %p cmd: %p timeout task_active"
+                                " == 0\n", task, cmd);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+
+        atomic_inc(&T_TASK(cmd)->t_se_count);
+        atomic_inc(&T_TASK(cmd)->t_transport_timeout);
+        T_TASK(cmd)->t_tasks_failed = 1;
+
+        atomic_set(&task->task_timeout, 1);
+        task->task_error_status = PYX_TRANSPORT_TASK_TIMEOUT;
+        task->task_scsi_status = 1;
+
+        if (atomic_read(&task->task_stop)) {
+                DEBUG_TT("transport task: %p cmd: %p timeout task_stop"
+                                " == 1\n", task, cmd);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                complete(&task->task_stop_comp);
+                return;
+        }
+
+        if (!(atomic_dec_and_test(&T_TASK(cmd)->t_task_cdbs_left))) {
+                DEBUG_TT("transport task: %p cmd: %p timeout non zero"
+                                " t_task_cdbs_left\n", task, cmd);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return;
+        }
+        DEBUG_TT("transport task: %p cmd: %p timeout ZERO t_task_cdbs_left\n",
+                        task, cmd);
+
+        cmd->t_state = TRANSPORT_COMPLETE_FAILURE;
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_add_cmd_to_queue(cmd, TRANSPORT_COMPLETE_FAILURE);
+}
+
+/*
+ * Called with T_TASK(cmd)->t_state_lock held.
+ */
+static void transport_start_task_timer(struct se_task *task)
+{
+        struct se_device *dev = task->se_dev;
+        int timeout;
+
+        if (task->task_flags & TF_RUNNING)
+                return;
+        /*
+         * If the task_timeout is disabled, exit now.
+         */
+        timeout = DEV_ATTRIB(dev)->task_timeout;
+        if (!(timeout))
+                return;
+
+        init_timer(&task->task_timer);
+        task->task_timer.expires = (get_jiffies_64() + timeout * HZ);
+        task->task_timer.data = (unsigned long) task;
+        task->task_timer.function = transport_task_timeout_handler;
+
+        task->task_flags |= TF_RUNNING;
+        add_timer(&task->task_timer);
+#if 0
+        printk(KERN_INFO "Starting task timer for cmd: %p task: %p seconds:"
+                " %d\n", task->task_se_cmd, task, timeout);
+#endif
+}
+
+/*
+ * Called with spin_lock_irq(&T_TASK(cmd)->t_state_lock) held.
+ */
+void __transport_stop_task_timer(struct se_task *task, unsigned long *flags)
+{
+        struct se_cmd *cmd = TASK_CMD(task);
+
+        if (!(task->task_flags & TF_RUNNING))
+                return;
+
+        task->task_flags |= TF_STOP;
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, *flags);
+
+        del_timer_sync(&task->task_timer);
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, *flags);
+        task->task_flags &= ~TF_RUNNING;
+        task->task_flags &= ~TF_STOP;
+}
+
+static void transport_stop_all_task_timers(struct se_cmd *cmd)
+{
+        struct se_task *task = NULL, *task_tmp;
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        list_for_each_entry_safe(task, task_tmp,
+                                &T_TASK(cmd)->t_task_list, t_list)
+                __transport_stop_task_timer(task, &flags);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+}
+
+static inline int transport_tcq_window_closed(struct se_device *dev)
+{
+        if (dev->dev_tcq_window_closed++ <
+                        PYX_TRANSPORT_WINDOW_CLOSED_THRESHOLD) {
+                msleep(PYX_TRANSPORT_WINDOW_CLOSED_WAIT_SHORT);
+        } else
+                msleep(PYX_TRANSPORT_WINDOW_CLOSED_WAIT_LONG);
+
+        wake_up_interruptible(&dev->dev_queue_obj->thread_wq);
+        return 0;
+}
+
+/*
+ * Called from Fabric Module context from transport_execute_tasks()
+ *
+ * The return of this function determins if the tasks from struct se_cmd
+ * get added to the execution queue in transport_execute_tasks(),
+ * or are added to the delayed or ordered lists here.
+ */
+static inline int transport_execute_task_attr(struct se_cmd *cmd)
+{
+        if (SE_DEV(cmd)->dev_task_attr_type != SAM_TASK_ATTR_EMULATED)
+                return 1;
+        /*
+         * Check for the existance of HEAD_OF_QUEUE, and if true return 1
+         * to allow the passed struct se_cmd list of tasks to the front of the list.
+         */
+         if (cmd->sam_task_attr == TASK_ATTR_HOQ) {
+                atomic_inc(&SE_DEV(cmd)->dev_hoq_count);
+                smp_mb__after_atomic_inc();
+                DEBUG_STA("Added HEAD_OF_QUEUE for CDB:"
+                        " 0x%02x, se_ordered_id: %u\n",
+                        T_TASK(cmd)->t_task_cdb[0],
+                        cmd->se_ordered_id);
+                return 1;
+        } else if (cmd->sam_task_attr == TASK_ATTR_ORDERED) {
+                spin_lock(&SE_DEV(cmd)->ordered_cmd_lock);
+                list_add_tail(&cmd->se_ordered_list,
+                                &SE_DEV(cmd)->ordered_cmd_list);
+                spin_unlock(&SE_DEV(cmd)->ordered_cmd_lock);
+
+                atomic_inc(&SE_DEV(cmd)->dev_ordered_sync);
+                smp_mb__after_atomic_inc();
+
+                DEBUG_STA("Added ORDERED for CDB: 0x%02x to ordered"
+                                " list, se_ordered_id: %u\n",
+                                T_TASK(cmd)->t_task_cdb[0],
+                                cmd->se_ordered_id);
+                /*
+                 * Add ORDERED command to tail of execution queue if
+                 * no other older commands exist that need to be
+                 * completed first.
+                 */
+                if (!(atomic_read(&SE_DEV(cmd)->simple_cmds)))
+                        return 1;
+        } else {
+                /*
+                 * For SIMPLE and UNTAGGED Task Attribute commands
+                 */
+                atomic_inc(&SE_DEV(cmd)->simple_cmds);
+                smp_mb__after_atomic_inc();
+        }
+        /*
+         * Otherwise if one or more outstanding ORDERED task attribute exist,
+         * add the dormant task(s) built for the passed struct se_cmd to the
+         * execution queue and become in Active state for this struct se_device.
+         */
+        if (atomic_read(&SE_DEV(cmd)->dev_ordered_sync) != 0) {
+                /*
+                 * Otherwise, add cmd w/ tasks to delayed cmd queue that
+                 * will be drained upon competion of HEAD_OF_QUEUE task.
+                 */
+                spin_lock(&SE_DEV(cmd)->delayed_cmd_lock);
+                cmd->se_cmd_flags |= SCF_DELAYED_CMD_FROM_SAM_ATTR;
+                list_add_tail(&cmd->se_delayed_list,
+                                &SE_DEV(cmd)->delayed_cmd_list);
+                spin_unlock(&SE_DEV(cmd)->delayed_cmd_lock);
+
+                DEBUG_STA("Added CDB: 0x%02x Task Attr: 0x%02x to"
+                        " delayed CMD list, se_ordered_id: %u\n",
+                        T_TASK(cmd)->t_task_cdb[0], cmd->sam_task_attr,
+                        cmd->se_ordered_id);
+                /*
+                 * Return zero to let transport_execute_tasks() know
+                 * not to add the delayed tasks to the execution list.
+                 */
+                return 0;
+        }
+        /*
+         * Otherwise, no ORDERED task attributes exist..
+         */
+        return 1;
+}
+
+/*
+ * Called from fabric module context in transport_generic_new_cmd() and
+ * transport_generic_process_write()
+ */
+static int transport_execute_tasks(struct se_cmd *cmd)
+{
+        int add_tasks;
+
+        if (!(cmd->se_cmd_flags & SCF_SE_DISABLE_ONLINE_CHECK)) {
+                if (se_dev_check_online(cmd->se_orig_obj_ptr) != 0) {
+                        cmd->transport_error_status =
+                                PYX_TRANSPORT_LU_COMM_FAILURE;
+                        transport_generic_request_failure(cmd, NULL, 0, 1);
+                        return 0;
+                }
+        }
+        /*
+         * Call transport_cmd_check_stop() to see if a fabric exception
+         * has occured that prevents execution.
+         */
+        if (!(transport_cmd_check_stop(cmd, 0, TRANSPORT_PROCESSING))) {
+                /*
+                 * Check for SAM Task Attribute emulation and HEAD_OF_QUEUE
+                 * attribute for the tasks of the received struct se_cmd CDB
+                 */
+                add_tasks = transport_execute_task_attr(cmd);
+                if (add_tasks == 0)
+                        goto execute_tasks;
+                /*
+                 * This calls transport_add_tasks_from_cmd() to handle
+                 * HEAD_OF_QUEUE ordering for SAM Task Attribute emulation
+                 * (if enabled) in __transport_add_task_to_execute_queue() and
+                 * transport_add_task_check_sam_attr().
+                 */
+                transport_add_tasks_from_cmd(cmd);
+        }
+        /*
+         * Kick the execution queue for the cmd associated struct se_device
+         * storage object.
+         */
+execute_tasks:
+        __transport_execute_tasks(SE_DEV(cmd));
+        return 0;
+}
+
+/*
+ * Called to check struct se_device tcq depth window, and once open pull struct se_task
+ * from struct se_device->execute_task_list and
+ *
+ * Called from transport_processing_thread()
+ */
+static int __transport_execute_tasks(struct se_device *dev)
+{
+        int error;
+        struct se_cmd *cmd = NULL;
+        struct se_task *task;
+        unsigned long flags;
+
+        /*
+         * Check if there is enough room in the device and HBA queue to send
+         * struct se_transport_task's to the selected transport.
+         */
+check_depth:
+        spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);
+        if (!(atomic_read(&dev->depth_left)) ||
+            !(atomic_read(&SE_HBA(dev)->left_queue_depth))) {
+                spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
+                return transport_tcq_window_closed(dev);
+        }
+        dev->dev_tcq_window_closed = 0;
+
+        spin_lock(&dev->execute_task_lock);
+        task = transport_get_task_from_execute_queue(dev);
+        spin_unlock(&dev->execute_task_lock);
+
+        if (!task) {
+                spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
+                return 0;
+        }
+
+        atomic_dec(&dev->depth_left);
+        atomic_dec(&SE_HBA(dev)->left_queue_depth);
+        spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);
+
+        cmd = TASK_CMD(task);
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        atomic_set(&task->task_active, 1);
+        atomic_set(&task->task_sent, 1);
+        atomic_inc(&T_TASK(cmd)->t_task_cdbs_sent);
+
+        if (atomic_read(&T_TASK(cmd)->t_task_cdbs_sent) ==
+            T_TASK(cmd)->t_task_cdbs)
+                atomic_set(&cmd->transport_sent, 1);
+
+        transport_start_task_timer(task);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+        /*
+         * The struct se_cmd->transport_emulate_cdb() function pointer is used
+         * to grab REPORT_LUNS CDBs before they hit the
+         * struct se_subsystem_api->do_task() caller below.
+         */
+        if (cmd->transport_emulate_cdb) {
+                error = cmd->transport_emulate_cdb(cmd);
+                if (error != 0) {
+                        cmd->transport_error_status = error;
+                        atomic_set(&task->task_active, 0);
+                        atomic_set(&cmd->transport_sent, 0);
+                        transport_stop_tasks_for_cmd(cmd);
+                        transport_generic_request_failure(cmd, dev, 0, 1);
+                        goto check_depth;
+                }
+                /*
+                 * Handle the successful completion for transport_emulate_cdb()
+                 * for synchronous operation, following SCF_EMULATE_CDB_ASYNC
+                 * Otherwise the caller is expected to complete the task with
+                 * proper status.
+                 */
+                if (!(cmd->se_cmd_flags & SCF_EMULATE_CDB_ASYNC)) {
+                        cmd->scsi_status = SAM_STAT_GOOD;
+                        task->task_scsi_status = GOOD;
+                        transport_complete_task(task, 1);
+                }
+        } else {
+                /*
+                 * Currently for all virtual TCM plugins including IBLOCK, FILEIO and
+                 * RAMDISK we use the internal transport_emulate_control_cdb() logic
+                 * with struct se_subsystem_api callers for the primary SPC-3 TYPE_DISK
+                 * LUN emulation code.
+                 *
+                 * For TCM/pSCSI and all other SCF_SCSI_DATA_SG_IO_CDB I/O tasks we
+                 * call ->do_task() directly and let the underlying TCM subsystem plugin
+                 * code handle the CDB emulation.
+                 */
+                if ((TRANSPORT(dev)->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV) &&
+                    (!(TASK_CMD(task)->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)))
+                        error = transport_emulate_control_cdb(task);
+                else
+                        error = TRANSPORT(dev)->do_task(task);
+
+                if (error != 0) {
+                        cmd->transport_error_status = error;
+                        atomic_set(&task->task_active, 0);
+                        atomic_set(&cmd->transport_sent, 0);
+                        transport_stop_tasks_for_cmd(cmd);
+                        transport_generic_request_failure(cmd, dev, 0, 1);
+                }
+        }
+
+        goto check_depth;
+
+        return 0;
+}
+
+void transport_new_cmd_failure(struct se_cmd *se_cmd)
+{
+        unsigned long flags;
+        /*
+         * Any unsolicited data will get dumped for failed command inside of
+         * the fabric plugin
+         */
+        spin_lock_irqsave(&T_TASK(se_cmd)->t_state_lock, flags);
+        se_cmd->se_cmd_flags |= SCF_SE_CMD_FAILED;
+        se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+        spin_unlock_irqrestore(&T_TASK(se_cmd)->t_state_lock, flags);
+
+        CMD_TFO(se_cmd)->new_cmd_failure(se_cmd);
+}
+
+static void transport_nop_wait_for_tasks(struct se_cmd *, int, int);
+
+static inline u32 transport_get_sectors_6(
+        unsigned char *cdb,
+        struct se_cmd *cmd,
+        int *ret)
+{
+        struct se_device *dev = SE_LUN(cmd)->lun_se_dev;
+
+        /*
+         * Assume TYPE_DISK for non struct se_device objects.
+         * Use 8-bit sector value.
+         */
+        if (!dev)
+                goto type_disk;
+
+        /*
+         * Use 24-bit allocation length for TYPE_TAPE.
+         */
+        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_TAPE)
+                return (u32)(cdb[2] << 16) + (cdb[3] << 8) + cdb[4];
+
+        /*
+         * Everything else assume TYPE_DISK Sector CDB location.
+         * Use 8-bit sector value.
+         */
+type_disk:
+        return (u32)cdb[4];
+}
+
+static inline u32 transport_get_sectors_10(
+        unsigned char *cdb,
+        struct se_cmd *cmd,
+        int *ret)
+{
+        struct se_device *dev = SE_LUN(cmd)->lun_se_dev;
+
+        /*
+         * Assume TYPE_DISK for non struct se_device objects.
+         * Use 16-bit sector value.
+         */
+        if (!dev)
+                goto type_disk;
+
+        /*
+         * XXX_10 is not defined in SSC, throw an exception
+         */
+        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_TAPE) {
+                *ret = -1;
+                return 0;
+        }
+
+        /*
+         * Everything else assume TYPE_DISK Sector CDB location.
+         * Use 16-bit sector value.
+         */
+type_disk:
+        return (u32)(cdb[7] << 8) + cdb[8];
+}
+
+static inline u32 transport_get_sectors_12(
+        unsigned char *cdb,
+        struct se_cmd *cmd,
+        int *ret)
+{
+        struct se_device *dev = SE_LUN(cmd)->lun_se_dev;
+
+        /*
+         * Assume TYPE_DISK for non struct se_device objects.
+         * Use 32-bit sector value.
+         */
+        if (!dev)
+                goto type_disk;
+
+        /*
+         * XXX_12 is not defined in SSC, throw an exception
+         */
+        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_TAPE) {
+                *ret = -1;
+                return 0;
+        }
+
+        /*
+         * Everything else assume TYPE_DISK Sector CDB location.
+         * Use 32-bit sector value.
+         */
+type_disk:
+        return (u32)(cdb[6] << 24) + (cdb[7] << 16) + (cdb[8] << 8) + cdb[9];
+}
+
+static inline u32 transport_get_sectors_16(
+        unsigned char *cdb,
+        struct se_cmd *cmd,
+        int *ret)
+{
+        struct se_device *dev = SE_LUN(cmd)->lun_se_dev;
+
+        /*
+         * Assume TYPE_DISK for non struct se_device objects.
+         * Use 32-bit sector value.
+         */
+        if (!dev)
+                goto type_disk;
+
+        /*
+         * Use 24-bit allocation length for TYPE_TAPE.
+         */
+        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_TAPE)
+                return (u32)(cdb[12] << 16) + (cdb[13] << 8) + cdb[14];
+
+type_disk:
+        return (u32)(cdb[10] << 24) + (cdb[11] << 16) +
+                    (cdb[12] << 8) + cdb[13];
+}
+
+/*
+ * Used for VARIABLE_LENGTH_CDB WRITE_32 and READ_32 variants
+ */
+static inline u32 transport_get_sectors_32(
+        unsigned char *cdb,
+        struct se_cmd *cmd,
+        int *ret)
+{
+        /*
+         * Assume TYPE_DISK for non struct se_device objects.
+         * Use 32-bit sector value.
+         */
+        return (u32)(cdb[28] << 24) + (cdb[29] << 16) +
+                    (cdb[30] << 8) + cdb[31];
+
+}
+
+static inline u32 transport_get_size(
+        u32 sectors,
+        unsigned char *cdb,
+        struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+
+        if (TRANSPORT(dev)->get_device_type(dev) == TYPE_TAPE) {
+                if (cdb[1] & 1) { /* sectors */
+                        return DEV_ATTRIB(dev)->block_size * sectors;
+                } else /* bytes */
+                        return sectors;
+        }
+#if 0
+        printk(KERN_INFO "Returning block_size: %u, sectors: %u == %u for"
+                        " %s object\n", DEV_ATTRIB(dev)->block_size, sectors,
+                        DEV_ATTRIB(dev)->block_size * sectors,
+                        TRANSPORT(dev)->name);
+#endif
+        return DEV_ATTRIB(dev)->block_size * sectors;
+}
+
+unsigned char transport_asciihex_to_binaryhex(unsigned char val[2])
+{
+        unsigned char result = 0;
+        /*
+         * MSB
+         */
+        if ((val[0] >= 'a') && (val[0] <= 'f'))
+                result = ((val[0] - 'a' + 10) & 0xf) << 4;
+        else
+                if ((val[0] >= 'A') && (val[0] <= 'F'))
+                        result = ((val[0] - 'A' + 10) & 0xf) << 4;
+                else /* digit */
+                        result = ((val[0] - '0') & 0xf) << 4;
+        /*
+         * LSB
+         */
+        if ((val[1] >= 'a') && (val[1] <= 'f'))
+                result |= ((val[1] - 'a' + 10) & 0xf);
+        else
+                if ((val[1] >= 'A') && (val[1] <= 'F'))
+                        result |= ((val[1] - 'A' + 10) & 0xf);
+                else /* digit */
+                        result |= ((val[1] - '0') & 0xf);
+
+        return result;
+}
+EXPORT_SYMBOL(transport_asciihex_to_binaryhex);
+
+static void transport_xor_callback(struct se_cmd *cmd)
+{
+        unsigned char *buf, *addr;
+        struct se_mem *se_mem;
+        unsigned int offset;
+        int i;
+        /*
+         * From sbc3r22.pdf section 5.48 XDWRITEREAD (10) command
+         *
+         * 1) read the specified logical block(s);
+         * 2) transfer logical blocks from the data-out buffer;
+         * 3) XOR the logical blocks transferred from the data-out buffer with
+         *    the logical blocks read, storing the resulting XOR data in a buffer;
+         * 4) if the DISABLE WRITE bit is set to zero, then write the logical
+         *    blocks transferred from the data-out buffer; and
+         * 5) transfer the resulting XOR data to the data-in buffer.
+         */
+        buf = kmalloc(cmd->data_length, GFP_KERNEL);
+        if (!(buf)) {
+                printk(KERN_ERR "Unable to allocate xor_callback buf\n");
+                return;
+        }
+        /*
+         * Copy the scatterlist WRITE buffer located at T_TASK(cmd)->t_mem_list
+         * into the locally allocated *buf
+         */
+        transport_memcpy_se_mem_read_contig(cmd, buf, T_TASK(cmd)->t_mem_list);
+        /*
+         * Now perform the XOR against the BIDI read memory located at
+         * T_TASK(cmd)->t_mem_bidi_list
+         */
+
+        offset = 0;
+        list_for_each_entry(se_mem, T_TASK(cmd)->t_mem_bidi_list, se_list) {
+                addr = (unsigned char *)kmap_atomic(se_mem->se_page, KM_USER0);
+                if (!(addr))
+                        goto out;
+
+                for (i = 0; i < se_mem->se_len; i++)
+                        *(addr + se_mem->se_off + i) ^= *(buf + offset + i);
+
+                offset += se_mem->se_len;
+                kunmap_atomic(addr, KM_USER0);
+        }
+out:
+        kfree(buf);
+}
+
+/*
+ * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd
+ */
+static int transport_get_sense_data(struct se_cmd *cmd)
+{
+        unsigned char *buffer = cmd->sense_buffer, *sense_buffer = NULL;
+        struct se_device *dev;
+        struct se_task *task = NULL, *task_tmp;
+        unsigned long flags;
+        u32 offset = 0;
+
+        if (!SE_LUN(cmd)) {
+                printk(KERN_ERR "SE_LUN(cmd) is NULL\n");
+                return -1;
+        }
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return 0;
+        }
+
+        list_for_each_entry_safe(task, task_tmp,
+                                &T_TASK(cmd)->t_task_list, t_list) {
+
+                if (!task->task_sense)
+                        continue;
+
+                dev = task->se_dev;
+                if (!(dev))
+                        continue;
+
+                if (!TRANSPORT(dev)->get_sense_buffer) {
+                        printk(KERN_ERR "TRANSPORT(dev)->get_sense_buffer"
+                                        " is NULL\n");
+                        continue;
+                }
+
+                sense_buffer = TRANSPORT(dev)->get_sense_buffer(task);
+                if (!(sense_buffer)) {
+                        printk(KERN_ERR "ITT[0x%08x]_TASK[%d]: Unable to locate"
+                                " sense buffer for task with sense\n",
+                                CMD_TFO(cmd)->get_task_tag(cmd), task->task_no);
+                        continue;
+                }
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+                offset = CMD_TFO(cmd)->set_fabric_sense_len(cmd,
+                                TRANSPORT_SENSE_BUFFER);
+
+                memcpy((void *)&buffer[offset], (void *)sense_buffer,
+                                TRANSPORT_SENSE_BUFFER);
+                cmd->scsi_status = task->task_scsi_status;
+                /* Automatically padded */
+                cmd->scsi_sense_length =
+                                (TRANSPORT_SENSE_BUFFER + offset);
+
+                printk(KERN_INFO "HBA_[%u]_PLUG[%s]: Set SAM STATUS: 0x%02x"
+                                " and sense\n",
+                        dev->se_hba->hba_id, TRANSPORT(dev)->name,
+                                cmd->scsi_status);
+                return 0;
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        return -1;
+}
+
+static int transport_allocate_resources(struct se_cmd *cmd)
+{
+        u32 length = cmd->data_length;
+
+        if ((cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) ||
+            (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB))
+                return transport_generic_get_mem(cmd, length, PAGE_SIZE);
+        else if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_NONSG_IO_CDB)
+                return transport_generic_allocate_buf(cmd, length);
+        else
+                return 0;
+}
+
+static int
+transport_handle_reservation_conflict(struct se_cmd *cmd)
+{
+        cmd->transport_wait_for_tasks = &transport_nop_wait_for_tasks;
+        cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+        cmd->se_cmd_flags |= SCF_SCSI_RESERVATION_CONFLICT;
+        cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT;
+        /*
+         * For UA Interlock Code 11b, a RESERVATION CONFLICT will
+         * establish a UNIT ATTENTION with PREVIOUS RESERVATION
+         * CONFLICT STATUS.
+         *
+         * See spc4r17, section 7.4.6 Control Mode Page, Table 349
+         */
+        if (SE_SESS(cmd) &&
+            DEV_ATTRIB(cmd->se_dev)->emulate_ua_intlck_ctrl == 2)
+                core_scsi3_ua_allocate(SE_SESS(cmd)->se_node_acl,
+                        cmd->orig_fe_lun, 0x2C,
+                        ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS);
+        return -2;
+}
+
+/*      transport_generic_cmd_sequencer():
+ *
+ *      Generic Command Sequencer that should work for most DAS transport
+ *      drivers.
+ *
+ *      Called from transport_generic_allocate_tasks() in the $FABRIC_MOD
+ *      RX Thread.
+ *
+ *      FIXME: Need to support other SCSI OPCODES where as well.
+ */
+static int transport_generic_cmd_sequencer(
+        struct se_cmd *cmd,
+        unsigned char *cdb)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_subsystem_dev *su_dev = dev->se_sub_dev;
+        int ret = 0, sector_ret = 0, passthrough;
+        u32 sectors = 0, size = 0, pr_reg_type = 0;
+        u16 service_action;
+        u8 alua_ascq = 0;
+        /*
+         * Check for an existing UNIT ATTENTION condition
+         */
+        if (core_scsi3_ua_check(cmd, cdb) < 0) {
+                cmd->transport_wait_for_tasks =
+                                &transport_nop_wait_for_tasks;
+                cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                cmd->scsi_sense_reason = TCM_CHECK_CONDITION_UNIT_ATTENTION;
+                return -2;
+        }
+        /*
+         * Check status of Asymmetric Logical Unit Assignment port
+         */
+        ret = T10_ALUA(su_dev)->alua_state_check(cmd, cdb, &alua_ascq);
+        if (ret != 0) {
+                cmd->transport_wait_for_tasks = &transport_nop_wait_for_tasks;
+                /*
+                 * Set SCSI additional sense code (ASC) to 'LUN Not Accessable';
+                 * The ALUA additional sense code qualifier (ASCQ) is determined
+                 * by the ALUA primary or secondary access state..
+                 */
+                if (ret > 0) {
+#if 0
+                        printk(KERN_INFO "[%s]: ALUA TG Port not available,"
+                                " SenseKey: NOT_READY, ASC/ASCQ: 0x04/0x%02x\n",
+                                CMD_TFO(cmd)->get_fabric_name(), alua_ascq);
+#endif
+                        transport_set_sense_codes(cmd, 0x04, alua_ascq);
+                        cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                        cmd->scsi_sense_reason = TCM_CHECK_CONDITION_NOT_READY;
+                        return -2;
+                }
+                goto out_invalid_cdb_field;
+        }
+        /*
+         * Check status for SPC-3 Persistent Reservations
+         */
+        if (T10_PR_OPS(su_dev)->t10_reservation_check(cmd, &pr_reg_type) != 0) {
+                if (T10_PR_OPS(su_dev)->t10_seq_non_holder(
+                                        cmd, cdb, pr_reg_type) != 0)
+                        return transport_handle_reservation_conflict(cmd);
+                /*
+                 * This means the CDB is allowed for the SCSI Initiator port
+                 * when said port is *NOT* holding the legacy SPC-2 or
+                 * SPC-3 Persistent Reservation.
+                 */
+        }
+
+        switch (cdb[0]) {
+        case READ_6:
+                sectors = transport_get_sectors_6(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_6;
+                T_TASK(cmd)->t_task_lba = transport_lba_21(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case READ_10:
+                sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_10;
+                T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case READ_12:
+                sectors = transport_get_sectors_12(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_12;
+                T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case READ_16:
+                sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_16;
+                T_TASK(cmd)->t_task_lba = transport_lba_64(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case WRITE_6:
+                sectors = transport_get_sectors_6(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_6;
+                T_TASK(cmd)->t_task_lba = transport_lba_21(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case WRITE_10:
+                sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_10;
+                T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                T_TASK(cmd)->t_tasks_fua = (cdb[1] & 0x8);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case WRITE_12:
+                sectors = transport_get_sectors_12(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_12;
+                T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                T_TASK(cmd)->t_tasks_fua = (cdb[1] & 0x8);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case WRITE_16:
+                sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_16;
+                T_TASK(cmd)->t_task_lba = transport_lba_64(cdb);
+                T_TASK(cmd)->t_tasks_fua = (cdb[1] & 0x8);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                break;
+        case XDWRITEREAD_10:
+                if ((cmd->data_direction != DMA_TO_DEVICE) ||
+                    !(T_TASK(cmd)->t_tasks_bidi))
+                        goto out_invalid_cdb_field;
+                sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->transport_split_cdb = &split_cdb_XX_10;
+                T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+                passthrough = (TRANSPORT(dev)->transport_type ==
+                                TRANSPORT_PLUGIN_PHBA_PDEV);
+                /*
+                 * Skip the remaining assignments for TCM/PSCSI passthrough
+                 */
+                if (passthrough)
+                        break;
+                /*
+                 * Setup BIDI XOR callback to be run during transport_generic_complete_ok()
+                 */
+                cmd->transport_complete_callback = &transport_xor_callback;
+                T_TASK(cmd)->t_tasks_fua = (cdb[1] & 0x8);
+                break;
+        case VARIABLE_LENGTH_CMD:
+                service_action = get_unaligned_be16(&cdb[8]);
+                /*
+                 * Determine if this is TCM/PSCSI device and we should disable
+                 * internal emulation for this CDB.
+                 */
+                passthrough = (TRANSPORT(dev)->transport_type ==
+                                        TRANSPORT_PLUGIN_PHBA_PDEV);
+
+                switch (service_action) {
+                case XDWRITEREAD_32:
+                        sectors = transport_get_sectors_32(cdb, cmd, &sector_ret);
+                        if (sector_ret)
+                                goto out_unsupported_cdb;
+                        size = transport_get_size(sectors, cdb, cmd);
+                        /*
+                         * Use WRITE_32 and READ_32 opcodes for the emulated
+                         * XDWRITE_READ_32 logic.
+                         */
+                        cmd->transport_split_cdb = &split_cdb_XX_32;
+                        T_TASK(cmd)->t_task_lba = transport_lba_64_ext(cdb);
+                        cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
+
+                        /*
+                         * Skip the remaining assignments for TCM/PSCSI passthrough
+                         */
+                        if (passthrough)
+                                break;
+
+                        /*
+                         * Setup BIDI XOR callback to be run during
+                         * transport_generic_complete_ok()
+                         */
+                        cmd->transport_complete_callback = &transport_xor_callback;
+                        T_TASK(cmd)->t_tasks_fua = (cdb[10] & 0x8);
+                        break;
+                case WRITE_SAME_32:
+                        sectors = transport_get_sectors_32(cdb, cmd, &sector_ret);
+                        if (sector_ret)
+                                goto out_unsupported_cdb;
+                        size = transport_get_size(sectors, cdb, cmd);
+                        T_TASK(cmd)->t_task_lba = get_unaligned_be64(&cdb[12]);
+                        cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+
+                        /*
+                         * Skip the remaining assignments for TCM/PSCSI passthrough
+                         */
+                        if (passthrough)
+                                break;
+
+                        if ((cdb[10] & 0x04) || (cdb[10] & 0x02)) {
+                                printk(KERN_ERR "WRITE_SAME PBDATA and LBDATA"
+                                        " bits not supported for Block Discard"
+                                        " Emulation\n");
+                                goto out_invalid_cdb_field;
+                        }
+                        /*
+                         * Currently for the emulated case we only accept
+                         * tpws with the UNMAP=1 bit set.
+                         */
+                        if (!(cdb[10] & 0x08)) {
+                                printk(KERN_ERR "WRITE_SAME w/o UNMAP bit not"
+                                        " supported for Block Discard Emulation\n");
+                                goto out_invalid_cdb_field;
+                        }
+                        break;
+                default:
+                        printk(KERN_ERR "VARIABLE_LENGTH_CMD service action"
+                                " 0x%04x not supported\n", service_action);
+                        goto out_unsupported_cdb;
+                }
+                break;
+        case 0xa3:
+                if (TRANSPORT(dev)->get_device_type(dev) != TYPE_ROM) {
+                        /* MAINTENANCE_IN from SCC-2 */
+                        /*
+                         * Check for emulated MI_REPORT_TARGET_PGS.
+                         */
+                        if (cdb[1] == MI_REPORT_TARGET_PGS) {
+                                cmd->transport_emulate_cdb =
+                                (T10_ALUA(su_dev)->alua_type ==
+                                 SPC3_ALUA_EMULATED) ?
+                                &core_emulate_report_target_port_groups :
+                                NULL;
+                        }
+                        size = (cdb[6] << 24) | (cdb[7] << 16) |
+                               (cdb[8] << 8) | cdb[9];
+                } else {
+                        /* GPCMD_SEND_KEY from multi media commands */
+                        size = (cdb[8] << 8) + cdb[9];
+                }
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case MODE_SELECT:
+                size = cdb[4];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
+        case MODE_SELECT_10:
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
+        case MODE_SENSE:
+                size = cdb[4];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case MODE_SENSE_10:
+        case GPCMD_READ_BUFFER_CAPACITY:
+        case GPCMD_SEND_OPC:
+        case LOG_SELECT:
+        case LOG_SENSE:
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case READ_BLOCK_LIMITS:
+                size = READ_BLOCK_LEN;
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case GPCMD_GET_CONFIGURATION:
+        case GPCMD_READ_FORMAT_CAPACITIES:
+        case GPCMD_READ_DISC_INFO:
+        case GPCMD_READ_TRACK_RZONE_INFO:
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
+        case PERSISTENT_RESERVE_IN:
+        case PERSISTENT_RESERVE_OUT:
+                cmd->transport_emulate_cdb =
+                        (T10_RES(su_dev)->res_type ==
+                         SPC3_PERSISTENT_RESERVATIONS) ?
+                        &core_scsi3_emulate_pr : NULL;
+                size = (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case GPCMD_MECHANISM_STATUS:
+        case GPCMD_READ_DVD_STRUCTURE:
+                size = (cdb[8] << 8) + cdb[9];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
+        case READ_POSITION:
+                size = READ_POSITION_LEN;
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case 0xa4:
+                if (TRANSPORT(dev)->get_device_type(dev) != TYPE_ROM) {
+                        /* MAINTENANCE_OUT from SCC-2
+                         *
+                         * Check for emulated MO_SET_TARGET_PGS.
+                         */
+                        if (cdb[1] == MO_SET_TARGET_PGS) {
+                                cmd->transport_emulate_cdb =
+                                (T10_ALUA(su_dev)->alua_type ==
+                                        SPC3_ALUA_EMULATED) ?
+                                &core_emulate_set_target_port_groups :
+                                NULL;
+                        }
+
+                        size = (cdb[6] << 24) | (cdb[7] << 16) |
+                               (cdb[8] << 8) | cdb[9];
+                } else  {
+                        /* GPCMD_REPORT_KEY from multi media commands */
+                        size = (cdb[8] << 8) + cdb[9];
+                }
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case INQUIRY:
+                size = (cdb[3] << 8) + cdb[4];
+                /*
+                 * Do implict HEAD_OF_QUEUE processing for INQUIRY.
+                 * See spc4r17 section 5.3
+                 */
+                if (SE_DEV(cmd)->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
+                        cmd->sam_task_attr = TASK_ATTR_HOQ;
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case READ_BUFFER:
+                size = (cdb[6] << 16) + (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case READ_CAPACITY:
+                size = READ_CAP_LEN;
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case READ_MEDIA_SERIAL_NUMBER:
+        case SECURITY_PROTOCOL_IN:
+        case SECURITY_PROTOCOL_OUT:
+                size = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case SERVICE_ACTION_IN:
+        case ACCESS_CONTROL_IN:
+        case ACCESS_CONTROL_OUT:
+        case EXTENDED_COPY:
+        case READ_ATTRIBUTE:
+        case RECEIVE_COPY_RESULTS:
+        case WRITE_ATTRIBUTE:
+                size = (cdb[10] << 24) | (cdb[11] << 16) |
+                       (cdb[12] << 8) | cdb[13];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case RECEIVE_DIAGNOSTIC:
+        case SEND_DIAGNOSTIC:
+                size = (cdb[3] << 8) | cdb[4];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+/* #warning FIXME: Figure out correct GPCMD_READ_CD blocksize. */
+#if 0
+        case GPCMD_READ_CD:
+                sectors = (cdb[6] << 16) + (cdb[7] << 8) + cdb[8];
+                size = (2336 * sectors);
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+#endif
+        case READ_TOC:
+                size = cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case REQUEST_SENSE:
+                size = cdb[4];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case READ_ELEMENT_STATUS:
+                size = 65536 * cdb[7] + 256 * cdb[8] + cdb[9];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case WRITE_BUFFER:
+                size = (cdb[6] << 16) + (cdb[7] << 8) + cdb[8];
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case RESERVE:
+        case RESERVE_10:
+                /*
+                 * The SPC-2 RESERVE does not contain a size in the SCSI CDB.
+                 * Assume the passthrough or $FABRIC_MOD will tell us about it.
+                 */
+                if (cdb[0] == RESERVE_10)
+                        size = (cdb[7] << 8) | cdb[8];
+                else
+                        size = cmd->data_length;
+
+                /*
+                 * Setup the legacy emulated handler for SPC-2 and
+                 * >= SPC-3 compatible reservation handling (CRH=1)
+                 * Otherwise, we assume the underlying SCSI logic is
+                 * is running in SPC_PASSTHROUGH, and wants reservations
+                 * emulation disabled.
+                 */
+                cmd->transport_emulate_cdb =
+                                (T10_RES(su_dev)->res_type !=
+                                 SPC_PASSTHROUGH) ?
+                                &core_scsi2_emulate_crh : NULL;
+                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
+                break;
+        case RELEASE:
+        case RELEASE_10:
+                /*
+                 * The SPC-2 RELEASE does not contain a size in the SCSI CDB.
+                 * Assume the passthrough or $FABRIC_MOD will tell us about it.
+                */
+                if (cdb[0] == RELEASE_10)
+                        size = (cdb[7] << 8) | cdb[8];
+                else
+                        size = cmd->data_length;
+
+                cmd->transport_emulate_cdb =
+                                (T10_RES(su_dev)->res_type !=
+                                 SPC_PASSTHROUGH) ?
+                                &core_scsi2_emulate_crh : NULL;
+                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
+                break;
+        case SYNCHRONIZE_CACHE:
+        case 0x91: /* SYNCHRONIZE_CACHE_16: */
+                /*
+                 * Extract LBA and range to be flushed for emulated SYNCHRONIZE_CACHE
+                 */
+                if (cdb[0] == SYNCHRONIZE_CACHE) {
+                        sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
+                        T_TASK(cmd)->t_task_lba = transport_lba_32(cdb);
+                } else {
+                        sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
+                        T_TASK(cmd)->t_task_lba = transport_lba_64(cdb);
+                }
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+
+                size = transport_get_size(sectors, cdb, cmd);
+                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
+
+                /*
+                 * For TCM/pSCSI passthrough, skip cmd->transport_emulate_cdb()
+                 */
+                if (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
+                        break;
+                /*
+                 * Set SCF_EMULATE_CDB_ASYNC to ensure asynchronous operation
+                 * for SYNCHRONIZE_CACHE* Immed=1 case in __transport_execute_tasks()
+                 */
+                cmd->se_cmd_flags |= SCF_EMULATE_CDB_ASYNC;
+                /*
+                 * Check to ensure that LBA + Range does not exceed past end of
+                 * device.
+                 */
+                if (transport_get_sectors(cmd) < 0)
+                        goto out_invalid_cdb_field;
+                break;
+        case UNMAP:
+                size = get_unaligned_be16(&cdb[7]);
+                passthrough = (TRANSPORT(dev)->transport_type ==
+                                TRANSPORT_PLUGIN_PHBA_PDEV);
+                /*
+                 * Determine if the received UNMAP used to for direct passthrough
+                 * into Linux/SCSI with struct request via TCM/pSCSI or we are
+                 * signaling the use of internal transport_generic_unmap() emulation
+                 * for UNMAP -> Linux/BLOCK disbard with TCM/IBLOCK and TCM/FILEIO
+                 * subsystem plugin backstores.
+                 */
+                if (!(passthrough))
+                        cmd->se_cmd_flags |= SCF_EMULATE_SYNC_UNMAP;
+
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        case WRITE_SAME_16:
+                sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
+                if (sector_ret)
+                        goto out_unsupported_cdb;
+                size = transport_get_size(sectors, cdb, cmd);
+                T_TASK(cmd)->t_task_lba = get_unaligned_be16(&cdb[2]);
+                passthrough = (TRANSPORT(dev)->transport_type ==
+                                TRANSPORT_PLUGIN_PHBA_PDEV);
+                /*
+                 * Determine if the received WRITE_SAME_16 is used to for direct
+                 * passthrough into Linux/SCSI with struct request via TCM/pSCSI
+                 * or we are signaling the use of internal WRITE_SAME + UNMAP=1
+                 * emulation for -> Linux/BLOCK disbard with TCM/IBLOCK and
+                 * TCM/FILEIO subsystem plugin backstores.
+                 */
+                if (!(passthrough)) {
+                        if ((cdb[1] & 0x04) || (cdb[1] & 0x02)) {
+                                printk(KERN_ERR "WRITE_SAME PBDATA and LBDATA"
+                                        " bits not supported for Block Discard"
+                                        " Emulation\n");
+                                goto out_invalid_cdb_field;
+                        }
+                        /*
+                         * Currently for the emulated case we only accept
+                         * tpws with the UNMAP=1 bit set.
+                         */
+                        if (!(cdb[1] & 0x08)) {
+                                printk(KERN_ERR "WRITE_SAME w/o UNMAP bit not "
+                                        " supported for Block Discard Emulation\n");
+                                goto out_invalid_cdb_field;
+                        }
+                }
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
+                break;
+        case ALLOW_MEDIUM_REMOVAL:
+        case GPCMD_CLOSE_TRACK:
+        case ERASE:
+        case INITIALIZE_ELEMENT_STATUS:
+        case GPCMD_LOAD_UNLOAD:
+        case REZERO_UNIT:
+        case SEEK_10:
+        case GPCMD_SET_SPEED:
+        case SPACE:
+        case START_STOP:
+        case TEST_UNIT_READY:
+        case VERIFY:
+        case WRITE_FILEMARKS:
+        case MOVE_MEDIUM:
+                cmd->se_cmd_flags |= SCF_SCSI_NON_DATA_CDB;
+                break;
+        case REPORT_LUNS:
+                cmd->transport_emulate_cdb =
+                                &transport_core_report_lun_response;
+                size = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
+                /*
+                 * Do implict HEAD_OF_QUEUE processing for REPORT_LUNS
+                 * See spc4r17 section 5.3
+                 */
+                if (SE_DEV(cmd)->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
+                        cmd->sam_task_attr = TASK_ATTR_HOQ;
+                cmd->se_cmd_flags |= SCF_SCSI_CONTROL_NONSG_IO_CDB;
+                break;
+        default:
+                printk(KERN_WARNING "TARGET_CORE[%s]: Unsupported SCSI Opcode"
+                        " 0x%02x, sending CHECK_CONDITION.\n",
+                        CMD_TFO(cmd)->get_fabric_name(), cdb[0]);
+                cmd->transport_wait_for_tasks = &transport_nop_wait_for_tasks;
+                goto out_unsupported_cdb;
+        }
+
+        if (size != cmd->data_length) {
+                printk(KERN_WARNING "TARGET_CORE[%s]: Expected Transfer Length:"
+                        " %u does not match SCSI CDB Length: %u for SAM Opcode:"
+                        " 0x%02x\n", CMD_TFO(cmd)->get_fabric_name(),
+                                cmd->data_length, size, cdb[0]);
+
+                cmd->cmd_spdtl = size;
+
+                if (cmd->data_direction == DMA_TO_DEVICE) {
+                        printk(KERN_ERR "Rejecting underflow/overflow"
+                                        " WRITE data\n");
+                        goto out_invalid_cdb_field;
+                }
+                /*
+                 * Reject READ_* or WRITE_* with overflow/underflow for
+                 * type SCF_SCSI_DATA_SG_IO_CDB.
+                 */
+                if (!(ret) && (DEV_ATTRIB(dev)->block_size != 512))  {
+                        printk(KERN_ERR "Failing OVERFLOW/UNDERFLOW for LBA op"
+                                " CDB on non 512-byte sector setup subsystem"
+                                " plugin: %s\n", TRANSPORT(dev)->name);
+                        /* Returns CHECK_CONDITION + INVALID_CDB_FIELD */
+                        goto out_invalid_cdb_field;
+                }
+
+                if (size > cmd->data_length) {
+                        cmd->se_cmd_flags |= SCF_OVERFLOW_BIT;
+                        cmd->residual_count = (size - cmd->data_length);
+                } else {
+                        cmd->se_cmd_flags |= SCF_UNDERFLOW_BIT;
+                        cmd->residual_count = (cmd->data_length - size);
+                }
+                cmd->data_length = size;
+        }
+
+        transport_set_supported_SAM_opcode(cmd);
+        return ret;
+
+out_unsupported_cdb:
+        cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+        cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
+        return -2;
+out_invalid_cdb_field:
+        cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+        cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+        return -2;
+}
+
+static inline void transport_release_tasks(struct se_cmd *);
+
+/*
+ * This function will copy a contiguous *src buffer into a destination
+ * struct scatterlist array.
+ */
+static void transport_memcpy_write_contig(
+        struct se_cmd *cmd,
+        struct scatterlist *sg_d,
+        unsigned char *src)
+{
+        u32 i = 0, length = 0, total_length = cmd->data_length;
+        void *dst;
+
+        while (total_length) {
+                length = sg_d[i].length;
+
+                if (length > total_length)
+                        length = total_length;
+
+                dst = sg_virt(&sg_d[i]);
+
+                memcpy(dst, src, length);
+
+                if (!(total_length -= length))
+                        return;
+
+                src += length;
+                i++;
+        }
+}
+
+/*
+ * This function will copy a struct scatterlist array *sg_s into a destination
+ * contiguous *dst buffer.
+ */
+static void transport_memcpy_read_contig(
+        struct se_cmd *cmd,
+        unsigned char *dst,
+        struct scatterlist *sg_s)
+{
+        u32 i = 0, length = 0, total_length = cmd->data_length;
+        void *src;
+
+        while (total_length) {
+                length = sg_s[i].length;
+
+                if (length > total_length)
+                        length = total_length;
+
+                src = sg_virt(&sg_s[i]);
+
+                memcpy(dst, src, length);
+
+                if (!(total_length -= length))
+                        return;
+
+                dst += length;
+                i++;
+        }
+}
+
+static void transport_memcpy_se_mem_read_contig(
+        struct se_cmd *cmd,
+        unsigned char *dst,
+        struct list_head *se_mem_list)
+{
+        struct se_mem *se_mem;
+        void *src;
+        u32 length = 0, total_length = cmd->data_length;
+
+        list_for_each_entry(se_mem, se_mem_list, se_list) {
+                length = se_mem->se_len;
+
+                if (length > total_length)
+                        length = total_length;
+
+                src = page_address(se_mem->se_page) + se_mem->se_off;
+
+                memcpy(dst, src, length);
+
+                if (!(total_length -= length))
+                        return;
+
+                dst += length;
+        }
+}
+
+/*
+ * Called from transport_generic_complete_ok() and
+ * transport_generic_request_failure() to determine which dormant/delayed
+ * and ordered cmds need to have their tasks added to the execution queue.
+ */
+static void transport_complete_task_attr(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_cmd *cmd_p, *cmd_tmp;
+        int new_active_tasks = 0;
+
+        if (cmd->sam_task_attr == TASK_ATTR_SIMPLE) {
+                atomic_dec(&dev->simple_cmds);
+                smp_mb__after_atomic_dec();
+                dev->dev_cur_ordered_id++;
+                DEBUG_STA("Incremented dev->dev_cur_ordered_id: %u for"
+                        " SIMPLE: %u\n", dev->dev_cur_ordered_id,
+                        cmd->se_ordered_id);
+        } else if (cmd->sam_task_attr == TASK_ATTR_HOQ) {
+                atomic_dec(&dev->dev_hoq_count);
+                smp_mb__after_atomic_dec();
+                dev->dev_cur_ordered_id++;
+                DEBUG_STA("Incremented dev_cur_ordered_id: %u for"
+                        " HEAD_OF_QUEUE: %u\n", dev->dev_cur_ordered_id,
+                        cmd->se_ordered_id);
+        } else if (cmd->sam_task_attr == TASK_ATTR_ORDERED) {
+                spin_lock(&dev->ordered_cmd_lock);
+                list_del(&cmd->se_ordered_list);
+                atomic_dec(&dev->dev_ordered_sync);
+                smp_mb__after_atomic_dec();
+                spin_unlock(&dev->ordered_cmd_lock);
+
+                dev->dev_cur_ordered_id++;
+                DEBUG_STA("Incremented dev_cur_ordered_id: %u for ORDERED:"
+                        " %u\n", dev->dev_cur_ordered_id, cmd->se_ordered_id);
+        }
+        /*
+         * Process all commands up to the last received
+         * ORDERED task attribute which requires another blocking
+         * boundary
+         */
+        spin_lock(&dev->delayed_cmd_lock);
+        list_for_each_entry_safe(cmd_p, cmd_tmp,
+                        &dev->delayed_cmd_list, se_delayed_list) {
+
+                list_del(&cmd_p->se_delayed_list);
+                spin_unlock(&dev->delayed_cmd_lock);
+
+                DEBUG_STA("Calling add_tasks() for"
+                        " cmd_p: 0x%02x Task Attr: 0x%02x"
+                        " Dormant -> Active, se_ordered_id: %u\n",
+                        T_TASK(cmd_p)->t_task_cdb[0],
+                        cmd_p->sam_task_attr, cmd_p->se_ordered_id);
+
+                transport_add_tasks_from_cmd(cmd_p);
+                new_active_tasks++;
+
+                spin_lock(&dev->delayed_cmd_lock);
+                if (cmd_p->sam_task_attr == TASK_ATTR_ORDERED)
+                        break;
+        }
+        spin_unlock(&dev->delayed_cmd_lock);
+        /*
+         * If new tasks have become active, wake up the transport thread
+         * to do the processing of the Active tasks.
+         */
+        if (new_active_tasks != 0)
+                wake_up_interruptible(&dev->dev_queue_obj->thread_wq);
+}
+
+static void transport_generic_complete_ok(struct se_cmd *cmd)
+{
+        int reason = 0;
+        /*
+         * Check if we need to move delayed/dormant tasks from cmds on the
+         * delayed execution list after a HEAD_OF_QUEUE or ORDERED Task
+         * Attribute.
+         */
+        if (SE_DEV(cmd)->dev_task_attr_type == SAM_TASK_ATTR_EMULATED)
+                transport_complete_task_attr(cmd);
+        /*
+         * Check if we need to retrieve a sense buffer from
+         * the struct se_cmd in question.
+         */
+        if (cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE) {
+                if (transport_get_sense_data(cmd) < 0)
+                        reason = TCM_NON_EXISTENT_LUN;
+
+                /*
+                 * Only set when an struct se_task->task_scsi_status returned
+                 * a non GOOD status.
+                 */
+                if (cmd->scsi_status) {
+                        transport_send_check_condition_and_sense(
+                                        cmd, reason, 1);
+                        transport_lun_remove_cmd(cmd);
+                        transport_cmd_check_stop_to_fabric(cmd);
+                        return;
+                }
+        }
+        /*
+         * Check for a callback, used by amoungst other things
+         * XDWRITE_READ_10 emulation.
+         */
+        if (cmd->transport_complete_callback)
+                cmd->transport_complete_callback(cmd);
+
+        switch (cmd->data_direction) {
+        case DMA_FROM_DEVICE:
+                spin_lock(&cmd->se_lun->lun_sep_lock);
+                if (SE_LUN(cmd)->lun_sep) {
+                        SE_LUN(cmd)->lun_sep->sep_stats.tx_data_octets +=
+                                        cmd->data_length;
+                }
+                spin_unlock(&cmd->se_lun->lun_sep_lock);
+                /*
+                 * If enabled by TCM fabirc module pre-registered SGL
+                 * memory, perform the memcpy() from the TCM internal
+                 * contigious buffer back to the original SGL.
+                 */
+                if (cmd->se_cmd_flags & SCF_PASSTHROUGH_CONTIG_TO_SG)
+                        transport_memcpy_write_contig(cmd,
+                                 T_TASK(cmd)->t_task_pt_sgl,
+                                 T_TASK(cmd)->t_task_buf);
+
+                CMD_TFO(cmd)->queue_data_in(cmd);
+                break;
+        case DMA_TO_DEVICE:
+                spin_lock(&cmd->se_lun->lun_sep_lock);
+                if (SE_LUN(cmd)->lun_sep) {
+                        SE_LUN(cmd)->lun_sep->sep_stats.rx_data_octets +=
+                                cmd->data_length;
+                }
+                spin_unlock(&cmd->se_lun->lun_sep_lock);
+                /*
+                 * Check if we need to send READ payload for BIDI-COMMAND
+                 */
+                if (T_TASK(cmd)->t_mem_bidi_list != NULL) {
+                        spin_lock(&cmd->se_lun->lun_sep_lock);
+                        if (SE_LUN(cmd)->lun_sep) {
+                                SE_LUN(cmd)->lun_sep->sep_stats.tx_data_octets +=
+                                        cmd->data_length;
+                        }
+                        spin_unlock(&cmd->se_lun->lun_sep_lock);
+                        CMD_TFO(cmd)->queue_data_in(cmd);
+                        break;
+                }
+                /* Fall through for DMA_TO_DEVICE */
+        case DMA_NONE:
+                CMD_TFO(cmd)->queue_status(cmd);
+                break;
+        default:
+                break;
+        }
+
+        transport_lun_remove_cmd(cmd);
+        transport_cmd_check_stop_to_fabric(cmd);
+}
+
+static void transport_free_dev_tasks(struct se_cmd *cmd)
+{
+        struct se_task *task, *task_tmp;
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        list_for_each_entry_safe(task, task_tmp,
+                                &T_TASK(cmd)->t_task_list, t_list) {
+                if (atomic_read(&task->task_active))
+                        continue;
+
+                kfree(task->task_sg_bidi);
+                kfree(task->task_sg);
+
+                list_del(&task->t_list);
+
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                if (task->se_dev)
+                        TRANSPORT(task->se_dev)->free_task(task);
+                else
+                        printk(KERN_ERR "task[%u] - task->se_dev is NULL\n",
+                                task->task_no);
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+}
+
+static inline void transport_free_pages(struct se_cmd *cmd)
+{
+        struct se_mem *se_mem, *se_mem_tmp;
+        int free_page = 1;
+
+        if (cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC)
+                free_page = 0;
+        if (cmd->se_dev->transport->do_se_mem_map)
+                free_page = 0;
+
+        if (T_TASK(cmd)->t_task_buf) {
+                kfree(T_TASK(cmd)->t_task_buf);
+                T_TASK(cmd)->t_task_buf = NULL;
+                return;
+        }
+
+        /*
+         * Caller will handle releasing of struct se_mem.
+         */
+        if (cmd->se_cmd_flags & SCF_CMD_PASSTHROUGH_NOALLOC)
+                return;
+
+        if (!(T_TASK(cmd)->t_tasks_se_num))
+                return;
+
+        list_for_each_entry_safe(se_mem, se_mem_tmp,
+                        T_TASK(cmd)->t_mem_list, se_list) {
+                /*
+                 * We only release call __free_page(struct se_mem->se_page) when
+                 * SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
+                 */
+                if (free_page)
+                        __free_page(se_mem->se_page);
+
+                list_del(&se_mem->se_list);
+                kmem_cache_free(se_mem_cache, se_mem);
+        }
+
+        if (T_TASK(cmd)->t_mem_bidi_list && T_TASK(cmd)->t_tasks_se_bidi_num) {
+                list_for_each_entry_safe(se_mem, se_mem_tmp,
+                                T_TASK(cmd)->t_mem_bidi_list, se_list) {
+                        /*
+                         * We only release call __free_page(struct se_mem->se_page) when
+                         * SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
+                         */
+                        if (free_page)
+                                __free_page(se_mem->se_page);
+
+                        list_del(&se_mem->se_list);
+                        kmem_cache_free(se_mem_cache, se_mem);
+                }
+        }
+
+        kfree(T_TASK(cmd)->t_mem_bidi_list);
+        T_TASK(cmd)->t_mem_bidi_list = NULL;
+        kfree(T_TASK(cmd)->t_mem_list);
+        T_TASK(cmd)->t_mem_list = NULL;
+        T_TASK(cmd)->t_tasks_se_num = 0;
+}
+
+static inline void transport_release_tasks(struct se_cmd *cmd)
+{
+        transport_free_dev_tasks(cmd);
+}
+
+static inline int transport_dec_and_check(struct se_cmd *cmd)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (atomic_read(&T_TASK(cmd)->t_fe_count)) {
+                if (!(atomic_dec_and_test(&T_TASK(cmd)->t_fe_count))) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        flags);
+                        return 1;
+                }
+        }
+
+        if (atomic_read(&T_TASK(cmd)->t_se_count)) {
+                if (!(atomic_dec_and_test(&T_TASK(cmd)->t_se_count))) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        flags);
+                        return 1;
+                }
+        }
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        return 0;
+}
+
+static void transport_release_fe_cmd(struct se_cmd *cmd)
+{
+        unsigned long flags;
+
+        if (transport_dec_and_check(cmd))
+                return;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (!(atomic_read(&T_TASK(cmd)->transport_dev_active))) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                goto free_pages;
+        }
+        atomic_set(&T_TASK(cmd)->transport_dev_active, 0);
+        transport_all_task_dev_remove_state(cmd);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_release_tasks(cmd);
+free_pages:
+        transport_free_pages(cmd);
+        transport_free_se_cmd(cmd);
+        CMD_TFO(cmd)->release_cmd_direct(cmd);
+}
+
+static int transport_generic_remove(
+        struct se_cmd *cmd,
+        int release_to_pool,
+        int session_reinstatement)
+{
+        unsigned long flags;
+
+        if (!(T_TASK(cmd)))
+                goto release_cmd;
+
+        if (transport_dec_and_check(cmd)) {
+                if (session_reinstatement) {
+                        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                        transport_all_task_dev_remove_state(cmd);
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        flags);
+                }
+                return 1;
+        }
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (!(atomic_read(&T_TASK(cmd)->transport_dev_active))) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                goto free_pages;
+        }
+        atomic_set(&T_TASK(cmd)->transport_dev_active, 0);
+        transport_all_task_dev_remove_state(cmd);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        transport_release_tasks(cmd);
+free_pages:
+        transport_free_pages(cmd);
+
+release_cmd:
+        if (release_to_pool) {
+                transport_release_cmd_to_pool(cmd);
+        } else {
+                transport_free_se_cmd(cmd);
+                CMD_TFO(cmd)->release_cmd_direct(cmd);
+        }
+
+        return 0;
+}
+
+/*
+ * transport_generic_map_mem_to_cmd - Perform SGL -> struct se_mem map
+ * @cmd:  Associated se_cmd descriptor
+ * @mem:  SGL style memory for TCM WRITE / READ
+ * @sg_mem_num: Number of SGL elements
+ * @mem_bidi_in: SGL style memory for TCM BIDI READ
+ * @sg_mem_bidi_num: Number of BIDI READ SGL elements
+ *
+ * Return: nonzero return cmd was rejected for -ENOMEM or inproper usage
+ * of parameters.
+ */
+int transport_generic_map_mem_to_cmd(
+        struct se_cmd *cmd,
+        struct scatterlist *mem,
+        u32 sg_mem_num,
+        struct scatterlist *mem_bidi_in,
+        u32 sg_mem_bidi_num)
+{
+        u32 se_mem_cnt_out = 0;
+        int ret;
+
+        if (!(mem) || !(sg_mem_num))
+                return 0;
+        /*
+         * Passed *mem will contain a list_head containing preformatted
+         * struct se_mem elements...
+         */
+        if (!(cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM)) {
+                if ((mem_bidi_in) || (sg_mem_bidi_num)) {
+                        printk(KERN_ERR "SCF_CMD_PASSTHROUGH_NOALLOC not supported"
+                                " with BIDI-COMMAND\n");
+                        return -ENOSYS;
+                }
+
+                T_TASK(cmd)->t_mem_list = (struct list_head *)mem;
+                T_TASK(cmd)->t_tasks_se_num = sg_mem_num;
+                cmd->se_cmd_flags |= SCF_CMD_PASSTHROUGH_NOALLOC;
+                return 0;
+        }
+        /*
+         * Otherwise, assume the caller is passing a struct scatterlist
+         * array from include/linux/scatterlist.h
+         */
+        if ((cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) ||
+            (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB)) {
+                /*
+                 * For CDB using TCM struct se_mem linked list scatterlist memory
+                 * processed into a TCM struct se_subsystem_dev, we do the mapping
+                 * from the passed physical memory to struct se_mem->se_page here.
+                 */
+                T_TASK(cmd)->t_mem_list = transport_init_se_mem_list();
+                if (!(T_TASK(cmd)->t_mem_list))
+                        return -ENOMEM;
+
+                ret = transport_map_sg_to_mem(cmd,
+                        T_TASK(cmd)->t_mem_list, mem, &se_mem_cnt_out);
+                if (ret < 0)
+                        return -ENOMEM;
+
+                T_TASK(cmd)->t_tasks_se_num = se_mem_cnt_out;
+                /*
+                 * Setup BIDI READ list of struct se_mem elements
+                 */
+                if ((mem_bidi_in) && (sg_mem_bidi_num)) {
+                        T_TASK(cmd)->t_mem_bidi_list = transport_init_se_mem_list();
+                        if (!(T_TASK(cmd)->t_mem_bidi_list)) {
+                                kfree(T_TASK(cmd)->t_mem_list);
+                                return -ENOMEM;
+                        }
+                        se_mem_cnt_out = 0;
+
+                        ret = transport_map_sg_to_mem(cmd,
+                                T_TASK(cmd)->t_mem_bidi_list, mem_bidi_in,
+                                &se_mem_cnt_out);
+                        if (ret < 0) {
+                                kfree(T_TASK(cmd)->t_mem_list);
+                                return -ENOMEM;
+                        }
+
+                        T_TASK(cmd)->t_tasks_se_bidi_num = se_mem_cnt_out;
+                }
+                cmd->se_cmd_flags |= SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC;
+
+        } else if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_NONSG_IO_CDB) {
+                if (mem_bidi_in || sg_mem_bidi_num) {
+                        printk(KERN_ERR "BIDI-Commands not supported using "
+                                "SCF_SCSI_CONTROL_NONSG_IO_CDB\n");
+                        return -ENOSYS;
+                }
+                /*
+                 * For incoming CDBs using a contiguous buffer internall with TCM,
+                 * save the passed struct scatterlist memory.  After TCM storage object
+                 * processing has completed for this struct se_cmd, TCM core will call
+                 * transport_memcpy_[write,read]_contig() as necessary from
+                 * transport_generic_complete_ok() and transport_write_pending() in order
+                 * to copy the TCM buffer to/from the original passed *mem in SGL ->
+                 * struct scatterlist format.
+                 */
+                cmd->se_cmd_flags |= SCF_PASSTHROUGH_CONTIG_TO_SG;
+                T_TASK(cmd)->t_task_pt_sgl = mem;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(transport_generic_map_mem_to_cmd);
+
+
+static inline long long transport_dev_end_lba(struct se_device *dev)
+{
+        return dev->transport->get_blocks(dev) + 1;
+}
+
+static int transport_get_sectors(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+
+        T_TASK(cmd)->t_tasks_sectors =
+                (cmd->data_length / DEV_ATTRIB(dev)->block_size);
+        if (!(T_TASK(cmd)->t_tasks_sectors))
+                T_TASK(cmd)->t_tasks_sectors = 1;
+
+        if (TRANSPORT(dev)->get_device_type(dev) != TYPE_DISK)
+                return 0;
+
+        if ((T_TASK(cmd)->t_task_lba + T_TASK(cmd)->t_tasks_sectors) >
+             transport_dev_end_lba(dev)) {
+                printk(KERN_ERR "LBA: %llu Sectors: %u exceeds"
+                        " transport_dev_end_lba(): %llu\n",
+                        T_TASK(cmd)->t_task_lba, T_TASK(cmd)->t_tasks_sectors,
+                        transport_dev_end_lba(dev));
+                cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                cmd->scsi_sense_reason = TCM_SECTOR_COUNT_TOO_MANY;
+                return PYX_TRANSPORT_REQ_TOO_MANY_SECTORS;
+        }
+
+        return 0;
+}
+
+static int transport_new_cmd_obj(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        u32 task_cdbs = 0, rc;
+
+        if (!(cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)) {
+                task_cdbs++;
+                T_TASK(cmd)->t_task_cdbs++;
+        } else {
+                int set_counts = 1;
+
+                /*
+                 * Setup any BIDI READ tasks and memory from
+                 * T_TASK(cmd)->t_mem_bidi_list so the READ struct se_tasks
+                 * are queued first for the non pSCSI passthrough case.
+                 */
+                if ((T_TASK(cmd)->t_mem_bidi_list != NULL) &&
+                    (TRANSPORT(dev)->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV)) {
+                        rc = transport_generic_get_cdb_count(cmd,
+                                T_TASK(cmd)->t_task_lba,
+                                T_TASK(cmd)->t_tasks_sectors,
+                                DMA_FROM_DEVICE, T_TASK(cmd)->t_mem_bidi_list,
+                                set_counts);
+                        if (!(rc)) {
+                                cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                                cmd->scsi_sense_reason =
+                                        TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                                return PYX_TRANSPORT_LU_COMM_FAILURE;
+                        }
+                        set_counts = 0;
+                }
+                /*
+                 * Setup the tasks and memory from T_TASK(cmd)->t_mem_list
+                 * Note for BIDI transfers this will contain the WRITE payload
+                 */
+                task_cdbs = transport_generic_get_cdb_count(cmd,
+                                T_TASK(cmd)->t_task_lba,
+                                T_TASK(cmd)->t_tasks_sectors,
+                                cmd->data_direction, T_TASK(cmd)->t_mem_list,
+                                set_counts);
+                if (!(task_cdbs)) {
+                        cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                        cmd->scsi_sense_reason =
+                                        TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                        return PYX_TRANSPORT_LU_COMM_FAILURE;
+                }
+                T_TASK(cmd)->t_task_cdbs += task_cdbs;
+
+#if 0
+                printk(KERN_INFO "data_length: %u, LBA: %llu t_tasks_sectors:"
+                        " %u, t_task_cdbs: %u\n", obj_ptr, cmd->data_length,
+                        T_TASK(cmd)->t_task_lba, T_TASK(cmd)->t_tasks_sectors,
+                        T_TASK(cmd)->t_task_cdbs);
+#endif
+        }
+
+        atomic_set(&T_TASK(cmd)->t_task_cdbs_left, task_cdbs);
+        atomic_set(&T_TASK(cmd)->t_task_cdbs_ex_left, task_cdbs);
+        atomic_set(&T_TASK(cmd)->t_task_cdbs_timeout_left, task_cdbs);
+        return 0;
+}
+
+static struct list_head *transport_init_se_mem_list(void)
+{
+        struct list_head *se_mem_list;
+
+        se_mem_list = kzalloc(sizeof(struct list_head), GFP_KERNEL);
+        if (!(se_mem_list)) {
+                printk(KERN_ERR "Unable to allocate memory for se_mem_list\n");
+                return NULL;
+        }
+        INIT_LIST_HEAD(se_mem_list);
+
+        return se_mem_list;
+}
+
+static int
+transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
+{
+        unsigned char *buf;
+        struct se_mem *se_mem;
+
+        T_TASK(cmd)->t_mem_list = transport_init_se_mem_list();
+        if (!(T_TASK(cmd)->t_mem_list))
+                return -ENOMEM;
+
+        /*
+         * If the device uses memory mapping this is enough.
+         */
+        if (cmd->se_dev->transport->do_se_mem_map)
+                return 0;
+
+        /*
+         * Setup BIDI-COMMAND READ list of struct se_mem elements
+         */
+        if (T_TASK(cmd)->t_tasks_bidi) {
+                T_TASK(cmd)->t_mem_bidi_list = transport_init_se_mem_list();
+                if (!(T_TASK(cmd)->t_mem_bidi_list)) {
+                        kfree(T_TASK(cmd)->t_mem_list);
+                        return -ENOMEM;
+                }
+        }
+
+        while (length) {
+                se_mem = kmem_cache_zalloc(se_mem_cache, GFP_KERNEL);
+                if (!(se_mem)) {
+                        printk(KERN_ERR "Unable to allocate struct se_mem\n");
+                        goto out;
+                }
+                INIT_LIST_HEAD(&se_mem->se_list);
+                se_mem->se_len = (length > dma_size) ? dma_size : length;
+
+/* #warning FIXME Allocate contigous pages for struct se_mem elements */
+                se_mem->se_page = (struct page *) alloc_pages(GFP_KERNEL, 0);
+                if (!(se_mem->se_page)) {
+                        printk(KERN_ERR "alloc_pages() failed\n");
+                        goto out;
+                }
+
+                buf = kmap_atomic(se_mem->se_page, KM_IRQ0);
+                if (!(buf)) {
+                        printk(KERN_ERR "kmap_atomic() failed\n");
+                        goto out;
+                }
+                memset(buf, 0, se_mem->se_len);
+                kunmap_atomic(buf, KM_IRQ0);
+
+                list_add_tail(&se_mem->se_list, T_TASK(cmd)->t_mem_list);
+                T_TASK(cmd)->t_tasks_se_num++;
+
+                DEBUG_MEM("Allocated struct se_mem page(%p) Length(%u)"
+                        " Offset(%u)\n", se_mem->se_page, se_mem->se_len,
+                        se_mem->se_off);
+
+                length -= se_mem->se_len;
+        }
+
+        DEBUG_MEM("Allocated total struct se_mem elements(%u)\n",
+                        T_TASK(cmd)->t_tasks_se_num);
+
+        return 0;
+out:
+        return -1;
+}
+
+extern u32 transport_calc_sg_num(
+        struct se_task *task,
+        struct se_mem *in_se_mem,
+        u32 task_offset)
+{
+        struct se_cmd *se_cmd = task->task_se_cmd;
+        struct se_device *se_dev = SE_DEV(se_cmd);
+        struct se_mem *se_mem = in_se_mem;
+        struct target_core_fabric_ops *tfo = CMD_TFO(se_cmd);
+        u32 sg_length, task_size = task->task_size, task_sg_num_padded;
+
+        while (task_size != 0) {
+                DEBUG_SC("se_mem->se_page(%p) se_mem->se_len(%u)"
+                        " se_mem->se_off(%u) task_offset(%u)\n",
+                        se_mem->se_page, se_mem->se_len,
+                        se_mem->se_off, task_offset);
+
+                if (task_offset == 0) {
+                        if (task_size >= se_mem->se_len) {
+                                sg_length = se_mem->se_len;
+
+                                if (!(list_is_last(&se_mem->se_list,
+                                                T_TASK(se_cmd)->t_mem_list)))
+                                        se_mem = list_entry(se_mem->se_list.next,
+                                                        struct se_mem, se_list);
+                        } else {
+                                sg_length = task_size;
+                                task_size -= sg_length;
+                                goto next;
+                        }
+
+                        DEBUG_SC("sg_length(%u) task_size(%u)\n",
+                                        sg_length, task_size);
+                } else {
+                        if ((se_mem->se_len - task_offset) > task_size) {
+                                sg_length = task_size;
+                                task_size -= sg_length;
+                                goto next;
+                         } else {
+                                sg_length = (se_mem->se_len - task_offset);
+
+                                if (!(list_is_last(&se_mem->se_list,
+                                                T_TASK(se_cmd)->t_mem_list)))
+                                        se_mem = list_entry(se_mem->se_list.next,
+                                                        struct se_mem, se_list);
+                        }
+
+                        DEBUG_SC("sg_length(%u) task_size(%u)\n",
+                                        sg_length, task_size);
+
+                        task_offset = 0;
+                }
+                task_size -= sg_length;
+next:
+                DEBUG_SC("task[%u] - Reducing task_size to(%u)\n",
+                        task->task_no, task_size);
+
+                task->task_sg_num++;
+        }
+        /*
+         * Check if the fabric module driver is requesting that all
+         * struct se_task->task_sg[] be chained together..  If so,
+         * then allocate an extra padding SG entry for linking and
+         * marking the end of the chained SGL.
+         */
+        if (tfo->task_sg_chaining) {
+                task_sg_num_padded = (task->task_sg_num + 1);
+                task->task_padded_sg = 1;
+        } else
+                task_sg_num_padded = task->task_sg_num;
+
+        task->task_sg = kzalloc(task_sg_num_padded *
+                        sizeof(struct scatterlist), GFP_KERNEL);
+        if (!(task->task_sg)) {
+                printk(KERN_ERR "Unable to allocate memory for"
+                                " task->task_sg\n");
+                return 0;
+        }
+        sg_init_table(&task->task_sg[0], task_sg_num_padded);
+        /*
+         * Setup task->task_sg_bidi for SCSI READ payload for
+         * TCM/pSCSI passthrough if present for BIDI-COMMAND
+         */
+        if ((T_TASK(se_cmd)->t_mem_bidi_list != NULL) &&
+            (TRANSPORT(se_dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)) {
+                task->task_sg_bidi = kzalloc(task_sg_num_padded *
+                                sizeof(struct scatterlist), GFP_KERNEL);
+                if (!(task->task_sg_bidi)) {
+                        printk(KERN_ERR "Unable to allocate memory for"
+                                " task->task_sg_bidi\n");
+                        return 0;
+                }
+                sg_init_table(&task->task_sg_bidi[0], task_sg_num_padded);
+        }
+        /*
+         * For the chaining case, setup the proper end of SGL for the
+         * initial submission struct task into struct se_subsystem_api.
+         * This will be cleared later by transport_do_task_sg_chain()
+         */
+        if (task->task_padded_sg) {
+                sg_mark_end(&task->task_sg[task->task_sg_num - 1]);
+                /*
+                 * Added the 'if' check before marking end of bi-directional
+                 * scatterlist (which gets created only in case of request
+                 * (RD + WR).
+                 */
+                if (task->task_sg_bidi)
+                        sg_mark_end(&task->task_sg_bidi[task->task_sg_num - 1]);
+        }
+
+        DEBUG_SC("Successfully allocated task->task_sg_num(%u),"
+                " task_sg_num_padded(%u)\n", task->task_sg_num,
+                task_sg_num_padded);
+
+        return task->task_sg_num;
+}
+
+static inline int transport_set_tasks_sectors_disk(
+        struct se_task *task,
+        struct se_device *dev,
+        unsigned long long lba,
+        u32 sectors,
+        int *max_sectors_set)
+{
+        if ((lba + sectors) > transport_dev_end_lba(dev)) {
+                task->task_sectors = ((transport_dev_end_lba(dev) - lba) + 1);
+
+                if (task->task_sectors > DEV_ATTRIB(dev)->max_sectors) {
+                        task->task_sectors = DEV_ATTRIB(dev)->max_sectors;
+                        *max_sectors_set = 1;
+                }
+        } else {
+                if (sectors > DEV_ATTRIB(dev)->max_sectors) {
+                        task->task_sectors = DEV_ATTRIB(dev)->max_sectors;
+                        *max_sectors_set = 1;
+                } else
+                        task->task_sectors = sectors;
+        }
+
+        return 0;
+}
+
+static inline int transport_set_tasks_sectors_non_disk(
+        struct se_task *task,
+        struct se_device *dev,
+        unsigned long long lba,
+        u32 sectors,
+        int *max_sectors_set)
+{
+        if (sectors > DEV_ATTRIB(dev)->max_sectors) {
+                task->task_sectors = DEV_ATTRIB(dev)->max_sectors;
+                *max_sectors_set = 1;
+        } else
+                task->task_sectors = sectors;
+
+        return 0;
+}
+
+static inline int transport_set_tasks_sectors(
+        struct se_task *task,
+        struct se_device *dev,
+        unsigned long long lba,
+        u32 sectors,
+        int *max_sectors_set)
+{
+        return (TRANSPORT(dev)->get_device_type(dev) == TYPE_DISK) ?
+                transport_set_tasks_sectors_disk(task, dev, lba, sectors,
+                                max_sectors_set) :
+                transport_set_tasks_sectors_non_disk(task, dev, lba, sectors,
+                                max_sectors_set);
+}
+
+static int transport_map_sg_to_mem(
+        struct se_cmd *cmd,
+        struct list_head *se_mem_list,
+        void *in_mem,
+        u32 *se_mem_cnt)
+{
+        struct se_mem *se_mem;
+        struct scatterlist *sg;
+        u32 sg_count = 1, cmd_size = cmd->data_length;
+
+        if (!in_mem) {
+                printk(KERN_ERR "No source scatterlist\n");
+                return -1;
+        }
+        sg = (struct scatterlist *)in_mem;
+
+        while (cmd_size) {
+                se_mem = kmem_cache_zalloc(se_mem_cache, GFP_KERNEL);
+                if (!(se_mem)) {
+                        printk(KERN_ERR "Unable to allocate struct se_mem\n");
+                        return -1;
+                }
+                INIT_LIST_HEAD(&se_mem->se_list);
+                DEBUG_MEM("sg_to_mem: Starting loop with cmd_size: %u"
+                        " sg_page: %p offset: %d length: %d\n", cmd_size,
+                        sg_page(sg), sg->offset, sg->length);
+
+                se_mem->se_page = sg_page(sg);
+                se_mem->se_off = sg->offset;
+
+                if (cmd_size > sg->length) {
+                        se_mem->se_len = sg->length;
+                        sg = sg_next(sg);
+                        sg_count++;
+                } else
+                        se_mem->se_len = cmd_size;
+
+                cmd_size -= se_mem->se_len;
+
+                DEBUG_MEM("sg_to_mem: *se_mem_cnt: %u cmd_size: %u\n",
+                                *se_mem_cnt, cmd_size);
+                DEBUG_MEM("sg_to_mem: Final se_page: %p se_off: %d se_len: %d\n",
+                                se_mem->se_page, se_mem->se_off, se_mem->se_len);
+
+                list_add_tail(&se_mem->se_list, se_mem_list);
+                (*se_mem_cnt)++;
+        }
+
+        DEBUG_MEM("task[0] - Mapped(%u) struct scatterlist segments to(%u)"
+                " struct se_mem\n", sg_count, *se_mem_cnt);
+
+        if (sg_count != *se_mem_cnt)
+                BUG();
+
+        return 0;
+}
+
+/*      transport_map_mem_to_sg():
+ *
+ *
+ */
+int transport_map_mem_to_sg(
+        struct se_task *task,
+        struct list_head *se_mem_list,
+        void *in_mem,
+        struct se_mem *in_se_mem,
+        struct se_mem **out_se_mem,
+        u32 *se_mem_cnt,
+        u32 *task_offset)
+{
+        struct se_cmd *se_cmd = task->task_se_cmd;
+        struct se_mem *se_mem = in_se_mem;
+        struct scatterlist *sg = (struct scatterlist *)in_mem;
+        u32 task_size = task->task_size, sg_no = 0;
+
+        if (!sg) {
+                printk(KERN_ERR "Unable to locate valid struct"
+                                " scatterlist pointer\n");
+                return -1;
+        }
+
+        while (task_size != 0) {
+                /*
+                 * Setup the contigious array of scatterlists for
+                 * this struct se_task.
+                 */
+                sg_assign_page(sg, se_mem->se_page);
+
+                if (*task_offset == 0) {
+                        sg->offset = se_mem->se_off;
+
+                        if (task_size >= se_mem->se_len) {
+                                sg->length = se_mem->se_len;
+
+                                if (!(list_is_last(&se_mem->se_list,
+                                                T_TASK(se_cmd)->t_mem_list))) {
+                                        se_mem = list_entry(se_mem->se_list.next,
+                                                        struct se_mem, se_list);
+                                        (*se_mem_cnt)++;
+                                }
+                        } else {
+                                sg->length = task_size;
+                                /*
+                                 * Determine if we need to calculate an offset
+                                 * into the struct se_mem on the next go around..
+                                 */
+                                task_size -= sg->length;
+                                if (!(task_size))
+                                        *task_offset = sg->length;
+
+                                goto next;
+                        }
+
+                } else {
+                        sg->offset = (*task_offset + se_mem->se_off);
+
+                        if ((se_mem->se_len - *task_offset) > task_size) {
+                                sg->length = task_size;
+                                /*
+                                 * Determine if we need to calculate an offset
+                                 * into the struct se_mem on the next go around..
+                                 */
+                                task_size -= sg->length;
+                                if (!(task_size))
+                                        *task_offset += sg->length;
+
+                                goto next;
+                        } else {
+                                sg->length = (se_mem->se_len - *task_offset);
+
+                                if (!(list_is_last(&se_mem->se_list,
+                                                T_TASK(se_cmd)->t_mem_list))) {
+                                        se_mem = list_entry(se_mem->se_list.next,
+                                                        struct se_mem, se_list);
+                                        (*se_mem_cnt)++;
+                                }
+                        }
+
+                        *task_offset = 0;
+                }
+                task_size -= sg->length;
+next:
+                DEBUG_MEM("task[%u] mem_to_sg - sg[%u](%p)(%u)(%u) - Reducing"
+                        " task_size to(%u), task_offset: %u\n", task->task_no, sg_no,
+                        sg_page(sg), sg->length, sg->offset, task_size, *task_offset);
+
+                sg_no++;
+                if (!(task_size))
+                        break;
+
+                sg = sg_next(sg);
+
+                if (task_size > se_cmd->data_length)
+                        BUG();
+        }
+        *out_se_mem = se_mem;
+
+        DEBUG_MEM("task[%u] - Mapped(%u) struct se_mem segments to total(%u)"
+                " SGs\n", task->task_no, *se_mem_cnt, sg_no);
+
+        return 0;
+}
+
+/*
+ * This function can be used by HW target mode drivers to create a linked
+ * scatterlist from all contiguously allocated struct se_task->task_sg[].
+ * This is intended to be called during the completion path by TCM Core
+ * when struct target_core_fabric_ops->check_task_sg_chaining is enabled.
+ */
+void transport_do_task_sg_chain(struct se_cmd *cmd)
+{
+        struct scatterlist *sg_head = NULL, *sg_link = NULL, *sg_first = NULL;
+        struct scatterlist *sg_head_cur = NULL, *sg_link_cur = NULL;
+        struct scatterlist *sg, *sg_end = NULL, *sg_end_cur = NULL;
+        struct se_task *task;
+        struct target_core_fabric_ops *tfo = CMD_TFO(cmd);
+        u32 task_sg_num = 0, sg_count = 0;
+        int i;
+
+        if (tfo->task_sg_chaining == 0) {
+                printk(KERN_ERR "task_sg_chaining is diabled for fabric module:"
+                                " %s\n", tfo->get_fabric_name());
+                dump_stack();
+                return;
+        }
+        /*
+         * Walk the struct se_task list and setup scatterlist chains
+         * for each contiguosly allocated struct se_task->task_sg[].
+         */
+        list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+                if (!(task->task_sg) || !(task->task_padded_sg))
+                        continue;
+
+                if (sg_head && sg_link) {
+                        sg_head_cur = &task->task_sg[0];
+                        sg_link_cur = &task->task_sg[task->task_sg_num];
+                        /*
+                         * Either add chain or mark end of scatterlist
+                         */
+                        if (!(list_is_last(&task->t_list,
+                                        &T_TASK(cmd)->t_task_list))) {
+                                /*
+                                 * Clear existing SGL termination bit set in
+                                 * transport_calc_sg_num(), see sg_mark_end()
+                                 */
+                                sg_end_cur = &task->task_sg[task->task_sg_num - 1];
+                                sg_end_cur->page_link &= ~0x02;
+
+                                sg_chain(sg_head, task_sg_num, sg_head_cur);
+                                sg_count += (task->task_sg_num + 1);
+                        } else
+                                sg_count += task->task_sg_num;
+
+                        sg_head = sg_head_cur;
+                        sg_link = sg_link_cur;
+                        task_sg_num = task->task_sg_num;
+                        continue;
+                }
+                sg_head = sg_first = &task->task_sg[0];
+                sg_link = &task->task_sg[task->task_sg_num];
+                task_sg_num = task->task_sg_num;
+                /*
+                 * Check for single task..
+                 */
+                if (!(list_is_last(&task->t_list, &T_TASK(cmd)->t_task_list))) {
+                        /*
+                         * Clear existing SGL termination bit set in
+                         * transport_calc_sg_num(), see sg_mark_end()
+                         */
+                        sg_end = &task->task_sg[task->task_sg_num - 1];
+                        sg_end->page_link &= ~0x02;
+                        sg_count += (task->task_sg_num + 1);
+                } else
+                        sg_count += task->task_sg_num;
+        }
+        /*
+         * Setup the starting pointer and total t_tasks_sg_linked_no including
+         * padding SGs for linking and to mark the end.
+         */
+        T_TASK(cmd)->t_tasks_sg_chained = sg_first;
+        T_TASK(cmd)->t_tasks_sg_chained_no = sg_count;
+
+        DEBUG_CMD_M("Setup T_TASK(cmd)->t_tasks_sg_chained: %p and"
+                " t_tasks_sg_chained_no: %u\n", T_TASK(cmd)->t_tasks_sg_chained,
+                T_TASK(cmd)->t_tasks_sg_chained_no);
+
+        for_each_sg(T_TASK(cmd)->t_tasks_sg_chained, sg,
+                        T_TASK(cmd)->t_tasks_sg_chained_no, i) {
+
+                DEBUG_CMD_M("SG: %p page: %p length: %d offset: %d\n",
+                        sg, sg_page(sg), sg->length, sg->offset);
+                if (sg_is_chain(sg))
+                        DEBUG_CMD_M("SG: %p sg_is_chain=1\n", sg);
+                if (sg_is_last(sg))
+                        DEBUG_CMD_M("SG: %p sg_is_last=1\n", sg);
+        }
+
+}
+EXPORT_SYMBOL(transport_do_task_sg_chain);
+
+static int transport_do_se_mem_map(
+        struct se_device *dev,
+        struct se_task *task,
+        struct list_head *se_mem_list,
+        void *in_mem,
+        struct se_mem *in_se_mem,
+        struct se_mem **out_se_mem,
+        u32 *se_mem_cnt,
+        u32 *task_offset_in)
+{
+        u32 task_offset = *task_offset_in;
+        int ret = 0;
+        /*
+         * se_subsystem_api_t->do_se_mem_map is used when internal allocation
+         * has been done by the transport plugin.
+         */
+        if (TRANSPORT(dev)->do_se_mem_map) {
+                ret = TRANSPORT(dev)->do_se_mem_map(task, se_mem_list,
+                                in_mem, in_se_mem, out_se_mem, se_mem_cnt,
+                                task_offset_in);
+                if (ret == 0)
+                        T_TASK(task->task_se_cmd)->t_tasks_se_num += *se_mem_cnt;
+
+                return ret;
+        }
+        /*
+         * This is the normal path for all normal non BIDI and BIDI-COMMAND
+         * WRITE payloads..  If we need to do BIDI READ passthrough for
+         * TCM/pSCSI the first call to transport_do_se_mem_map ->
+         * transport_calc_sg_num() -> transport_map_mem_to_sg() will do the
+         * allocation for task->task_sg_bidi, and the subsequent call to
+         * transport_do_se_mem_map() from transport_generic_get_cdb_count()
+         */
+        if (!(task->task_sg_bidi)) {
+                /*
+                 * Assume default that transport plugin speaks preallocated
+                 * scatterlists.
+                 */
+                if (!(transport_calc_sg_num(task, in_se_mem, task_offset)))
+                        return -1;
+                /*
+                 * struct se_task->task_sg now contains the struct scatterlist array.
+                 */
+                return transport_map_mem_to_sg(task, se_mem_list, task->task_sg,
+                                        in_se_mem, out_se_mem, se_mem_cnt,
+                                        task_offset_in);
+        }
+        /*
+         * Handle the se_mem_list -> struct task->task_sg_bidi
+         * memory map for the extra BIDI READ payload
+         */
+        return transport_map_mem_to_sg(task, se_mem_list, task->task_sg_bidi,
+                                in_se_mem, out_se_mem, se_mem_cnt,
+                                task_offset_in);
+}
+
+static u32 transport_generic_get_cdb_count(
+        struct se_cmd *cmd,
+        unsigned long long lba,
+        u32 sectors,
+        enum dma_data_direction data_direction,
+        struct list_head *mem_list,
+        int set_counts)
+{
+        unsigned char *cdb = NULL;
+        struct se_task *task;
+        struct se_mem *se_mem = NULL, *se_mem_lout = NULL;
+        struct se_mem *se_mem_bidi = NULL, *se_mem_bidi_lout = NULL;
+        struct se_device *dev = SE_DEV(cmd);
+        int max_sectors_set = 0, ret;
+        u32 task_offset_in = 0, se_mem_cnt = 0, se_mem_bidi_cnt = 0, task_cdbs = 0;
+
+        if (!mem_list) {
+                printk(KERN_ERR "mem_list is NULL in transport_generic_get"
+                                "_cdb_count()\n");
+                return 0;
+        }
+        /*
+         * While using RAMDISK_DR backstores is the only case where
+         * mem_list will ever be empty at this point.
+         */
+        if (!(list_empty(mem_list)))
+                se_mem = list_entry(mem_list->next, struct se_mem, se_list);
+        /*
+         * Check for extra se_mem_bidi mapping for BIDI-COMMANDs to
+         * struct se_task->task_sg_bidi for TCM/pSCSI passthrough operation
+         */
+        if ((T_TASK(cmd)->t_mem_bidi_list != NULL) &&
+            !(list_empty(T_TASK(cmd)->t_mem_bidi_list)) &&
+            (TRANSPORT(dev)->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV))
+                se_mem_bidi = list_entry(T_TASK(cmd)->t_mem_bidi_list->next,
+                                        struct se_mem, se_list);
+
+        while (sectors) {
+                DEBUG_VOL("ITT[0x%08x] LBA(%llu) SectorsLeft(%u) EOBJ(%llu)\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd), lba, sectors,
+                        transport_dev_end_lba(dev));
+
+                task = transport_generic_get_task(cmd, data_direction);
+                if (!(task))
+                        goto out;
+
+                transport_set_tasks_sectors(task, dev, lba, sectors,
+                                &max_sectors_set);
+
+                task->task_lba = lba;
+                lba += task->task_sectors;
+                sectors -= task->task_sectors;
+                task->task_size = (task->task_sectors *
+                                   DEV_ATTRIB(dev)->block_size);
+
+                cdb = TRANSPORT(dev)->get_cdb(task);
+                if ((cdb)) {
+                        memcpy(cdb, T_TASK(cmd)->t_task_cdb,
+                                scsi_command_size(T_TASK(cmd)->t_task_cdb));
+                        cmd->transport_split_cdb(task->task_lba,
+                                        &task->task_sectors, cdb);
+                }
+
+                /*
+                 * Perform the SE OBJ plugin and/or Transport plugin specific
+                 * mapping for T_TASK(cmd)->t_mem_list. And setup the
+                 * task->task_sg and if necessary task->task_sg_bidi
+                 */
+                ret = transport_do_se_mem_map(dev, task, mem_list,
+                                NULL, se_mem, &se_mem_lout, &se_mem_cnt,
+                                &task_offset_in);
+                if (ret < 0)
+                        goto out;
+
+                se_mem = se_mem_lout;
+                /*
+                 * Setup the T_TASK(cmd)->t_mem_bidi_list -> task->task_sg_bidi
+                 * mapping for SCSI READ for BIDI-COMMAND passthrough with TCM/pSCSI
+                 *
+                 * Note that the first call to transport_do_se_mem_map() above will
+                 * allocate struct se_task->task_sg_bidi in transport_do_se_mem_map()
+                 * -> transport_calc_sg_num(), and the second here will do the
+                 * mapping for SCSI READ for BIDI-COMMAND passthrough with TCM/pSCSI.
+                 */
+                if (task->task_sg_bidi != NULL) {
+                        ret = transport_do_se_mem_map(dev, task,
+                                T_TASK(cmd)->t_mem_bidi_list, NULL,
+                                se_mem_bidi, &se_mem_bidi_lout, &se_mem_bidi_cnt,
+                                &task_offset_in);
+                        if (ret < 0)
+                                goto out;
+
+                        se_mem_bidi = se_mem_bidi_lout;
+                }
+                task_cdbs++;
+
+                DEBUG_VOL("Incremented task_cdbs(%u) task->task_sg_num(%u)\n",
+                                task_cdbs, task->task_sg_num);
+
+                if (max_sectors_set) {
+                        max_sectors_set = 0;
+                        continue;
+                }
+
+                if (!sectors)
+                        break;
+        }
+
+        if (set_counts) {
+                atomic_inc(&T_TASK(cmd)->t_fe_count);
+                atomic_inc(&T_TASK(cmd)->t_se_count);
+        }
+
+        DEBUG_VOL("ITT[0x%08x] total %s cdbs(%u)\n",
+                CMD_TFO(cmd)->get_task_tag(cmd), (data_direction == DMA_TO_DEVICE)
+                ? "DMA_TO_DEVICE" : "DMA_FROM_DEVICE", task_cdbs);
+
+        return task_cdbs;
+out:
+        return 0;
+}
+
+static int
+transport_map_control_cmd_to_task(struct se_cmd *cmd)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        unsigned char *cdb;
+        struct se_task *task;
+        int ret;
+
+        task = transport_generic_get_task(cmd, cmd->data_direction);
+        if (!task)
+                return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+
+        cdb = TRANSPORT(dev)->get_cdb(task);
+        if (cdb)
+                memcpy(cdb, cmd->t_task->t_task_cdb,
+                        scsi_command_size(cmd->t_task->t_task_cdb));
+
+        task->task_size = cmd->data_length;
+        task->task_sg_num =
+                (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) ? 1 : 0;
+
+        atomic_inc(&cmd->t_task->t_fe_count);
+        atomic_inc(&cmd->t_task->t_se_count);
+
+        if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) {
+                struct se_mem *se_mem = NULL, *se_mem_lout = NULL;
+                u32 se_mem_cnt = 0, task_offset = 0;
+
+                BUG_ON(list_empty(cmd->t_task->t_mem_list));
+
+                ret = transport_do_se_mem_map(dev, task,
+                                cmd->t_task->t_mem_list, NULL, se_mem,
+                                &se_mem_lout, &se_mem_cnt, &task_offset);
+                if (ret < 0)
+                        return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+
+                if (dev->transport->map_task_SG)
+                        return dev->transport->map_task_SG(task);
+                return 0;
+        } else if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_NONSG_IO_CDB) {
+                if (dev->transport->map_task_non_SG)
+                        return dev->transport->map_task_non_SG(task);
+                return 0;
+        } else if (cmd->se_cmd_flags & SCF_SCSI_NON_DATA_CDB) {
+                if (dev->transport->cdb_none)
+                        return dev->transport->cdb_none(task);
+                return 0;
+        } else {
+                BUG();
+                return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+        }
+}
+
+/*       transport_generic_new_cmd(): Called from transport_processing_thread()
+ *
+ *       Allocate storage transport resources from a set of values predefined
+ *       by transport_generic_cmd_sequencer() from the iSCSI Target RX process.
+ *       Any non zero return here is treated as an "out of resource' op here.
+ */
+        /*
+         * Generate struct se_task(s) and/or their payloads for this CDB.
+         */
+static int transport_generic_new_cmd(struct se_cmd *cmd)
+{
+        struct se_portal_group *se_tpg;
+        struct se_task *task;
+        struct se_device *dev = SE_DEV(cmd);
+        int ret = 0;
+
+        /*
+         * Determine is the TCM fabric module has already allocated physical
+         * memory, and is directly calling transport_generic_map_mem_to_cmd()
+         * to setup beforehand the linked list of physical memory at
+         * T_TASK(cmd)->t_mem_list of struct se_mem->se_page
+         */
+        if (!(cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC)) {
+                ret = transport_allocate_resources(cmd);
+                if (ret < 0)
+                        return ret;
+        }
+
+        ret = transport_get_sectors(cmd);
+        if (ret < 0)
+                return ret;
+
+        ret = transport_new_cmd_obj(cmd);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * Determine if the calling TCM fabric module is talking to
+         * Linux/NET via kernel sockets and needs to allocate a
+         * struct iovec array to complete the struct se_cmd
+         */
+        se_tpg = SE_LUN(cmd)->lun_sep->sep_tpg;
+        if (TPG_TFO(se_tpg)->alloc_cmd_iovecs != NULL) {
+                ret = TPG_TFO(se_tpg)->alloc_cmd_iovecs(cmd);
+                if (ret < 0)
+                        return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
+        }
+
+        if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {
+                list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+                        if (atomic_read(&task->task_sent))
+                                continue;
+                        if (!dev->transport->map_task_SG)
+                                continue;
+
+                        ret = dev->transport->map_task_SG(task);
+                        if (ret < 0)
+                                return ret;
+                }
+        } else {
+                ret = transport_map_control_cmd_to_task(cmd);
+                if (ret < 0)
+                        return ret;
+        }
+
+        /*
+         * For WRITEs, let the iSCSI Target RX Thread know its buffer is ready..
+         * This WRITE struct se_cmd (and all of its associated struct se_task's)
+         * will be added to the struct se_device execution queue after its WRITE
+         * data has arrived. (ie: It gets handled by the transport processing
+         * thread a second time)
+         */
+        if (cmd->data_direction == DMA_TO_DEVICE) {
+                transport_add_tasks_to_state_queue(cmd);
+                return transport_generic_write_pending(cmd);
+        }
+        /*
+         * Everything else but a WRITE, add the struct se_cmd's struct se_task's
+         * to the execution queue.
+         */
+        transport_execute_tasks(cmd);
+        return 0;
+}
+
+/*      transport_generic_process_write():
+ *
+ *
+ */
+void transport_generic_process_write(struct se_cmd *cmd)
+{
+#if 0
+        /*
+         * Copy SCSI Presented DTL sector(s) from received buffers allocated to
+         * original EDTL
+         */
+        if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
+                if (!T_TASK(cmd)->t_tasks_se_num) {
+                        unsigned char *dst, *buf =
+                                (unsigned char *)T_TASK(cmd)->t_task_buf;
+
+                        dst = kzalloc(cmd->cmd_spdtl), GFP_KERNEL);
+                        if (!(dst)) {
+                                printk(KERN_ERR "Unable to allocate memory for"
+                                                " WRITE underflow\n");
+                                transport_generic_request_failure(cmd, NULL,
+                                        PYX_TRANSPORT_REQ_TOO_MANY_SECTORS, 1);
+                                return;
+                        }
+                        memcpy(dst, buf, cmd->cmd_spdtl);
+
+                        kfree(T_TASK(cmd)->t_task_buf);
+                        T_TASK(cmd)->t_task_buf = dst;
+                } else {
+                        struct scatterlist *sg =
+                                (struct scatterlist *sg)T_TASK(cmd)->t_task_buf;
+                        struct scatterlist *orig_sg;
+
+                        orig_sg = kzalloc(sizeof(struct scatterlist) *
+                                        T_TASK(cmd)->t_tasks_se_num,
+                                        GFP_KERNEL))) {
+                        if (!(orig_sg)) {
+                                printk(KERN_ERR "Unable to allocate memory"
+                                                " for WRITE underflow\n");
+                                transport_generic_request_failure(cmd, NULL,
+                                        PYX_TRANSPORT_REQ_TOO_MANY_SECTORS, 1);
+                                return;
+                        }
+
+                        memcpy(orig_sg, T_TASK(cmd)->t_task_buf,
+                                        sizeof(struct scatterlist) *
+                                        T_TASK(cmd)->t_tasks_se_num);
+
+                        cmd->data_length = cmd->cmd_spdtl;
+                        /*
+                         * FIXME, clear out original struct se_task and state
+                         * information.
+                         */
+                        if (transport_generic_new_cmd(cmd) < 0) {
+                                transport_generic_request_failure(cmd, NULL,
+                                        PYX_TRANSPORT_REQ_TOO_MANY_SECTORS, 1);
+                                kfree(orig_sg);
+                                return;
+                        }
+
+                        transport_memcpy_write_sg(cmd, orig_sg);
+                }
+        }
+#endif
+        transport_execute_tasks(cmd);
+}
+EXPORT_SYMBOL(transport_generic_process_write);
+
+/*      transport_generic_write_pending():
+ *
+ *
+ */
+static int transport_generic_write_pending(struct se_cmd *cmd)
+{
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        cmd->t_state = TRANSPORT_WRITE_PENDING;
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+        /*
+         * For the TCM control CDBs using a contiguous buffer, do the memcpy
+         * from the passed Linux/SCSI struct scatterlist located at
+         * T_TASK(se_cmd)->t_task_pt_buf to the contiguous buffer at
+         * T_TASK(se_cmd)->t_task_buf.
+         */
+        if (cmd->se_cmd_flags & SCF_PASSTHROUGH_CONTIG_TO_SG)
+                transport_memcpy_read_contig(cmd,
+                                T_TASK(cmd)->t_task_buf,
+                                T_TASK(cmd)->t_task_pt_sgl);
+        /*
+         * Clear the se_cmd for WRITE_PENDING status in order to set
+         * T_TASK(cmd)->t_transport_active=0 so that transport_generic_handle_data
+         * can be called from HW target mode interrupt code.  This is safe
+         * to be called with transport_off=1 before the CMD_TFO(cmd)->write_pending
+         * because the se_cmd->se_lun pointer is not being cleared.
+         */
+        transport_cmd_check_stop(cmd, 1, 0);
+
+        /*
+         * Call the fabric write_pending function here to let the
+         * frontend know that WRITE buffers are ready.
+         */
+        ret = CMD_TFO(cmd)->write_pending(cmd);
+        if (ret < 0)
+                return ret;
+
+        return PYX_TRANSPORT_WRITE_PENDING;
+}
+
+/*      transport_release_cmd_to_pool():
+ *
+ *
+ */
+void transport_release_cmd_to_pool(struct se_cmd *cmd)
+{
+        BUG_ON(!T_TASK(cmd));
+        BUG_ON(!CMD_TFO(cmd));
+
+        transport_free_se_cmd(cmd);
+        CMD_TFO(cmd)->release_cmd_to_pool(cmd);
+}
+EXPORT_SYMBOL(transport_release_cmd_to_pool);
+
+/*      transport_generic_free_cmd():
+ *
+ *      Called from processing frontend to release storage engine resources
+ */
+void transport_generic_free_cmd(
+        struct se_cmd *cmd,
+        int wait_for_tasks,
+        int release_to_pool,
+        int session_reinstatement)
+{
+        if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD) || !T_TASK(cmd))
+                transport_release_cmd_to_pool(cmd);
+        else {
+                core_dec_lacl_count(cmd->se_sess->se_node_acl, cmd);
+
+                if (SE_LUN(cmd)) {
+#if 0
+                        printk(KERN_INFO "cmd: %p ITT: 0x%08x contains"
+                                " SE_LUN(cmd)\n", cmd,
+                                CMD_TFO(cmd)->get_task_tag(cmd));
+#endif
+                        transport_lun_remove_cmd(cmd);
+                }
+
+                if (wait_for_tasks && cmd->transport_wait_for_tasks)
+                        cmd->transport_wait_for_tasks(cmd, 0, 0);
+
+                transport_generic_remove(cmd, release_to_pool,
+                                session_reinstatement);
+        }
+}
+EXPORT_SYMBOL(transport_generic_free_cmd);
+
+static void transport_nop_wait_for_tasks(
+        struct se_cmd *cmd,
+        int remove_cmd,
+        int session_reinstatement)
+{
+        return;
+}
+
+/*      transport_lun_wait_for_tasks():
+ *
+ *      Called from ConfigFS context to stop the passed struct se_cmd to allow
+ *      an struct se_lun to be successfully shutdown.
+ */
+static int transport_lun_wait_for_tasks(struct se_cmd *cmd, struct se_lun *lun)
+{
+        unsigned long flags;
+        int ret;
+        /*
+         * If the frontend has already requested this struct se_cmd to
+         * be stopped, we can safely ignore this struct se_cmd.
+         */
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (atomic_read(&T_TASK(cmd)->t_transport_stop)) {
+                atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
+                DEBUG_TRANSPORT_S("ConfigFS ITT[0x%08x] - t_transport_stop =="
+                        " TRUE, skipping\n", CMD_TFO(cmd)->get_task_tag(cmd));
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                transport_cmd_check_stop(cmd, 1, 0);
+                return -1;
+        }
+        atomic_set(&T_TASK(cmd)->transport_lun_fe_stop, 1);
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        wake_up_interruptible(&SE_DEV(cmd)->dev_queue_obj->thread_wq);
+
+        ret = transport_stop_tasks_for_cmd(cmd);
+
+        DEBUG_TRANSPORT_S("ConfigFS: cmd: %p t_task_cdbs: %d stop tasks ret:"
+                        " %d\n", cmd, T_TASK(cmd)->t_task_cdbs, ret);
+        if (!ret) {
+                DEBUG_TRANSPORT_S("ConfigFS: ITT[0x%08x] - stopping cmd....\n",
+                                CMD_TFO(cmd)->get_task_tag(cmd));
+                wait_for_completion(&T_TASK(cmd)->transport_lun_stop_comp);
+                DEBUG_TRANSPORT_S("ConfigFS: ITT[0x%08x] - stopped cmd....\n",
+                                CMD_TFO(cmd)->get_task_tag(cmd));
+        }
+        transport_remove_cmd_from_queue(cmd, SE_DEV(cmd)->dev_queue_obj);
+
+        return 0;
+}
+
+/* #define DEBUG_CLEAR_LUN */
+#ifdef DEBUG_CLEAR_LUN
+#define DEBUG_CLEAR_L(x...) printk(KERN_INFO x)
+#else
+#define DEBUG_CLEAR_L(x...)
+#endif
+
+static void __transport_clear_lun_from_sessions(struct se_lun *lun)
+{
+        struct se_cmd *cmd = NULL;
+        unsigned long lun_flags, cmd_flags;
+        /*
+         * Do exception processing and return CHECK_CONDITION status to the
+         * Initiator Port.
+         */
+        spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
+        while (!list_empty_careful(&lun->lun_cmd_list)) {
+                cmd = list_entry(lun->lun_cmd_list.next,
+                        struct se_cmd, se_lun_list);
+                list_del(&cmd->se_lun_list);
+
+                if (!(T_TASK(cmd))) {
+                        printk(KERN_ERR "ITT: 0x%08x, T_TASK(cmd) = NULL"
+                                "[i,t]_state: %u/%u\n",
+                                CMD_TFO(cmd)->get_task_tag(cmd),
+                                CMD_TFO(cmd)->get_cmd_state(cmd), cmd->t_state);
+                        BUG();
+                }
+                atomic_set(&T_TASK(cmd)->transport_lun_active, 0);
+                /*
+                 * This will notify iscsi_target_transport.c:
+                 * transport_cmd_check_stop() that a LUN shutdown is in
+                 * progress for the iscsi_cmd_t.
+                 */
+                spin_lock(&T_TASK(cmd)->t_state_lock);
+                DEBUG_CLEAR_L("SE_LUN[%d] - Setting T_TASK(cmd)->transport"
+                        "_lun_stop for  ITT: 0x%08x\n",
+                        SE_LUN(cmd)->unpacked_lun,
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+                atomic_set(&T_TASK(cmd)->transport_lun_stop, 1);
+                spin_unlock(&T_TASK(cmd)->t_state_lock);
+
+                spin_unlock_irqrestore(&lun->lun_cmd_lock, lun_flags);
+
+                if (!(SE_LUN(cmd))) {
+                        printk(KERN_ERR "ITT: 0x%08x, [i,t]_state: %u/%u\n",
+                                CMD_TFO(cmd)->get_task_tag(cmd),
+                                CMD_TFO(cmd)->get_cmd_state(cmd), cmd->t_state);
+                        BUG();
+                }
+                /*
+                 * If the Storage engine still owns the iscsi_cmd_t, determine
+                 * and/or stop its context.
+                 */
+                DEBUG_CLEAR_L("SE_LUN[%d] - ITT: 0x%08x before transport"
+                        "_lun_wait_for_tasks()\n", SE_LUN(cmd)->unpacked_lun,
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+
+                if (transport_lun_wait_for_tasks(cmd, SE_LUN(cmd)) < 0) {
+                        spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
+                        continue;
+                }
+
+                DEBUG_CLEAR_L("SE_LUN[%d] - ITT: 0x%08x after transport_lun"
+                        "_wait_for_tasks(): SUCCESS\n",
+                        SE_LUN(cmd)->unpacked_lun,
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, cmd_flags);
+                if (!(atomic_read(&T_TASK(cmd)->transport_dev_active))) {
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, cmd_flags);
+                        goto check_cond;
+                }
+                atomic_set(&T_TASK(cmd)->transport_dev_active, 0);
+                transport_all_task_dev_remove_state(cmd);
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, cmd_flags);
+
+                transport_free_dev_tasks(cmd);
+                /*
+                 * The Storage engine stopped this struct se_cmd before it was
+                 * send to the fabric frontend for delivery back to the
+                 * Initiator Node.  Return this SCSI CDB back with an
+                 * CHECK_CONDITION status.
+                 */
+check_cond:
+                transport_send_check_condition_and_sense(cmd,
+                                TCM_NON_EXISTENT_LUN, 0);
+                /*
+                 *  If the fabric frontend is waiting for this iscsi_cmd_t to
+                 * be released, notify the waiting thread now that LU has
+                 * finished accessing it.
+                 */
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, cmd_flags);
+                if (atomic_read(&T_TASK(cmd)->transport_lun_fe_stop)) {
+                        DEBUG_CLEAR_L("SE_LUN[%d] - Detected FE stop for"
+                                " struct se_cmd: %p ITT: 0x%08x\n",
+                                lun->unpacked_lun,
+                                cmd, CMD_TFO(cmd)->get_task_tag(cmd));
+
+                        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
+                                        cmd_flags);
+                        transport_cmd_check_stop(cmd, 1, 0);
+                        complete(&T_TASK(cmd)->transport_lun_fe_stop_comp);
+                        spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
+                        continue;
+                }
+                DEBUG_CLEAR_L("SE_LUN[%d] - ITT: 0x%08x finished processing\n",
+                        lun->unpacked_lun, CMD_TFO(cmd)->get_task_tag(cmd));
+
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, cmd_flags);
+                spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
+        }
+        spin_unlock_irqrestore(&lun->lun_cmd_lock, lun_flags);
+}
+
+static int transport_clear_lun_thread(void *p)
+{
+        struct se_lun *lun = (struct se_lun *)p;
+
+        __transport_clear_lun_from_sessions(lun);
+        complete(&lun->lun_shutdown_comp);
+
+        return 0;
+}
+
+int transport_clear_lun_from_sessions(struct se_lun *lun)
+{
+        struct task_struct *kt;
+
+        kt = kthread_run(transport_clear_lun_thread, (void *)lun,
+                        "tcm_cl_%u", lun->unpacked_lun);
+        if (IS_ERR(kt)) {
+                printk(KERN_ERR "Unable to start clear_lun thread\n");
+                return -1;
+        }
+        wait_for_completion(&lun->lun_shutdown_comp);
+
+        return 0;
+}
+
+/*      transport_generic_wait_for_tasks():
+ *
+ *      Called from frontend or passthrough context to wait for storage engine
+ *      to pause and/or release frontend generated struct se_cmd.
+ */
+static void transport_generic_wait_for_tasks(
+        struct se_cmd *cmd,
+        int remove_cmd,
+        int session_reinstatement)
+{
+        unsigned long flags;
+
+        if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD) && !(cmd->se_tmr_req))
+                return;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        /*
+         * If we are already stopped due to an external event (ie: LUN shutdown)
+         * sleep until the connection can have the passed struct se_cmd back.
+         * The T_TASK(cmd)->transport_lun_stopped_sem will be upped by
+         * transport_clear_lun_from_sessions() once the ConfigFS context caller
+         * has completed its operation on the struct se_cmd.
+         */
+        if (atomic_read(&T_TASK(cmd)->transport_lun_stop)) {
+
+                DEBUG_TRANSPORT_S("wait_for_tasks: Stopping"
+                        " wait_for_completion(&T_TASK(cmd)transport_lun_fe"
+                        "_stop_comp); for ITT: 0x%08x\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+                /*
+                 * There is a special case for WRITES where a FE exception +
+                 * LUN shutdown means ConfigFS context is still sleeping on
+                 * transport_lun_stop_comp in transport_lun_wait_for_tasks().
+                 * We go ahead and up transport_lun_stop_comp just to be sure
+                 * here.
+                 */
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                complete(&T_TASK(cmd)->transport_lun_stop_comp);
+                wait_for_completion(&T_TASK(cmd)->transport_lun_fe_stop_comp);
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+
+                transport_all_task_dev_remove_state(cmd);
+                /*
+                 * At this point, the frontend who was the originator of this
+                 * struct se_cmd, now owns the structure and can be released through
+                 * normal means below.
+                 */
+                DEBUG_TRANSPORT_S("wait_for_tasks: Stopped"
+                        " wait_for_completion(&T_TASK(cmd)transport_lun_fe_"
+                        "stop_comp); for ITT: 0x%08x\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+
+                atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
+        }
+        if (!atomic_read(&T_TASK(cmd)->t_transport_active))
+                goto remove;
+
+        atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
+
+        DEBUG_TRANSPORT_S("wait_for_tasks: Stopping %p ITT: 0x%08x"
+                " i_state: %d, t_state/def_t_state: %d/%d, t_transport_stop"
+                " = TRUE\n", cmd, CMD_TFO(cmd)->get_task_tag(cmd),
+                CMD_TFO(cmd)->get_cmd_state(cmd), cmd->t_state,
+                cmd->deferred_t_state);
+
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        wake_up_interruptible(&SE_DEV(cmd)->dev_queue_obj->thread_wq);
+
+        wait_for_completion(&T_TASK(cmd)->t_transport_stop_comp);
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        atomic_set(&T_TASK(cmd)->t_transport_active, 0);
+        atomic_set(&T_TASK(cmd)->t_transport_stop, 0);
+
+        DEBUG_TRANSPORT_S("wait_for_tasks: Stopped wait_for_compltion("
+                "&T_TASK(cmd)->t_transport_stop_comp) for ITT: 0x%08x\n",
+                CMD_TFO(cmd)->get_task_tag(cmd));
+remove:
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+        if (!remove_cmd)
+                return;
+
+        transport_generic_free_cmd(cmd, 0, 0, session_reinstatement);
+}
+
+static int transport_get_sense_codes(
+        struct se_cmd *cmd,
+        u8 *asc,
+        u8 *ascq)
+{
+        *asc = cmd->scsi_asc;
+        *ascq = cmd->scsi_ascq;
+
+        return 0;
+}
+
+static int transport_set_sense_codes(
+        struct se_cmd *cmd,
+        u8 asc,
+        u8 ascq)
+{
+        cmd->scsi_asc = asc;
+        cmd->scsi_ascq = ascq;
+
+        return 0;
+}
+
+int transport_send_check_condition_and_sense(
+        struct se_cmd *cmd,
+        u8 reason,
+        int from_transport)
+{
+        unsigned char *buffer = cmd->sense_buffer;
+        unsigned long flags;
+        int offset;
+        u8 asc = 0, ascq = 0;
+
+        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+        if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
+                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+                return 0;
+        }
+        cmd->se_cmd_flags |= SCF_SENT_CHECK_CONDITION;
+        spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
+
+        if (!reason && from_transport)
+                goto after_reason;
+
+        if (!from_transport)
+                cmd->se_cmd_flags |= SCF_EMULATED_TASK_SENSE;
+        /*
+         * Data Segment and SenseLength of the fabric response PDU.
+         *
+         * TRANSPORT_SENSE_BUFFER is now set to SCSI_SENSE_BUFFERSIZE
+         * from include/scsi/scsi_cmnd.h
+         */
+        offset = CMD_TFO(cmd)->set_fabric_sense_len(cmd,
+                                TRANSPORT_SENSE_BUFFER);
+        /*
+         * Actual SENSE DATA, see SPC-3 7.23.2  SPC_SENSE_KEY_OFFSET uses
+         * SENSE KEY values from include/scsi/scsi.h
+         */
+        switch (reason) {
+        case TCM_NON_EXISTENT_LUN:
+        case TCM_UNSUPPORTED_SCSI_OPCODE:
+        case TCM_SECTOR_COUNT_TOO_MANY:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
+                /* INVALID COMMAND OPERATION CODE */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x20;
+                break;
+        case TCM_UNKNOWN_MODE_PAGE:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
+                /* INVALID FIELD IN CDB */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x24;
+                break;
+        case TCM_CHECK_CONDITION_ABORT_CMD:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* BUS DEVICE RESET FUNCTION OCCURRED */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x29;
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = 0x03;
+                break;
+        case TCM_INCORRECT_AMOUNT_OF_DATA:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* WRITE ERROR */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x0c;
+                /* NOT ENOUGH UNSOLICITED DATA */
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = 0x0d;
+                break;
+        case TCM_INVALID_CDB_FIELD:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* INVALID FIELD IN CDB */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x24;
+                break;
+        case TCM_INVALID_PARAMETER_LIST:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* INVALID FIELD IN PARAMETER LIST */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x26;
+                break;
+        case TCM_UNEXPECTED_UNSOLICITED_DATA:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* WRITE ERROR */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x0c;
+                /* UNEXPECTED_UNSOLICITED_DATA */
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = 0x0c;
+                break;
+        case TCM_SERVICE_CRC_ERROR:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* PROTOCOL SERVICE CRC ERROR */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x47;
+                /* N/A */
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = 0x05;
+                break;
+        case TCM_SNACK_REJECTED:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ABORTED COMMAND */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* READ ERROR */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x11;
+                /* FAILED RETRANSMISSION REQUEST */
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = 0x13;
+                break;
+        case TCM_WRITE_PROTECTED:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* DATA PROTECT */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = DATA_PROTECT;
+                /* WRITE PROTECTED */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x27;
+                break;
+        case TCM_CHECK_CONDITION_UNIT_ATTENTION:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* UNIT ATTENTION */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = UNIT_ATTENTION;
+                core_scsi3_ua_for_check_condition(cmd, &asc, &ascq);
+                buffer[offset+SPC_ASC_KEY_OFFSET] = asc;
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = ascq;
+                break;
+        case TCM_CHECK_CONDITION_NOT_READY:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* Not Ready */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = NOT_READY;
+                transport_get_sense_codes(cmd, &asc, &ascq);
+                buffer[offset+SPC_ASC_KEY_OFFSET] = asc;
+                buffer[offset+SPC_ASCQ_KEY_OFFSET] = ascq;
+                break;
+        case TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE:
+        default:
+                /* CURRENT ERROR */
+                buffer[offset] = 0x70;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
+                /* LOGICAL UNIT COMMUNICATION FAILURE */
+                buffer[offset+SPC_ASC_KEY_OFFSET] = 0x80;
+                break;
+        }
+        /*
+         * This code uses linux/include/scsi/scsi.h SAM status codes!
+         */
+        cmd->scsi_status = SAM_STAT_CHECK_CONDITION;
+        /*
+         * Automatically padded, this value is encoded in the fabric's
+         * data_length response PDU containing the SCSI defined sense data.
+         */
+        cmd->scsi_sense_length  = TRANSPORT_SENSE_BUFFER + offset;
+
+after_reason:
+        CMD_TFO(cmd)->queue_status(cmd);
+        return 0;
+}
+EXPORT_SYMBOL(transport_send_check_condition_and_sense);
+
+int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
+{
+        int ret = 0;
+
+        if (atomic_read(&T_TASK(cmd)->t_transport_aborted) != 0) {
+                if (!(send_status) ||
+                     (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
+                        return 1;
+#if 0
+                printk(KERN_INFO "Sending delayed SAM_STAT_TASK_ABORTED"
+                        " status for CDB: 0x%02x ITT: 0x%08x\n",
+                        T_TASK(cmd)->t_task_cdb[0],
+                        CMD_TFO(cmd)->get_task_tag(cmd));
+#endif
+                cmd->se_cmd_flags |= SCF_SENT_DELAYED_TAS;
+                CMD_TFO(cmd)->queue_status(cmd);
+                ret = 1;
+        }
+        return ret;
+}
+EXPORT_SYMBOL(transport_check_aborted_status);
+
+void transport_send_task_abort(struct se_cmd *cmd)
+{
+        /*
+         * If there are still expected incoming fabric WRITEs, we wait
+         * until until they have completed before sending a TASK_ABORTED
+         * response.  This response with TASK_ABORTED status will be
+         * queued back to fabric module by transport_check_aborted_status().
+         */
+        if (cmd->data_direction == DMA_TO_DEVICE) {
+                if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
+                        atomic_inc(&T_TASK(cmd)->t_transport_aborted);
+                        smp_mb__after_atomic_inc();
+                        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
+                        transport_new_cmd_failure(cmd);
+                        return;
+                }
+        }
+        cmd->scsi_status = SAM_STAT_TASK_ABORTED;
+#if 0
+        printk(KERN_INFO "Setting SAM_STAT_TASK_ABORTED status for CDB: 0x%02x,"
+                " ITT: 0x%08x\n", T_TASK(cmd)->t_task_cdb[0],
+                CMD_TFO(cmd)->get_task_tag(cmd));
+#endif
+        CMD_TFO(cmd)->queue_status(cmd);
+}
+
+/*      transport_generic_do_tmr():
+ *
+ *
+ */
+int transport_generic_do_tmr(struct se_cmd *cmd)
+{
+        struct se_cmd *ref_cmd;
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_tmr_req *tmr = cmd->se_tmr_req;
+        int ret;
+
+        switch (tmr->function) {
+        case ABORT_TASK:
+                ref_cmd = tmr->ref_cmd;
+                tmr->response = TMR_FUNCTION_REJECTED;
+                break;
+        case ABORT_TASK_SET:
+        case CLEAR_ACA:
+        case CLEAR_TASK_SET:
+                tmr->response = TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;
+                break;
+        case LUN_RESET:
+                ret = core_tmr_lun_reset(dev, tmr, NULL, NULL);
+                tmr->response = (!ret) ? TMR_FUNCTION_COMPLETE :
+                                         TMR_FUNCTION_REJECTED;
+                break;
+#if 0
+        case TARGET_WARM_RESET:
+                transport_generic_host_reset(dev->se_hba);
+                tmr->response = TMR_FUNCTION_REJECTED;
+                break;
+        case TARGET_COLD_RESET:
+                transport_generic_host_reset(dev->se_hba);
+                transport_generic_cold_reset(dev->se_hba);
+                tmr->response = TMR_FUNCTION_REJECTED;
+                break;
+#endif
+        default:
+                printk(KERN_ERR "Uknown TMR function: 0x%02x.\n",
+                                tmr->function);
+                tmr->response = TMR_FUNCTION_REJECTED;
+                break;
+        }
+
+        cmd->t_state = TRANSPORT_ISTATE_PROCESSING;
+        CMD_TFO(cmd)->queue_tm_rsp(cmd);
+
+        transport_cmd_check_stop(cmd, 2, 0);
+        return 0;
+}
+
+/*
+ *      Called with spin_lock_irq(&dev->execute_task_lock); held
+ *
+ */
+static struct se_task *
+transport_get_task_from_state_list(struct se_device *dev)
+{
+        struct se_task *task;
+
+        if (list_empty(&dev->state_task_list))
+                return NULL;
+
+        list_for_each_entry(task, &dev->state_task_list, t_state_list)
+                break;
+
+        list_del(&task->t_state_list);
+        atomic_set(&task->task_state_active, 0);
+
+        return task;
+}
+
+static void transport_processing_shutdown(struct se_device *dev)
+{
+        struct se_cmd *cmd;
+        struct se_queue_req *qr;
+        struct se_task *task;
+        u8 state;
+        unsigned long flags;
+        /*
+         * Empty the struct se_device's struct se_task state list.
+         */
+        spin_lock_irqsave(&dev->execute_task_lock, flags);
+        while ((task = transport_get_task_from_state_list(dev))) {
+                if (!(TASK_CMD(task))) {
+                        printk(KERN_ERR "TASK_CMD(task) is NULL!\n");
+                        continue;
+                }
+                cmd = TASK_CMD(task);
+
+                if (!T_TASK(cmd)) {
+                        printk(KERN_ERR "T_TASK(cmd) is NULL for task: %p cmd:"
+                                " %p ITT: 0x%08x\n", task, cmd,
+                                CMD_TFO(cmd)->get_task_tag(cmd));
+                        continue;
+                }
+                spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+
+                spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+
+                DEBUG_DO("PT: cmd: %p task: %p ITT/CmdSN: 0x%08x/0x%08x,"
+                        " i_state/def_i_state: %d/%d, t_state/def_t_state:"
+                        " %d/%d cdb: 0x%02x\n", cmd, task,
+                        CMD_TFO(cmd)->get_task_tag(cmd), cmd->cmd_sn,
+                        CMD_TFO(cmd)->get_cmd_state(cmd), cmd->deferred_i_state,
+                        cmd->t_state, cmd->deferred_t_state,
+                        T_TASK(cmd)->t_task_cdb[0]);
+                DEBUG_DO("PT: ITT[0x%08x] - t_task_cdbs: %d t_task_cdbs_left:"
+                        " %d t_task_cdbs_sent: %d -- t_transport_active: %d"
+                        " t_transport_stop: %d t_transport_sent: %d\n",
+                        CMD_TFO(cmd)->get_task_tag(cmd),
+                        T_TASK(cmd)->t_task_cdbs,
+                        atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
+                        atomic_read(&T_TASK(cmd)->t_task_cdbs_sent),
+                        atomic_read(&T_TASK(cmd)->t_transport_active),
+                        atomic_read(&T_TASK(cmd)->t_transport_stop),
+                        atomic_read(&T_TASK(cmd)->t_transport_sent));
+
+                if (atomic_read(&task->task_active)) {
+                        atomic_set(&task->task_stop, 1);
+                        spin_unlock_irqrestore(
+                                &T_TASK(cmd)->t_state_lock, flags);
+
+                        DEBUG_DO("Waiting for task: %p to shutdown for dev:"
+                                " %p\n", task, dev);
+                        wait_for_completion(&task->task_stop_comp);
+                        DEBUG_DO("Completed task: %p shutdown for dev: %p\n",
+                                task, dev);
+
+                        spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
+                        atomic_dec(&T_TASK(cmd)->t_task_cdbs_left);
+
+                        atomic_set(&task->task_active, 0);
+                        atomic_set(&task->task_stop, 0);
+                }
+                __transport_stop_task_timer(task, &flags);
+
+                if (!(atomic_dec_and_test(&T_TASK(cmd)->t_task_cdbs_ex_left))) {
+                        spin_unlock_irqrestore(
+                                        &T_TASK(cmd)->t_state_lock, flags);
+
+                        DEBUG_DO("Skipping task: %p, dev: %p for"
+                                " t_task_cdbs_ex_left: %d\n", task, dev,
+                                atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left));
+
+                        spin_lock_irqsave(&dev->execute_task_lock, flags);
+                        continue;
+                }
+
+                if (atomic_read(&T_TASK(cmd)->t_transport_active)) {
+                        DEBUG_DO("got t_transport_active = 1 for task: %p, dev:"
+                                        " %p\n", task, dev);
+
+                        if (atomic_read(&T_TASK(cmd)->t_fe_count)) {
+                                spin_unlock_irqrestore(
+                                        &T_TASK(cmd)->t_state_lock, flags);
+                                transport_send_check_condition_and_sense(
+                                        cmd, TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE,
+                                        0);
+                                transport_remove_cmd_from_queue(cmd,
+                                        SE_DEV(cmd)->dev_queue_obj);
+
+                                transport_lun_remove_cmd(cmd);
+                                transport_cmd_check_stop(cmd, 1, 0);
+                        } else {
+                                spin_unlock_irqrestore(
+                                        &T_TASK(cmd)->t_state_lock, flags);
+
+                                transport_remove_cmd_from_queue(cmd,
+                                        SE_DEV(cmd)->dev_queue_obj);
+
+                                transport_lun_remove_cmd(cmd);
+
+                                if (transport_cmd_check_stop(cmd, 1, 0))
+                                        transport_generic_remove(cmd, 0, 0);
+                        }
+
+                        spin_lock_irqsave(&dev->execute_task_lock, flags);
+                        continue;
+                }
+                DEBUG_DO("Got t_transport_active = 0 for task: %p, dev: %p\n",
+                                task, dev);
+
+                if (atomic_read(&T_TASK(cmd)->t_fe_count)) {
+                        spin_unlock_irqrestore(
+                                &T_TASK(cmd)->t_state_lock, flags);
+                        transport_send_check_condition_and_sense(cmd,
+                                TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
+                        transport_remove_cmd_from_queue(cmd,
+                                SE_DEV(cmd)->dev_queue_obj);
+
+                        transport_lun_remove_cmd(cmd);
+                        transport_cmd_check_stop(cmd, 1, 0);
+                } else {
+                        spin_unlock_irqrestore(
+                                &T_TASK(cmd)->t_state_lock, flags);
+
+                        transport_remove_cmd_from_queue(cmd,
+                                SE_DEV(cmd)->dev_queue_obj);
+                        transport_lun_remove_cmd(cmd);
+
+                        if (transport_cmd_check_stop(cmd, 1, 0))
+                                transport_generic_remove(cmd, 0, 0);
+                }
+
+                spin_lock_irqsave(&dev->execute_task_lock, flags);
+        }
+        spin_unlock_irqrestore(&dev->execute_task_lock, flags);
+        /*
+         * Empty the struct se_device's struct se_cmd list.
+         */
+        spin_lock_irqsave(&dev->dev_queue_obj->cmd_queue_lock, flags);
+        while ((qr = __transport_get_qr_from_queue(dev->dev_queue_obj))) {
+                spin_unlock_irqrestore(
+                                &dev->dev_queue_obj->cmd_queue_lock, flags);
+                cmd = (struct se_cmd *)qr->cmd;
+                state = qr->state;
+                kfree(qr);
+
+                DEBUG_DO("From Device Queue: cmd: %p t_state: %d\n",
+                                cmd, state);
+
+                if (atomic_read(&T_TASK(cmd)->t_fe_count)) {
+                        transport_send_check_condition_and_sense(cmd,
+                                TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
+
+                        transport_lun_remove_cmd(cmd);
+                        transport_cmd_check_stop(cmd, 1, 0);
+                } else {
+                        transport_lun_remove_cmd(cmd);
+                        if (transport_cmd_check_stop(cmd, 1, 0))
+                                transport_generic_remove(cmd, 0, 0);
+                }
+                spin_lock_irqsave(&dev->dev_queue_obj->cmd_queue_lock, flags);
+        }
+        spin_unlock_irqrestore(&dev->dev_queue_obj->cmd_queue_lock, flags);
+}
+
+/*      transport_processing_thread():
+ *
+ *
+ */
+static int transport_processing_thread(void *param)
+{
+        int ret, t_state;
+        struct se_cmd *cmd;
+        struct se_device *dev = (struct se_device *) param;
+        struct se_queue_req *qr;
+
+        set_user_nice(current, -20);
+
+        while (!kthread_should_stop()) {
+                ret = wait_event_interruptible(dev->dev_queue_obj->thread_wq,
+                                atomic_read(&dev->dev_queue_obj->queue_cnt) ||
+                                kthread_should_stop());
+                if (ret < 0)
+                        goto out;
+
+                spin_lock_irq(&dev->dev_status_lock);
+                if (dev->dev_status & TRANSPORT_DEVICE_SHUTDOWN) {
+                        spin_unlock_irq(&dev->dev_status_lock);
+                        transport_processing_shutdown(dev);
+                        continue;
+                }
+                spin_unlock_irq(&dev->dev_status_lock);
+
+get_cmd:
+                __transport_execute_tasks(dev);
+
+                qr = transport_get_qr_from_queue(dev->dev_queue_obj);
+                if (!(qr))
+                        continue;
+
+                cmd = (struct se_cmd *)qr->cmd;
+                t_state = qr->state;
+                kfree(qr);
+
+                switch (t_state) {
+                case TRANSPORT_NEW_CMD_MAP:
+                        if (!(CMD_TFO(cmd)->new_cmd_map)) {
+                                printk(KERN_ERR "CMD_TFO(cmd)->new_cmd_map is"
+                                        " NULL for TRANSPORT_NEW_CMD_MAP\n");
+                                BUG();
+                        }
+                        ret = CMD_TFO(cmd)->new_cmd_map(cmd);
+                        if (ret < 0) {
+                                cmd->transport_error_status = ret;
+                                transport_generic_request_failure(cmd, NULL,
+                                                0, (cmd->data_direction !=
+                                                    DMA_TO_DEVICE));
+                                break;
+                        }
+                        /* Fall through */
+                case TRANSPORT_NEW_CMD:
+                        ret = transport_generic_new_cmd(cmd);
+                        if (ret < 0) {
+                                cmd->transport_error_status = ret;
+                                transport_generic_request_failure(cmd, NULL,
+                                        0, (cmd->data_direction !=
+                                         DMA_TO_DEVICE));
+                        }
+                        break;
+                case TRANSPORT_PROCESS_WRITE:
+                        transport_generic_process_write(cmd);
+                        break;
+                case TRANSPORT_COMPLETE_OK:
+                        transport_stop_all_task_timers(cmd);
+                        transport_generic_complete_ok(cmd);
+                        break;
+                case TRANSPORT_REMOVE:
+                        transport_generic_remove(cmd, 1, 0);
+                        break;
+                case TRANSPORT_PROCESS_TMR:
+                        transport_generic_do_tmr(cmd);
+                        break;
+                case TRANSPORT_COMPLETE_FAILURE:
+                        transport_generic_request_failure(cmd, NULL, 1, 1);
+                        break;
+                case TRANSPORT_COMPLETE_TIMEOUT:
+                        transport_stop_all_task_timers(cmd);
+                        transport_generic_request_timeout(cmd);
+                        break;
+                default:
+                        printk(KERN_ERR "Unknown t_state: %d deferred_t_state:"
+                                " %d for ITT: 0x%08x i_state: %d on SE LUN:"
+                                " %u\n", t_state, cmd->deferred_t_state,
+                                CMD_TFO(cmd)->get_task_tag(cmd),
+                                CMD_TFO(cmd)->get_cmd_state(cmd),
+                                SE_LUN(cmd)->unpacked_lun);
+                        BUG();
+                }
+
+                goto get_cmd;
+        }
+
+out:
+        transport_release_all_cmds(dev);
+        dev->process_thread = NULL;
+        return 0;
+}
diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c
new file mode 100644
index 000000000000..a2ef346087e8
--- /dev/null
+++ b/drivers/target/target_core_ua.c
@@ -0,0 +1,332 @@
+/*******************************************************************************
+ * Filename: target_core_ua.c
+ *
+ * This file contains logic for SPC-3 Unit Attention emulation
+ *
+ * Copyright (c) 2009,2010 Rising Tide Systems
+ * Copyright (c) 2009,2010 Linux-iSCSI.org
+ *
+ * Nicholas A. Bellinger <nab@kernel.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/version.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+
+#include <target/target_core_base.h>
+#include <target/target_core_device.h>
+#include <target/target_core_transport.h>
+#include <target/target_core_fabric_ops.h>
+#include <target/target_core_configfs.h>
+
+#include "target_core_alua.h"
+#include "target_core_hba.h"
+#include "target_core_pr.h"
+#include "target_core_ua.h"
+
+int core_scsi3_ua_check(
+        struct se_cmd *cmd,
+        unsigned char *cdb)
+{
+        struct se_dev_entry *deve;
+        struct se_session *sess = cmd->se_sess;
+        struct se_node_acl *nacl;
+
+        if (!(sess))
+                return 0;
+
+        nacl = sess->se_node_acl;
+        if (!(nacl))
+                return 0;
+
+        deve = &nacl->device_list[cmd->orig_fe_lun];
+        if (!(atomic_read(&deve->ua_count)))
+                return 0;
+        /*
+         * From sam4r14, section 5.14 Unit attention condition:
+         *
+         * a) if an INQUIRY command enters the enabled command state, the
+         *    device server shall process the INQUIRY command and shall neither
+         *    report nor clear any unit attention condition;
+         * b) if a REPORT LUNS command enters the enabled command state, the
+         *    device server shall process the REPORT LUNS command and shall not
+         *    report any unit attention condition;
+         * e) if a REQUEST SENSE command enters the enabled command state while
+         *    a unit attention condition exists for the SCSI initiator port
+         *    associated with the I_T nexus on which the REQUEST SENSE command
+         *    was received, then the device server shall process the command
+         *    and either:
+         */
+        switch (cdb[0]) {
+        case INQUIRY:
+        case REPORT_LUNS:
+        case REQUEST_SENSE:
+                return 0;
+        default:
+                return -1;
+        }
+
+        return -1;
+}
+
+int core_scsi3_ua_allocate(
+        struct se_node_acl *nacl,
+        u32 unpacked_lun,
+        u8 asc,
+        u8 ascq)
+{
+        struct se_dev_entry *deve;
+        struct se_ua *ua, *ua_p, *ua_tmp;
+        /*
+         * PASSTHROUGH OPS
+         */
+        if (!(nacl))
+                return -1;
+
+        ua = kmem_cache_zalloc(se_ua_cache, GFP_ATOMIC);
+        if (!(ua)) {
+                printk(KERN_ERR "Unable to allocate struct se_ua\n");
+                return -1;
+        }
+        INIT_LIST_HEAD(&ua->ua_dev_list);
+        INIT_LIST_HEAD(&ua->ua_nacl_list);
+
+        ua->ua_nacl = nacl;
+        ua->ua_asc = asc;
+        ua->ua_ascq = ascq;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        deve = &nacl->device_list[unpacked_lun];
+
+        spin_lock(&deve->ua_lock);
+        list_for_each_entry_safe(ua_p, ua_tmp, &deve->ua_list, ua_nacl_list) {
+                /*
+                 * Do not report the same UNIT ATTENTION twice..
+                 */
+                if ((ua_p->ua_asc == asc) && (ua_p->ua_ascq == ascq)) {
+                        spin_unlock(&deve->ua_lock);
+                        spin_unlock_irq(&nacl->device_list_lock);
+                        kmem_cache_free(se_ua_cache, ua);
+                        return 0;
+                }
+                /*
+                 * Attach the highest priority Unit Attention to
+                 * the head of the list following sam4r14,
+                 * Section 5.14 Unit Attention Condition:
+                 *
+                 * POWER ON, RESET, OR BUS DEVICE RESET OCCURRED highest
+                 * POWER ON OCCURRED or
+                 * DEVICE INTERNAL RESET
+                 * SCSI BUS RESET OCCURRED or
+                 * MICROCODE HAS BEEN CHANGED or
+                 * protocol specific
+                 * BUS DEVICE RESET FUNCTION OCCURRED
+                 * I_T NEXUS LOSS OCCURRED
+                 * COMMANDS CLEARED BY POWER LOSS NOTIFICATION
+                 * all others                                    Lowest
+                 *
+                 * Each of the ASCQ codes listed above are defined in
+                 * the 29h ASC family, see spc4r17 Table D.1
+                 */
+                if (ua_p->ua_asc == 0x29) {
+                        if ((asc == 0x29) && (ascq > ua_p->ua_ascq))
+                                list_add(&ua->ua_nacl_list,
+                                                &deve->ua_list);
+                        else
+                                list_add_tail(&ua->ua_nacl_list,
+                                                &deve->ua_list);
+                } else if (ua_p->ua_asc == 0x2a) {
+                        /*
+                         * Incoming Family 29h ASCQ codes will override
+                         * Family 2AHh ASCQ codes for Unit Attention condition.
+                         */
+                        if ((asc == 0x29) || (ascq > ua_p->ua_asc))
+                                list_add(&ua->ua_nacl_list,
+                                        &deve->ua_list);
+                        else
+                                list_add_tail(&ua->ua_nacl_list,
+                                                &deve->ua_list);
+                } else
+                        list_add_tail(&ua->ua_nacl_list,
+                                &deve->ua_list);
+                spin_unlock(&deve->ua_lock);
+                spin_unlock_irq(&nacl->device_list_lock);
+
+                atomic_inc(&deve->ua_count);
+                smp_mb__after_atomic_inc();
+                return 0;
+        }
+        list_add_tail(&ua->ua_nacl_list, &deve->ua_list);
+        spin_unlock(&deve->ua_lock);
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        printk(KERN_INFO "[%s]: Allocated UNIT ATTENTION, mapped LUN: %u, ASC:"
+                " 0x%02x, ASCQ: 0x%02x\n",
+                TPG_TFO(nacl->se_tpg)->get_fabric_name(), unpacked_lun,
+                asc, ascq);
+
+        atomic_inc(&deve->ua_count);
+        smp_mb__after_atomic_inc();
+        return 0;
+}
+
+void core_scsi3_ua_release_all(
+        struct se_dev_entry *deve)
+{
+        struct se_ua *ua, *ua_p;
+
+        spin_lock(&deve->ua_lock);
+        list_for_each_entry_safe(ua, ua_p, &deve->ua_list, ua_nacl_list) {
+                list_del(&ua->ua_nacl_list);
+                kmem_cache_free(se_ua_cache, ua);
+
+                atomic_dec(&deve->ua_count);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&deve->ua_lock);
+}
+
+void core_scsi3_ua_for_check_condition(
+        struct se_cmd *cmd,
+        u8 *asc,
+        u8 *ascq)
+{
+        struct se_device *dev = SE_DEV(cmd);
+        struct se_dev_entry *deve;
+        struct se_session *sess = cmd->se_sess;
+        struct se_node_acl *nacl;
+        struct se_ua *ua = NULL, *ua_p;
+        int head = 1;
+
+        if (!(sess))
+                return;
+
+        nacl = sess->se_node_acl;
+        if (!(nacl))
+                return;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        deve = &nacl->device_list[cmd->orig_fe_lun];
+        if (!(atomic_read(&deve->ua_count))) {
+                spin_unlock_irq(&nacl->device_list_lock);
+                return;
+        }
+        /*
+         * The highest priority Unit Attentions are placed at the head of the
+         * struct se_dev_entry->ua_list, and will be returned in CHECK_CONDITION +
+         * sense data for the received CDB.
+         */
+        spin_lock(&deve->ua_lock);
+        list_for_each_entry_safe(ua, ua_p, &deve->ua_list, ua_nacl_list) {
+                /*
+                 * For ua_intlck_ctrl code not equal to 00b, only report the
+                 * highest priority UNIT_ATTENTION and ASC/ASCQ without
+                 * clearing it.
+                 */
+                if (DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl != 0) {
+                        *asc = ua->ua_asc;
+                        *ascq = ua->ua_ascq;
+                        break;
+                }
+                /*
+                 * Otherwise for the default 00b, release the UNIT ATTENTION
+                 * condition.  Return the ASC/ASCQ of the higest priority UA
+                 * (head of the list) in the outgoing CHECK_CONDITION + sense.
+                 */
+                if (head) {
+                        *asc = ua->ua_asc;
+                        *ascq = ua->ua_ascq;
+                        head = 0;
+                }
+                list_del(&ua->ua_nacl_list);
+                kmem_cache_free(se_ua_cache, ua);
+
+                atomic_dec(&deve->ua_count);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&deve->ua_lock);
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        printk(KERN_INFO "[%s]: %s UNIT ATTENTION condition with"
+                " INTLCK_CTRL: %d, mapped LUN: %u, got CDB: 0x%02x"
+                " reported ASC: 0x%02x, ASCQ: 0x%02x\n",
+                TPG_TFO(nacl->se_tpg)->get_fabric_name(),
+                (DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl != 0) ? "Reporting" :
+                "Releasing", DEV_ATTRIB(dev)->emulate_ua_intlck_ctrl,
+                cmd->orig_fe_lun, T_TASK(cmd)->t_task_cdb[0], *asc, *ascq);
+}
+
+int core_scsi3_ua_clear_for_request_sense(
+        struct se_cmd *cmd,
+        u8 *asc,
+        u8 *ascq)
+{
+        struct se_dev_entry *deve;
+        struct se_session *sess = cmd->se_sess;
+        struct se_node_acl *nacl;
+        struct se_ua *ua = NULL, *ua_p;
+        int head = 1;
+
+        if (!(sess))
+                return -1;
+
+        nacl = sess->se_node_acl;
+        if (!(nacl))
+                return -1;
+
+        spin_lock_irq(&nacl->device_list_lock);
+        deve = &nacl->device_list[cmd->orig_fe_lun];
+        if (!(atomic_read(&deve->ua_count))) {
+                spin_unlock_irq(&nacl->device_list_lock);
+                return -1;
+        }
+        /*
+         * The highest priority Unit Attentions are placed at the head of the
+         * struct se_dev_entry->ua_list.  The First (and hence highest priority)
+         * ASC/ASCQ will be returned in REQUEST_SENSE payload data for the
+         * matching struct se_lun.
+         *
+         * Once the returning ASC/ASCQ values are set, we go ahead and
+         * release all of the Unit Attention conditions for the assoicated
+         * struct se_lun.
+         */
+        spin_lock(&deve->ua_lock);
+        list_for_each_entry_safe(ua, ua_p, &deve->ua_list, ua_nacl_list) {
+                if (head) {
+                        *asc = ua->ua_asc;
+                        *ascq = ua->ua_ascq;
+                        head = 0;
+                }
+                list_del(&ua->ua_nacl_list);
+                kmem_cache_free(se_ua_cache, ua);
+
+                atomic_dec(&deve->ua_count);
+                smp_mb__after_atomic_dec();
+        }
+        spin_unlock(&deve->ua_lock);
+        spin_unlock_irq(&nacl->device_list_lock);
+
+        printk(KERN_INFO "[%s]: Released UNIT ATTENTION condition, mapped"
+                " LUN: %u, got REQUEST_SENSE reported ASC: 0x%02x,"
+                " ASCQ: 0x%02x\n", TPG_TFO(nacl->se_tpg)->get_fabric_name(),
+                cmd->orig_fe_lun, *asc, *ascq);
+
+        return (head) ? -1 : 0;
+}
diff --git a/drivers/target/target_core_ua.h b/drivers/target/target_core_ua.h
new file mode 100644
index 000000000000..6e6b03460a1a
--- /dev/null
+++ b/drivers/target/target_core_ua.h
@@ -0,0 +1,36 @@
+#ifndef TARGET_CORE_UA_H
+
+/*
+ * From spc4r17, Table D.1: ASC and ASCQ Assignement
+ */
+#define ASCQ_29H_POWER_ON_RESET_OR_BUS_DEVICE_RESET_OCCURED     0x00
+#define ASCQ_29H_POWER_ON_OCCURRED                              0x01
+#define ASCQ_29H_SCSI_BUS_RESET_OCCURED                         0x02
+#define ASCQ_29H_BUS_DEVICE_RESET_FUNCTION_OCCURRED             0x03
+#define ASCQ_29H_DEVICE_INTERNAL_RESET                          0x04
+#define ASCQ_29H_TRANSCEIVER_MODE_CHANGED_TO_SINGLE_ENDED       0x05
+#define ASCQ_29H_TRANSCEIVER_MODE_CHANGED_TO_LVD                0x06
+#define ASCQ_29H_NEXUS_LOSS_OCCURRED                            0x07
+
+#define ASCQ_2AH_PARAMETERS_CHANGED                             0x00
+#define ASCQ_2AH_MODE_PARAMETERS_CHANGED                        0x01
+#define ASCQ_2AH_LOG_PARAMETERS_CHANGED                         0x02
+#define ASCQ_2AH_RESERVATIONS_PREEMPTED                         0x03
+#define ASCQ_2AH_RESERVATIONS_RELEASED                          0x04
+#define ASCQ_2AH_REGISTRATIONS_PREEMPTED                        0x05
+#define ASCQ_2AH_ASYMMETRIC_ACCESS_STATE_CHANGED                0x06
+#define ASCQ_2AH_IMPLICT_ASYMMETRIC_ACCESS_STATE_TRANSITION_FAILED 0x07
+#define ASCQ_2AH_PRIORITY_CHANGED                               0x08
+
+#define ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS           0x09
+
+extern struct kmem_cache *se_ua_cache;
+
+extern int core_scsi3_ua_check(struct se_cmd *, unsigned char *);
+extern int core_scsi3_ua_allocate(struct se_node_acl *, u32, u8, u8);
+extern void core_scsi3_ua_release_all(struct se_dev_entry *);
+extern void core_scsi3_ua_for_check_condition(struct se_cmd *, u8 *, u8 *);
+extern int core_scsi3_ua_clear_for_request_sense(struct se_cmd *,
+                                                u8 *, u8 *);
+
+#endif /* TARGET_CORE_UA_H */
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index bf7c687519ef..f7a5dba3ca23 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig THERMAL
         tristate "Generic Thermal sysfs driver"
+        depends on NET
         help
           Generic Thermal Sysfs driver offers a generic mechanism for
           thermal management. Usually it's made up of one or more thermal
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 13c72c629329..7d0e63c79280 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -32,6 +32,8 @@
 #include <linux/thermal.h>
 #include <linux/spinlock.h>
 #include <linux/reboot.h>
+#include <net/netlink.h>
+#include <net/genetlink.h>
 
 MODULE_AUTHOR("Zhang Rui");
 MODULE_DESCRIPTION("Generic thermal management sysfs support");
@@ -58,6 +60,22 @@ static LIST_HEAD(thermal_tz_list);
 static LIST_HEAD(thermal_cdev_list);
 static DEFINE_MUTEX(thermal_list_lock);
 
+static unsigned int thermal_event_seqnum;
+
+static struct genl_family thermal_event_genl_family = {
+        .id = GENL_ID_GENERATE,
+        .name = THERMAL_GENL_FAMILY_NAME,
+        .version = THERMAL_GENL_VERSION,
+        .maxattr = THERMAL_GENL_ATTR_MAX,
+};
+
+static struct genl_multicast_group thermal_event_mcgrp = {
+        .name = THERMAL_GENL_MCAST_GROUP_NAME,
+};
+
+static int genetlink_init(void);
+static void genetlink_exit(void);
+
 static int get_idr(struct idr *idr, struct mutex *lock, int *id)
 {
         int err;
@@ -823,11 +841,8 @@ static struct class thermal_class = {
  * @devdata:    device private data.
  * @ops:                standard thermal cooling devices callbacks.
  */
-struct thermal_cooling_device *thermal_cooling_device_register(char *type,
-                                                               void *devdata,
-                                                               struct
-                                                               thermal_cooling_device_ops
-                                                               *ops)
+struct thermal_cooling_device *thermal_cooling_device_register(
+     char *type, void *devdata, const struct thermal_cooling_device_ops *ops)
 {
         struct thermal_cooling_device *cdev;
         struct thermal_zone_device *pos;
@@ -1048,13 +1063,9 @@ EXPORT_SYMBOL(thermal_zone_device_update);
  * section 11.1.5.1 of the ACPI specification 3.0.
  */
 struct thermal_zone_device *thermal_zone_device_register(char *type,
-                                                         int trips,
-                                                         void *devdata, struct
-                                                         thermal_zone_device_ops
-                                                         *ops, int tc1, int
-                                                         tc2,
-                                                         int passive_delay,
-                                                         int polling_delay)
+        int trips, void *devdata,
+        const struct thermal_zone_device_ops *ops,
+        int tc1, int tc2, int passive_delay, int polling_delay)
 {
         struct thermal_zone_device *tz;
         struct thermal_cooling_device *pos;
@@ -1214,6 +1225,82 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 
 EXPORT_SYMBOL(thermal_zone_device_unregister);
 
+int generate_netlink_event(u32 orig, enum events event)
+{
+        struct sk_buff *skb;
+        struct nlattr *attr;
+        struct thermal_genl_event *thermal_event;
+        void *msg_header;
+        int size;
+        int result;
+
+        /* allocate memory */
+        size = nla_total_size(sizeof(struct thermal_genl_event)) + \
+                                nla_total_size(0);
+
+        skb = genlmsg_new(size, GFP_ATOMIC);
+        if (!skb)
+                return -ENOMEM;
+
+        /* add the genetlink message header */
+        msg_header = genlmsg_put(skb, 0, thermal_event_seqnum++,
+                                 &thermal_event_genl_family, 0,
+                                 THERMAL_GENL_CMD_EVENT);
+        if (!msg_header) {
+                nlmsg_free(skb);
+                return -ENOMEM;
+        }
+
+        /* fill the data */
+        attr = nla_reserve(skb, THERMAL_GENL_ATTR_EVENT, \
+                        sizeof(struct thermal_genl_event));
+
+        if (!attr) {
+                nlmsg_free(skb);
+                return -EINVAL;
+        }
+
+        thermal_event = nla_data(attr);
+        if (!thermal_event) {
+                nlmsg_free(skb);
+                return -EINVAL;
+        }
+
+        memset(thermal_event, 0, sizeof(struct thermal_genl_event));
+
+        thermal_event->orig = orig;
+        thermal_event->event = event;
+
+        /* send multicast genetlink message */
+        result = genlmsg_end(skb, msg_header);
+        if (result < 0) {
+                nlmsg_free(skb);
+                return result;
+        }
+
+        result = genlmsg_multicast(skb, 0, thermal_event_mcgrp.id, GFP_ATOMIC);
+        if (result)
+                printk(KERN_INFO "failed to send netlink event:%d", result);
+
+        return result;
+}
+EXPORT_SYMBOL(generate_netlink_event);
+
+static int genetlink_init(void)
+{
+        int result;
+
+        result = genl_register_family(&thermal_event_genl_family);
+        if (result)
+                return result;
+
+        result = genl_register_mc_group(&thermal_event_genl_family,
+                                        &thermal_event_mcgrp);
+        if (result)
+                genl_unregister_family(&thermal_event_genl_family);
+        return result;
+}
+
 static int __init thermal_init(void)
 {
         int result = 0;
@@ -1225,9 +1312,15 @@ static int __init thermal_init(void)
                 mutex_destroy(&thermal_idr_lock);
                 mutex_destroy(&thermal_list_lock);
         }
+        result = genetlink_init();
         return result;
 }
 
+static void genetlink_exit(void)
+{
+        genl_unregister_family(&thermal_event_genl_family);
+}
+
 static void __exit thermal_exit(void)
 {
         class_unregister(&thermal_class);
@@ -1235,7 +1328,8 @@ static void __exit thermal_exit(void)
         idr_destroy(&thermal_cdev_idr);
         mutex_destroy(&thermal_idr_lock);
         mutex_destroy(&thermal_list_lock);
+        genetlink_exit();
 }
 
-subsys_initcall(thermal_init);
+fs_initcall(thermal_init);
 module_exit(thermal_exit);
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index c43ef48b1a0f..396277216e4f 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -9,3 +9,5 @@ obj-$(CONFIG_N_GSM)		+= n_gsm.o
 obj-$(CONFIG_R3964)             += n_r3964.o
 
 obj-y                           += vt/
+obj-$(CONFIG_HVC_DRIVER)        += hvc/
+obj-y                           += serial/
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
new file mode 100644
index 000000000000..d79e7e9bf9d2
--- /dev/null
+++ b/drivers/tty/hvc/Makefile
@@ -0,0 +1,12 @@
+obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
+obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
+obj-$(CONFIG_HVC_TILE)          += hvc_tile.o
+obj-$(CONFIG_HVC_DCC)           += hvc_dcc.o
+obj-$(CONFIG_HVC_BEAT)          += hvc_beat.o
+obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
+obj-$(CONFIG_HVC_IRQ)           += hvc_irq.o
+obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
+obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
+obj-$(CONFIG_HVC_UDBG)          += hvc_udbg.o
+obj-$(CONFIG_HVCS)              += hvcs.o
diff --git a/drivers/char/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
index 5fe4631e2a61..5fe4631e2a61 100644
--- a/drivers/char/hvc_beat.c
+++ b/drivers/tty/hvc/hvc_beat.c
diff --git a/drivers/char/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index e9cba13ee800..e9cba13ee800 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
diff --git a/drivers/char/hvc_console.h b/drivers/tty/hvc/hvc_console.h
index 54381eba4e4a..54381eba4e4a 100644
--- a/drivers/char/hvc_console.h
+++ b/drivers/tty/hvc/hvc_console.h
diff --git a/drivers/char/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 6470f63deb4b..6470f63deb4b 100644
--- a/drivers/char/hvc_dcc.c
+++ b/drivers/tty/hvc/hvc_dcc.c
diff --git a/drivers/char/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c
index 2623e177e8d6..2623e177e8d6 100644
--- a/drivers/char/hvc_irq.c
+++ b/drivers/tty/hvc/hvc_irq.c
diff --git a/drivers/char/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
index 21c54955084e..21c54955084e 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/char/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index c3425bb3a1f6..c3425bb3a1f6 100644
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
diff --git a/drivers/char/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
index 61c4a61558d9..61c4a61558d9 100644
--- a/drivers/char/hvc_rtas.c
+++ b/drivers/tty/hvc/hvc_rtas.c
diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index 7a84a0595477..7a84a0595477 100644
--- a/drivers/char/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
diff --git a/drivers/char/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
index b0957e61a7be..b0957e61a7be 100644
--- a/drivers/char/hvc_udbg.c
+++ b/drivers/tty/hvc/hvc_udbg.c
diff --git a/drivers/char/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 5e2f52b33327..5e2f52b33327 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
diff --git a/drivers/char/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 3740e327f180..3740e327f180 100644
--- a/drivers/char/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
diff --git a/drivers/char/hvcs.c b/drivers/tty/hvc/hvcs.c
index bedc6c1b6fa5..bedc6c1b6fa5 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c
index 67a75a502c01..67a75a502c01 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 44b8412a04e8..aa2e5d3eb01a 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2414,6 +2414,7 @@ static int gsmld_config(struct tty_struct *tty, struct gsm_mux *gsm,
 
         gsm->initiator = c->initiator;
         gsm->mru = c->mru;
+        gsm->mtu = c->mtu;
         gsm->encoding = c->encapsulation;
         gsm->adaption = c->adaption;
         gsm->n2 = c->n2;
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 47d32281032c..52fc0c9a6364 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -581,8 +581,9 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
                            __u8 __user *buf, size_t nr)
 {
         struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
-        int ret;
+        int ret = 0;
         struct n_hdlc_buf *rbuf;
+        DECLARE_WAITQUEUE(wait, current);
 
         if (debuglevel >= DEBUG_LEVEL_INFO)     
                 printk("%s(%d)n_hdlc_tty_read() called\n",__FILE__,__LINE__);
@@ -598,57 +599,55 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
                 return -EFAULT;
         }
 
-        tty_lock();
+        add_wait_queue(&tty->read_wait, &wait);
 
         for (;;) {
                 if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
-                        tty_unlock();
-                        return -EIO;
+                        ret = -EIO;
+                        break;
                 }
+                if (tty_hung_up_p(file))
+                        break;
 
-                n_hdlc = tty2n_hdlc (tty);
-                if (!n_hdlc || n_hdlc->magic != HDLC_MAGIC ||
-                         tty != n_hdlc->tty) {
-                        tty_unlock();
-                        return 0;
-                }
+                set_current_state(TASK_INTERRUPTIBLE);
 
                 rbuf = n_hdlc_buf_get(&n_hdlc->rx_buf_list);
-                if (rbuf)
+                if (rbuf) {
+                        if (rbuf->count > nr) {
+                                /* too large for caller's buffer */
+                                ret = -EOVERFLOW;
+                        } else {
+                                if (copy_to_user(buf, rbuf->buf, rbuf->count))
+                                        ret = -EFAULT;
+                                else
+                                        ret = rbuf->count;
+                        }
+
+                        if (n_hdlc->rx_free_buf_list.count >
+                            DEFAULT_RX_BUF_COUNT)
+                                kfree(rbuf);
+                        else
+                                n_hdlc_buf_put(&n_hdlc->rx_free_buf_list, rbuf);
                         break;
+                }
                         
                 /* no data */
                 if (file->f_flags & O_NONBLOCK) {
-                        tty_unlock();
-                        return -EAGAIN;
+                        ret = -EAGAIN;
+                        break;
                 }
-                        
-                interruptible_sleep_on (&tty->read_wait);
+
+                schedule();
+
                 if (signal_pending(current)) {
-                        tty_unlock();
-                        return -EINTR;
+                        ret = -EINTR;
+                        break;
                 }
         }
-                
-        if (rbuf->count > nr)
-                /* frame too large for caller's buffer (discard frame) */
-                ret = -EOVERFLOW;
-        else {
-                /* Copy the data to the caller's buffer */
-                if (copy_to_user(buf, rbuf->buf, rbuf->count))
-                        ret = -EFAULT;
-                else
-                        ret = rbuf->count;
-        }
-        
-        /* return HDLC buffer to free list unless the free list */
-        /* count has exceeded the default value, in which case the */
-        /* buffer is freed back to the OS to conserve memory */
-        if (n_hdlc->rx_free_buf_list.count > DEFAULT_RX_BUF_COUNT)
-                kfree(rbuf);
-        else    
-                n_hdlc_buf_put(&n_hdlc->rx_free_buf_list,rbuf);
-        tty_unlock();
+
+        remove_wait_queue(&tty->read_wait, &wait);
+        __set_current_state(TASK_RUNNING);
+
         return ret;
         
 }       /* end of n_hdlc_tty_read() */
@@ -691,14 +690,15 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
                 count = maxframe;
         }
         
-        tty_lock();
-
         add_wait_queue(&tty->write_wait, &wait);
-        set_current_state(TASK_INTERRUPTIBLE);
+
+        for (;;) {
+                set_current_state(TASK_INTERRUPTIBLE);
         
-        /* Allocate transmit buffer */
-        /* sleep until transmit buffer available */             
-        while (!(tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list))) {
+                tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list);
+                if (tbuf)
+                        break;
+
                 if (file->f_flags & O_NONBLOCK) {
                         error = -EAGAIN;
                         break;
@@ -719,7 +719,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
                 }
         }
 
-        set_current_state(TASK_RUNNING);
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&tty->write_wait, &wait);
 
         if (!error) {           
@@ -731,7 +731,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
                 n_hdlc_buf_put(&n_hdlc->tx_buf_list,tbuf);
                 n_hdlc_send_frames(n_hdlc,tty);
         }
-        tty_unlock();
+
         return error;
         
 }       /* end of n_hdlc_tty_write() */
diff --git a/drivers/serial/21285.c b/drivers/tty/serial/21285.c
index d89aa38c5cf0..d89aa38c5cf0 100644
--- a/drivers/serial/21285.c
+++ b/drivers/tty/serial/21285.c
diff --git a/drivers/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index be0ebce36e54..be0ebce36e54 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
diff --git a/drivers/serial/68328serial.h b/drivers/tty/serial/68328serial.h
index 664ceb0a158c..664ceb0a158c 100644
--- a/drivers/serial/68328serial.h
+++ b/drivers/tty/serial/68328serial.h
diff --git a/drivers/serial/68360serial.c b/drivers/tty/serial/68360serial.c
index 88b13356ec10..bc21eeae8fde 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/tty/serial/68360serial.c
@@ -2428,6 +2428,7 @@ static const struct tty_operations rs_360_ops = {
         /* .read_proc = rs_360_read_proc, */
         .tiocmget = rs_360_tiocmget,
         .tiocmset = rs_360_tiocmset,
+        .get_icount = rs_360_get_icount,
 };
 
 static int __init rs_360_init(void)
diff --git a/drivers/serial/8250.c b/drivers/tty/serial/8250.c
index b25e6e490530..3975df6f7fdb 100644
--- a/drivers/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -236,7 +236,8 @@ static const struct serial8250_config uart_config[] = {
                 .fifo_size      = 128,
                 .tx_loadsz      = 128,
                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-                .flags          = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP,
+                /* UART_CAP_EFR breaks billionon CF bluetooth card. */
+                .flags          = UART_CAP_FIFO | UART_CAP_SLEEP,
         },
         [PORT_16654] = {
                 .name           = "ST16654",
diff --git a/drivers/serial/8250.h b/drivers/tty/serial/8250.h
index 6e19ea3e48d5..6e19ea3e48d5 100644
--- a/drivers/serial/8250.h
+++ b/drivers/tty/serial/8250.h
diff --git a/drivers/serial/8250_accent.c b/drivers/tty/serial/8250_accent.c
index 9c10262f2469..9c10262f2469 100644
--- a/drivers/serial/8250_accent.c
+++ b/drivers/tty/serial/8250_accent.c
diff --git a/drivers/serial/8250_acorn.c b/drivers/tty/serial/8250_acorn.c
index b0ce8c56f1a4..b0ce8c56f1a4 100644
--- a/drivers/serial/8250_acorn.c
+++ b/drivers/tty/serial/8250_acorn.c
diff --git a/drivers/serial/8250_boca.c b/drivers/tty/serial/8250_boca.c
index 3bfe0f7b26fb..3bfe0f7b26fb 100644
--- a/drivers/serial/8250_boca.c
+++ b/drivers/tty/serial/8250_boca.c
diff --git a/drivers/serial/8250_early.c b/drivers/tty/serial/8250_early.c
index eaafb98debed..eaafb98debed 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/tty/serial/8250_early.c
diff --git a/drivers/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250_exar_st16c554.c
index 567143ace159..567143ace159 100644
--- a/drivers/serial/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250_exar_st16c554.c
diff --git a/drivers/serial/8250_fourport.c b/drivers/tty/serial/8250_fourport.c
index 6375d68b7913..6375d68b7913 100644
--- a/drivers/serial/8250_fourport.c
+++ b/drivers/tty/serial/8250_fourport.c
diff --git a/drivers/serial/8250_gsc.c b/drivers/tty/serial/8250_gsc.c
index d8c0ffbfa6e3..d8c0ffbfa6e3 100644
--- a/drivers/serial/8250_gsc.c
+++ b/drivers/tty/serial/8250_gsc.c
diff --git a/drivers/serial/8250_hp300.c b/drivers/tty/serial/8250_hp300.c
index c13438c93012..c13438c93012 100644
--- a/drivers/serial/8250_hp300.c
+++ b/drivers/tty/serial/8250_hp300.c
diff --git a/drivers/serial/8250_hub6.c b/drivers/tty/serial/8250_hub6.c
index 7609150e7d5e..7609150e7d5e 100644
--- a/drivers/serial/8250_hub6.c
+++ b/drivers/tty/serial/8250_hub6.c
diff --git a/drivers/serial/8250_mca.c b/drivers/tty/serial/8250_mca.c
index d10be944ad44..d10be944ad44 100644
--- a/drivers/serial/8250_mca.c
+++ b/drivers/tty/serial/8250_mca.c
diff --git a/drivers/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 8b8930f700b5..8b8930f700b5 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
diff --git a/drivers/serial/8250_pnp.c b/drivers/tty/serial/8250_pnp.c
index 4822cb50cd0f..4822cb50cd0f 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/tty/serial/8250_pnp.c
diff --git a/drivers/serial/Kconfig b/drivers/tty/serial/Kconfig
index c1df7676a73d..2b8334601c8b 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -81,7 +81,7 @@ config SERIAL_8250_GSC
         default SERIAL_8250
 
 config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EMBEDDED
+        tristate "8250/16550 PCI device support" if EXPERT
         depends on SERIAL_8250 && PCI
         default SERIAL_8250
         help
@@ -90,7 +90,7 @@ config SERIAL_8250_PCI
           Saves about 9K.
 
 config SERIAL_8250_PNP
-        tristate "8250/16550 PNP device support" if EMBEDDED
+        tristate "8250/16550 PNP device support" if EXPERT
         depends on SERIAL_8250 && PNP
         default SERIAL_8250
         help
@@ -1518,6 +1518,7 @@ config SERIAL_BCM63XX_CONSOLE
 config SERIAL_GRLIB_GAISLER_APBUART
         tristate "GRLIB APBUART serial support"
         depends on OF
+        select SERIAL_CORE
         ---help---
         Add support for the GRLIB APBUART serial port.
 
diff --git a/drivers/serial/Makefile b/drivers/tty/serial/Makefile
index 8ea92e9c73b0..8ea92e9c73b0 100644
--- a/drivers/serial/Makefile
+++ b/drivers/tty/serial/Makefile
diff --git a/drivers/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index f9b49b5ff5e1..f9b49b5ff5e1 100644
--- a/drivers/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
diff --git a/drivers/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 721216292a50..721216292a50 100644
--- a/drivers/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
diff --git a/drivers/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 2904aa044126..2904aa044126 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
diff --git a/drivers/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index e76d7d000128..e76d7d000128 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
diff --git a/drivers/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 095a5d562618..095a5d562618 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
diff --git a/drivers/serial/apbuart.h b/drivers/tty/serial/apbuart.h
index 5faf87c8d2bc..5faf87c8d2bc 100644
--- a/drivers/serial/apbuart.h
+++ b/drivers/tty/serial/apbuart.h
diff --git a/drivers/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 3892666b5fbd..2a1d52fb4936 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1732,6 +1732,11 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
         device_init_wakeup(&pdev->dev, 1);
         platform_set_drvdata(pdev, port);
 
+        if (port->rs485.flags & SER_RS485_ENABLED) {
+                UART_PUT_MR(&port->uart, ATMEL_US_USMODE_NORMAL);
+                UART_PUT_CR(&port->uart, ATMEL_US_RTSEN);
+        }
+
         return 0;
 
 err_add_port:
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index a1a0e55d0807..a1a0e55d0807 100644
--- a/drivers/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
diff --git a/drivers/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c
index e381b895b04d..9b1ff2b6bb37 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/tty/serial/bfin_5xx.c
@@ -370,10 +370,8 @@ static irqreturn_t bfin_serial_rx_int(int irq, void *dev_id)
 {
         struct bfin_serial_port *uart = dev_id;
 
-        spin_lock(&uart->port.lock);
         while (UART_GET_LSR(uart) & DR)
                 bfin_serial_rx_chars(uart);
-        spin_unlock(&uart->port.lock);
 
         return IRQ_HANDLED;
 }
@@ -490,9 +488,8 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
 {
         int x_pos, pos;
 
-        dma_disable_irq(uart->tx_dma_channel);
-        dma_disable_irq(uart->rx_dma_channel);
-        spin_lock_bh(&uart->port.lock);
+        dma_disable_irq_nosync(uart->rx_dma_channel);
+        spin_lock_bh(&uart->rx_lock);
 
         /* 2D DMA RX buffer ring is used. Because curr_y_count and
          * curr_x_count can't be read as an atomic operation,
@@ -523,8 +520,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
                 uart->rx_dma_buf.tail = uart->rx_dma_buf.head;
         }
 
-        spin_unlock_bh(&uart->port.lock);
-        dma_enable_irq(uart->tx_dma_channel);
+        spin_unlock_bh(&uart->rx_lock);
         dma_enable_irq(uart->rx_dma_channel);
 
         mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES);
@@ -571,7 +567,7 @@ static irqreturn_t bfin_serial_dma_rx_int(int irq, void *dev_id)
         unsigned short irqstat;
         int x_pos, pos;
 
-        spin_lock(&uart->port.lock);
+        spin_lock(&uart->rx_lock);
         irqstat = get_dma_curr_irqstat(uart->rx_dma_channel);
         clear_dma_irqstat(uart->rx_dma_channel);
 
@@ -589,7 +585,7 @@ static irqreturn_t bfin_serial_dma_rx_int(int irq, void *dev_id)
                 uart->rx_dma_buf.tail = uart->rx_dma_buf.head;
         }
 
-        spin_unlock(&uart->port.lock);
+        spin_unlock(&uart->rx_lock);
 
         return IRQ_HANDLED;
 }
@@ -1332,6 +1328,7 @@ static int bfin_serial_probe(struct platform_device *pdev)
                 }
 
 #ifdef CONFIG_SERIAL_BFIN_DMA
+                spin_lock_init(&uart->rx_lock);
                 uart->tx_done       = 1;
                 uart->tx_count      = 0;
 
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index e95c524d9d18..e95c524d9d18 100644
--- a/drivers/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
index 6d06ce1d5675..6d06ce1d5675 100644
--- a/drivers/serial/bfin_sport_uart.h
+++ b/drivers/tty/serial/bfin_sport_uart.h
diff --git a/drivers/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index b6acd19b458e..b6acd19b458e 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
diff --git a/drivers/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
index e072724ea754..e072724ea754 100644
--- a/drivers/serial/cpm_uart/Makefile
+++ b/drivers/tty/serial/cpm_uart/Makefile
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
index b754dcf0fda5..b754dcf0fda5 100644
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart.h
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 8692ff98fc07..8692ff98fc07 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
index 3fc1d66e32c6..3fc1d66e32c6 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
index 10eecd6af6d4..10eecd6af6d4 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
index 814ac006393f..814ac006393f 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
index 7194c63dcf5f..7194c63dcf5f 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
diff --git a/drivers/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index bcc31f2140ac..bcc31f2140ac 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
diff --git a/drivers/serial/crisv10.h b/drivers/tty/serial/crisv10.h
index ea0beb46a10d..ea0beb46a10d 100644
--- a/drivers/serial/crisv10.h
+++ b/drivers/tty/serial/crisv10.h
diff --git a/drivers/serial/dz.c b/drivers/tty/serial/dz.c
index 57421d776329..57421d776329 100644
--- a/drivers/serial/dz.c
+++ b/drivers/tty/serial/dz.c
diff --git a/drivers/serial/dz.h b/drivers/tty/serial/dz.h
index faf169ed27b3..faf169ed27b3 100644
--- a/drivers/serial/dz.h
+++ b/drivers/tty/serial/dz.h
diff --git a/drivers/serial/icom.c b/drivers/tty/serial/icom.c
index 53a468227056..53a468227056 100644
--- a/drivers/serial/icom.c
+++ b/drivers/tty/serial/icom.c
diff --git a/drivers/serial/icom.h b/drivers/tty/serial/icom.h
index c8029e0025c9..c8029e0025c9 100644
--- a/drivers/serial/icom.h
+++ b/drivers/tty/serial/icom.h
diff --git a/drivers/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index ab93763862d5..ab93763862d5 100644
--- a/drivers/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
diff --git a/drivers/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
index deb7b8d977dc..deb7b8d977dc 100644
--- a/drivers/serial/ifx6x60.h
+++ b/drivers/tty/serial/ifx6x60.h
diff --git a/drivers/serial/imx.c b/drivers/tty/serial/imx.c
index dfcf4b1878aa..dfcf4b1878aa 100644
--- a/drivers/serial/imx.c
+++ b/drivers/tty/serial/imx.c
diff --git a/drivers/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
index ee43efc7bdcc..ee43efc7bdcc 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/tty/serial/ioc3_serial.c
diff --git a/drivers/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index fcfe82653ac8..fcfe82653ac8 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
diff --git a/drivers/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index ebff4a1d4bcc..ebff4a1d4bcc 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
diff --git a/drivers/serial/ip22zilog.h b/drivers/tty/serial/ip22zilog.h
index a59a9a8341d2..a59a9a8341d2 100644
--- a/drivers/serial/ip22zilog.h
+++ b/drivers/tty/serial/ip22zilog.h
diff --git a/drivers/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile
index e46b6e0f8b18..e46b6e0f8b18 100644
--- a/drivers/serial/jsm/Makefile
+++ b/drivers/tty/serial/jsm/Makefile
diff --git a/drivers/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
index 38a509c684cd..38a509c684cd 100644
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/tty/serial/jsm/jsm.h
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 18f548449c63..18f548449c63 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 7960d9633c15..7960d9633c15 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index 7a4a914ecff0..7a4a914ecff0 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
diff --git a/drivers/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 25a8bc565f40..25a8bc565f40 100644
--- a/drivers/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
diff --git a/drivers/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index bea5c215460c..bea5c215460c 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
diff --git a/drivers/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
index e9b7e11793b1..e9b7e11793b1 100644
--- a/drivers/serial/m32r_sio.h
+++ b/drivers/tty/serial/m32r_sio.h
diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
index 4671473793e3..4671473793e3 100644
--- a/drivers/serial/m32r_sio_reg.h
+++ b/drivers/tty/serial/m32r_sio_reg.h
diff --git a/drivers/serial/max3100.c b/drivers/tty/serial/max3100.c
index beb1afa27d8d..beb1afa27d8d 100644
--- a/drivers/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
diff --git a/drivers/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
index a1fe304f2f52..a1fe304f2f52 100644
--- a/drivers/serial/max3107-aava.c
+++ b/drivers/tty/serial/max3107-aava.c
diff --git a/drivers/serial/max3107.c b/drivers/tty/serial/max3107.c
index 910870edf708..910870edf708 100644
--- a/drivers/serial/max3107.c
+++ b/drivers/tty/serial/max3107.c
diff --git a/drivers/serial/max3107.h b/drivers/tty/serial/max3107.h
index 7ab632392502..7ab632392502 100644
--- a/drivers/serial/max3107.h
+++ b/drivers/tty/serial/max3107.h
diff --git a/drivers/serial/mcf.c b/drivers/tty/serial/mcf.c
index 3394b7cc1722..3394b7cc1722 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
diff --git a/drivers/serial/mfd.c b/drivers/tty/serial/mfd.c
index d40010a22ecd..d40010a22ecd 100644
--- a/drivers/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 126ec7f568ec..126ec7f568ec 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
diff --git a/drivers/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index 6a9c6605666a..6a9c6605666a 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
diff --git a/drivers/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index b62857bf2fdb..b62857bf2fdb 100644
--- a/drivers/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
diff --git a/drivers/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h
index d1ef43af397c..d1ef43af397c 100644
--- a/drivers/serial/mrst_max3110.h
+++ b/drivers/tty/serial/mrst_max3110.h
diff --git a/drivers/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 8e43a7b69e64..8e43a7b69e64 100644
--- a/drivers/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
diff --git a/drivers/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h
index f6ca9ca79e98..f6ca9ca79e98 100644
--- a/drivers/serial/msm_serial.h
+++ b/drivers/tty/serial/msm_serial.h
diff --git a/drivers/serial/mux.c b/drivers/tty/serial/mux.c
index 9711e06a8374..9711e06a8374 100644
--- a/drivers/serial/mux.c
+++ b/drivers/tty/serial/mux.c
diff --git a/drivers/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index 7735c9f35fa0..7735c9f35fa0 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
diff --git a/drivers/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
index de173671e3d0..de173671e3d0 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/tty/serial/nwpserial.c
diff --git a/drivers/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 5c7abe4c94dd..5c7abe4c94dd 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
diff --git a/drivers/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7f2f01058789..7f2f01058789 100644
--- a/drivers/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
diff --git a/drivers/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 70a61458ec42..70a61458ec42 100644
--- a/drivers/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
diff --git a/drivers/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 5b9cde79e4ea..5b9cde79e4ea 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
diff --git a/drivers/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h
index cbc34fbb1b20..cbc34fbb1b20 100644
--- a/drivers/serial/pmac_zilog.h
+++ b/drivers/tty/serial/pmac_zilog.h
diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index 0aa75a97531c..0aa75a97531c 100644
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
diff --git a/drivers/serial/pxa.c b/drivers/tty/serial/pxa.c
index 1102a39b44f5..1102a39b44f5 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
diff --git a/drivers/serial/s3c2400.c b/drivers/tty/serial/s3c2400.c
index fed1a9a1ffb4..fed1a9a1ffb4 100644
--- a/drivers/serial/s3c2400.c
+++ b/drivers/tty/serial/s3c2400.c
diff --git a/drivers/serial/s3c2410.c b/drivers/tty/serial/s3c2410.c
index 73f089d3efd6..73f089d3efd6 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/tty/serial/s3c2410.c
diff --git a/drivers/serial/s3c2412.c b/drivers/tty/serial/s3c2412.c
index 1700b1a2fb7e..1700b1a2fb7e 100644
--- a/drivers/serial/s3c2412.c
+++ b/drivers/tty/serial/s3c2412.c
diff --git a/drivers/serial/s3c2440.c b/drivers/tty/serial/s3c2440.c
index 094cc3904b13..094cc3904b13 100644
--- a/drivers/serial/s3c2440.c
+++ b/drivers/tty/serial/s3c2440.c
diff --git a/drivers/serial/s3c24a0.c b/drivers/tty/serial/s3c24a0.c
index fad6083ca427..fad6083ca427 100644
--- a/drivers/serial/s3c24a0.c
+++ b/drivers/tty/serial/s3c24a0.c
diff --git a/drivers/serial/s3c6400.c b/drivers/tty/serial/s3c6400.c
index 4be92ab50058..4be92ab50058 100644
--- a/drivers/serial/s3c6400.c
+++ b/drivers/tty/serial/s3c6400.c
diff --git a/drivers/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
index 6ebccd70a707..6ebccd70a707 100644
--- a/drivers/serial/s5pv210.c
+++ b/drivers/tty/serial/s5pv210.c
diff --git a/drivers/serial/sa1100.c b/drivers/tty/serial/sa1100.c
index 2199d819a987..2199d819a987 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/tty/serial/sa1100.c
diff --git a/drivers/serial/samsung.c b/drivers/tty/serial/samsung.c
index 7ac2bf5167cd..2335edafe903 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -883,10 +883,10 @@ static struct uart_ops s3c24xx_serial_ops = {
 
 static struct uart_driver s3c24xx_uart_drv = {
         .owner          = THIS_MODULE,
-        .dev_name       = "s3c2410_serial",
+        .driver_name    = "s3c2410_serial",
         .nr             = CONFIG_SERIAL_SAMSUNG_UARTS,
         .cons           = S3C24XX_SERIAL_CONSOLE,
-        .driver_name    = S3C24XX_SERIAL_NAME,
+        .dev_name       = S3C24XX_SERIAL_NAME,
         .major          = S3C24XX_SERIAL_MAJOR,
         .minor          = S3C24XX_SERIAL_MINOR,
 };
diff --git a/drivers/serial/samsung.h b/drivers/tty/serial/samsung.h
index 0ac06a07d25f..0ac06a07d25f 100644
--- a/drivers/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
diff --git a/drivers/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index a2f2b3254499..602d9845c52f 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -829,7 +829,7 @@ static void __init sbd_probe_duarts(void)
 #ifdef CONFIG_SERIAL_SB1250_DUART_CONSOLE
 /*
  * Serial console stuff.  Very basic, polling driver for doing serial
- * console output.  The console_sem is held by the caller, so we
+ * console output.  The console_lock is held by the caller, so we
  * shouldn't be interrupted for more console activity.
  */
 static void sbd_console_putchar(struct uart_port *uport, int ch)
diff --git a/drivers/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c
index 75038ad2b242..75038ad2b242 100644
--- a/drivers/serial/sc26xx.c
+++ b/drivers/tty/serial/sc26xx.c
diff --git a/drivers/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 460a72d91bb7..460a72d91bb7 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
diff --git a/drivers/serial/serial_cs.c b/drivers/tty/serial/serial_cs.c
index 93760b2ea172..93760b2ea172 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/tty/serial/serial_cs.c
diff --git a/drivers/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index b1962025b1aa..b1962025b1aa 100644
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/tty/serial/serial_lh7a40x.c
index ea744707c4d6..ea744707c4d6 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/tty/serial/serial_lh7a40x.c
diff --git a/drivers/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index c50e9fbbf743..c50e9fbbf743 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
diff --git a/drivers/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 92c91c83edde..92c91c83edde 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
diff --git a/drivers/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index b223d6cbf33a..b223d6cbf33a 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
diff --git a/drivers/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index cff9a306660f..cff9a306660f 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
diff --git a/drivers/serial/suncore.c b/drivers/tty/serial/suncore.c
index 6381a0282ee7..6381a0282ee7 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/tty/serial/suncore.c
diff --git a/drivers/serial/suncore.h b/drivers/tty/serial/suncore.h
index db2057936c31..db2057936c31 100644
--- a/drivers/serial/suncore.h
+++ b/drivers/tty/serial/suncore.h
diff --git a/drivers/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index c9014868297d..c9014868297d 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
diff --git a/drivers/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 5b246b18f42f..5b246b18f42f 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
diff --git a/drivers/serial/sunsab.h b/drivers/tty/serial/sunsab.h
index b78e1f7b8050..b78e1f7b8050 100644
--- a/drivers/serial/sunsab.h
+++ b/drivers/tty/serial/sunsab.h
diff --git a/drivers/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 551ebfe3ccbb..551ebfe3ccbb 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
diff --git a/drivers/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index c1967ac1c07f..c1967ac1c07f 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
diff --git a/drivers/serial/sunzilog.h b/drivers/tty/serial/sunzilog.h
index 5dec7b47cc38..5dec7b47cc38 100644
--- a/drivers/serial/sunzilog.h
+++ b/drivers/tty/serial/sunzilog.h
diff --git a/drivers/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 1f36b7eb7351..1f36b7eb7351 100644
--- a/drivers/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
diff --git a/drivers/serial/timbuart.h b/drivers/tty/serial/timbuart.h
index 7e566766bc43..7e566766bc43 100644
--- a/drivers/serial/timbuart.h
+++ b/drivers/tty/serial/timbuart.h
diff --git a/drivers/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index d2fce865b731..d2fce865b731 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
diff --git a/drivers/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 3f4848e2174a..3f4848e2174a 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 3beb6ab4fa68..3beb6ab4fa68 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
diff --git a/drivers/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 322bf56c0d89..322bf56c0d89 100644
--- a/drivers/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
diff --git a/drivers/serial/zs.c b/drivers/tty/serial/zs.c
index 1a7fd3e70315..1a7fd3e70315 100644
--- a/drivers/serial/zs.c
+++ b/drivers/tty/serial/zs.c
diff --git a/drivers/serial/zs.h b/drivers/tty/serial/zs.h
index aa921b57d827..aa921b57d827 100644
--- a/drivers/serial/zs.h
+++ b/drivers/tty/serial/zs.h
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index c556ed9db13d..8e0dd254eb11 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -46,7 +46,7 @@
 #include <asm/irq_regs.h>
 
 /* Whether we react on sysrq keys or just ignore them */
-static int __read_mostly sysrq_enabled = 1;
+static int __read_mostly sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
 static bool __read_mostly sysrq_always_enabled;
 
 static bool sysrq_on(void)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 464d09d97873..0065da4b11c1 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3256,8 +3256,8 @@ static ssize_t show_cons_active(struct device *dev,
         struct console *c;
         ssize_t count = 0;
 
-        acquire_console_sem();
-        for (c = console_drivers; c; c = c->next) {
+        console_lock();
+        for_each_console(c) {
                 if (!c->device)
                         continue;
                 if (!c->write)
@@ -3271,7 +3271,7 @@ static ssize_t show_cons_active(struct device *dev,
         while (i--)
                 count += sprintf(buf + count, "%s%d%c",
                                  cs[i]->name, cs[i]->index, i ? ' ':'\n');
-        release_console_sem();
+        console_unlock();
 
         return count;
 }
@@ -3306,7 +3306,7 @@ int __init tty_init(void)
         if (IS_ERR(consdev))
                 consdev = NULL;
         else
-                device_create_file(consdev, &dev_attr_active);
+                WARN_ON(device_create_file(consdev, &dev_attr_active) < 0);
 
 #ifdef CONFIG_VT
         vty_init(&console_fops);
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index ebae344ce910..c956ed6c83a3 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -316,9 +316,9 @@ int paste_selection(struct tty_struct *tty)
         /* always called with BTM from vt_ioctl */
         WARN_ON(!tty_locked());
 
-        acquire_console_sem();
+        console_lock();
         poke_blanked_console();
-        release_console_sem();
+        console_unlock();
 
         ld = tty_ldisc_ref(tty);
         if (!ld) {
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index eab3a1ff99e4..a672ed192d33 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -202,7 +202,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         /* Select the proper current console and verify
          * sanity of the situation under the console lock.
          */
-        acquire_console_sem();
+        console_lock();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -336,9 +336,9 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                  * the pagefault handling code may want to call printk().
                  */
 
-                release_console_sem();
+                console_unlock();
                 ret = copy_to_user(buf, con_buf_start, orig_count);
-                acquire_console_sem();
+                console_lock();
 
                 if (ret) {
                         read += (orig_count - ret);
@@ -354,7 +354,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (read)
                 ret = read;
 unlock_out:
-        release_console_sem();
+        console_unlock();
         mutex_unlock(&con_buf_mtx);
         return ret;
 }
@@ -379,7 +379,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         /* Select the proper current console and verify
          * sanity of the situation under the console lock.
          */
-        acquire_console_sem();
+        console_lock();
 
         attr = (currcons & 128);
         currcons = (currcons & 127);
@@ -414,9 +414,9 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 /* Temporarily drop the console lock so that we can read
                  * in the write data from userspace safely.
                  */
-                release_console_sem();
+                console_unlock();
                 ret = copy_from_user(con_buf, buf, this_round);
-                acquire_console_sem();
+                console_lock();
 
                 if (ret) {
                         this_round -= ret;
@@ -542,7 +542,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 vcs_scr_updated(vc);
 
 unlock_out:
-        release_console_sem();
+        console_unlock();
 
         mutex_unlock(&con_buf_mtx);
 
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 76407eca9ab0..147ede3423df 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1003,9 +1003,9 @@ static int vt_resize(struct tty_struct *tty, struct winsize *ws)
         struct vc_data *vc = tty->driver_data;
         int ret;
 
-        acquire_console_sem();
+        console_lock();
         ret = vc_do_resize(tty, vc, ws->ws_col, ws->ws_row);
-        release_console_sem();
+        console_unlock();
         return ret;
 }
 
@@ -1271,7 +1271,7 @@ static void default_attr(struct vc_data *vc)
         vc->vc_color = vc->vc_def_color;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_m(struct vc_data *vc)
 {
         int i;
@@ -1415,7 +1415,7 @@ int mouse_reporting(void)
         return vc_cons[fg_console].d->vc_report_mouse;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void set_mode(struct vc_data *vc, int on_off)
 {
         int i;
@@ -1485,7 +1485,7 @@ static void set_mode(struct vc_data *vc, int on_off)
                 }
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void setterm_command(struct vc_data *vc)
 {
         switch(vc->vc_par[0]) {
@@ -1545,7 +1545,7 @@ static void setterm_command(struct vc_data *vc)
         }
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_at(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_cols - vc->vc_x)
@@ -1555,7 +1555,7 @@ static void csi_at(struct vc_data *vc, unsigned int nr)
         insert_char(vc, nr);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_L(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_rows - vc->vc_y)
@@ -1566,7 +1566,7 @@ static void csi_L(struct vc_data *vc, unsigned int nr)
         vc->vc_need_wrap = 0;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_P(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_cols - vc->vc_x)
@@ -1576,7 +1576,7 @@ static void csi_P(struct vc_data *vc, unsigned int nr)
         delete_char(vc, nr);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void csi_M(struct vc_data *vc, unsigned int nr)
 {
         if (nr > vc->vc_rows - vc->vc_y)
@@ -1587,7 +1587,7 @@ static void csi_M(struct vc_data *vc, unsigned int nr)
         vc->vc_need_wrap = 0;
 }
 
-/* console_sem is held (except via vc_init->reset_terminal */
+/* console_lock is held (except via vc_init->reset_terminal */
 static void save_cur(struct vc_data *vc)
 {
         vc->vc_saved_x          = vc->vc_x;
@@ -1603,7 +1603,7 @@ static void save_cur(struct vc_data *vc)
         vc->vc_saved_G1         = vc->vc_G1_charset;
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void restore_cur(struct vc_data *vc)
 {
         gotoxy(vc, vc->vc_saved_x, vc->vc_saved_y);
@@ -1625,7 +1625,7 @@ enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
         EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
         ESpalette };
 
-/* console_sem is held (except via vc_init()) */
+/* console_lock is held (except via vc_init()) */
 static void reset_terminal(struct vc_data *vc, int do_clear)
 {
         vc->vc_top              = 0;
@@ -1685,7 +1685,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
             csi_J(vc, 2);
 }
 
-/* console_sem is held */
+/* console_lock is held */
 static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
 {
         /*
@@ -2119,7 +2119,7 @@ static int is_double_width(uint32_t ucs)
         return bisearch(ucs, double_width, ARRAY_SIZE(double_width) - 1);
 }
 
-/* acquires console_sem */
+/* acquires console_lock */
 static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
 #ifdef VT_BUF_VRAM_ONLY
@@ -2147,11 +2147,11 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 
         might_sleep();
 
-        acquire_console_sem();
+        console_lock();
         vc = tty->driver_data;
         if (vc == NULL) {
                 printk(KERN_ERR "vt: argh, driver_data is NULL !\n");
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -2159,7 +2159,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
         if (!vc_cons_allocated(currcons)) {
             /* could this happen? */
                 printk_once("con_write: tty %d not allocated\n", currcons+1);
-            release_console_sem();
+            console_unlock();
             return 0;
         }
 
@@ -2375,7 +2375,7 @@ rescan_last_byte:
         }
         FLUSH
         console_conditional_schedule();
-        release_console_sem();
+        console_unlock();
         notify_update(vc);
         return n;
 #undef FLUSH
@@ -2388,11 +2388,11 @@ rescan_last_byte:
  * us to do the switches asynchronously (needed when we want
  * to switch due to a keyboard interrupt).  Synchronization
  * with other console code and prevention of re-entrancy is
- * ensured with console_sem.
+ * ensured with console_lock.
  */
 static void console_callback(struct work_struct *ignored)
 {
-        acquire_console_sem();
+        console_lock();
 
         if (want_console >= 0) {
                 if (want_console != fg_console &&
@@ -2422,7 +2422,7 @@ static void console_callback(struct work_struct *ignored)
         }
         notify_update(vc_cons[fg_console].d);
 
-        release_console_sem();
+        console_unlock();
 }
 
 int set_console(int nr)
@@ -2603,7 +2603,7 @@ static struct console vt_console_driver = {
  */
 
 /*
- * Generally a bit racy with respect to console_sem().
+ * Generally a bit racy with respect to console_lock();.
  *
  * There are some functions which don't need it.
  *
@@ -2629,17 +2629,17 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
         switch (type)
         {
                 case TIOCL_SETSEL:
-                        acquire_console_sem();
+                        console_lock();
                         ret = set_selection((struct tiocl_selection __user *)(p+1), tty);
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_PASTESEL:
                         ret = paste_selection(tty);
                         break;
                 case TIOCL_UNBLANKSCREEN:
-                        acquire_console_sem();
+                        console_lock();
                         unblank_screen();
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_SELLOADLUT:
                         ret = sel_loadlut(p);
@@ -2688,10 +2688,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         }
                         break;
                 case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */
-                        acquire_console_sem();
+                        console_lock();
                         ignore_poke = 1;
                         do_blank_screen(0);
-                        release_console_sem();
+                        console_unlock();
                         break;
                 case TIOCL_BLANKEDSCREEN:
                         ret = console_blanked;
@@ -2790,11 +2790,11 @@ static void con_flush_chars(struct tty_struct *tty)
                 return;
 
         /* if we race with con_close(), vt may be null */
-        acquire_console_sem();
+        console_lock();
         vc = tty->driver_data;
         if (vc)
                 set_cursor(vc);
-        release_console_sem();
+        console_unlock();
 }
 
 /*
@@ -2805,7 +2805,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
         unsigned int currcons = tty->index;
         int ret = 0;
 
-        acquire_console_sem();
+        console_lock();
         if (tty->driver_data == NULL) {
                 ret = vc_allocate(currcons);
                 if (ret == 0) {
@@ -2813,7 +2813,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
 
                         /* Still being freed */
                         if (vc->port.tty) {
-                                release_console_sem();
+                                console_unlock();
                                 return -ERESTARTSYS;
                         }
                         tty->driver_data = vc;
@@ -2827,11 +2827,11 @@ static int con_open(struct tty_struct *tty, struct file *filp)
                                 tty->termios->c_iflag |= IUTF8;
                         else
                                 tty->termios->c_iflag &= ~IUTF8;
-                        release_console_sem();
+                        console_unlock();
                         return ret;
                 }
         }
-        release_console_sem();
+        console_unlock();
         return ret;
 }
 
@@ -2844,9 +2844,9 @@ static void con_shutdown(struct tty_struct *tty)
 {
         struct vc_data *vc = tty->driver_data;
         BUG_ON(vc == NULL);
-        acquire_console_sem();
+        console_lock();
         vc->port.tty = NULL;
-        release_console_sem();
+        console_unlock();
         tty_shutdown(tty);
 }
 
@@ -2893,13 +2893,13 @@ static int __init con_init(void)
         struct vc_data *vc;
         unsigned int currcons = 0, i;
 
-        acquire_console_sem();
+        console_lock();
 
         if (conswitchp)
                 display_desc = conswitchp->con_startup();
         if (!display_desc) {
                 fg_console = 0;
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -2946,7 +2946,7 @@ static int __init con_init(void)
         printable = 1;
         printk("\n");
 
-        release_console_sem();
+        console_unlock();
 
 #ifdef CONFIG_VT_CONSOLE
         register_console(&vt_console_driver);
@@ -2994,7 +2994,7 @@ int __init vty_init(const struct file_operations *console_fops)
         if (IS_ERR(tty0dev))
                 tty0dev = NULL;
         else
-                device_create_file(tty0dev, &dev_attr_active);
+                WARN_ON(device_create_file(tty0dev, &dev_attr_active) < 0);
 
         vcs_init();
 
@@ -3037,7 +3037,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* check if driver is registered */
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
@@ -3122,7 +3122,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 
         retval = 0;
 err:
-        release_console_sem();
+        console_unlock();
         module_put(owner);
         return retval;
 };
@@ -3171,7 +3171,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* check if driver is registered and if it is unbindable */
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
@@ -3185,7 +3185,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         }
 
         if (retval) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
@@ -3204,12 +3204,12 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         }
 
         if (retval) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
         if (!con_is_bound(csw)) {
-                release_console_sem();
+                console_unlock();
                 goto err;
         }
 
@@ -3238,7 +3238,7 @@ int unbind_con_driver(const struct consw *csw, int first, int last, int deflt)
         if (!con_is_bound(csw))
                 con_driver->flag &= ~CON_DRIVER_FLAG_INIT;
 
-        release_console_sem();
+        console_unlock();
         /* ignore return value, binding should not fail */
         bind_con_driver(defcsw, first, last, deflt);
 err:
@@ -3538,14 +3538,14 @@ int register_con_driver(const struct consw *csw, int first, int last)
         if (!try_module_get(owner))
                 return -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
                 con_driver = &registered_con_driver[i];
 
                 /* already registered */
                 if (con_driver->con == csw)
-                        retval = -EINVAL;
+                        retval = -EBUSY;
         }
 
         if (retval)
@@ -3592,7 +3592,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
         }
 
 err:
-        release_console_sem();
+        console_unlock();
         module_put(owner);
         return retval;
 }
@@ -3613,7 +3613,7 @@ int unregister_con_driver(const struct consw *csw)
 {
         int i, retval = -ENODEV;
 
-        acquire_console_sem();
+        console_lock();
 
         /* cannot unregister a bound driver */
         if (con_is_bound(csw))
@@ -3639,7 +3639,7 @@ int unregister_con_driver(const struct consw *csw)
                 }
         }
 err:
-        release_console_sem();
+        console_unlock();
         return retval;
 }
 EXPORT_SYMBOL(unregister_con_driver);
@@ -3656,7 +3656,12 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)
         int err;
 
         err = register_con_driver(csw, first, last);
-
+        /* if we get an busy error we still want to bind the console driver
+         * and return success, as we may have unbound the console driver
+         * but not unregistered it.
+        */
+        if (err == -EBUSY)
+                err = 0;
         if (!err)
                 bind_con_driver(csw, first, last, deflt);
 
@@ -3934,9 +3939,9 @@ int con_set_cmap(unsigned char __user *arg)
 {
         int rc;
 
-        acquire_console_sem();
+        console_lock();
         rc = set_get_cmap (arg,1);
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
@@ -3945,9 +3950,9 @@ int con_get_cmap(unsigned char __user *arg)
 {
         int rc;
 
-        acquire_console_sem();
+        console_lock();
         rc = set_get_cmap (arg,0);
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
@@ -3994,12 +3999,12 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
         } else
                 font.data = NULL;
 
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_get)
                 rc = vc->vc_sw->con_font_get(vc, &font);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
 
         if (rc)
                 goto out;
@@ -4076,12 +4081,12 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
         font.data = memdup_user(op->data, size);
         if (IS_ERR(font.data))
                 return PTR_ERR(font.data);
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_set)
                 rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
         kfree(font.data);
         return rc;
 }
@@ -4103,12 +4108,12 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
         else
                 name[MAX_FONT_NAME - 1] = 0;
 
-        acquire_console_sem();
+        console_lock();
         if (vc->vc_sw->con_font_default)
                 rc = vc->vc_sw->con_font_default(vc, &font, s);
         else
                 rc = -ENOSYS;
-        release_console_sem();
+        console_unlock();
         if (!rc) {
                 op->width = font.width;
                 op->height = font.height;
@@ -4124,7 +4129,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
         if (vc->vc_mode != KD_TEXT)
                 return -EINVAL;
 
-        acquire_console_sem();
+        console_lock();
         if (!vc->vc_sw->con_font_copy)
                 rc = -ENOSYS;
         else if (con < 0 || !vc_cons_allocated(con))
@@ -4133,7 +4138,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
                 rc = 0;
         else
                 rc = vc->vc_sw->con_font_copy(vc, con);
-        release_console_sem();
+        console_unlock();
         return rc;
 }
 
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 6b68a0fb4611..1235ebda6e1c 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -649,12 +649,12 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 /*
                  * explicitly blank/unblank the screen if switching modes
                  */
-                acquire_console_sem();
+                console_lock();
                 if (arg == KD_TEXT)
                         do_unblank_screen(1);
                 else
                         do_blank_screen(1);
-                release_console_sem();
+                console_unlock();
                 break;
 
         case KDGETMODE:
@@ -893,7 +893,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret = -EINVAL;
                         goto out;
                 }
-                acquire_console_sem();
+                console_lock();
                 vc->vt_mode = tmp;
                 /* the frsig is ignored, so we set it to 0 */
                 vc->vt_mode.frsig = 0;
@@ -901,7 +901,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 vc->vt_pid = get_pid(task_pid(current));
                 /* no switch is required -- saw@shade.msu.ru */
                 vc->vt_newvt = -1;
-                release_console_sem();
+                console_unlock();
                 break;
         }
 
@@ -910,9 +910,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 struct vt_mode tmp;
                 int rc;
 
-                acquire_console_sem();
+                console_lock();
                 memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode));
-                release_console_sem();
+                console_unlock();
 
                 rc = copy_to_user(up, &tmp, sizeof(struct vt_mode));
                 if (rc)
@@ -965,9 +965,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret =  -ENXIO;
                 else {
                         arg--;
-                        acquire_console_sem();
+                        console_lock();
                         ret = vc_allocate(arg);
-                        release_console_sem();
+                        console_unlock();
                         if (ret)
                                 break;
                         set_console(arg);
@@ -990,7 +990,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         ret = -ENXIO;
                 else {
                         vsa.console--;
-                        acquire_console_sem();
+                        console_lock();
                         ret = vc_allocate(vsa.console);
                         if (ret == 0) {
                                 struct vc_data *nvc;
@@ -1003,7 +1003,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                 put_pid(nvc->vt_pid);
                                 nvc->vt_pid = get_pid(task_pid(current));
                         }
-                        release_console_sem();
+                        console_unlock();
                         if (ret)
                                 break;
                         /* Commence switch and lock */
@@ -1044,7 +1044,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 /*
                  * Switching-from response
                  */
-                acquire_console_sem();
+                console_lock();
                 if (vc->vt_newvt >= 0) {
                         if (arg == 0)
                                 /*
@@ -1063,7 +1063,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                 vc->vt_newvt = -1;
                                 ret = vc_allocate(newvt);
                                 if (ret) {
-                                        release_console_sem();
+                                        console_unlock();
                                         break;
                                 }
                                 /*
@@ -1083,7 +1083,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                         if (arg != VT_ACKACQ)
                                 ret = -EINVAL;
                 }
-                release_console_sem();
+                console_unlock();
                 break;
 
          /*
@@ -1096,20 +1096,20 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 }
                 if (arg == 0) {
                     /* deallocate all unused consoles, but leave 0 */
-                        acquire_console_sem();
+                        console_lock();
                         for (i=1; i<MAX_NR_CONSOLES; i++)
                                 if (! VT_BUSY(i))
                                         vc_deallocate(i);
-                        release_console_sem();
+                        console_unlock();
                 } else {
                         /* deallocate a single console, if possible */
                         arg--;
                         if (VT_BUSY(arg))
                                 ret = -EBUSY;
                         else if (arg) {                       /* leave 0 */
-                                acquire_console_sem();
+                                console_lock();
                                 vc_deallocate(arg);
-                                release_console_sem();
+                                console_unlock();
                         }
                 }
                 break;
@@ -1126,7 +1126,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                     get_user(cc, &vtsizes->v_cols))
                         ret = -EFAULT;
                 else {
-                        acquire_console_sem();
+                        console_lock();
                         for (i = 0; i < MAX_NR_CONSOLES; i++) {
                                 vc = vc_cons[i].d;
 
@@ -1135,7 +1135,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                                         vc_resize(vc_cons[i].d, cc, ll);
                                 }
                         }
-                        release_console_sem();
+                        console_unlock();
                 }
                 break;
         }
@@ -1187,14 +1187,14 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 for (i = 0; i < MAX_NR_CONSOLES; i++) {
                         if (!vc_cons[i].d)
                                 continue;
-                        acquire_console_sem();
+                        console_lock();
                         if (vlin)
                                 vc_cons[i].d->vc_scan_lines = vlin;
                         if (clin)
                                 vc_cons[i].d->vc_font.height = clin;
                         vc_cons[i].d->vc_resize_user = 1;
                         vc_resize(vc_cons[i].d, cc, ll);
-                        release_console_sem();
+                        console_unlock();
                 }
                 break;
         }
@@ -1367,7 +1367,7 @@ void vc_SAK(struct work_struct *work)
         struct vc_data *vc;
         struct tty_struct *tty;
 
-        acquire_console_sem();
+        console_lock();
         vc = vc_con->d;
         if (vc) {
                 tty = vc->port.tty;
@@ -1379,7 +1379,7 @@ void vc_SAK(struct work_struct *work)
                         __do_SAK(tty);
                 reset_vc(vc);
         }
-        release_console_sem();
+        console_unlock();
 }
 
 #ifdef CONFIG_COMPAT
@@ -1737,10 +1737,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
 {
         int prev;
 
-        acquire_console_sem();
+        console_lock();
         /* Graphics mode - up to X */
         if (disable_vt_switch) {
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
         prev = fg_console;
@@ -1748,7 +1748,7 @@ int vt_move_to_console(unsigned int vt, int alloc)
         if (alloc && vc_allocate(vt)) {
                 /* we can't have a free VC for now. Too bad,
                  * we don't want to mess the screen for now. */
-                release_console_sem();
+                console_unlock();
                 return -ENOSPC;
         }
 
@@ -1758,10 +1758,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
                  * Let the calling function know so it can decide
                  * what to do.
                  */
-                release_console_sem();
+                console_unlock();
                 return -EIO;
         }
-        release_console_sem();
+        console_unlock();
         tty_lock();
         if (vt_waitactive(vt + 1)) {
                 pr_debug("Suspend: Can't switch VCs.");
@@ -1781,8 +1781,8 @@ int vt_move_to_console(unsigned int vt, int alloc)
  */
 void pm_set_vt_switch(int do_switch)
 {
-        acquire_console_sem();
+        console_lock();
         disable_vt_switch = !do_switch;
-        release_console_sem();
+        console_unlock();
 }
 EXPORT_SYMBOL(pm_set_vt_switch);
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index d6ede989ff22..4ab49d4eebf4 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1607,6 +1607,7 @@ static const struct usb_device_id acm_ids[] = {
         { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */
         { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */
         { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */
+        { NOKIA_PCSUITE_ACM_INFO(0x0302), }, /* Nokia N8 */
         { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
 
         /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 6ee4451bfe2d..47085e5879ab 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -342,7 +342,7 @@ static ssize_t wdm_write
                 goto outnp;
         }
 
-        if (!file->f_flags && O_NONBLOCK)
+        if (!(file->f_flags & O_NONBLOCK))
                 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
                                                                 &desc->flags));
         else
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index bcc24779ba0e..18d02e32a3d5 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -123,9 +123,9 @@ config USB_OTG
 
 config USB_OTG_WHITELIST
         bool "Rely on OTG Targeted Peripherals List"
-        depends on USB_OTG || EMBEDDED
+        depends on USB_OTG || EXPERT
         default y if USB_OTG
-        default n if EMBEDDED
+        default n if EXPERT
         help
           If you say Y here, the "otg_whitelist.h" file will be used as a
           product whitelist, so USB peripherals not listed there will be
@@ -141,7 +141,7 @@ config USB_OTG_WHITELIST
 
 config USB_OTG_BLACKLIST_HUB
         bool "Disable external hubs"
-        depends on USB_OTG || EMBEDDED
+        depends on USB_OTG || EXPERT
         help
           If you say Y here, then Linux will refuse to enumerate
           external hubs.  OTG hosts are allowed to reduce hardware
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 9da250563027..df502a98d0df 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -192,12 +192,12 @@ int usb_create_ep_devs(struct device *parent,
         ep_dev->dev.parent = parent;
         ep_dev->dev.release = ep_device_release;
         dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress);
-        device_enable_async_suspend(&ep_dev->dev);
 
         retval = device_register(&ep_dev->dev);
         if (retval)
                 goto error_register;
 
+        device_enable_async_suspend(&ep_dev->dev);
         endpoint->ep_dev = ep_dev;
         return retval;
 
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index b55d46070a25..f71e8e307e0f 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -405,7 +405,12 @@ static int suspend_common(struct device *dev, bool do_wakeup)
                         return retval;
         }
 
-        synchronize_irq(pci_dev->irq);
+        /* If MSI-X is enabled, the driver will have synchronized all vectors
+         * in pci_suspend(). If MSI or legacy PCI is enabled, that will be
+         * synchronized here.
+         */
+        if (!hcd->msix_enabled)
+                synchronize_irq(pci_dev->irq);
 
         /* Downstream ports from this root hub should already be quiesced, so
          * there will be no DMA activity.  Now we can shut down the upstream
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 6a95017fa62b..e935f71d7a34 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1955,7 +1955,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
 
         dev_dbg(&rhdev->dev, "usb %s%s\n",
                         (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
-        clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
         if (!hcd->driver->bus_resume)
                 return -ENOENT;
         if (hcd->state == HC_STATE_RUNNING)
@@ -1963,6 +1962,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)
 
         hcd->state = HC_STATE_RESUMING;
         status = hcd->driver->bus_resume(hcd);
+        clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
         if (status == 0) {
                 /* TRSMRCY = 10 msec */
                 msleep(10);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index b98efae6a1cf..d041c6826e43 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -676,6 +676,8 @@ static void hub_init_func3(struct work_struct *ws);
 static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 {
         struct usb_device *hdev = hub->hdev;
+        struct usb_hcd *hcd;
+        int ret;
         int port1;
         int status;
         bool need_debounce_delay = false;
@@ -714,6 +716,25 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                         usb_autopm_get_interface_no_resume(
                                         to_usb_interface(hub->intfdev));
                         return;         /* Continues at init2: below */
+                } else if (type == HUB_RESET_RESUME) {
+                        /* The internal host controller state for the hub device
+                         * may be gone after a host power loss on system resume.
+                         * Update the device's info so the HW knows it's a hub.
+                         */
+                        hcd = bus_to_hcd(hdev->bus);
+                        if (hcd->driver->update_hub_device) {
+                                ret = hcd->driver->update_hub_device(hcd, hdev,
+                                                &hub->tt, GFP_NOIO);
+                                if (ret < 0) {
+                                        dev_err(hub->intfdev, "Host not "
+                                                        "accepting hub info "
+                                                        "update.\n");
+                                        dev_err(hub->intfdev, "LS/FS devices "
+                                                        "and hubs may not work "
+                                                        "under this hub\n.");
+                                }
+                        }
+                        hub_power_on(hub, true);
                 } else {
                         hub_power_on(hub, true);
                 }
@@ -2732,6 +2753,11 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
                 udev->ttport = hdev->ttport;
         } else if (udev->speed != USB_SPEED_HIGH
                         && hdev->speed == USB_SPEED_HIGH) {
+                if (!hub->tt.hub) {
+                        dev_err(&udev->dev, "parent hub has no TT\n");
+                        retval = -EINVAL;
+                        goto fail;
+                }
                 udev->tt = &hub->tt;
                 udev->ttport = port1;
         }
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 1dc9739277b4..d50099675f28 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -509,7 +509,7 @@ config USB_LANGWELL
         select USB_GADGET_SELECTED
 
 config USB_GADGET_EG20T
-        boolean "Intel EG20T(Topcliff) USB Device controller"
+        boolean "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH UDC"
         depends on PCI
         select USB_GADGET_DUALSPEED
         help
@@ -525,6 +525,11 @@ config USB_GADGET_EG20T
           This driver dose not support interrupt transfer or isochronous
           transfer modes.
 
+          This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is
+          for IVI(In-Vehicle Infotainment) use.
+          ML7213 is companion chip for Intel Atom E6xx series.
+          ML7213 is completely compatible for Intel EG20T PCH.
+
 config USB_EG20T
         tristate
         depends on USB_GADGET_EG20T
@@ -541,6 +546,8 @@ config USB_GADGET_CI13XXX_MSM
           ci13xxx_udc core.
           This driver depends on OTG driver for PHY initialization,
           clock management, powering up VBUS, and power management.
+          This driver is not supported on boards like trout which
+          has an external PHY.
 
           Say "y" to link the driver statically, or "m" to build a
           dynamically linked module called "ci13xxx_msm" and force all
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 31656a2b4ab4..a1c67ae1572a 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -76,10 +76,21 @@ static DEFINE_SPINLOCK(udc_lock);
 
 /* control endpoint description */
 static const struct usb_endpoint_descriptor
-ctrl_endpt_desc = {
+ctrl_endpt_out_desc = {
         .bLength         = USB_DT_ENDPOINT_SIZE,
         .bDescriptorType = USB_DT_ENDPOINT,
 
+        .bEndpointAddress = USB_DIR_OUT,
+        .bmAttributes    = USB_ENDPOINT_XFER_CONTROL,
+        .wMaxPacketSize  = cpu_to_le16(CTRL_PAYLOAD_MAX),
+};
+
+static const struct usb_endpoint_descriptor
+ctrl_endpt_in_desc = {
+        .bLength         = USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType = USB_DT_ENDPOINT,
+
+        .bEndpointAddress = USB_DIR_IN,
         .bmAttributes    = USB_ENDPOINT_XFER_CONTROL,
         .wMaxPacketSize  = cpu_to_le16(CTRL_PAYLOAD_MAX),
 };
@@ -265,10 +276,10 @@ static int hw_device_init(void __iomem *base)
         hw_bank.size /= sizeof(u32);
 
         reg = hw_aread(ABS_DCCPARAMS, DCCPARAMS_DEN) >> ffs_nr(DCCPARAMS_DEN);
-        if (reg == 0 || reg > ENDPT_MAX)
-                return -ENODEV;
+        hw_ep_max = reg * 2;   /* cache hw ENDPT_MAX */
 
-        hw_ep_max = reg;   /* cache hw ENDPT_MAX */
+        if (hw_ep_max == 0 || hw_ep_max > ENDPT_MAX)
+                return -ENODEV;
 
         /* setup lock mode ? */
 
@@ -1197,16 +1208,17 @@ static ssize_t show_qheads(struct device *dev, struct device_attribute *attr,
         }
 
         spin_lock_irqsave(udc->lock, flags);
-        for (i = 0; i < hw_ep_max; i++) {
-                struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
+        for (i = 0; i < hw_ep_max/2; i++) {
+                struct ci13xxx_ep *mEpRx = &udc->ci13xxx_ep[i];
+                struct ci13xxx_ep *mEpTx = &udc->ci13xxx_ep[i + hw_ep_max/2];
                 n += scnprintf(buf + n, PAGE_SIZE - n,
                                "EP=%02i: RX=%08X TX=%08X\n",
-                               i, (u32)mEp->qh[RX].dma, (u32)mEp->qh[TX].dma);
+                               i, (u32)mEpRx->qh.dma, (u32)mEpTx->qh.dma);
                 for (j = 0; j < (sizeof(struct ci13xxx_qh)/sizeof(u32)); j++) {
                         n += scnprintf(buf + n, PAGE_SIZE - n,
                                        " %04X:    %08X    %08X\n", j,
-                                       *((u32 *)mEp->qh[RX].ptr + j),
-                                       *((u32 *)mEp->qh[TX].ptr + j));
+                                       *((u32 *)mEpRx->qh.ptr + j),
+                                       *((u32 *)mEpTx->qh.ptr + j));
                 }
         }
         spin_unlock_irqrestore(udc->lock, flags);
@@ -1293,7 +1305,7 @@ static ssize_t show_requests(struct device *dev, struct device_attribute *attr,
         unsigned long flags;
         struct list_head   *ptr = NULL;
         struct ci13xxx_req *req = NULL;
-        unsigned i, j, k, n = 0, qSize = sizeof(struct ci13xxx_td)/sizeof(u32);
+        unsigned i, j, n = 0, qSize = sizeof(struct ci13xxx_td)/sizeof(u32);
 
         dbg_trace("[%s] %p\n", __func__, buf);
         if (attr == NULL || buf == NULL) {
@@ -1303,22 +1315,20 @@ static ssize_t show_requests(struct device *dev, struct device_attribute *attr,
 
         spin_lock_irqsave(udc->lock, flags);
         for (i = 0; i < hw_ep_max; i++)
-                for (k = RX; k <= TX; k++)
-                        list_for_each(ptr, &udc->ci13xxx_ep[i].qh[k].queue)
-                        {
-                                req = list_entry(ptr,
-                                                 struct ci13xxx_req, queue);
+                list_for_each(ptr, &udc->ci13xxx_ep[i].qh.queue)
+                {
+                        req = list_entry(ptr, struct ci13xxx_req, queue);
+
+                        n += scnprintf(buf + n, PAGE_SIZE - n,
+                                        "EP=%02i: TD=%08X %s\n",
+                                        i % hw_ep_max/2, (u32)req->dma,
+                                        ((i < hw_ep_max/2) ? "RX" : "TX"));
 
+                        for (j = 0; j < qSize; j++)
                                 n += scnprintf(buf + n, PAGE_SIZE - n,
-                                               "EP=%02i: TD=%08X %s\n",
-                                               i, (u32)req->dma,
-                                               ((k == RX) ? "RX" : "TX"));
-
-                                for (j = 0; j < qSize; j++)
-                                        n += scnprintf(buf + n, PAGE_SIZE - n,
-                                                       " %04X:    %08X\n", j,
-                                                       *((u32 *)req->ptr + j));
-                        }
+                                                " %04X:    %08X\n", j,
+                                                *((u32 *)req->ptr + j));
+                }
         spin_unlock_irqrestore(udc->lock, flags);
 
         return n;
@@ -1467,12 +1477,12 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)
          *  At this point it's guaranteed exclusive access to qhead
          *  (endpt is not primed) so it's no need to use tripwire
          */
-        mEp->qh[mEp->dir].ptr->td.next   = mReq->dma;    /* TERMINATE = 0 */
-        mEp->qh[mEp->dir].ptr->td.token &= ~TD_STATUS;   /* clear status */
+        mEp->qh.ptr->td.next   = mReq->dma;    /* TERMINATE = 0 */
+        mEp->qh.ptr->td.token &= ~TD_STATUS;   /* clear status */
         if (mReq->req.zero == 0)
-                mEp->qh[mEp->dir].ptr->cap |=  QH_ZLT;
+                mEp->qh.ptr->cap |=  QH_ZLT;
         else
-                mEp->qh[mEp->dir].ptr->cap &= ~QH_ZLT;
+                mEp->qh.ptr->cap &= ~QH_ZLT;
 
         wmb();   /* synchronize before ep prime */
 
@@ -1542,11 +1552,11 @@ __acquires(mEp->lock)
 
         hw_ep_flush(mEp->num, mEp->dir);
 
-        while (!list_empty(&mEp->qh[mEp->dir].queue)) {
+        while (!list_empty(&mEp->qh.queue)) {
 
                 /* pop oldest request */
                 struct ci13xxx_req *mReq = \
-                        list_entry(mEp->qh[mEp->dir].queue.next,
+                        list_entry(mEp->qh.queue.next,
                                    struct ci13xxx_req, queue);
                 list_del_init(&mReq->queue);
                 mReq->req.status = -ESHUTDOWN;
@@ -1571,8 +1581,6 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)
 {
         struct usb_ep *ep;
         struct ci13xxx    *udc = container_of(gadget, struct ci13xxx, gadget);
-        struct ci13xxx_ep *mEp = container_of(gadget->ep0,
-                                              struct ci13xxx_ep, ep);
 
         trace("%p", gadget);
 
@@ -1583,7 +1591,8 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)
         gadget_for_each_ep(ep, gadget) {
                 usb_ep_fifo_flush(ep);
         }
-        usb_ep_fifo_flush(gadget->ep0);
+        usb_ep_fifo_flush(&udc->ep0out.ep);
+        usb_ep_fifo_flush(&udc->ep0in.ep);
 
         udc->driver->disconnect(gadget);
 
@@ -1591,11 +1600,12 @@ static int _gadget_stop_activity(struct usb_gadget *gadget)
         gadget_for_each_ep(ep, gadget) {
                 usb_ep_disable(ep);
         }
-        usb_ep_disable(gadget->ep0);
+        usb_ep_disable(&udc->ep0out.ep);
+        usb_ep_disable(&udc->ep0in.ep);
 
-        if (mEp->status != NULL) {
-                usb_ep_free_request(gadget->ep0, mEp->status);
-                mEp->status = NULL;
+        if (udc->status != NULL) {
+                usb_ep_free_request(&udc->ep0in.ep, udc->status);
+                udc->status = NULL;
         }
 
         return 0;
@@ -1614,7 +1624,6 @@ static void isr_reset_handler(struct ci13xxx *udc)
 __releases(udc->lock)
 __acquires(udc->lock)
 {
-        struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[0];
         int retval;
 
         trace("%p", udc);
@@ -1635,11 +1644,15 @@ __acquires(udc->lock)
         if (retval)
                 goto done;
 
-        retval = usb_ep_enable(&mEp->ep, &ctrl_endpt_desc);
+        retval = usb_ep_enable(&udc->ep0out.ep, &ctrl_endpt_out_desc);
+        if (retval)
+                goto done;
+
+        retval = usb_ep_enable(&udc->ep0in.ep, &ctrl_endpt_in_desc);
         if (!retval) {
-                mEp->status = usb_ep_alloc_request(&mEp->ep, GFP_ATOMIC);
-                if (mEp->status == NULL) {
-                        usb_ep_disable(&mEp->ep);
+                udc->status = usb_ep_alloc_request(&udc->ep0in.ep, GFP_ATOMIC);
+                if (udc->status == NULL) {
+                        usb_ep_disable(&udc->ep0out.ep);
                         retval = -ENOMEM;
                 }
         }
@@ -1672,16 +1685,17 @@ static void isr_get_status_complete(struct usb_ep *ep, struct usb_request *req)
 
 /**
  * isr_get_status_response: get_status request response
- * @ep:    endpoint
+ * @udc: udc struct
  * @setup: setup request packet
  *
  * This function returns an error code
  */
-static int isr_get_status_response(struct ci13xxx_ep *mEp,
+static int isr_get_status_response(struct ci13xxx *udc,
                                    struct usb_ctrlrequest *setup)
 __releases(mEp->lock)
 __acquires(mEp->lock)
 {
+        struct ci13xxx_ep *mEp = &udc->ep0in;
         struct usb_request *req = NULL;
         gfp_t gfp_flags = GFP_ATOMIC;
         int dir, num, retval;
@@ -1736,27 +1750,23 @@ __acquires(mEp->lock)
 
 /**
  * isr_setup_status_phase: queues the status phase of a setup transation
- * @mEp: endpoint
+ * @udc: udc struct
  *
  * This function returns an error code
  */
-static int isr_setup_status_phase(struct ci13xxx_ep *mEp)
+static int isr_setup_status_phase(struct ci13xxx *udc)
 __releases(mEp->lock)
 __acquires(mEp->lock)
 {
         int retval;
+        struct ci13xxx_ep *mEp;
 
-        trace("%p", mEp);
-
-        /* mEp is always valid & configured */
-
-        if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
-                mEp->dir = (mEp->dir == TX) ? RX : TX;
+        trace("%p", udc);
 
-        mEp->status->no_interrupt = 1;
+        mEp = (udc->ep0_dir == TX) ? &udc->ep0out : &udc->ep0in;
 
         spin_unlock(mEp->lock);
-        retval = usb_ep_queue(&mEp->ep, mEp->status, GFP_ATOMIC);
+        retval = usb_ep_queue(&mEp->ep, udc->status, GFP_ATOMIC);
         spin_lock(mEp->lock);
 
         return retval;
@@ -1778,11 +1788,11 @@ __acquires(mEp->lock)
 
         trace("%p", mEp);
 
-        if (list_empty(&mEp->qh[mEp->dir].queue))
+        if (list_empty(&mEp->qh.queue))
                 return -EINVAL;
 
         /* pop oldest request */
-        mReq = list_entry(mEp->qh[mEp->dir].queue.next,
+        mReq = list_entry(mEp->qh.queue.next,
                           struct ci13xxx_req, queue);
         list_del_init(&mReq->queue);
 
@@ -1794,10 +1804,10 @@ __acquires(mEp->lock)
 
         dbg_done(_usb_addr(mEp), mReq->ptr->token, retval);
 
-        if (!list_empty(&mEp->qh[mEp->dir].queue)) {
+        if (!list_empty(&mEp->qh.queue)) {
                 struct ci13xxx_req* mReqEnq;
 
-                mReqEnq = list_entry(mEp->qh[mEp->dir].queue.next,
+                mReqEnq = list_entry(mEp->qh.queue.next,
                                   struct ci13xxx_req, queue);
                 _hardware_enqueue(mEp, mReqEnq);
         }
@@ -1836,16 +1846,14 @@ __acquires(udc->lock)
                 int type, num, err = -EINVAL;
                 struct usb_ctrlrequest req;
 
-
                 if (mEp->desc == NULL)
                         continue;   /* not configured */
 
-                if ((mEp->dir == RX && hw_test_and_clear_complete(i)) ||
-                    (mEp->dir == TX && hw_test_and_clear_complete(i + 16))) {
+                if (hw_test_and_clear_complete(i)) {
                         err = isr_tr_complete_low(mEp);
                         if (mEp->type == USB_ENDPOINT_XFER_CONTROL) {
                                 if (err > 0)   /* needs status phase */
-                                        err = isr_setup_status_phase(mEp);
+                                        err = isr_setup_status_phase(udc);
                                 if (err < 0) {
                                         dbg_event(_usb_addr(mEp),
                                                   "ERROR", err);
@@ -1866,15 +1874,22 @@ __acquires(udc->lock)
                         continue;
                 }
 
+                /*
+                 * Flush data and handshake transactions of previous
+                 * setup packet.
+                 */
+                _ep_nuke(&udc->ep0out);
+                _ep_nuke(&udc->ep0in);
+
                 /* read_setup_packet */
                 do {
                         hw_test_and_set_setup_guard();
-                        memcpy(&req, &mEp->qh[RX].ptr->setup, sizeof(req));
+                        memcpy(&req, &mEp->qh.ptr->setup, sizeof(req));
                 } while (!hw_test_and_clear_setup_guard());
 
                 type = req.bRequestType;
 
-                mEp->dir = (type & USB_DIR_IN) ? TX : RX;
+                udc->ep0_dir = (type & USB_DIR_IN) ? TX : RX;
 
                 dbg_setup(_usb_addr(mEp), &req);
 
@@ -1895,7 +1910,7 @@ __acquires(udc->lock)
                                 if (err)
                                         break;
                         }
-                        err = isr_setup_status_phase(mEp);
+                        err = isr_setup_status_phase(udc);
                         break;
                 case USB_REQ_GET_STATUS:
                         if (type != (USB_DIR_IN|USB_RECIP_DEVICE)   &&
@@ -1905,7 +1920,7 @@ __acquires(udc->lock)
                         if (le16_to_cpu(req.wLength) != 2 ||
                             le16_to_cpu(req.wValue)  != 0)
                                 break;
-                        err = isr_get_status_response(mEp, &req);
+                        err = isr_get_status_response(udc, &req);
                         break;
                 case USB_REQ_SET_ADDRESS:
                         if (type != (USB_DIR_OUT|USB_RECIP_DEVICE))
@@ -1916,7 +1931,7 @@ __acquires(udc->lock)
                         err = hw_usb_set_address((u8)le16_to_cpu(req.wValue));
                         if (err)
                                 break;
-                        err = isr_setup_status_phase(mEp);
+                        err = isr_setup_status_phase(udc);
                         break;
                 case USB_REQ_SET_FEATURE:
                         if (type != (USB_DIR_OUT|USB_RECIP_ENDPOINT) &&
@@ -1932,12 +1947,12 @@ __acquires(udc->lock)
                         spin_lock(udc->lock);
                         if (err)
                                 break;
-                        err = isr_setup_status_phase(mEp);
+                        err = isr_setup_status_phase(udc);
                         break;
                 default:
 delegate:
                         if (req.wLength == 0)   /* no data phase */
-                                mEp->dir = TX;
+                                udc->ep0_dir = TX;
 
                         spin_unlock(udc->lock);
                         err = udc->driver->setup(&udc->gadget, &req);
@@ -1968,7 +1983,7 @@ static int ep_enable(struct usb_ep *ep,
                      const struct usb_endpoint_descriptor *desc)
 {
         struct ci13xxx_ep *mEp = container_of(ep, struct ci13xxx_ep, ep);
-        int direction, retval = 0;
+        int retval = 0;
         unsigned long flags;
 
         trace("%p, %p", ep, desc);
@@ -1982,7 +1997,7 @@ static int ep_enable(struct usb_ep *ep,
 
         mEp->desc = desc;
 
-        if (!list_empty(&mEp->qh[mEp->dir].queue))
+        if (!list_empty(&mEp->qh.queue))
                 warn("enabling a non-empty endpoint!");
 
         mEp->dir  = usb_endpoint_dir_in(desc) ? TX : RX;
@@ -1991,29 +2006,22 @@ static int ep_enable(struct usb_ep *ep,
 
         mEp->ep.maxpacket = __constant_le16_to_cpu(desc->wMaxPacketSize);
 
-        direction = mEp->dir;
-        do {
-                dbg_event(_usb_addr(mEp), "ENABLE", 0);
+        dbg_event(_usb_addr(mEp), "ENABLE", 0);
 
-                mEp->qh[mEp->dir].ptr->cap = 0;
+        mEp->qh.ptr->cap = 0;
 
-                if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
-                        mEp->qh[mEp->dir].ptr->cap |=  QH_IOS;
-                else if (mEp->type == USB_ENDPOINT_XFER_ISOC)
-                        mEp->qh[mEp->dir].ptr->cap &= ~QH_MULT;
-                else
-                        mEp->qh[mEp->dir].ptr->cap &= ~QH_ZLT;
-
-                mEp->qh[mEp->dir].ptr->cap |=
-                        (mEp->ep.maxpacket << ffs_nr(QH_MAX_PKT)) & QH_MAX_PKT;
-                mEp->qh[mEp->dir].ptr->td.next |= TD_TERMINATE;   /* needed? */
-
-                retval |= hw_ep_enable(mEp->num, mEp->dir, mEp->type);
+        if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
+                mEp->qh.ptr->cap |=  QH_IOS;
+        else if (mEp->type == USB_ENDPOINT_XFER_ISOC)
+                mEp->qh.ptr->cap &= ~QH_MULT;
+        else
+                mEp->qh.ptr->cap &= ~QH_ZLT;
 
-                if (mEp->type == USB_ENDPOINT_XFER_CONTROL)
-                        mEp->dir = (mEp->dir == TX) ? RX : TX;
+        mEp->qh.ptr->cap |=
+                (mEp->ep.maxpacket << ffs_nr(QH_MAX_PKT)) & QH_MAX_PKT;
+        mEp->qh.ptr->td.next |= TD_TERMINATE;   /* needed? */
 
-        } while (mEp->dir != direction);
+        retval |= hw_ep_enable(mEp->num, mEp->dir, mEp->type);
 
         spin_unlock_irqrestore(mEp->lock, flags);
         return retval;
@@ -2146,7 +2154,7 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req,
         spin_lock_irqsave(mEp->lock, flags);
 
         if (mEp->type == USB_ENDPOINT_XFER_CONTROL &&
-            !list_empty(&mEp->qh[mEp->dir].queue)) {
+            !list_empty(&mEp->qh.queue)) {
                 _ep_nuke(mEp);
                 retval = -EOVERFLOW;
                 warn("endpoint ctrl %X nuked", _usb_addr(mEp));
@@ -2170,9 +2178,9 @@ static int ep_queue(struct usb_ep *ep, struct usb_request *req,
         /* push request */
         mReq->req.status = -EINPROGRESS;
         mReq->req.actual = 0;
-        list_add_tail(&mReq->queue, &mEp->qh[mEp->dir].queue);
+        list_add_tail(&mReq->queue, &mEp->qh.queue);
 
-        if (list_is_singular(&mEp->qh[mEp->dir].queue))
+        if (list_is_singular(&mEp->qh.queue))
                 retval = _hardware_enqueue(mEp, mReq);
 
         if (retval == -EALREADY) {
@@ -2199,7 +2207,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req)
         trace("%p, %p", ep, req);
 
         if (ep == NULL || req == NULL || mEp->desc == NULL ||
-            list_empty(&mReq->queue)  || list_empty(&mEp->qh[mEp->dir].queue))
+            list_empty(&mReq->queue)  || list_empty(&mEp->qh.queue))
                 return -EINVAL;
 
         spin_lock_irqsave(mEp->lock, flags);
@@ -2244,7 +2252,7 @@ static int ep_set_halt(struct usb_ep *ep, int value)
 #ifndef STALL_IN
         /* g_file_storage MS compliant but g_zero fails chapter 9 compliance */
         if (value && mEp->type == USB_ENDPOINT_XFER_BULK && mEp->dir == TX &&
-            !list_empty(&mEp->qh[mEp->dir].queue)) {
+            !list_empty(&mEp->qh.queue)) {
                 spin_unlock_irqrestore(mEp->lock, flags);
                 return -EAGAIN;
         }
@@ -2355,7 +2363,7 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active)
                 if (is_active) {
                         pm_runtime_get_sync(&_gadget->dev);
                         hw_device_reset(udc);
-                        hw_device_state(udc->ci13xxx_ep[0].qh[RX].dma);
+                        hw_device_state(udc->ep0out.qh.dma);
                 } else {
                         hw_device_state(0);
                         if (udc->udc_driver->notify_event)
@@ -2390,7 +2398,8 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
                 int (*bind)(struct usb_gadget *))
 {
         struct ci13xxx *udc = _udc;
-        unsigned long i, k, flags;
+        unsigned long flags;
+        int i, j;
         int retval = -ENOMEM;
 
         trace("%p", driver);
@@ -2427,45 +2436,46 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
 
         info("hw_ep_max = %d", hw_ep_max);
 
-        udc->driver = driver;
         udc->gadget.dev.driver = NULL;
 
         retval = 0;
-        for (i = 0; i < hw_ep_max; i++) {
-                struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
+        for (i = 0; i < hw_ep_max/2; i++) {
+                for (j = RX; j <= TX; j++) {
+                        int k = i + j * hw_ep_max/2;
+                        struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[k];
 
-                scnprintf(mEp->name, sizeof(mEp->name), "ep%i", (int)i);
+                        scnprintf(mEp->name, sizeof(mEp->name), "ep%i%s", i,
+                                        (j == TX)  ? "in" : "out");
 
-                mEp->lock         = udc->lock;
-                mEp->device       = &udc->gadget.dev;
-                mEp->td_pool      = udc->td_pool;
+                        mEp->lock         = udc->lock;
+                        mEp->device       = &udc->gadget.dev;
+                        mEp->td_pool      = udc->td_pool;
 
-                mEp->ep.name      = mEp->name;
-                mEp->ep.ops       = &usb_ep_ops;
-                mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
+                        mEp->ep.name      = mEp->name;
+                        mEp->ep.ops       = &usb_ep_ops;
+                        mEp->ep.maxpacket = CTRL_PAYLOAD_MAX;
 
-                /* this allocation cannot be random */
-                for (k = RX; k <= TX; k++) {
-                        INIT_LIST_HEAD(&mEp->qh[k].queue);
+                        INIT_LIST_HEAD(&mEp->qh.queue);
                         spin_unlock_irqrestore(udc->lock, flags);
-                        mEp->qh[k].ptr = dma_pool_alloc(udc->qh_pool,
-                                                        GFP_KERNEL,
-                                                        &mEp->qh[k].dma);
+                        mEp->qh.ptr = dma_pool_alloc(udc->qh_pool, GFP_KERNEL,
+                                        &mEp->qh.dma);
                         spin_lock_irqsave(udc->lock, flags);
-                        if (mEp->qh[k].ptr == NULL)
+                        if (mEp->qh.ptr == NULL)
                                 retval = -ENOMEM;
                         else
-                                memset(mEp->qh[k].ptr, 0,
-                                       sizeof(*mEp->qh[k].ptr));
-                }
-                if (i == 0)
-                        udc->gadget.ep0 = &mEp->ep;
-                else
+                                memset(mEp->qh.ptr, 0, sizeof(*mEp->qh.ptr));
+
+                        /* skip ep0 out and in endpoints */
+                        if (i == 0)
+                                continue;
+
                         list_add_tail(&mEp->ep.ep_list, &udc->gadget.ep_list);
+                }
         }
         if (retval)
                 goto done;
 
+        udc->gadget.ep0 = &udc->ep0in.ep;
         /* bind gadget */
         driver->driver.bus     = NULL;
         udc->gadget.dev.driver = &driver->driver;
@@ -2479,6 +2489,7 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
                 goto done;
         }
 
+        udc->driver = driver;
         pm_runtime_get_sync(&udc->gadget.dev);
         if (udc->udc_driver->flags & CI13XXX_PULLUP_ON_VBUS) {
                 if (udc->vbus_active) {
@@ -2490,14 +2501,12 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
                 }
         }
 
-        retval = hw_device_state(udc->ci13xxx_ep[0].qh[RX].dma);
+        retval = hw_device_state(udc->ep0out.qh.dma);
         if (retval)
                 pm_runtime_put_sync(&udc->gadget.dev);
 
  done:
         spin_unlock_irqrestore(udc->lock, flags);
-        if (retval)
-                usb_gadget_unregister_driver(driver);
         return retval;
 }
 EXPORT_SYMBOL(usb_gadget_probe_driver);
@@ -2510,7 +2519,7 @@ EXPORT_SYMBOL(usb_gadget_probe_driver);
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 {
         struct ci13xxx *udc = _udc;
-        unsigned long i, k, flags;
+        unsigned long i, flags;
 
         trace("%p", driver);
 
@@ -2546,17 +2555,14 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         for (i = 0; i < hw_ep_max; i++) {
                 struct ci13xxx_ep *mEp = &udc->ci13xxx_ep[i];
 
-                if (i == 0)
-                        udc->gadget.ep0 = NULL;
-                else if (!list_empty(&mEp->ep.ep_list))
+                if (!list_empty(&mEp->ep.ep_list))
                         list_del_init(&mEp->ep.ep_list);
 
-                for (k = RX; k <= TX; k++)
-                        if (mEp->qh[k].ptr != NULL)
-                                dma_pool_free(udc->qh_pool,
-                                              mEp->qh[k].ptr, mEp->qh[k].dma);
+                if (mEp->qh.ptr != NULL)
+                        dma_pool_free(udc->qh_pool, mEp->qh.ptr, mEp->qh.dma);
         }
 
+        udc->gadget.ep0 = NULL;
         udc->driver = NULL;
 
         spin_unlock_irqrestore(udc->lock, flags);
diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h
index f61fed07f76b..a2492b65f98c 100644
--- a/drivers/usb/gadget/ci13xxx_udc.h
+++ b/drivers/usb/gadget/ci13xxx_udc.h
@@ -20,7 +20,7 @@
  * DEFINE
  *****************************************************************************/
 #define CI13XXX_PAGE_SIZE  4096ul /* page size for TD's */
-#define ENDPT_MAX          (16)
+#define ENDPT_MAX          (32)
 #define CTRL_PAYLOAD_MAX   (64)
 #define RX        (0)  /* similar to USB_DIR_OUT but can be used as an index */
 #define TX        (1)  /* similar to USB_DIR_IN  but can be used as an index */
@@ -88,8 +88,7 @@ struct ci13xxx_ep {
                 struct list_head   queue;
                 struct ci13xxx_qh *ptr;
                 dma_addr_t         dma;
-        }                                      qh[2];
-        struct usb_request                    *status;
+        }                                      qh;
         int                                    wedge;
 
         /* global resources */
@@ -119,9 +118,13 @@ struct ci13xxx {
 
         struct dma_pool           *qh_pool;   /* DMA pool for queue heads */
         struct dma_pool           *td_pool;   /* DMA pool for transfer descs */
+        struct usb_request        *status;    /* ep0 status request */
 
         struct usb_gadget          gadget;     /* USB slave device */
         struct ci13xxx_ep          ci13xxx_ep[ENDPT_MAX]; /* extended endpts */
+        u32                        ep0_dir;    /* ep0 direction */
+#define ep0out ci13xxx_ep[0]
+#define ep0in  ci13xxx_ep[16]
 
         struct usb_gadget_driver  *driver;     /* 3rd party gadget driver */
         struct ci13xxx_udc_driver *udc_driver; /* device controller driver */
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f6ff8456d52d..1ba4befe336b 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -928,8 +928,9 @@ unknown:
                  */
                 switch (ctrl->bRequestType & USB_RECIP_MASK) {
                 case USB_RECIP_INTERFACE:
-                        if (cdev->config)
-                                f = cdev->config->interface[intf];
+                        if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+                                break;
+                        f = cdev->config->interface[intf];
                         break;
 
                 case USB_RECIP_ENDPOINT:
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index b5dbb2308f56..6d8e533949eb 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -293,6 +293,7 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/composite.h>
 
 #include "gadget_chips.h"
 
@@ -2763,7 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
                         return ERR_PTR(-ENOMEM);
                 common->free_storage_on_release = 1;
         } else {
-                memset(common, 0, sizeof common);
+                memset(common, 0, sizeof *common);
                 common->free_storage_on_release = 0;
         }
 
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 0c8dd81dddca..b120dbb64d0f 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -198,10 +198,10 @@
 #define PCH_UDC_BRLEN           0x0F    /* Burst length */
 #define PCH_UDC_THLEN           0x1F    /* Threshold length */
 /* Value of EP Buffer Size */
-#define UDC_EP0IN_BUFF_SIZE     64
-#define UDC_EPIN_BUFF_SIZE      512
-#define UDC_EP0OUT_BUFF_SIZE    64
-#define UDC_EPOUT_BUFF_SIZE     512
+#define UDC_EP0IN_BUFF_SIZE     16
+#define UDC_EPIN_BUFF_SIZE      256
+#define UDC_EP0OUT_BUFF_SIZE    16
+#define UDC_EPOUT_BUFF_SIZE     256
 /* Value of EP maximum packet size */
 #define UDC_EP0IN_MAX_PKT_SIZE  64
 #define UDC_EP0OUT_MAX_PKT_SIZE 64
@@ -351,7 +351,7 @@ struct pch_udc_dev {
         struct pci_pool         *data_requests;
         struct pci_pool         *stp_requests;
         dma_addr_t                      dma_addr;
-        unsigned long                   ep0out_buf[64];
+        void                            *ep0out_buf;
         struct usb_ctrlrequest          setup_data;
         unsigned long                   phys_addr;
         void __iomem                    *base_addr;
@@ -361,6 +361,8 @@ struct pch_udc_dev {
 
 #define PCH_UDC_PCI_BAR                 1
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC   0x8808
+#define PCI_VENDOR_ID_ROHM              0x10DB
+#define PCI_DEVICE_ID_ML7213_IOH_UDC    0x801D
 
 static const char       ep0_string[] = "ep0in";
 static DEFINE_SPINLOCK(udc_stall_spinlock);     /* stall spin lock */
@@ -1219,11 +1221,11 @@ static void complete_req(struct pch_udc_ep *ep, struct pch_udc_request *req,
         dev = ep->dev;
         if (req->dma_mapped) {
                 if (ep->in)
-                        pci_unmap_single(dev->pdev, req->req.dma,
-                                         req->req.length, PCI_DMA_TODEVICE);
+                        dma_unmap_single(&dev->pdev->dev, req->req.dma,
+                                         req->req.length, DMA_TO_DEVICE);
                 else
-                        pci_unmap_single(dev->pdev, req->req.dma,
-                                         req->req.length, PCI_DMA_FROMDEVICE);
+                        dma_unmap_single(&dev->pdev->dev, req->req.dma,
+                                         req->req.length, DMA_FROM_DEVICE);
                 req->dma_mapped = 0;
                 req->req.dma = DMA_ADDR_INVALID;
         }
@@ -1414,7 +1416,6 @@ static void pch_udc_start_rxrequest(struct pch_udc_ep *ep,
 
         pch_udc_clear_dma(ep->dev, DMA_DIR_RX);
         td_data = req->td_data;
-        ep->td_data = req->td_data;
         /* Set the status bits for all descriptors */
         while (1) {
                 td_data->status = (td_data->status & ~PCH_UDC_BUFF_STS) |
@@ -1613,15 +1614,19 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq,
         if (usbreq->length &&
             ((usbreq->dma == DMA_ADDR_INVALID) || !usbreq->dma)) {
                 if (ep->in)
-                        usbreq->dma = pci_map_single(dev->pdev, usbreq->buf,
-                                        usbreq->length, PCI_DMA_TODEVICE);
+                        usbreq->dma = dma_map_single(&dev->pdev->dev,
+                                                     usbreq->buf,
+                                                     usbreq->length,
+                                                     DMA_TO_DEVICE);
                 else
-                        usbreq->dma = pci_map_single(dev->pdev, usbreq->buf,
-                                        usbreq->length, PCI_DMA_FROMDEVICE);
+                        usbreq->dma = dma_map_single(&dev->pdev->dev,
+                                                     usbreq->buf,
+                                                     usbreq->length,
+                                                     DMA_FROM_DEVICE);
                 req->dma_mapped = 1;
         }
         if (usbreq->length > 0) {
-                retval = prepare_dma(ep, req, gfp);
+                retval = prepare_dma(ep, req, GFP_ATOMIC);
                 if (retval)
                         goto probe_end;
         }
@@ -1646,7 +1651,6 @@ static int pch_udc_pcd_queue(struct usb_ep *usbep, struct usb_request *usbreq,
                         pch_udc_wait_ep_stall(ep);
                         pch_udc_ep_clear_nak(ep);
                         pch_udc_enable_ep_interrupts(ep->dev, (1 << ep->num));
-                        pch_udc_set_dma(dev, DMA_DIR_TX);
                 }
         }
         /* Now add this request to the ep's pending requests */
@@ -1926,6 +1930,7 @@ static void pch_udc_complete_receiver(struct pch_udc_ep *ep)
             PCH_UDC_BS_DMA_DONE)
                 return;
         pch_udc_clear_dma(ep->dev, DMA_DIR_RX);
+        pch_udc_ep_set_ddptr(ep, 0);
         if ((req->td_data_last->status & PCH_UDC_RXTX_STS) !=
             PCH_UDC_RTS_SUCC) {
                 dev_err(&dev->pdev->dev, "Invalid RXTX status (0x%08x) "
@@ -1963,7 +1968,7 @@ static void pch_udc_svc_data_in(struct pch_udc_dev *dev, int ep_num)
         u32     epsts;
         struct pch_udc_ep       *ep;
 
-        ep = &dev->ep[2*ep_num];
+        ep = &dev->ep[UDC_EPIN_IDX(ep_num)];
         epsts = ep->epsts;
         ep->epsts = 0;
 
@@ -2008,7 +2013,7 @@ static void pch_udc_svc_data_out(struct pch_udc_dev *dev, int ep_num)
         struct pch_udc_ep               *ep;
         struct pch_udc_request          *req = NULL;
 
-        ep = &dev->ep[2*ep_num + 1];
+        ep = &dev->ep[UDC_EPOUT_IDX(ep_num)];
         epsts = ep->epsts;
         ep->epsts = 0;
 
@@ -2025,10 +2030,11 @@ static void pch_udc_svc_data_out(struct pch_udc_dev *dev, int ep_num)
         }
         if (epsts & UDC_EPSTS_HE)
                 return;
-        if (epsts & UDC_EPSTS_RSS)
+        if (epsts & UDC_EPSTS_RSS) {
                 pch_udc_ep_set_stall(ep);
                 pch_udc_enable_ep_interrupts(ep->dev,
                                              PCH_UDC_EPINT(ep->in, ep->num));
+        }
         if (epsts & UDC_EPSTS_RCS) {
                 if (!dev->prot_stall) {
                         pch_udc_ep_clear_stall(ep);
@@ -2060,8 +2066,10 @@ static void pch_udc_svc_control_in(struct pch_udc_dev *dev)
 {
         u32     epsts;
         struct pch_udc_ep       *ep;
+        struct pch_udc_ep       *ep_out;
 
         ep = &dev->ep[UDC_EP0IN_IDX];
+        ep_out = &dev->ep[UDC_EP0OUT_IDX];
         epsts = ep->epsts;
         ep->epsts = 0;
 
@@ -2073,8 +2081,16 @@ static void pch_udc_svc_control_in(struct pch_udc_dev *dev)
                 return;
         if (epsts & UDC_EPSTS_HE)
                 return;
-        if ((epsts & UDC_EPSTS_TDC) && (!dev->stall))
+        if ((epsts & UDC_EPSTS_TDC) && (!dev->stall)) {
                 pch_udc_complete_transfer(ep);
+                pch_udc_clear_dma(dev, DMA_DIR_RX);
+                ep_out->td_data->status = (ep_out->td_data->status &
+                                        ~PCH_UDC_BUFF_STS) |
+                                        PCH_UDC_BS_HST_RDY;
+                pch_udc_ep_clear_nak(ep_out);
+                pch_udc_set_dma(dev, DMA_DIR_RX);
+                pch_udc_ep_set_rrdy(ep_out);
+        }
         /* On IN interrupt, provide data if we have any */
         if ((epsts & UDC_EPSTS_IN) && !(epsts & UDC_EPSTS_TDC) &&
              !(epsts & UDC_EPSTS_TXEMPTY))
@@ -2102,11 +2118,9 @@ static void pch_udc_svc_control_out(struct pch_udc_dev *dev)
                 dev->stall = 0;
                 dev->ep[UDC_EP0IN_IDX].halted = 0;
                 dev->ep[UDC_EP0OUT_IDX].halted = 0;
-                /* In data not ready */
-                pch_udc_ep_set_nak(&(dev->ep[UDC_EP0IN_IDX]));
                 dev->setup_data = ep->td_stp->request;
                 pch_udc_init_setup_buff(ep->td_stp);
-                pch_udc_clear_dma(dev, DMA_DIR_TX);
+                pch_udc_clear_dma(dev, DMA_DIR_RX);
                 pch_udc_ep_fifo_flush(&(dev->ep[UDC_EP0IN_IDX]),
                                       dev->ep[UDC_EP0IN_IDX].in);
                 if ((dev->setup_data.bRequestType & USB_DIR_IN))
@@ -2122,14 +2136,23 @@ static void pch_udc_svc_control_out(struct pch_udc_dev *dev)
                 setup_supported = dev->driver->setup(&dev->gadget,
                                                      &dev->setup_data);
                 spin_lock(&dev->lock);
+
+                if (dev->setup_data.bRequestType & USB_DIR_IN) {
+                        ep->td_data->status = (ep->td_data->status &
+                                                ~PCH_UDC_BUFF_STS) |
+                                                PCH_UDC_BS_HST_RDY;
+                        pch_udc_ep_set_ddptr(ep, ep->td_data_phys);
+                }
                 /* ep0 in returns data on IN phase */
                 if (setup_supported >= 0 && setup_supported <
                                             UDC_EP0IN_MAX_PKT_SIZE) {
                         pch_udc_ep_clear_nak(&(dev->ep[UDC_EP0IN_IDX]));
                         /* Gadget would have queued a request when
                          * we called the setup */
-                        pch_udc_set_dma(dev, DMA_DIR_RX);
-                        pch_udc_ep_clear_nak(ep);
+                        if (!(dev->setup_data.bRequestType & USB_DIR_IN)) {
+                                pch_udc_set_dma(dev, DMA_DIR_RX);
+                                pch_udc_ep_clear_nak(ep);
+                        }
                 } else if (setup_supported < 0) {
                         /* if unsupported request, then stall */
                         pch_udc_ep_set_stall(&(dev->ep[UDC_EP0IN_IDX]));
@@ -2142,22 +2165,13 @@ static void pch_udc_svc_control_out(struct pch_udc_dev *dev)
                 }
         } else if ((((stat & UDC_EPSTS_OUT_MASK) >> UDC_EPSTS_OUT_SHIFT) ==
                      UDC_EPSTS_OUT_DATA) && !dev->stall) {
-                if (list_empty(&ep->queue)) {
-                        dev_err(&dev->pdev->dev, "%s: No request\n", __func__);
-                        ep->td_data->status = (ep->td_data->status &
-                                               ~PCH_UDC_BUFF_STS) |
-                                               PCH_UDC_BS_HST_RDY;
-                        pch_udc_set_dma(dev, DMA_DIR_RX);
-                } else {
-                        /* control write */
-                        /* next function will pickuo an clear the status */
+                pch_udc_clear_dma(dev, DMA_DIR_RX);
+                pch_udc_ep_set_ddptr(ep, 0);
+                if (!list_empty(&ep->queue)) {
                         ep->epsts = stat;
-
-                        pch_udc_svc_data_out(dev, 0);
-                        /* re-program desc. pointer for possible ZLPs */
-                        pch_udc_ep_set_ddptr(ep, ep->td_data_phys);
-                        pch_udc_set_dma(dev, DMA_DIR_RX);
+                        pch_udc_svc_data_out(dev, PCH_UDC_EP0);
                 }
+                pch_udc_set_dma(dev, DMA_DIR_RX);
         }
         pch_udc_ep_set_rrdy(ep);
 }
@@ -2174,7 +2188,7 @@ static void pch_udc_postsvc_epinters(struct pch_udc_dev *dev, int ep_num)
         struct pch_udc_ep       *ep;
         struct pch_udc_request *req;
 
-        ep = &dev->ep[2*ep_num];
+        ep = &dev->ep[UDC_EPIN_IDX(ep_num)];
         if (!list_empty(&ep->queue)) {
                 req = list_entry(ep->queue.next, struct pch_udc_request, queue);
                 pch_udc_enable_ep_interrupts(ep->dev,
@@ -2196,13 +2210,13 @@ static void pch_udc_read_all_epstatus(struct pch_udc_dev *dev, u32 ep_intr)
         for (i = 0; i < PCH_UDC_USED_EP_NUM; i++) {
                 /* IN */
                 if (ep_intr & (0x1 << i)) {
-                        ep = &dev->ep[2*i];
+                        ep = &dev->ep[UDC_EPIN_IDX(i)];
                         ep->epsts = pch_udc_read_ep_status(ep);
                         pch_udc_clear_ep_status(ep, ep->epsts);
                 }
                 /* OUT */
                 if (ep_intr & (0x10000 << i)) {
-                        ep = &dev->ep[2*i+1];
+                        ep = &dev->ep[UDC_EPOUT_IDX(i)];
                         ep->epsts = pch_udc_read_ep_status(ep);
                         pch_udc_clear_ep_status(ep, ep->epsts);
                 }
@@ -2563,9 +2577,6 @@ static void pch_udc_pcd_reinit(struct pch_udc_dev *dev)
         dev->ep[UDC_EP0IN_IDX].ep.maxpacket = UDC_EP0IN_MAX_PKT_SIZE;
         dev->ep[UDC_EP0OUT_IDX].ep.maxpacket = UDC_EP0OUT_MAX_PKT_SIZE;
 
-        dev->dma_addr = pci_map_single(dev->pdev, dev->ep0out_buf, 256,
-                                  PCI_DMA_FROMDEVICE);
-
         /* remove ep0 in and out from the list.  They have own pointer */
         list_del_init(&dev->ep[UDC_EP0IN_IDX].ep.ep_list);
         list_del_init(&dev->ep[UDC_EP0OUT_IDX].ep.ep_list);
@@ -2637,6 +2648,13 @@ static int init_dma_pools(struct pch_udc_dev *dev)
         dev->ep[UDC_EP0IN_IDX].td_stp_phys = 0;
         dev->ep[UDC_EP0IN_IDX].td_data = NULL;
         dev->ep[UDC_EP0IN_IDX].td_data_phys = 0;
+
+        dev->ep0out_buf = kzalloc(UDC_EP0OUT_BUFF_SIZE * 4, GFP_KERNEL);
+        if (!dev->ep0out_buf)
+                return -ENOMEM;
+        dev->dma_addr = dma_map_single(&dev->pdev->dev, dev->ep0out_buf,
+                                       UDC_EP0OUT_BUFF_SIZE * 4,
+                                       DMA_FROM_DEVICE);
         return 0;
 }
 
@@ -2700,7 +2718,8 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         pch_udc_disable_interrupts(dev, UDC_DEVINT_MSK);
 
-        /* Assues that there are no pending requets with this driver */
+        /* Assures that there are no pending requests with this driver */
+        driver->disconnect(&dev->gadget);
         driver->unbind(&dev->gadget);
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
@@ -2750,6 +2769,11 @@ static void pch_udc_remove(struct pci_dev *pdev)
                 pci_pool_destroy(dev->stp_requests);
         }
 
+        if (dev->dma_addr)
+                dma_unmap_single(&dev->pdev->dev, dev->dma_addr,
+                                 UDC_EP0OUT_BUFF_SIZE * 4, DMA_FROM_DEVICE);
+        kfree(dev->ep0out_buf);
+
         pch_udc_exit(dev);
 
         if (dev->irq_registered)
@@ -2792,11 +2816,7 @@ static int pch_udc_resume(struct pci_dev *pdev)
         int ret;
 
         pci_set_power_state(pdev, PCI_D0);
-        ret = pci_restore_state(pdev);
-        if (ret) {
-                dev_err(&pdev->dev, "%s: pci_restore_state failed\n", __func__);
-                return ret;
-        }
+        pci_restore_state(pdev);
         ret = pci_enable_device(pdev);
         if (ret) {
                 dev_err(&pdev->dev, "%s: pci_enable_device failed\n", __func__);
@@ -2914,6 +2934,11 @@ static DEFINE_PCI_DEVICE_TABLE(pch_udc_pcidev_id) = {
                 .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
                 .class_mask = 0xffffffff,
         },
+        {
+                PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7213_IOH_UDC),
+                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class_mask = 0xffffffff,
+        },
         { 0 },
 };
 
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 2fc8636316c5..12ff6cffedc9 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -131,31 +131,31 @@ static struct printer_dev usb_printer_gadget;
  * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
  */
 
-static ushort __initdata idVendor;
+static ushort idVendor;
 module_param(idVendor, ushort, S_IRUGO);
 MODULE_PARM_DESC(idVendor, "USB Vendor ID");
 
-static ushort __initdata idProduct;
+static ushort idProduct;
 module_param(idProduct, ushort, S_IRUGO);
 MODULE_PARM_DESC(idProduct, "USB Product ID");
 
-static ushort __initdata bcdDevice;
+static ushort bcdDevice;
 module_param(bcdDevice, ushort, S_IRUGO);
 MODULE_PARM_DESC(bcdDevice, "USB Device version (BCD)");
 
-static char *__initdata iManufacturer;
+static char *iManufacturer;
 module_param(iManufacturer, charp, S_IRUGO);
 MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string");
 
-static char *__initdata iProduct;
+static char *iProduct;
 module_param(iProduct, charp, S_IRUGO);
 MODULE_PARM_DESC(iProduct, "USB Product string");
 
-static char *__initdata iSerialNum;
+static char *iSerialNum;
 module_param(iSerialNum, charp, S_IRUGO);
 MODULE_PARM_DESC(iSerialNum, "1");
 
-static char *__initdata iPNPstring;
+static char *iPNPstring;
 module_param(iPNPstring, charp, S_IRUGO);
 MODULE_PARM_DESC(iPNPstring, "MFG:linux;MDL:g_printer;CLS:PRINTER;SN:1;");
 
@@ -1596,13 +1596,12 @@ cleanup(void)
         int status;
 
         mutex_lock(&usb_printer_gadget.lock_printer_io);
-        class_destroy(usb_gadget_class);
-        unregister_chrdev_region(g_printer_devno, 2);
-
         status = usb_gadget_unregister_driver(&printer_driver);
         if (status)
                 ERROR(dev, "usb_gadget_unregister_driver %x\n", status);
 
+        unregister_chrdev_region(g_printer_devno, 2);
+        class_destroy(usb_gadget_class);
         mutex_unlock(&usb_printer_gadget.lock_printer_io);
 }
 module_exit(cleanup);
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 20d43da319ae..015118535f77 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -258,7 +258,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597,
                 break;
         case R8A66597_BULK:
                 /* isochronous pipes may be used as bulk pipes */
-                if (info->pipe > R8A66597_BASE_PIPENUM_BULK)
+                if (info->pipe >= R8A66597_BASE_PIPENUM_BULK)
                         bufnum = info->pipe - R8A66597_BASE_PIPENUM_BULK;
                 else
                         bufnum = info->pipe - R8A66597_BASE_PIPENUM_ISOC;
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 24046c0f5878..0e6afa260ed8 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -151,6 +151,8 @@ config USB_EHCI_MSM
           Qualcomm chipsets. Root Hub has inbuilt TT.
           This driver depends on OTG driver for PHY initialization,
           clock management, powering up VBUS, and power management.
+          This driver is not supported on boards like trout which
+          has an external PHY.
 
 config USB_EHCI_HCD_PPC_OF
         bool "EHCI support for PPC USB controller on OF platform bus"
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index 2baf8a849086..a869e3c103d3 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -227,8 +227,8 @@ static int ehci_hcd_au1xxx_drv_suspend(struct device *dev)
          * mark HW unaccessible.  The PM and USB cores make sure that
          * the root hub is either suspended or stopped.
          */
-        spin_lock_irqsave(&ehci->lock, flags);
         ehci_prepare_ports_for_controller_suspend(ehci, device_may_wakeup(dev));
+        spin_lock_irqsave(&ehci->lock, flags);
         ehci_writel(ehci, 0, &ehci->regs->intr_enable);
         (void)ehci_readl(ehci, &ehci->regs->intr_enable);
 
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 86e42892016d..5c761df7fa83 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -52,7 +52,6 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
         struct resource *res;
         int irq;
         int retval;
-        unsigned int temp;
 
         pr_debug("initializing FSL-SOC USB Controller\n");
 
@@ -126,18 +125,6 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
                 goto err3;
         }
 
-        /*
-         * Check if it is MPC5121 SoC, otherwise set pdata->have_sysif_regs
-         * flag for 83xx or 8536 system interface registers.
-         */
-        if (pdata->big_endian_mmio)
-                temp = in_be32(hcd->regs + FSL_SOC_USB_ID);
-        else
-                temp = in_le32(hcd->regs + FSL_SOC_USB_ID);
-
-        if ((temp & ID_MSK) != (~((temp & NID_MSK) >> 8) & ID_MSK))
-                pdata->have_sysif_regs = 1;
-
         /* Enable USB controller, 83xx or 8536 */
         if (pdata->have_sysif_regs)
                 setbits32(hcd->regs + FSL_SOC_USB_CTRL, 0x4);
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index 2c8353795226..3fabed33d940 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -19,9 +19,6 @@
 #define _EHCI_FSL_H
 
 /* offsets for the non-ehci registers in the FSL SOC USB controller */
-#define FSL_SOC_USB_ID          0x0
-#define ID_MSK                  0x3f
-#define NID_MSK                 0x3f00
 #define FSL_SOC_USB_ULPIVP      0x170
 #define FSL_SOC_USB_PORTSC1     0x184
 #define PORT_PTS_MSK            (3<<30)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 6fee3cd58efe..74dcf49bd015 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -572,6 +572,8 @@ static int ehci_init(struct usb_hcd *hcd)
         ehci->iaa_watchdog.function = ehci_iaa_watchdog;
         ehci->iaa_watchdog.data = (unsigned long) ehci;
 
+        hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
+
         /*
          * hw default: 1K periodic list heads, one per frame.
          * periodic_size can shrink by USBCMD update if hcc_params allows.
@@ -579,11 +581,20 @@ static int ehci_init(struct usb_hcd *hcd)
         ehci->periodic_size = DEFAULT_I_TDPS;
         INIT_LIST_HEAD(&ehci->cached_itd_list);
         INIT_LIST_HEAD(&ehci->cached_sitd_list);
+
+        if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
+                /* periodic schedule size can be smaller than default */
+                switch (EHCI_TUNE_FLS) {
+                case 0: ehci->periodic_size = 1024; break;
+                case 1: ehci->periodic_size = 512; break;
+                case 2: ehci->periodic_size = 256; break;
+                default:        BUG();
+                }
+        }
         if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0)
                 return retval;
 
         /* controllers may cache some of the periodic schedule ... */
-        hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params);
         if (HCC_ISOC_CACHE(hcc_params))         // full frame cache
                 ehci->i_thresh = 2 + 8;
         else                                    // N microframes cached
@@ -637,12 +648,6 @@ static int ehci_init(struct usb_hcd *hcd)
                 /* periodic schedule size can be smaller than default */
                 temp &= ~(3 << 2);
                 temp |= (EHCI_TUNE_FLS << 2);
-                switch (EHCI_TUNE_FLS) {
-                case 0: ehci->periodic_size = 1024; break;
-                case 1: ehci->periodic_size = 512; break;
-                case 2: ehci->periodic_size = 256; break;
-                default:        BUG();
-                }
         }
         if (HCC_LPM(hcc_params)) {
                 /* support link power management EHCI 1.1 addendum */
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 796ea0c8900f..8a515f0d5988 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -111,6 +111,7 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
 {
         int             port;
         u32             temp;
+        unsigned long   flags;
 
         /* If remote wakeup is enabled for the root hub but disabled
          * for the controller, we must adjust all the port wakeup flags
@@ -120,6 +121,8 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         if (!ehci_to_hcd(ehci)->self.root_hub->do_remote_wakeup || do_wakeup)
                 return;
 
+        spin_lock_irqsave(&ehci->lock, flags);
+
         /* clear phy low-power mode before changing wakeup flags */
         if (ehci->has_hostpc) {
                 port = HCS_N_PORTS(ehci->hcs_params);
@@ -131,7 +134,9 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
                         temp = ehci_readl(ehci, hostpc_reg);
                         ehci_writel(ehci, temp & ~HOSTPC_PHCD, hostpc_reg);
                 }
+                spin_unlock_irqrestore(&ehci->lock, flags);
                 msleep(5);
+                spin_lock_irqsave(&ehci->lock, flags);
         }
 
         port = HCS_N_PORTS(ehci->hcs_params);
@@ -170,6 +175,8 @@ static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         /* Does the root hub have a port wakeup pending? */
         if (!suspending && (ehci_readl(ehci, &ehci->regs->status) & STS_PCD))
                 usb_hcd_resume_root_hub(ehci_to_hcd(ehci));
+
+        spin_unlock_irqrestore(&ehci->lock, flags);
 }
 
 static int ehci_bus_suspend (struct usb_hcd *hcd)
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index fa59b26fc5bc..c8e360d7d975 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -21,10 +21,13 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/usb/otg.h>
+#include <linux/usb/ulpi.h>
 #include <linux/slab.h>
 
 #include <mach/mxc_ehci.h>
 
+#include <asm/mach-types.h>
+
 #define ULPI_VIEWPORT_OFFSET    0x170
 
 struct ehci_mxc_priv {
@@ -114,6 +117,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         struct usb_hcd *hcd;
         struct resource *res;
         int irq, ret;
+        unsigned int flags;
         struct ehci_mxc_priv *priv;
         struct device *dev = &pdev->dev;
         struct ehci_hcd *ehci;
@@ -177,8 +181,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
                 clk_enable(priv->ahbclk);
         }
 
-        /* "dr" device has its own clock */
-        if (pdev->id == 0) {
+        /* "dr" device has its own clock on i.MX51 */
+        if (cpu_is_mx51() && (pdev->id == 0)) {
                 priv->phy1clk = clk_get(dev, "usb_phy1");
                 if (IS_ERR(priv->phy1clk)) {
                         ret = PTR_ERR(priv->phy1clk);
@@ -240,6 +244,23 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add;
 
+        if (pdata->otg) {
+                /*
+                 * efikamx and efikasb have some hardware bug which is
+                 * preventing usb to work unless CHRGVBUS is set.
+                 * It's in violation of USB specs
+                 */
+                if (machine_is_mx51_efikamx() || machine_is_mx51_efikasb()) {
+                        flags = otg_io_read(pdata->otg, ULPI_OTG_CTRL);
+                        flags |= ULPI_OTG_CTRL_CHRGVBUS;
+                        ret = otg_io_write(pdata->otg, flags, ULPI_OTG_CTRL);
+                        if (ret) {
+                                dev_err(dev, "unable to set CHRVBUS\n");
+                                goto err_add;
+                        }
+                }
+        }
+
         return 0;
 
 err_add:
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 680f2ef4e59f..f784ceb862a3 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -796,7 +796,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev,
                         dev_name(&pdev->dev));
         if (!hcd) {
-                dev_dbg(&pdev->dev, "failed to create hcd with err %d\n", ret);
+                dev_err(&pdev->dev, "failed to create hcd with err %d\n", ret);
                 ret = -ENOMEM;
                 goto err_create_hcd;
         }
@@ -864,7 +864,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 
         ret = omap_start_ehc(omap, hcd);
         if (ret) {
-                dev_dbg(&pdev->dev, "failed to start ehci\n");
+                dev_err(&pdev->dev, "failed to start ehci with err %d\n", ret);
                 goto err_start;
         }
 
@@ -879,7 +879,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 
         ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
         if (ret) {
-                dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
+                dev_err(&pdev->dev, "failed to add hcd with err %d\n", ret);
                 goto err_add_hcd;
         }
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 76179c39c0e3..07bb982e59f6 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -44,28 +44,35 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
         return 0;
 }
 
-static int ehci_quirk_amd_SB800(struct ehci_hcd *ehci)
+static int ehci_quirk_amd_hudson(struct ehci_hcd *ehci)
 {
         struct pci_dev *amd_smbus_dev;
         u8 rev = 0;
 
         amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_ATI, 0x4385, NULL);
-        if (!amd_smbus_dev)
-                return 0;
-
-        pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
-        if (rev < 0x40) {
-                pci_dev_put(amd_smbus_dev);
-                amd_smbus_dev = NULL;
-                return 0;
+        if (amd_smbus_dev) {
+                pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
+                if (rev < 0x40) {
+                        pci_dev_put(amd_smbus_dev);
+                        amd_smbus_dev = NULL;
+                        return 0;
+                }
+        } else {
+                amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x780b, NULL);
+                if (!amd_smbus_dev)
+                        return 0;
+                pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
+                if (rev < 0x11 || rev > 0x18) {
+                        pci_dev_put(amd_smbus_dev);
+                        amd_smbus_dev = NULL;
+                        return 0;
+                }
         }
 
         if (!amd_nb_dev)
                 amd_nb_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1510, NULL);
-        if (!amd_nb_dev)
-                ehci_err(ehci, "QUIRK: unable to get AMD NB device\n");
 
-        ehci_info(ehci, "QUIRK: Enable AMD SB800 L1 fix\n");
+        ehci_info(ehci, "QUIRK: Enable exception for AMD Hudson ASPM\n");
 
         pci_dev_put(amd_smbus_dev);
         amd_smbus_dev = NULL;
@@ -131,7 +138,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
         /* cache this readonly data; minimize chip reads */
         ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
 
-        if (ehci_quirk_amd_SB800(ehci))
+        if (ehci_quirk_amd_hudson(ehci))
                 ehci->amd_l1_fix = 1;
 
         retval = ehci_halt(ehci);
@@ -360,8 +367,8 @@ static int ehci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
          * mark HW unaccessible.  The PM and USB cores make sure that
          * the root hub is either suspended or stopped.
          */
-        spin_lock_irqsave (&ehci->lock, flags);
         ehci_prepare_ports_for_controller_suspend(ehci, do_wakeup);
+        spin_lock_irqsave (&ehci->lock, flags);
         ehci_writel(ehci, 0, &ehci->regs->intr_enable);
         (void)ehci_readl(ehci, &ehci->regs->intr_enable);
 
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 574b99ea0700..79a66d622f9c 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -262,19 +262,24 @@ static void fsl_usb2_mpc5121_exit(struct platform_device *pdev)
         }
 }
 
-struct fsl_usb2_platform_data fsl_usb2_mpc5121_pd = {
+static struct fsl_usb2_platform_data fsl_usb2_mpc5121_pd = {
         .big_endian_desc = 1,
         .big_endian_mmio = 1,
         .es = 1,
+        .have_sysif_regs = 0,
         .le_setup_buf = 1,
         .init = fsl_usb2_mpc5121_init,
         .exit = fsl_usb2_mpc5121_exit,
 };
 #endif /* CONFIG_PPC_MPC512x */
 
+static struct fsl_usb2_platform_data fsl_usb2_mpc8xxx_pd = {
+        .have_sysif_regs = 1,
+};
+
 static const struct of_device_id fsl_usb2_mph_dr_of_match[] = {
-        { .compatible = "fsl-usb2-mph", },
-        { .compatible = "fsl-usb2-dr", },
+        { .compatible = "fsl-usb2-mph", .data = &fsl_usb2_mpc8xxx_pd, },
+        { .compatible = "fsl-usb2-dr", .data = &fsl_usb2_mpc8xxx_pd, },
 #ifdef CONFIG_PPC_MPC512x
         { .compatible = "fsl,mpc5121-usb2-dr", .data = &fsl_usb2_mpc5121_pd, },
 #endif
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 990f06b89eaa..2e9602a10e9b 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -861,6 +861,7 @@ static int sl811h_urb_enqueue(
                         DBG("dev %d ep%d maxpacket %d\n",
                                 udev->devnum, epnum, ep->maxpacket);
                         retval = -EINVAL;
+                        kfree(ep);
                         goto fail;
                 }
 
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index df558f6f84e3..3e8211c1ce5a 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -308,11 +308,8 @@ static int room_on_ring(struct xhci_hcd *xhci, struct xhci_ring *ring,
 /* Ring the host controller doorbell after placing a command on the ring */
 void xhci_ring_cmd_db(struct xhci_hcd *xhci)
 {
-        u32 temp;
-
         xhci_dbg(xhci, "// Ding dong!\n");
-        temp = xhci_readl(xhci, &xhci->dba->doorbell[0]) & DB_MASK;
-        xhci_writel(xhci, temp | DB_TARGET_HOST, &xhci->dba->doorbell[0]);
+        xhci_writel(xhci, DB_VALUE_HOST, &xhci->dba->doorbell[0]);
         /* Flush PCI posted writes */
         xhci_readl(xhci, &xhci->dba->doorbell[0]);
 }
@@ -322,26 +319,24 @@ void xhci_ring_ep_doorbell(struct xhci_hcd *xhci,
                 unsigned int ep_index,
                 unsigned int stream_id)
 {
-        struct xhci_virt_ep *ep;
-        unsigned int ep_state;
-        u32 field;
         __u32 __iomem *db_addr = &xhci->dba->doorbell[slot_id];
+        struct xhci_virt_ep *ep = &xhci->devs[slot_id]->eps[ep_index];
+        unsigned int ep_state = ep->ep_state;
 
-        ep = &xhci->devs[slot_id]->eps[ep_index];
-        ep_state = ep->ep_state;
         /* Don't ring the doorbell for this endpoint if there are pending
-         * cancellations because the we don't want to interrupt processing.
+         * cancellations because we don't want to interrupt processing.
          * We don't want to restart any stream rings if there's a set dequeue
          * pointer command pending because the device can choose to start any
          * stream once the endpoint is on the HW schedule.
          * FIXME - check all the stream rings for pending cancellations.
          */
-        if (!(ep_state & EP_HALT_PENDING) && !(ep_state & SET_DEQ_PENDING)
-                        && !(ep_state & EP_HALTED)) {
-                field = xhci_readl(xhci, db_addr) & DB_MASK;
-                field |= EPI_TO_DB(ep_index) | STREAM_ID_TO_DB(stream_id);
-                xhci_writel(xhci, field, db_addr);
-        }
+        if ((ep_state & EP_HALT_PENDING) || (ep_state & SET_DEQ_PENDING) ||
+            (ep_state & EP_HALTED))
+                return;
+        xhci_writel(xhci, DB_VALUE(ep_index, stream_id), db_addr);
+        /* The CPU has better things to do at this point than wait for a
+         * write-posting flush.  It'll get there soon enough.
+         */
 }
 
 /* Ring the doorbell for any rings with pending URBs */
@@ -1188,7 +1183,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
 
         addr = &xhci->op_regs->port_status_base + NUM_PORT_REGS * (port_id - 1);
         temp = xhci_readl(xhci, addr);
-        if ((temp & PORT_CONNECT) && (hcd->state == HC_STATE_SUSPENDED)) {
+        if (hcd->state == HC_STATE_SUSPENDED) {
                 xhci_dbg(xhci, "resume root hub\n");
                 usb_hcd_resume_root_hub(hcd);
         }
@@ -1710,8 +1705,7 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 /* Others already handled above */
                 break;
         }
-        dev_dbg(&td->urb->dev->dev,
-                        "ep %#x - asked for %d bytes, "
+        xhci_dbg(xhci, "ep %#x - asked for %d bytes, "
                         "%d bytes untransferred\n",
                         td->urb->ep->desc.bEndpointAddress,
                         td->urb->transfer_buffer_length,
@@ -2389,7 +2383,8 @@ static unsigned int count_sg_trbs_needed(struct xhci_hcd *xhci, struct urb *urb)
         }
         xhci_dbg(xhci, "\n");
         if (!in_interrupt())
-                dev_dbg(&urb->dev->dev, "ep %#x - urb len = %d, sglist used, num_trbs = %d\n",
+                xhci_dbg(xhci, "ep %#x - urb len = %d, sglist used, "
+                                "num_trbs = %d\n",
                                 urb->ep->desc.bEndpointAddress,
                                 urb->transfer_buffer_length,
                                 num_trbs);
@@ -2414,14 +2409,17 @@ static void check_trb_math(struct urb *urb, int num_trbs, int running_total)
 
 static void giveback_first_trb(struct xhci_hcd *xhci, int slot_id,
                 unsigned int ep_index, unsigned int stream_id, int start_cycle,
-                struct xhci_generic_trb *start_trb, struct xhci_td *td)
+                struct xhci_generic_trb *start_trb)
 {
         /*
          * Pass all the TRBs to the hardware at once and make sure this write
          * isn't reordered.
          */
         wmb();
-        start_trb->field[3] |= start_cycle;
+        if (start_cycle)
+                start_trb->field[3] |= start_cycle;
+        else
+                start_trb->field[3] &= ~0x1;
         xhci_ring_ep_doorbell(xhci, slot_id, ep_index, stream_id);
 }
 
@@ -2449,7 +2447,7 @@ int xhci_queue_intr_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
          * to set the polling interval (once the API is added).
          */
         if (xhci_interval != ep_interval) {
-                if (!printk_ratelimit())
+                if (printk_ratelimit())
                         dev_dbg(&urb->dev->dev, "Driver uses different interval"
                                         " (%d microframe%s) than xHCI "
                                         "(%d microframe%s)\n",
@@ -2551,9 +2549,11 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 u32 remainder = 0;
 
                 /* Don't change the cycle bit of the first TRB until later */
-                if (first_trb)
+                if (first_trb) {
                         first_trb = false;
-                else
+                        if (start_cycle == 0)
+                                field |= 0x1;
+                } else
                         field |= ep_ring->cycle_state;
 
                 /* Chain all the TRBs together; clear the chain bit in the last
@@ -2625,7 +2625,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
 
         check_trb_math(urb, num_trbs, running_total);
         giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
-                        start_cycle, start_trb, td);
+                        start_cycle, start_trb);
         return 0;
 }
 
@@ -2671,7 +2671,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */
 
         if (!in_interrupt())
-                dev_dbg(&urb->dev->dev, "ep %#x - urb len = %#x (%d), addr = %#llx, num_trbs = %d\n",
+                xhci_dbg(xhci, "ep %#x - urb len = %#x (%d), "
+                                "addr = %#llx, num_trbs = %d\n",
                                 urb->ep->desc.bEndpointAddress,
                                 urb->transfer_buffer_length,
                                 urb->transfer_buffer_length,
@@ -2711,9 +2712,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 field = 0;
 
                 /* Don't change the cycle bit of the first TRB until later */
-                if (first_trb)
+                if (first_trb) {
                         first_trb = false;
-                else
+                        if (start_cycle == 0)
+                                field |= 0x1;
+                } else
                         field |= ep_ring->cycle_state;
 
                 /* Chain all the TRBs together; clear the chain bit in the last
@@ -2757,7 +2760,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
 
         check_trb_math(urb, num_trbs, running_total);
         giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
-                        start_cycle, start_trb, td);
+                        start_cycle, start_trb);
         return 0;
 }
 
@@ -2818,13 +2821,17 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         /* Queue setup TRB - see section 6.4.1.2.1 */
         /* FIXME better way to translate setup_packet into two u32 fields? */
         setup = (struct usb_ctrlrequest *) urb->setup_packet;
+        field = 0;
+        field |= TRB_IDT | TRB_TYPE(TRB_SETUP);
+        if (start_cycle == 0)
+                field |= 0x1;
         queue_trb(xhci, ep_ring, false, true,
                         /* FIXME endianness is probably going to bite my ass here. */
                         setup->bRequestType | setup->bRequest << 8 | setup->wValue << 16,
                         setup->wIndex | setup->wLength << 16,
                         TRB_LEN(8) | TRB_INTR_TARGET(0),
                         /* Immediate data in pointer */
-                        TRB_IDT | TRB_TYPE(TRB_SETUP));
+                        field);
 
         /* If there's data, queue data TRBs */
         field = 0;
@@ -2859,7 +2866,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                         field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state);
 
         giveback_first_trb(xhci, slot_id, ep_index, 0,
-                        start_cycle, start_trb, td);
+                        start_cycle, start_trb);
         return 0;
 }
 
@@ -2900,6 +2907,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         int running_total, trb_buff_len, td_len, td_remain_len, ret;
         u64 start_addr, addr;
         int i, j;
+        bool more_trbs_coming;
 
         ep_ring = xhci->devs[slot_id]->eps[ep_index].ring;
 
@@ -2910,7 +2918,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         }
 
         if (!in_interrupt())
-                dev_dbg(&urb->dev->dev, "ep %#x - urb len = %#x (%d),"
+                xhci_dbg(xhci, "ep %#x - urb len = %#x (%d),"
                                 " addr = %#llx, num_tds = %d\n",
                                 urb->ep->desc.bEndpointAddress,
                                 urb->transfer_buffer_length,
@@ -2950,7 +2958,10 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                                 field |= TRB_TYPE(TRB_ISOC);
                                 /* Assume URB_ISO_ASAP is set */
                                 field |= TRB_SIA;
-                                if (i > 0)
+                                if (i == 0) {
+                                        if (start_cycle == 0)
+                                                field |= 0x1;
+                                } else
                                         field |= ep_ring->cycle_state;
                                 first_trb = false;
                         } else {
@@ -2965,9 +2976,11 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                          */
                         if (j < trbs_per_td - 1) {
                                 field |= TRB_CHAIN;
+                                more_trbs_coming = true;
                         } else {
                                 td->last_trb = ep_ring->enqueue;
                                 field |= TRB_IOC;
+                                more_trbs_coming = false;
                         }
 
                         /* Calculate TRB length */
@@ -2980,7 +2993,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                         length_field = TRB_LEN(trb_buff_len) |
                                 remainder |
                                 TRB_INTR_TARGET(0);
-                        queue_trb(xhci, ep_ring, false, false,
+                        queue_trb(xhci, ep_ring, false, more_trbs_coming,
                                 lower_32_bits(addr),
                                 upper_32_bits(addr),
                                 length_field,
@@ -3003,10 +3016,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 }
         }
 
-        wmb();
-        start_trb->field[3] |= start_cycle;
-
-        xhci_ring_ep_doorbell(xhci, slot_id, ep_index, urb->stream_id);
+        giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
+                        start_cycle, start_trb);
         return 0;
 }
 
@@ -3064,7 +3075,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags,
          * to set the polling interval (once the API is added).
          */
         if (xhci_interval != ep_interval) {
-                if (!printk_ratelimit())
+                if (printk_ratelimit())
                         dev_dbg(&urb->dev->dev, "Driver uses different interval"
                                         " (%d microframe%s) than xHCI "
                                         "(%d microframe%s)\n",
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 45e4a3108cc3..34cf4e165877 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -226,7 +226,8 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
 static int xhci_setup_msix(struct xhci_hcd *xhci)
 {
         int i, ret = 0;
-        struct pci_dev *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
+        struct usb_hcd *hcd = xhci_to_hcd(xhci);
+        struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
 
         /*
          * calculate number of msi-x vectors supported.
@@ -265,6 +266,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
                         goto disable_msix;
         }
 
+        hcd->msix_enabled = 1;
         return ret;
 
 disable_msix:
@@ -280,7 +282,8 @@ free_entries:
 /* Free any IRQs and disable MSI-X */
 static void xhci_cleanup_msix(struct xhci_hcd *xhci)
 {
-        struct pci_dev *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
+        struct usb_hcd *hcd = xhci_to_hcd(xhci);
+        struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
 
         xhci_free_irq(xhci);
 
@@ -292,6 +295,7 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)
                 pci_disable_msi(pdev);
         }
 
+        hcd->msix_enabled = 0;
         return;
 }
 
@@ -508,9 +512,10 @@ void xhci_stop(struct usb_hcd *hcd)
         spin_lock_irq(&xhci->lock);
         xhci_halt(xhci);
         xhci_reset(xhci);
-        xhci_cleanup_msix(xhci);
         spin_unlock_irq(&xhci->lock);
 
+        xhci_cleanup_msix(xhci);
+
 #ifdef CONFIG_USB_XHCI_HCD_DEBUGGING
         /* Tell the event ring poll function not to reschedule */
         xhci->zombie = 1;
@@ -544,9 +549,10 @@ void xhci_shutdown(struct usb_hcd *hcd)
 
         spin_lock_irq(&xhci->lock);
         xhci_halt(xhci);
-        xhci_cleanup_msix(xhci);
         spin_unlock_irq(&xhci->lock);
 
+        xhci_cleanup_msix(xhci);
+
         xhci_dbg(xhci, "xhci_shutdown completed - status = %x\n",
                     xhci_readl(xhci, &xhci->op_regs->status));
 }
@@ -647,6 +653,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
         int                     rc = 0;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
         u32                     command;
+        int                     i;
 
         spin_lock_irq(&xhci->lock);
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
@@ -677,10 +684,15 @@ int xhci_suspend(struct xhci_hcd *xhci)
                 spin_unlock_irq(&xhci->lock);
                 return -ETIMEDOUT;
         }
-        /* step 5: remove core well power */
-        xhci_cleanup_msix(xhci);
         spin_unlock_irq(&xhci->lock);
 
+        /* step 5: remove core well power */
+        /* synchronize irq when using MSI-X */
+        if (xhci->msix_entries) {
+                for (i = 0; i < xhci->msix_count; i++)
+                        synchronize_irq(xhci->msix_entries[i].vector);
+        }
+
         return rc;
 }
 
@@ -694,7 +706,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 {
         u32                     command, temp = 0;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
-        struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
         int     old_state, retval;
 
         old_state = hcd->state;
@@ -729,9 +740,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
                 xhci_dbg(xhci, "Stop HCD\n");
                 xhci_halt(xhci);
                 xhci_reset(xhci);
-                if (hibernated)
-                        xhci_cleanup_msix(xhci);
                 spin_unlock_irq(&xhci->lock);
+                xhci_cleanup_msix(xhci);
 
 #ifdef CONFIG_USB_XHCI_HCD_DEBUGGING
                 /* Tell the event ring poll function not to reschedule */
@@ -765,30 +775,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
                 return retval;
         }
 
-        spin_unlock_irq(&xhci->lock);
-        /* Re-setup MSI-X */
-        if (hcd->irq)
-                free_irq(hcd->irq, hcd);
-        hcd->irq = -1;
-
-        retval = xhci_setup_msix(xhci);
-        if (retval)
-                /* fall back to msi*/
-                retval = xhci_setup_msi(xhci);
-
-        if (retval) {
-                /* fall back to legacy interrupt*/
-                retval = request_irq(pdev->irq, &usb_hcd_irq, IRQF_SHARED,
-                                        hcd->irq_descr, hcd);
-                if (retval) {
-                        xhci_err(xhci, "request interrupt %d failed\n",
-                                        pdev->irq);
-                        return retval;
-                }
-                hcd->irq = pdev->irq;
-        }
-
-        spin_lock_irq(&xhci->lock);
         /* step 4: set Run/Stop bit */
         command = xhci_readl(xhci, &xhci->op_regs->command);
         command |= CMD_RUN;
@@ -2445,8 +2431,12 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
                 xhci_err(xhci, "Error while assigning device slot ID\n");
                 return 0;
         }
-        /* xhci_alloc_virt_device() does not touch rings; no need to lock */
-        if (!xhci_alloc_virt_device(xhci, xhci->slot_id, udev, GFP_KERNEL)) {
+        /* xhci_alloc_virt_device() does not touch rings; no need to lock.
+         * Use GFP_NOIO, since this function can be called from
+         * xhci_discover_or_reset_device(), which may be called as part of
+         * mass storage driver error handling.
+         */
+        if (!xhci_alloc_virt_device(xhci, xhci->slot_id, udev, GFP_NOIO)) {
                 /* Disable slot, if we can do it without mem alloc */
                 xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n");
                 spin_lock_irqsave(&xhci->lock, flags);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 170c367112d2..7f236fd22015 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -436,22 +436,18 @@ struct xhci_run_regs {
 /**
  * struct doorbell_array
  *
+ * Bits  0 -  7: Endpoint target
+ * Bits  8 - 15: RsvdZ
+ * Bits 16 - 31: Stream ID
+ *
  * Section 5.6
  */
 struct xhci_doorbell_array {
         u32     doorbell[256];
 };
 
-#define DB_TARGET_MASK          0xFFFFFF00
-#define DB_STREAM_ID_MASK       0x0000FFFF
-#define DB_TARGET_HOST          0x0
-#define DB_STREAM_ID_HOST       0x0
-#define DB_MASK                 (0xff << 8)
-
-/* Endpoint Target - bits 0:7 */
-#define EPI_TO_DB(p)            (((p) + 1) & 0xff)
-#define STREAM_ID_TO_DB(p)      (((p) & 0xffff) << 16)
-
+#define DB_VALUE(ep, stream)    ((((ep) + 1) & 0xff) | ((stream) << 16))
+#define DB_VALUE_HOST           0x00000000
 
 /**
  * struct xhci_protocol_caps
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index 1732d9bc097e..1616ad1793a4 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -45,7 +45,7 @@ struct usb_led {
 
 static void change_color(struct usb_led *led)
 {
-        int retval;
+        int retval = 0;
         unsigned char *buffer;
 
         buffer = kmalloc(8, GFP_KERNEL);
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 4ff21587ab03..f7a205738032 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -776,7 +776,6 @@ static const struct usb_device_id uss720_table[] = {
         { USB_DEVICE(0x0557, 0x2001) },
         { USB_DEVICE(0x0729, 0x1284) },
         { USB_DEVICE(0x1293, 0x0002) },
-        { USB_DEVICE(0x1293, 0x0002) },
         { USB_DEVICE(0x050d, 0x0002) },
         { }                                             /* Terminating entry */
 };
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index eeba228eb2af..9d49d1cd7ce2 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -404,6 +404,7 @@ static int bfin_musb_init(struct musb *musb)
                 musb->xceiv->set_power = bfin_musb_set_power;
 
         musb->isr = blackfin_interrupt;
+        musb->double_buffer_not_ok = true;
 
         return 0;
 }
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 07cf394e491b..54a8bd1047d6 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -128,12 +128,7 @@ MODULE_ALIAS("platform:" MUSB_DRIVER_NAME);
 
 static inline struct musb *dev_to_musb(struct device *dev)
 {
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-        /* usbcore insists dev->driver_data is a "struct hcd *" */
-        return hcd_to_musb(dev_get_drvdata(dev));
-#else
         return dev_get_drvdata(dev);
-#endif
 }
 
 /*-------------------------------------------------------------------------*/
@@ -1876,10 +1871,9 @@ allocate_instance(struct device *dev,
         musb = kzalloc(sizeof *musb, GFP_KERNEL);
         if (!musb)
                 return NULL;
-        dev_set_drvdata(dev, musb);
 
 #endif
-
+        dev_set_drvdata(dev, musb);
         musb->mregs = mbase;
         musb->ctrl_base = mbase;
         musb->nIrq = -ENODEV;
@@ -2191,7 +2185,7 @@ static int __init musb_probe(struct platform_device *pdev)
         void __iomem    *base;
 
         iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!iomem || irq == 0)
+        if (!iomem || irq <= 0)
                 return -ENODEV;
 
         base = ioremap(iomem->start, resource_size(iomem));
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d0c236f8e191..d74a8113ae74 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -488,6 +488,18 @@ struct musb {
         unsigned                set_address:1;
         unsigned                test_mode:1;
         unsigned                softconnect:1;
+        /*
+         * FIXME: Remove this flag.
+         *
+         * This is only added to allow Blackfin to work
+         * with current driver. For some unknown reason
+         * Blackfin doesn't work with double buffering
+         * and that's enabled by default.
+         *
+         * We added this flag to forcefully disable double
+         * buffering until we get it working.
+         */
+        unsigned                double_buffer_not_ok:1 __deprecated;
 
         u8                      address;
         u8                      test_mode_nr;
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 916065ba9e70..3a97c4e2d4f5 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -169,6 +169,9 @@ struct dma_controller {
                                                         dma_addr_t dma_addr,
                                                         u32 length);
         int                     (*channel_abort)(struct dma_channel *);
+        int                     (*is_compatible)(struct dma_channel *channel,
+                                                        u16 maxpacket,
+                                                        void *buf, u32 length);
 };
 
 /* called after channel_program(), may indicate a fault */
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index ed58c6c8f15c..2fe304611dcf 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -92,11 +92,33 @@
 
 /* ----------------------------------------------------------------------- */
 
+#define is_buffer_mapped(req) (is_dma_capable() && \
+                                        (req->map_state != UN_MAPPED))
+
 /* Maps the buffer to dma  */
 
 static inline void map_dma_buffer(struct musb_request *request,
-                                struct musb *musb)
+                        struct musb *musb, struct musb_ep *musb_ep)
 {
+        int compatible = true;
+        struct dma_controller *dma = musb->dma_controller;
+
+        request->map_state = UN_MAPPED;
+
+        if (!is_dma_capable() || !musb_ep->dma)
+                return;
+
+        /* Check if DMA engine can handle this request.
+         * DMA code must reject the USB request explicitly.
+         * Default behaviour is to map the request.
+         */
+        if (dma->is_compatible)
+                compatible = dma->is_compatible(musb_ep->dma,
+                                musb_ep->packet_sz, request->request.buf,
+                                request->request.length);
+        if (!compatible)
+                return;
+
         if (request->request.dma == DMA_ADDR_INVALID) {
                 request->request.dma = dma_map_single(
                                 musb->controller,
@@ -105,7 +127,7 @@ static inline void map_dma_buffer(struct musb_request *request,
                                 request->tx
                                         ? DMA_TO_DEVICE
                                         : DMA_FROM_DEVICE);
-                request->mapped = 1;
+                request->map_state = MUSB_MAPPED;
         } else {
                 dma_sync_single_for_device(musb->controller,
                         request->request.dma,
@@ -113,7 +135,7 @@ static inline void map_dma_buffer(struct musb_request *request,
                         request->tx
                                 ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
-                request->mapped = 0;
+                request->map_state = PRE_MAPPED;
         }
 }
 
@@ -121,11 +143,14 @@ static inline void map_dma_buffer(struct musb_request *request,
 static inline void unmap_dma_buffer(struct musb_request *request,
                                 struct musb *musb)
 {
+        if (!is_buffer_mapped(request))
+                return;
+
         if (request->request.dma == DMA_ADDR_INVALID) {
                 DBG(20, "not unmapping a never mapped buffer\n");
                 return;
         }
-        if (request->mapped) {
+        if (request->map_state == MUSB_MAPPED) {
                 dma_unmap_single(musb->controller,
                         request->request.dma,
                         request->request.length,
@@ -133,16 +158,15 @@ static inline void unmap_dma_buffer(struct musb_request *request,
                                 ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
                 request->request.dma = DMA_ADDR_INVALID;
-                request->mapped = 0;
-        } else {
+        } else { /* PRE_MAPPED */
                 dma_sync_single_for_cpu(musb->controller,
                         request->request.dma,
                         request->request.length,
                         request->tx
                                 ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
-
         }
+        request->map_state = UN_MAPPED;
 }
 
 /*
@@ -172,8 +196,7 @@ __acquires(ep->musb->lock)
 
         ep->busy = 1;
         spin_unlock(&musb->lock);
-        if (is_dma_capable() && ep->dma)
-                unmap_dma_buffer(req, musb);
+        unmap_dma_buffer(req, musb);
         if (request->status == 0)
                 DBG(5, "%s done request %p,  %d/%d\n",
                                 ep->end_point.name, request,
@@ -335,7 +358,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
                         csr);
 
 #ifndef CONFIG_MUSB_PIO_ONLY
-        if (is_dma_capable() && musb_ep->dma) {
+        if (is_buffer_mapped(req)) {
                 struct dma_controller   *c = musb->dma_controller;
                 size_t request_size;
 
@@ -436,8 +459,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
                  * Unmap the dma buffer back to cpu if dma channel
                  * programming fails
                  */
-                if (is_dma_capable() && musb_ep->dma)
-                        unmap_dma_buffer(req, musb);
+                unmap_dma_buffer(req, musb);
 
                 musb_write_fifo(musb_ep->hw_ep, fifo_count,
                                 (u8 *) (request->buf + request->actual));
@@ -627,7 +649,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)
                 return;
         }
 
-        if (is_cppi_enabled() && musb_ep->dma) {
+        if (is_cppi_enabled() && is_buffer_mapped(req)) {
                 struct dma_controller   *c = musb->dma_controller;
                 struct dma_channel      *channel = musb_ep->dma;
 
@@ -658,7 +680,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)
                 len = musb_readw(epio, MUSB_RXCOUNT);
                 if (request->actual < request->length) {
 #ifdef CONFIG_USB_INVENTRA_DMA
-                        if (is_dma_capable() && musb_ep->dma) {
+                        if (is_buffer_mapped(req)) {
                                 struct dma_controller   *c;
                                 struct dma_channel      *channel;
                                 int                     use_dma = 0;
@@ -742,7 +764,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)
                         fifo_count = min_t(unsigned, len, fifo_count);
 
 #ifdef  CONFIG_USB_TUSB_OMAP_DMA
-                        if (tusb_dma_omap() && musb_ep->dma) {
+                        if (tusb_dma_omap() && is_buffer_mapped(req)) {
                                 struct dma_controller *c = musb->dma_controller;
                                 struct dma_channel *channel = musb_ep->dma;
                                 u32 dma_addr = request->dma + request->actual;
@@ -762,7 +784,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)
                          * programming fails. This buffer is mapped if the
                          * channel allocation is successful
                          */
-                         if (is_dma_capable() && musb_ep->dma) {
+                         if (is_buffer_mapped(req)) {
                                 unmap_dma_buffer(req, musb);
 
                                 /*
@@ -989,7 +1011,11 @@ static int musb_gadget_enable(struct usb_ep *ep,
                 /* Set TXMAXP with the FIFO size of the endpoint
                  * to disable double buffering mode.
                  */
-                musb_writew(regs, MUSB_TXMAXP, musb_ep->packet_sz | (musb_ep->hb_mult << 11));
+                if (musb->double_buffer_not_ok)
+                        musb_writew(regs, MUSB_TXMAXP, hw_ep->max_packet_sz_tx);
+                else
+                        musb_writew(regs, MUSB_TXMAXP, musb_ep->packet_sz
+                                        | (musb_ep->hb_mult << 11));
 
                 csr = MUSB_TXCSR_MODE | MUSB_TXCSR_CLRDATATOG;
                 if (musb_readw(regs, MUSB_TXCSR)
@@ -1025,7 +1051,11 @@ static int musb_gadget_enable(struct usb_ep *ep,
                 /* Set RXMAXP with the FIFO size of the endpoint
                  * to disable double buffering mode.
                  */
-                musb_writew(regs, MUSB_RXMAXP, musb_ep->packet_sz | (musb_ep->hb_mult << 11));
+                if (musb->double_buffer_not_ok)
+                        musb_writew(regs, MUSB_RXMAXP, hw_ep->max_packet_sz_tx);
+                else
+                        musb_writew(regs, MUSB_RXMAXP, musb_ep->packet_sz
+                                        | (musb_ep->hb_mult << 11));
 
                 /* force shared fifo to OUT-only mode */
                 if (hw_ep->is_shared_fifo) {
@@ -1214,10 +1244,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
         request->epnum = musb_ep->current_epnum;
         request->tx = musb_ep->is_in;
 
-        if (is_dma_capable() && musb_ep->dma)
-                map_dma_buffer(request, musb);
-        else
-                request->mapped = 0;
+        map_dma_buffer(request, musb, musb_ep);
 
         spin_lock_irqsave(&musb->lock, lockflags);
 
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h
index dec8dc008191..a55354fbccf5 100644
--- a/drivers/usb/musb/musb_gadget.h
+++ b/drivers/usb/musb/musb_gadget.h
@@ -35,13 +35,19 @@
 #ifndef __MUSB_GADGET_H
 #define __MUSB_GADGET_H
 
+enum buffer_map_state {
+        UN_MAPPED = 0,
+        PRE_MAPPED,
+        MUSB_MAPPED
+};
+
 struct musb_request {
         struct usb_request      request;
         struct musb_ep          *ep;
         struct musb             *musb;
         u8 tx;                  /* endpoint direction */
         u8 epnum;
-        u8 mapped;
+        enum buffer_map_state map_state;
 };
 
 static inline struct musb_request *to_musb_request(struct usb_request *req)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 4d5bcb4e14d2..0f523d7db57b 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -609,7 +609,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)
         /* Set RXMAXP with the FIFO size of the endpoint
          * to disable double buffer mode.
          */
-        if (musb->hwvers < MUSB_HWVERS_2000)
+        if (musb->double_buffer_not_ok)
                 musb_writew(ep->regs, MUSB_RXMAXP, ep->max_packet_sz_rx);
         else
                 musb_writew(ep->regs, MUSB_RXMAXP,
@@ -784,14 +784,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                 /* protocol/endpoint/interval/NAKlimit */
                 if (epnum) {
                         musb_writeb(epio, MUSB_TXTYPE, qh->type_reg);
-                        if (can_bulk_split(musb, qh->type))
+                        if (musb->double_buffer_not_ok)
                                 musb_writew(epio, MUSB_TXMAXP,
-                                        packet_sz
-                                        | ((hw_ep->max_packet_sz_tx /
-                                                packet_sz) - 1) << 11);
+                                                hw_ep->max_packet_sz_tx);
                         else
                                 musb_writew(epio, MUSB_TXMAXP,
-                                        packet_sz);
+                                                qh->maxpacket |
+                                                ((qh->hb_mult - 1) << 11));
                         musb_writeb(epio, MUSB_TXINTERVAL, qh->intv_reg);
                 } else {
                         musb_writeb(epio, MUSB_NAKLIMIT0, qh->intv_reg);
diff --git a/drivers/usb/musb/musbhsdma.h b/drivers/usb/musb/musbhsdma.h
index f763d62f151c..21056c924c74 100644
--- a/drivers/usb/musb/musbhsdma.h
+++ b/drivers/usb/musb/musbhsdma.h
@@ -94,24 +94,33 @@ static inline void musb_write_hsdma_addr(void __iomem *mbase,
 {
         musb_writew(mbase,
                 MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_LOW),
-                ((u16)((u32) dma_addr & 0xFFFF)));
+                dma_addr);
         musb_writew(mbase,
                 MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_ADDR_HIGH),
-                ((u16)(((u32) dma_addr >> 16) & 0xFFFF)));
+                (dma_addr >> 16));
 }
 
 static inline u32 musb_read_hsdma_count(void __iomem *mbase, u8 bchannel)
 {
-        return musb_readl(mbase,
+        u32 count = musb_readw(mbase,
                 MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_HIGH));
+
+        count = count << 16;
+
+        count |= musb_readw(mbase,
+                MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_LOW));
+
+        return count;
 }
 
 static inline void musb_write_hsdma_count(void __iomem *mbase,
                                 u8 bchannel, u32 len)
 {
-        musb_writel(mbase,
+        musb_writew(mbase,
+                MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_LOW),len);
+        musb_writew(mbase,
                 MUSB_HSDMA_CHANNEL_OFFSET(bchannel, MUSB_HSDMA_COUNT_HIGH),
-                len);
+                (len >> 16));
 }
 
 #endif /* CONFIG_BLACKFIN */
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 9fb875d5f09c..9ffc8237fb4b 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -103,6 +103,8 @@ config USB_MSM_OTG_72K
           required after resetting the hardware and power management.
           This driver is required even for peripheral only or host only
           mode configurations.
+          This driver is not supported on boards like trout which
+          has an external PHY.
 
 config AB8500_USB
         tristate "AB8500 USB Transceiver Driver"
diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c
index e70014ab0976..8acf165fe13b 100644
--- a/drivers/usb/otg/nop-usb-xceiv.c
+++ b/drivers/usb/otg/nop-usb-xceiv.c
@@ -132,6 +132,8 @@ static int __devinit nop_usb_xceiv_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, nop);
 
+        BLOCKING_INIT_NOTIFIER_HEAD(&nop->otg.notifier);
+
         return 0;
 exit:
         kfree(nop);
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c
index 059d9ac0ab5b..770d799d5afb 100644
--- a/drivers/usb/otg/ulpi.c
+++ b/drivers/usb/otg/ulpi.c
@@ -45,7 +45,7 @@ struct ulpi_info {
 /* ULPI hardcoded IDs, used for probing */
 static struct ulpi_info ulpi_ids[] = {
         ULPI_INFO(ULPI_ID(0x04cc, 0x1504), "NXP ISP1504"),
-        ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB3319"),
+        ULPI_INFO(ULPI_ID(0x0424, 0x0006), "SMSC USB331x"),
 };
 
 static int ulpi_set_otg_flags(struct otg_transceiver *otg)
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 63f7cc45bcac..7b8815ddf368 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -486,12 +486,22 @@ static void ch341_read_int_callback(struct urb *urb)
         if (actual_length >= 4) {
                 struct ch341_private *priv = usb_get_serial_port_data(port);
                 unsigned long flags;
+                u8 prev_line_status = priv->line_status;
 
                 spin_lock_irqsave(&priv->lock, flags);
                 priv->line_status = (~(data[2])) & CH341_BITS_MODEM_STAT;
                 if ((data[1] & CH341_MULT_STAT))
                         priv->multi_status_change = 1;
                 spin_unlock_irqrestore(&priv->lock, flags);
+
+                if ((priv->line_status ^ prev_line_status) & CH341_BIT_DCD) {
+                        struct tty_struct *tty = tty_port_tty_get(&port->port);
+                        if (tty)
+                                usb_serial_handle_dcd_change(port, tty,
+                                            priv->line_status & CH341_BIT_DCD);
+                        tty_kref_put(tty);
+                }
+
                 wake_up_interruptible(&priv->delta_msr_wait);
         }
 
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 8d7731dbf478..735ea03157ab 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -49,7 +49,6 @@ static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *,
 static void cp210x_break_ctl(struct tty_struct *, int);
 static int cp210x_startup(struct usb_serial *);
 static void cp210x_dtr_rts(struct usb_serial_port *p, int on);
-static int cp210x_carrier_raised(struct usb_serial_port *p);
 
 static int debug;
 
@@ -87,7 +86,6 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */
         { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
         { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */
-        { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */
         { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
         { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
         { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
@@ -110,7 +108,9 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
         { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */
         { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */
+        { USB_DEVICE(0x10C4, 0x83D8) }, /* DekTec DTA Plus VHF/UHF Booster/Attenuator */
         { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */
+        { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */
         { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */
         { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
@@ -165,8 +165,7 @@ static struct usb_serial_driver cp210x_device = {
         .tiocmget               = cp210x_tiocmget,
         .tiocmset               = cp210x_tiocmset,
         .attach                 = cp210x_startup,
-        .dtr_rts                = cp210x_dtr_rts,
-        .carrier_raised         = cp210x_carrier_raised
+        .dtr_rts                = cp210x_dtr_rts
 };
 
 /* Config request types */
@@ -765,15 +764,6 @@ static int cp210x_tiocmget (struct tty_struct *tty, struct file *file)
         return result;
 }
 
-static int cp210x_carrier_raised(struct usb_serial_port *p)
-{
-        unsigned int control;
-        cp210x_get_config(p, CP210X_GET_MDMSTS, &control, 1);
-        if (control & CONTROL_DCD)
-                return 1;
-        return 0;
-}
-
 static void cp210x_break_ctl (struct tty_struct *tty, int break_state)
 {
         struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index b92070c103cd..666e5a6edd82 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -455,7 +455,6 @@ static int digi_write_room(struct tty_struct *tty);
 static int digi_chars_in_buffer(struct tty_struct *tty);
 static int digi_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void digi_close(struct usb_serial_port *port);
-static int digi_carrier_raised(struct usb_serial_port *port);
 static void digi_dtr_rts(struct usb_serial_port *port, int on);
 static int digi_startup_device(struct usb_serial *serial);
 static int digi_startup(struct usb_serial *serial);
@@ -511,7 +510,6 @@ static struct usb_serial_driver digi_acceleport_2_device = {
         .open =                         digi_open,
         .close =                        digi_close,
         .dtr_rts =                      digi_dtr_rts,
-        .carrier_raised =               digi_carrier_raised,
         .write =                        digi_write,
         .write_room =                   digi_write_room,
         .write_bulk_callback =          digi_write_bulk_callback,
@@ -1339,14 +1337,6 @@ static void digi_dtr_rts(struct usb_serial_port *port, int on)
         digi_set_modem_signals(port, on * (TIOCM_DTR|TIOCM_RTS), 1);
 }
 
-static int digi_carrier_raised(struct usb_serial_port *port)
-{
-        struct digi_port *priv = usb_get_serial_port_data(port);
-        if (priv->dp_modem_signals & TIOCM_CD)
-                return 1;
-        return 0;
-}
-
 static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         int ret;
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index a2668d089260..f349a3629d00 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -100,6 +100,7 @@ struct ftdi_sio_quirk {
 static int   ftdi_jtag_probe(struct usb_serial *serial);
 static int   ftdi_mtxorb_hack_setup(struct usb_serial *serial);
 static int   ftdi_NDI_device_setup(struct usb_serial *serial);
+static int   ftdi_stmclite_probe(struct usb_serial *serial);
 static void  ftdi_USB_UIRT_setup(struct ftdi_private *priv);
 static void  ftdi_HE_TIRA1_setup(struct ftdi_private *priv);
 
@@ -123,6 +124,10 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
         .port_probe = ftdi_HE_TIRA1_setup,
 };
 
+static struct ftdi_sio_quirk ftdi_stmclite_quirk = {
+        .probe  = ftdi_stmclite_probe,
+};
+
 /*
  * The 8U232AM has the same API as the sio except for:
  * - it can support MUCH higher baudrates; up to:
@@ -616,6 +621,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) },
         { USB_DEVICE(TTI_VID, TTI_QL355P_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },
+        { USB_DEVICE(ACTON_VID, ACTON_SPECTRAPRO_PID) },
         { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },
         { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
         { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
@@ -676,7 +682,17 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
-        { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_1_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_OPC_U_UC_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2C1_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2C2_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2D_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2VT_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2VR_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP4KVT_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP4KVR_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2KVT_PID) },
+        { USB_DEVICE(ICOM_VID, ICOM_ID_RP2KVR_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) },
@@ -800,6 +816,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) },
         { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
+                .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1699,6 +1717,25 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
 }
 
 /*
+ * First and second port on STMCLiteadaptors is reserved for JTAG interface
+ * and the forth port for pio
+ */
+static int ftdi_stmclite_probe(struct usb_serial *serial)
+{
+        struct usb_device *udev = serial->dev;
+        struct usb_interface *interface = serial->interface;
+
+        dbg("%s", __func__);
+
+        if (interface == udev->actconfig->interface[2])
+                return 0;
+
+        dev_info(&udev->dev, "Ignoring serial port reserved for JTAG\n");
+
+        return -ENODEV;
+}
+
+/*
  * The Matrix Orbital VK204-25-USB has an invalid IN endpoint.
  * We have to correct it if we want to read from it.
  */
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index bf0867285481..117e8e6f93c6 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -518,6 +518,12 @@
 #define RATOC_PRODUCT_ID_USB60F 0xb020
 
 /*
+ * Acton Research Corp.
+ */
+#define ACTON_VID               0x0647  /* Vendor ID */
+#define ACTON_SPECTRAPRO_PID    0x0100
+
+/*
  * Contec products (http://www.contec.com)
  * Submitted by Daniel Sangorrin
  */
@@ -569,11 +575,23 @@
 #define OCT_US101_PID           0x0421  /* OCT US101 USB to RS-232 */
 
 /*
- * Icom ID-1 digital transceiver
+ * Definitions for Icom Inc. devices
  */
-
-#define ICOM_ID1_VID            0x0C26
-#define ICOM_ID1_PID            0x0004
+#define ICOM_VID                0x0C26 /* Icom vendor ID */
+/* Note: ID-1 is a communications tranceiver for HAM-radio operators */
+#define ICOM_ID_1_PID           0x0004 /* ID-1 USB to RS-232 */
+/* Note: OPC is an Optional cable to connect an Icom Tranceiver */
+#define ICOM_OPC_U_UC_PID       0x0018 /* OPC-478UC, OPC-1122U cloning cable */
+/* Note: ID-RP* devices are Icom Repeater Devices for HAM-radio */
+#define ICOM_ID_RP2C1_PID       0x0009 /* ID-RP2C Asset 1 to RS-232 */
+#define ICOM_ID_RP2C2_PID       0x000A /* ID-RP2C Asset 2 to RS-232 */
+#define ICOM_ID_RP2D_PID        0x000B /* ID-RP2D configuration port*/
+#define ICOM_ID_RP2VT_PID       0x000C /* ID-RP2V Transmit config port */
+#define ICOM_ID_RP2VR_PID       0x000D /* ID-RP2V Receive config port */
+#define ICOM_ID_RP4KVT_PID      0x0010 /* ID-RP4000V Transmit config port */
+#define ICOM_ID_RP4KVR_PID      0x0011 /* ID-RP4000V Receive config port */
+#define ICOM_ID_RP2KVT_PID      0x0012 /* ID-RP2000V Transmit config port */
+#define ICOM_ID_RP2KVR_PID      0x0013 /* ID-RP2000V Receive config port */
 
 /*
  * GN Otometrics (http://www.otometrics.com)
@@ -1022,6 +1040,12 @@
 #define WHT_PID                 0x0004 /* Wireless Handheld Terminal */
 
 /*
+ * STMicroelectonics
+ */
+#define ST_VID                  0x0483
+#define ST_STMCLT1030_PID       0x3747 /* ST Micro Connect Lite STMCLT1030 */
+
+/*
  * Papouch products (http://www.papouch.com/)
  * Submitted by Folkert van Heusden
  */
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index e6833e216fc9..e4db5ad2bc55 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -479,6 +479,26 @@ int usb_serial_handle_break(struct usb_serial_port *port)
 }
 EXPORT_SYMBOL_GPL(usb_serial_handle_break);
 
+/**
+ *      usb_serial_handle_dcd_change - handle a change of carrier detect state
+ *      @port: usb_serial_port structure for the open port
+ *      @tty: tty_struct structure for the port
+ *      @status: new carrier detect status, nonzero if active
+ */
+void usb_serial_handle_dcd_change(struct usb_serial_port *usb_port,
+                                struct tty_struct *tty, unsigned int status)
+{
+        struct tty_port *port = &usb_port->port;
+
+        dbg("%s - port %d, status %d", __func__, usb_port->number, status);
+
+        if (status)
+                wake_up_interruptible(&port->open_wait);
+        else if (tty && !C_CLOCAL(tty))
+                tty_hangup(tty);
+}
+EXPORT_SYMBOL_GPL(usb_serial_handle_dcd_change);
+
 int usb_serial_generic_resume(struct usb_serial *serial)
 {
         struct usb_serial_port *port;
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index cd769ef24f8a..3b246d93cf22 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2889,8 +2889,8 @@ static void load_application_firmware(struct edgeport_serial *edge_serial)
 
         dbg("%s %d.%d.%d", fw_info, rec->data[0], rec->data[1], build);
 
-        edge_serial->product_info.FirmwareMajorVersion = fw->data[0];
-        edge_serial->product_info.FirmwareMinorVersion = fw->data[1];
+        edge_serial->product_info.FirmwareMajorVersion = rec->data[0];
+        edge_serial->product_info.FirmwareMinorVersion = rec->data[1];
         edge_serial->product_info.FirmwareBuildNumber = cpu_to_le16(build);
 
         for (rec = ihex_next_binrec(rec); rec;
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 6ab2a3f97fe8..178b22eb32b1 100644
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -199,6 +199,7 @@ static struct usb_serial_driver epic_device = {
                 .name           = "epic",
         },
         .description            = "EPiC device",
+        .usb_driver             = &io_driver,
         .id_table               = Epic_port_id_table,
         .num_ports              = 1,
         .open                   = edge_open,
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 12ed594f5f80..99b97c04896f 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1275,6 +1275,7 @@ static struct usb_serial_driver iuu_device = {
                    .name = "iuu_phoenix",
                    },
         .id_table = id_table,
+        .usb_driver = &iuu_driver,
         .num_ports = 1,
         .bulk_in_size = 512,
         .bulk_out_size = 512,
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 2d8baf6ac472..ce134dc28ddf 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -546,6 +546,7 @@ static struct usb_serial_driver keyspan_pre_device = {
                 .name           = "keyspan_no_firm",
         },
         .description            = "Keyspan - (without firmware)",
+        .usb_driver             = &keyspan_driver,
         .id_table               = keyspan_pre_ids,
         .num_ports              = 1,
         .attach                 = keyspan_fake_startup,
@@ -557,6 +558,7 @@ static struct usb_serial_driver keyspan_1port_device = {
                 .name           = "keyspan_1",
         },
         .description            = "Keyspan 1 port adapter",
+        .usb_driver             = &keyspan_driver,
         .id_table               = keyspan_1port_ids,
         .num_ports              = 1,
         .open                   = keyspan_open,
@@ -579,6 +581,7 @@ static struct usb_serial_driver keyspan_2port_device = {
                 .name           = "keyspan_2",
         },
         .description            = "Keyspan 2 port adapter",
+        .usb_driver             = &keyspan_driver,
         .id_table               = keyspan_2port_ids,
         .num_ports              = 2,
         .open                   = keyspan_open,
@@ -601,6 +604,7 @@ static struct usb_serial_driver keyspan_4port_device = {
                 .name           = "keyspan_4",
         },
         .description            = "Keyspan 4 port adapter",
+        .usb_driver             = &keyspan_driver,
         .id_table               = keyspan_4port_ids,
         .num_ports              = 4,
         .open                   = keyspan_open,
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index a10dd5676ccc..554a8693a463 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -679,22 +679,6 @@ static void keyspan_pda_dtr_rts(struct usb_serial_port *port, int on)
         }
 }
 
-static int keyspan_pda_carrier_raised(struct usb_serial_port *port)
-{
-        struct usb_serial *serial = port->serial;
-        unsigned char modembits;
-
-        /* If we can read the modem status and the DCD is low then
-           carrier is not raised yet */
-        if (keyspan_pda_get_modem_info(serial, &modembits) >= 0) {
-                if (!(modembits & (1>>6)))
-                        return 0;
-        }
-        /* Carrier raised, or we failed (eg disconnected) so
-           progress accordingly */
-        return 1;
-}
-
 
 static int keyspan_pda_open(struct tty_struct *tty,
                                         struct usb_serial_port *port)
@@ -881,7 +865,6 @@ static struct usb_serial_driver keyspan_pda_device = {
         .id_table =             id_table_std,
         .num_ports =            1,
         .dtr_rts =              keyspan_pda_dtr_rts,
-        .carrier_raised =       keyspan_pda_carrier_raised,
         .open =                 keyspan_pda_open,
         .close =                keyspan_pda_close,
         .write =                keyspan_pda_write,
diff --git a/drivers/usb/serial/moto_modem.c b/drivers/usb/serial/moto_modem.c
index cf1718394e18..653465f61d4a 100644
--- a/drivers/usb/serial/moto_modem.c
+++ b/drivers/usb/serial/moto_modem.c
@@ -44,6 +44,7 @@ static struct usb_serial_driver moto_device = {
                 .name =         "moto-modem",
         },
         .id_table =             id_table,
+        .usb_driver =           &moto_driver,
         .num_ports =            1,
 };
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 748778288d94..5f46838dfee5 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -382,7 +382,16 @@ static void option_instat_callback(struct urb *urb);
 #define HAIER_VENDOR_ID                         0x201e
 #define HAIER_PRODUCT_CE100                     0x2009
 
-#define CINTERION_VENDOR_ID                     0x0681
+/* Cinterion (formerly Siemens) products */
+#define SIEMENS_VENDOR_ID                               0x0681
+#define CINTERION_VENDOR_ID                             0x1e2d
+#define CINTERION_PRODUCT_HC25_MDM              0x0047
+#define CINTERION_PRODUCT_HC25_MDMNET   0x0040
+#define CINTERION_PRODUCT_HC28_MDM              0x004C
+#define CINTERION_PRODUCT_HC28_MDMNET   0x004A /* same for HC28J */
+#define CINTERION_PRODUCT_EU3_E                 0x0051
+#define CINTERION_PRODUCT_EU3_P                 0x0052
+#define CINTERION_PRODUCT_PH8                   0x0053
 
 /* Olivetti products */
 #define OLIVETTI_VENDOR_ID                      0x0b3c
@@ -944,7 +953,17 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100F) },
         { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
         { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
-        { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },
+        /* Cinterion */
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, 
+        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
+        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
+        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
+        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
+        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
+
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 5be866bb7a41..73613205be7a 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -157,6 +157,7 @@ static struct usb_serial_driver oti6858_device = {
                 .name =         "oti6858",
         },
         .id_table =             id_table,
+        .usb_driver =           &oti6858_driver,
         .num_ports =            1,
         .open =                 oti6858_open,
         .close =                oti6858_close,
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 8ae4c6cbc38a..08c9181b8e48 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -50,6 +50,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) },
+        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
         { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
@@ -677,9 +678,11 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
 {
 
         struct pl2303_private *priv = usb_get_serial_port_data(port);
+        struct tty_struct *tty;
         unsigned long flags;
         u8 status_idx = UART_STATE;
         u8 length = UART_STATE + 1;
+        u8 prev_line_status;
         u16 idv, idp;
 
         idv = le16_to_cpu(port->serial->dev->descriptor.idVendor);
@@ -701,11 +704,20 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
 
         /* Save off the uart status for others to look at */
         spin_lock_irqsave(&priv->lock, flags);
+        prev_line_status = priv->line_status;
         priv->line_status = data[status_idx];
         spin_unlock_irqrestore(&priv->lock, flags);
         if (priv->line_status & UART_BREAK_ERROR)
                 usb_serial_handle_break(port);
         wake_up_interruptible(&priv->delta_msr_wait);
+
+        tty = tty_port_tty_get(&port->port);
+        if (!tty)
+                return;
+        if ((priv->line_status ^ prev_line_status) & UART_DCD)
+                usb_serial_handle_dcd_change(port, tty,
+                                priv->line_status & UART_DCD);
+        tty_kref_put(tty);
 }
 
 static void pl2303_read_int_callback(struct urb *urb)
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 43eb9bdad422..1b025f75dafd 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -21,6 +21,7 @@
 #define PL2303_PRODUCT_ID_MMX           0x0612
 #define PL2303_PRODUCT_ID_GPRS          0x0609
 #define PL2303_PRODUCT_ID_HCR331        0x331a
+#define PL2303_PRODUCT_ID_MOTOROLA      0x0307
 
 #define ATEN_VENDOR_ID          0x0557
 #define ATEN_VENDOR_ID2         0x0547
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 214a3e504292..30b73e68a904 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -36,6 +36,7 @@
 #define UTSTARCOM_PRODUCT_UM175_V1              0x3712
 #define UTSTARCOM_PRODUCT_UM175_V2              0x3714
 #define UTSTARCOM_PRODUCT_UM175_ALLTEL          0x3715
+#define PANTECH_PRODUCT_UML290_VZW              0x3718
 
 /* CMOTECH devices */
 #define CMOTECH_VENDOR_ID                       0x16d8
@@ -66,6 +67,7 @@ static struct usb_device_id id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -84,6 +86,7 @@ static struct usb_serial_driver qcaux_device = {
                 .name =         "qcaux",
         },
         .id_table =             id_table,
+        .usb_driver =           &qcaux_driver,
         .num_ports =            1,
 };
 
diff --git a/drivers/usb/serial/siemens_mpi.c b/drivers/usb/serial/siemens_mpi.c
index cb8195cabfde..74cd4ccdb3fc 100644
--- a/drivers/usb/serial/siemens_mpi.c
+++ b/drivers/usb/serial/siemens_mpi.c
@@ -42,6 +42,7 @@ static struct usb_serial_driver siemens_usb_mpi_device = {
                 .name =         "siemens_mpi",
         },
         .id_table =             id_table,
+        .usb_driver =           &siemens_usb_mpi_driver,
         .num_ports =            1,
 };
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 765aa983bf58..cbfb70bffdd0 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -133,7 +133,7 @@ struct spcp8x5_usb_ctrl_arg {
 
 /* how come ??? */
 #define UART_STATE                      0x08
-#define UART_STATE_TRANSIENT_MASK       0x74
+#define UART_STATE_TRANSIENT_MASK       0x75
 #define UART_DCD                        0x01
 #define UART_DSR                        0x02
 #define UART_BREAK_ERROR                0x04
@@ -525,6 +525,10 @@ static void spcp8x5_process_read_urb(struct urb *urb)
                 /* overrun is special, not associated with a char */
                 if (status & UART_OVERRUN_ERROR)
                         tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+
+                if (status & UART_DCD)
+                        usb_serial_handle_dcd_change(port, tty,
+                                   priv->line_status & MSR_STATUS_LINE_DCD);
         }
 
         tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
@@ -645,6 +649,7 @@ static struct usb_serial_driver spcp8x5_device = {
                 .name =         "SPCP8x5",
         },
         .id_table               = id_table,
+        .usb_driver             = &spcp8x5_driver,
         .num_ports              = 1,
         .open                   = spcp8x5_open,
         .dtr_rts                = spcp8x5_dtr_rts,
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index b2902f307b47..a910004f4079 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -369,9 +369,9 @@ failed_1port:
 
 static void __exit ti_exit(void)
 {
+        usb_deregister(&ti_usb_driver);
         usb_serial_deregister(&ti_1port_device);
         usb_serial_deregister(&ti_2port_device);
-        usb_deregister(&ti_usb_driver);
 }
 
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 6954de50c0ff..546a52179bec 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1344,11 +1344,15 @@ int usb_serial_register(struct usb_serial_driver *driver)
                 return -ENODEV;
 
         fixup_generic(driver);
-        if (driver->usb_driver)
-                driver->usb_driver->supports_autosuspend = 1;
 
         if (!driver->description)
                 driver->description = driver->driver.name;
+        if (!driver->usb_driver) {
+                WARN(1, "Serial driver %s has no usb_driver\n",
+                                driver->description);
+                return -EINVAL;
+        }
+        driver->usb_driver->supports_autosuspend = 1;
 
         /* Add this device to our list of devices */
         mutex_lock(&table_lock);
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index f2ed6a31be77..95a82148ee81 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -75,6 +75,7 @@ static struct usb_serial_driver debug_device = {
                 .name =         "debug",
         },
         .id_table =             id_table,
+        .usb_driver =           &debug_driver,
         .num_ports =            1,
         .bulk_out_size =        USB_DEBUG_MAX_PACKET_SIZE,
         .break_ctl =            usb_debug_break_ctl,
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index c854fdebe0ae..2c8553026222 100644
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -31,4 +31,9 @@ UNUSUAL_DEV(  0x04b4, 0x6831, 0x0000, 0x9999,
                 "Cypress ISD-300LP",
                 USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
 
+UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
+                "Super Top",
+                "USB 2.0  SATA BRIDGE",
+                USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+
 #endif /* defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || ... */
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index fcc1e32ce256..c1602b8c5594 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1044,6 +1044,15 @@ UNUSUAL_DEV(  0x084d, 0x0011, 0x0110, 0x0110,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_BULK32),
 
+/* Reported by <ttkspam@free.fr>
+ * The device reports a vendor-specific device class, requiring an
+ * explicit vendor/product match.
+ */
+UNUSUAL_DEV(  0x0851, 0x1542, 0x0002, 0x0002,
+                "MagicPixel",
+                "FW_Omega2",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0),
+
 /* Andrew Lunn <andrew@lunn.ch>
  * PanDigital Digital Picture Frame. Does not like ALLOW_MEDIUM_REMOVAL
  * on LUN 4.
@@ -1388,6 +1397,13 @@ UNUSUAL_DEV(  0x0f19, 0x0105, 0x0100, 0x0100,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* Submitted by Nick Holloway */
+UNUSUAL_DEV( 0x0f88, 0x042e, 0x0100, 0x0100,
+                "VTech",
+                "Kidizoom",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 /* Reported by Michael Stattmann <michael@stattmann.com> */
 UNUSUAL_DEV(  0x0fce, 0xd008, 0x0000, 0x0000,
                 "Sony Ericsson",
@@ -1872,6 +1888,22 @@ UNUSUAL_DEV( 0x1908, 0x3335, 0x0200, 0x0200,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_NO_READ_DISC_INFO ),
 
+/* Patch by Richard Schütz <r.schtz@t-online.de>
+ * This external hard drive enclosure uses a JMicron chip which
+ * needs the US_FL_IGNORE_RESIDUE flag to work properly. */
+UNUSUAL_DEV(  0x1e68, 0x001b, 0x0000, 0x0000,
+                "TrekStor GmbH & Co. KG",
+                "DataStation maxi g.u",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE | US_FL_SANE_SENSE ),
+
+/* Reported by Jasper Mackenzie <scarletpimpernal@hotmail.com> */
+UNUSUAL_DEV( 0x1e74, 0x4621, 0x0000, 0x0000,
+                "Coby Electronics",
+                "MP3 Player",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ),
+
 UNUSUAL_DEV( 0x2116, 0x0320, 0x0001, 0x0001,
                 "ST",
                 "2A",
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 9b3ca103135f..f616cefc95ba 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -128,8 +128,7 @@ static void handle_tx(struct vhost_net *net)
         size_t hdr_size;
         struct socket *sock;
 
-        /* TODO: check that we are running from vhost_worker?
-         * Not sure it's worth it, it's straight-forward enough. */
+        /* TODO: check that we are running from vhost_worker? */
         sock = rcu_dereference_check(vq->private_data, 1);
         if (!sock)
                 return;
@@ -306,7 +305,8 @@ static void handle_rx_big(struct vhost_net *net)
         size_t len, total_len = 0;
         int err;
         size_t hdr_size;
-        struct socket *sock = rcu_dereference(vq->private_data);
+        /* TODO: check that we are running from vhost_worker? */
+        struct socket *sock = rcu_dereference_check(vq->private_data, 1);
         if (!sock || skb_queue_empty(&sock->sk->sk_receive_queue))
                 return;
 
@@ -415,7 +415,8 @@ static void handle_rx_mergeable(struct vhost_net *net)
         int err, headcount;
         size_t vhost_hlen, sock_hlen;
         size_t vhost_len, sock_len;
-        struct socket *sock = rcu_dereference(vq->private_data);
+        /* TODO: check that we are running from vhost_worker? */
+        struct socket *sock = rcu_dereference_check(vq->private_data, 1);
         if (!sock || skb_queue_empty(&sock->sk->sk_receive_queue))
                 return;
 
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 38244f59cdd9..ade0568c07a4 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -97,22 +97,26 @@ void vhost_poll_stop(struct vhost_poll *poll)
         remove_wait_queue(poll->wqh, &poll->wait);
 }
 
+static bool vhost_work_seq_done(struct vhost_dev *dev, struct vhost_work *work,
+                                unsigned seq)
+{
+        int left;
+        spin_lock_irq(&dev->work_lock);
+        left = seq - work->done_seq;
+        spin_unlock_irq(&dev->work_lock);
+        return left <= 0;
+}
+
 static void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work)
 {
         unsigned seq;
-        int left;
         int flushing;
 
         spin_lock_irq(&dev->work_lock);
         seq = work->queue_seq;
         work->flushing++;
         spin_unlock_irq(&dev->work_lock);
-        wait_event(work->done, ({
-                   spin_lock_irq(&dev->work_lock);
-                   left = seq - work->done_seq <= 0;
-                   spin_unlock_irq(&dev->work_lock);
-                   left;
-        }));
+        wait_event(work->done, vhost_work_seq_done(dev, work, seq));
         spin_lock_irq(&dev->work_lock);
         flushing = --work->flushing;
         spin_unlock_irq(&dev->work_lock);
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 2af44b7b1f3f..b3363ae38518 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -173,9 +173,9 @@ static inline int vhost_has_feature(struct vhost_dev *dev, int bit)
 {
         unsigned acked_features;
 
-        acked_features =
-                rcu_dereference_index_check(dev->acked_features,
-                                            lockdep_is_held(&dev->mutex));
+        /* TODO: check that we are running from vhost_worker or dev mutex is
+         * held? */
+        acked_features = rcu_dereference_index_check(dev->acked_features, 1);
         return acked_features & (1 << bit);
 }
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d916ac04abab..6bafb51bb437 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1227,7 +1227,7 @@ config FB_CARILLO_RANCH
 
 config FB_INTEL
         tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED
+        depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EXPERT
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index d583bea608fd..391ac939f011 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -23,7 +23,7 @@
 #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 <linux/console.h> /* Why should fb driver call console functions? because console_lock() */
 #include <video/vga.h>
 
 #ifdef CONFIG_MTRR
@@ -1091,12 +1091,12 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
 
         dev_info(info->device, "suspend\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
                 mutex_unlock(&(par->open_lock));
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -1107,7 +1107,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
         pci_set_power_state(dev, pci_choose_state(dev, state));
 
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -1122,7 +1122,7 @@ static int ark_pci_resume (struct pci_dev* dev)
 
         dev_info(info->device, "resume\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if (par->ref_count == 0)
@@ -1141,7 +1141,7 @@ static int ark_pci_resume (struct pci_dev* dev)
 
 fail:
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 #else
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index dd9de2e80580..4cb6a576c567 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1860,11 +1860,11 @@ static void aty128_early_resume(void *data)
 {
         struct aty128fb_par *par = data;
 
-        if (try_acquire_console_sem())
+        if (!console_trylock())
                 return;
         pci_restore_state(par->pdev);
         aty128_do_resume(par->pdev);
-        release_console_sem();
+        console_unlock();
 }
 #endif /* CONFIG_PPC_PMAC */
 
@@ -2438,7 +2438,7 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 
         printk(KERN_DEBUG "aty128fb: suspending...\n");
         
-        acquire_console_sem();
+        console_lock();
 
         fb_set_suspend(info, 1);
 
@@ -2470,7 +2470,7 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (state.event != PM_EVENT_ON)
                 aty128_set_suspend(par, 1);
 
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = state;
 
@@ -2527,9 +2527,9 @@ static int aty128_pci_resume(struct pci_dev *pdev)
 {
         int rc;
 
-        acquire_console_sem();
+        console_lock();
         rc = aty128_do_resume(pdev);
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 767ab4fb1a05..94e293fce1d2 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2069,7 +2069,7 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
 
         fb_set_suspend(info, 1);
 
@@ -2097,14 +2097,14 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
                 par->lock_blank = 0;
                 atyfb_blank(FB_BLANK_UNBLANK, info);
                 fb_set_suspend(info, 0);
-                release_console_sem();
+                console_unlock();
                 return -EIO;
         }
 #else
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
 #endif
 
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = state;
 
@@ -2133,7 +2133,7 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
 
         /*
          * PCI state will have been restored by the core, so
@@ -2161,7 +2161,7 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         par->lock_blank = 0;
         atyfb_blank(FB_BLANK_UNBLANK, info);
 
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = PMSG_ON;
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index c4e17642d9c5..92bda5848516 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2626,7 +2626,7 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
                 goto done;
         }
 
-        acquire_console_sem();
+        console_lock();
 
         fb_set_suspend(info, 1);
 
@@ -2690,7 +2690,7 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         if (rinfo->pm_mode & radeon_pm_d2)
                 radeon_set_suspend(rinfo, 1);
 
-        release_console_sem();
+        console_unlock();
 
  done:
         pdev->dev.power.power_state = mesg;
@@ -2715,10 +2715,10 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
                 return 0;
 
         if (rinfo->no_schedule) {
-                if (try_acquire_console_sem())
+                if (!console_trylock())
                         return 0;
         } else
-                acquire_console_sem();
+                console_lock();
 
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
                pci_name(pdev), pdev->dev.power.power_state.event);
@@ -2783,7 +2783,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         pdev->dev.power.power_state = PMSG_ON;
 
  bail:
-        release_console_sem();
+        console_unlock();
 
         return rc;
 }
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index c789c46e38af..b224396b86d5 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -21,7 +21,7 @@
 #define MAX_BRIGHTNESS          (0xFF)
 #define MIN_BRIGHTNESS          (0)
 
-#define CURRENT_MASK            (0x1F << 1)
+#define CURRENT_BITMASK         (0x1F << 1)
 
 struct pm860x_backlight_data {
         struct pm860x_chip *chip;
@@ -85,7 +85,7 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
         if ((data->current_brightness == 0) && brightness) {
                 if (data->iset) {
                         ret = pm860x_set_bits(data->i2c, wled_idc(data->port),
-                                              CURRENT_MASK, data->iset);
+                                              CURRENT_BITMASK, data->iset);
                         if (ret < 0)
                                 goto out;
                 }
diff --git a/drivers/video/bf537-lq035.c b/drivers/video/bf537-lq035.c
index 18c507874ff1..47c21fb2c82f 100644
--- a/drivers/video/bf537-lq035.c
+++ b/drivers/video/bf537-lq035.c
@@ -696,6 +696,7 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev)
 {
         struct backlight_properties props;
         dma_addr_t dma_handle;
+        int ret;
 
         if (request_dma(CH_PPI, KBUILD_MODNAME)) {
                 pr_err("couldn't request PPI DMA\n");
@@ -704,17 +705,16 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev)
 
         if (request_ports()) {
                 pr_err("couldn't request gpio port\n");
-                free_dma(CH_PPI);
-                return -EFAULT;
+                ret = -EFAULT;
+                goto out_ports;
         }
 
         fb_buffer = dma_alloc_coherent(NULL, TOTAL_VIDEO_MEM_SIZE,
                                        &dma_handle, GFP_KERNEL);
         if (fb_buffer == NULL) {
                 pr_err("couldn't allocate dma buffer\n");
-                free_dma(CH_PPI);
-                free_ports();
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out_dma_coherent;
         }
 
         if (L1_DATA_A_LENGTH)
@@ -725,10 +725,8 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev)
 
         if (dma_desc_table == NULL) {
                 pr_err("couldn't allocate dma descriptor\n");
-                free_dma(CH_PPI);
-                free_ports();
-                dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out_table;
         }
 
         bfin_lq035_fb.screen_base = (void *)fb_buffer;
@@ -771,31 +769,21 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev)
         bfin_lq035_fb.pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL);
         if (bfin_lq035_fb.pseudo_palette == NULL) {
                 pr_err("failed to allocate pseudo_palette\n");
-                free_dma(CH_PPI);
-                free_ports();
-                dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out_palette;
         }
 
         if (fb_alloc_cmap(&bfin_lq035_fb.cmap, NBR_PALETTE, 0) < 0) {
                 pr_err("failed to allocate colormap (%d entries)\n",
                         NBR_PALETTE);
-                free_dma(CH_PPI);
-                free_ports();
-                dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
-                kfree(bfin_lq035_fb.pseudo_palette);
-                return -EFAULT;
+                ret = -EFAULT;
+                goto out_cmap;
         }
 
         if (register_framebuffer(&bfin_lq035_fb) < 0) {
                 pr_err("unable to register framebuffer\n");
-                free_dma(CH_PPI);
-                free_ports();
-                dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
-                fb_buffer = NULL;
-                kfree(bfin_lq035_fb.pseudo_palette);
-                fb_dealloc_cmap(&bfin_lq035_fb.cmap);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_reg;
         }
 
         i2c_add_driver(&ad5280_driver);
@@ -807,11 +795,31 @@ static int __devinit bfin_lq035_probe(struct platform_device *pdev)
 
         lcd_dev = lcd_device_register(KBUILD_MODNAME, &pdev->dev, NULL,
                                       &bfin_lcd_ops);
+        if (IS_ERR(lcd_dev)) {
+                pr_err("unable to register lcd\n");
+                ret = PTR_ERR(lcd_dev);
+                goto out_lcd;
+        }
         lcd_dev->props.max_contrast = 255,
 
         pr_info("initialized");
 
         return 0;
+out_lcd:
+        unregister_framebuffer(&bfin_lq035_fb);
+out_reg:
+        fb_dealloc_cmap(&bfin_lq035_fb.cmap);
+out_cmap:
+        kfree(bfin_lq035_fb.pseudo_palette);
+out_palette:
+out_table:
+        dma_free_coherent(NULL, TOTAL_VIDEO_MEM_SIZE, fb_buffer, 0);
+        fb_buffer = NULL;
+out_dma_coherent:
+        free_ports();
+out_ports:
+        free_dma(CH_PPI);
+        return ret;
 }
 
 static int __devexit bfin_lq035_remove(struct platform_device *pdev)
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index d637e1f53172..cff742abdc5d 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -460,10 +460,10 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!(state.event & PM_EVENT_SLEEP))
                 goto done;
 
-        acquire_console_sem();
+        console_lock();
         chipsfb_blank(1, p);
         fb_set_suspend(p, 1);
-        release_console_sem();
+        console_unlock();
  done:
         pdev->dev.power.power_state = state;
         return 0;
@@ -473,10 +473,10 @@ static int chipsfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *p = pci_get_drvdata(pdev);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(p, 0);
         chipsfb_blank(0, p);
-        release_console_sem();
+        console_unlock();
 
         pdev->dev.power.power_state = PMSG_ON;
         return 0;
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5a35f22372b9..2209e354f531 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -5,7 +5,7 @@
 menu "Console display driver support"
 
 config VGA_CONSOLE
-        bool "VGA text console" if EMBEDDED || !X86
+        bool "VGA text console" if EXPERT || !X86
         depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER)
         default y
         help
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 7ccc967831f0..9c092b8d64e6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -375,14 +375,14 @@ static void fb_flashcursor(struct work_struct *work)
         int c;
         int mode;
 
-        acquire_console_sem();
+        console_lock();
         if (ops && ops->currcon != -1)
                 vc = vc_cons[ops->currcon].d;
 
         if (!vc || !CON_IS_VISIBLE(vc) ||
             registered_fb[con2fb_map[vc->vc_num]] != info ||
             vc->vc_deccm != 1) {
-                release_console_sem();
+                console_unlock();
                 return;
         }
 
@@ -392,7 +392,7 @@ static void fb_flashcursor(struct work_struct *work)
                 CM_ERASE : CM_DRAW;
         ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
                     get_color(vc, info, c, 0));
-        release_console_sem();
+        console_unlock();
 }
 
 static void cursor_timer_handler(unsigned long dev_addr)
@@ -836,7 +836,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
 
         found = search_fb_in_map(newidx);
 
-        acquire_console_sem();
+        console_lock();
         con2fb_map[unit] = newidx;
         if (!err && !found)
                 err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
@@ -863,7 +863,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
         if (!search_fb_in_map(info_idx))
                 info_idx = newidx;
 
-        release_console_sem();
+        console_unlock();
         return err;
 }
 
@@ -3321,7 +3321,7 @@ static ssize_t store_rotate(struct device *device,
         if (fbcon_has_exited)
                 return count;
 
-        acquire_console_sem();
+        console_lock();
         idx = con2fb_map[fg_console];
 
         if (idx == -1 || registered_fb[idx] == NULL)
@@ -3331,7 +3331,7 @@ static ssize_t store_rotate(struct device *device,
         rotate = simple_strtoul(buf, last, 0);
         fbcon_rotate(info, rotate);
 err:
-        release_console_sem();
+        console_unlock();
         return count;
 }
 
@@ -3346,7 +3346,7 @@ static ssize_t store_rotate_all(struct device *device,
         if (fbcon_has_exited)
                 return count;
 
-        acquire_console_sem();
+        console_lock();
         idx = con2fb_map[fg_console];
 
         if (idx == -1 || registered_fb[idx] == NULL)
@@ -3356,7 +3356,7 @@ static ssize_t store_rotate_all(struct device *device,
         rotate = simple_strtoul(buf, last, 0);
         fbcon_rotate_all(info, rotate);
 err:
-        release_console_sem();
+        console_unlock();
         return count;
 }
 
@@ -3369,7 +3369,7 @@ static ssize_t show_rotate(struct device *device,
         if (fbcon_has_exited)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         idx = con2fb_map[fg_console];
 
         if (idx == -1 || registered_fb[idx] == NULL)
@@ -3378,7 +3378,7 @@ static ssize_t show_rotate(struct device *device,
         info = registered_fb[idx];
         rotate = fbcon_get_rotate(info);
 err:
-        release_console_sem();
+        console_unlock();
         return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
 }
 
@@ -3392,7 +3392,7 @@ static ssize_t show_cursor_blink(struct device *device,
         if (fbcon_has_exited)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         idx = con2fb_map[fg_console];
 
         if (idx == -1 || registered_fb[idx] == NULL)
@@ -3406,7 +3406,7 @@ static ssize_t show_cursor_blink(struct device *device,
 
         blink = (ops->flags & FBCON_FLAGS_CURSOR_TIMER) ? 1 : 0;
 err:
-        release_console_sem();
+        console_unlock();
         return snprintf(buf, PAGE_SIZE, "%d\n", blink);
 }
 
@@ -3421,7 +3421,7 @@ static ssize_t store_cursor_blink(struct device *device,
         if (fbcon_has_exited)
                 return count;
 
-        acquire_console_sem();
+        console_lock();
         idx = con2fb_map[fg_console];
 
         if (idx == -1 || registered_fb[idx] == NULL)
@@ -3443,7 +3443,7 @@ static ssize_t store_cursor_blink(struct device *device,
         }
 
 err:
-        release_console_sem();
+        console_unlock();
         return count;
 }
 
@@ -3482,7 +3482,7 @@ static void fbcon_start(void)
         if (num_registered_fb) {
                 int i;
 
-                acquire_console_sem();
+                console_lock();
 
                 for (i = 0; i < FB_MAX; i++) {
                         if (registered_fb[i] != NULL) {
@@ -3491,7 +3491,7 @@ static void fbcon_start(void)
                         }
                 }
 
-                release_console_sem();
+                console_unlock();
                 fbcon_takeover(0);
         }
 }
@@ -3552,7 +3552,7 @@ static int __init fb_console_init(void)
 {
         int i;
 
-        acquire_console_sem();
+        console_lock();
         fb_register_client(&fbcon_event_notifier);
         fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
                                      "fbcon");
@@ -3568,7 +3568,7 @@ static int __init fb_console_init(void)
         for (i = 0; i < MAX_NR_CONSOLES; i++)
                 con2fb_map[i] = -1;
 
-        release_console_sem();
+        console_unlock();
         fbcon_start();
         return 0;
 }
@@ -3591,12 +3591,12 @@ static void __exit fbcon_deinit_device(void)
 
 static void __exit fb_console_exit(void)
 {
-        acquire_console_sem();
+        console_lock();
         fb_unregister_client(&fbcon_event_notifier);
         fbcon_deinit_device();
         device_destroy(fb_class, MKDEV(0, 0));
         fbcon_exit();
-        release_console_sem();
+        console_unlock();
         unregister_con_driver(&fb_con);
 }       
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index c97491b8b39b..915fd74da7a2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -202,11 +202,7 @@ static void vgacon_scrollback_init(int pitch)
         }
 }
 
-/*
- * Called only duing init so call of alloc_bootmen is ok.
- * Marked __init_refok to silence modpost.
- */
-static void __init_refok vgacon_scrollback_startup(void)
+static void vgacon_scrollback_startup(void)
 {
         vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT);
         vgacon_scrollback_init(vga_video_num_columns * 2);
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index c265aed09e04..8d61ef96eedd 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -1092,9 +1092,10 @@ static int __init fb_probe(struct platform_device *device)
 
 irq_freq:
 #ifdef CONFIG_CPU_FREQ
+        lcd_da8xx_cpufreq_deregister(par);
+#endif
 err_cpu_freq:
         unregister_framebuffer(da8xx_fb_info);
-#endif
 
 err_dealloc_cmap:
         fb_dealloc_cmap(&da8xx_fb_info->cmap);
@@ -1130,14 +1131,14 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state)
         struct fb_info *info = platform_get_drvdata(dev);
         struct da8xx_fb_par *par = info->par;
 
-        acquire_console_sem();
+        console_lock();
         if (par->panel_power_ctrl)
                 par->panel_power_ctrl(0);
 
         fb_set_suspend(info, 1);
         lcd_disable_raster();
         clk_disable(par->lcdc_clk);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -1146,14 +1147,14 @@ static int fb_resume(struct platform_device *dev)
         struct fb_info *info = platform_get_drvdata(dev);
         struct da8xx_fb_par *par = info->par;
 
-        acquire_console_sem();
+        console_lock();
         if (par->panel_power_ctrl)
                 par->panel_power_ctrl(1);
 
         clk_enable(par->lcdc_clk);
         lcd_enable_raster();
         fb_set_suspend(info, 0);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index 0c99de0562ca..b358d045f130 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -483,7 +483,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
                                   info->screen_base, info->fix.smem_start);
 }
 
-static int __init ep93xxfb_probe(struct platform_device *pdev)
+static int __devinit ep93xxfb_probe(struct platform_device *pdev)
 {
         struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
         struct fb_info *info;
@@ -598,7 +598,7 @@ failed:
         return err;
 }
 
-static int ep93xxfb_remove(struct platform_device *pdev)
+static int __devexit ep93xxfb_remove(struct platform_device *pdev)
 {
         struct fb_info *info = platform_get_drvdata(pdev);
         struct ep93xx_fbi *fbi = info->par;
@@ -622,7 +622,7 @@ static int ep93xxfb_remove(struct platform_device *pdev)
 
 static struct platform_driver ep93xxfb_driver = {
         .probe          = ep93xxfb_probe,
-        .remove         = ep93xxfb_remove,
+        .remove         = __devexit_p(ep93xxfb_remove),
         .driver = {
                 .name   = "ep93xx-fb",
                 .owner  = THIS_MODULE,
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 4ac1201ad6c2..e2bf95370e40 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1036,11 +1036,11 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         return -EFAULT;
                 if (!lock_fb_info(info))
                         return -ENODEV;
-                acquire_console_sem();
+                console_lock();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
-                release_console_sem();
+                console_unlock();
                 unlock_fb_info(info);
                 if (!ret && copy_to_user(argp, &var, sizeof(var)))
                         ret = -EFAULT;
@@ -1072,9 +1072,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                         return -EFAULT;
                 if (!lock_fb_info(info))
                         return -ENODEV;
-                acquire_console_sem();
+                console_lock();
                 ret = fb_pan_display(info, &var);
-                release_console_sem();
+                console_unlock();
                 unlock_fb_info(info);
                 if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
                         return -EFAULT;
@@ -1119,11 +1119,11 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         case FBIOBLANK:
                 if (!lock_fb_info(info))
                         return -ENODEV;
-                acquire_console_sem();
+                console_lock();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
-                release_console_sem();
+                console_unlock();
                 unlock_fb_info(info);
                 break;
         default:
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 0a08f1341227..f4a32779168b 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -90,11 +90,11 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
         int err;
 
         var->activate |= FB_ACTIVATE_FORCE;
-        acquire_console_sem();
+        console_lock();
         fb_info->flags |= FBINFO_MISC_USEREVENT;
         err = fb_set_var(fb_info, var);
         fb_info->flags &= ~FBINFO_MISC_USEREVENT;
-        release_console_sem();
+        console_unlock();
         if (err)
                 return err;
         return 0;
@@ -175,7 +175,7 @@ static ssize_t store_modes(struct device *device,
         if (i * sizeof(struct fb_videomode) != count)
                 return -EINVAL;
 
-        acquire_console_sem();
+        console_lock();
         list_splice(&fb_info->modelist, &old_list);
         fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
                                  &fb_info->modelist);
@@ -185,7 +185,7 @@ static ssize_t store_modes(struct device *device,
         } else
                 fb_destroy_modelist(&old_list);
 
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -301,11 +301,11 @@ static ssize_t store_blank(struct device *device,
         char *last = NULL;
         int err;
 
-        acquire_console_sem();
+        console_lock();
         fb_info->flags |= FBINFO_MISC_USEREVENT;
         err = fb_blank(fb_info, simple_strtoul(buf, &last, 0));
         fb_info->flags &= ~FBINFO_MISC_USEREVENT;
-        release_console_sem();
+        console_unlock();
         if (err < 0)
                 return err;
         return count;
@@ -364,9 +364,9 @@ static ssize_t store_pan(struct device *device,
                 return -EINVAL;
         var.yoffset = simple_strtoul(last, &last, 0);
 
-        acquire_console_sem();
+        console_lock();
         err = fb_pan_display(fb_info, &var);
-        release_console_sem();
+        console_unlock();
 
         if (err < 0)
                 return err;
@@ -399,9 +399,9 @@ static ssize_t store_fbstate(struct device *device,
 
         state = simple_strtoul(buf, &last, 0);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(fb_info, (int)state);
-        release_console_sem();
+        console_unlock();
 
         return count;
 }
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 70b1d9d51c96..b4f19db9bb54 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -344,10 +344,10 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
 
         if (state.event == PM_EVENT_SUSPEND) {
-                acquire_console_sem();
+                console_lock();
                 gx_powerdown(info);
                 fb_set_suspend(info, 1);
-                release_console_sem();
+                console_unlock();
         }
 
         /* there's no point in setting PCI states; we emulate PCI, so
@@ -361,7 +361,7 @@ static int gxfb_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         int ret;
 
-        acquire_console_sem();
+        console_lock();
         ret = gx_powerup(info);
         if (ret) {
                 printk(KERN_ERR "gxfb:  power up failed!\n");
@@ -369,7 +369,7 @@ static int gxfb_resume(struct pci_dev *pdev)
         }
 
         fb_set_suspend(info, 0);
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 #endif
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 39bdbedf43b4..416851ca8754 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -465,10 +465,10 @@ static int lxfb_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
 
         if (state.event == PM_EVENT_SUSPEND) {
-                acquire_console_sem();
+                console_lock();
                 lx_powerdown(info);
                 fb_set_suspend(info, 1);
-                release_console_sem();
+                console_unlock();
         }
 
         /* there's no point in setting PCI states; we emulate PCI, so
@@ -482,7 +482,7 @@ static int lxfb_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         int ret;
 
-        acquire_console_sem();
+        console_lock();
         ret = lx_powerup(info);
         if (ret) {
                 printk(KERN_ERR "lxfb:  power up failed!\n");
@@ -490,7 +490,7 @@ static int lxfb_resume(struct pci_dev *pdev)
         }
 
         fb_set_suspend(info, 0);
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 #else
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 5743ea25e818..318f6fb895b2 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1574,7 +1574,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t mesg)
                 return 0;
         }
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(info, 1);
 
         if (info->fbops->fb_sync)
@@ -1587,7 +1587,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t mesg)
         pci_save_state(dev);
         pci_disable_device(dev);
         pci_set_power_state(dev, pci_choose_state(dev, mesg));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -1605,7 +1605,7 @@ static int i810fb_resume(struct pci_dev *dev)
                 return 0;
         }
 
-        acquire_console_sem();
+        console_lock();
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
 
@@ -1621,7 +1621,7 @@ static int i810fb_resume(struct pci_dev *dev)
         fb_set_suspend (info, 0);
         info->fbops->fb_blank(VESA_NO_BLANKING, info);
 fail:
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 /***********************************************************************
diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index 670ecaa0385a..de366937c933 100644
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -778,9 +778,9 @@ static int jzfb_suspend(struct device *dev)
 {
         struct jzfb *jzfb = dev_get_drvdata(dev);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(jzfb->fb, 1);
-        release_console_sem();
+        console_unlock();
 
         mutex_lock(&jzfb->lock);
         if (jzfb->is_enabled)
@@ -800,9 +800,9 @@ static int jzfb_resume(struct device *dev)
                 jzfb_enable(jzfb);
         mutex_unlock(&jzfb->lock);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(jzfb->fb, 0);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index cb013919e9ce..7e3a490e8d76 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -1177,9 +1177,9 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state)
         struct mx3fb_data *mx3fb = platform_get_drvdata(pdev);
         struct mx3fb_info *mx3_fbi = mx3fb->fbi->par;
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(mx3fb->fbi, 1);
-        release_console_sem();
+        console_unlock();
 
         if (mx3_fbi->blank == FB_BLANK_UNBLANK) {
                 sdc_disable_channel(mx3_fbi);
@@ -1202,9 +1202,9 @@ static int mx3fb_resume(struct platform_device *pdev)
                 sdc_set_brightness(mx3fb, mx3fb->backlight_level);
         }
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(mx3fb->fbi, 0);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 62498bd662fc..f838d9e277f0 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -696,6 +696,8 @@ static int nuc900fb_remove(struct platform_device *pdev)
         nuc900fb_stop_lcd(fbinfo);
         msleep(1);
 
+        unregister_framebuffer(fbinfo);
+        nuc900fb_cpufreq_deregister(fbi);
         nuc900fb_unmap_video_memory(fbinfo);
 
         iounmap(fbi->io);
@@ -723,7 +725,7 @@ static int nuc900fb_suspend(struct platform_device *dev, pm_message_t state)
         struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct nuc900fb_info *info = fbinfo->par;
 
-        nuc900fb_stop_lcd();
+        nuc900fb_stop_lcd(fbinfo);
         msleep(1);
         clk_disable(info->clk);
         return 0;
@@ -740,7 +742,7 @@ static int nuc900fb_resume(struct platform_device *dev)
         msleep(1);
 
         nuc900fb_init_registers(fbinfo);
-        nuc900fb_activate_var(bfinfo);
+        nuc900fb_activate_var(fbinfo);
 
         return 0;
 }
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index efe10ff86d63..081dc4745274 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1057,7 +1057,7 @@ static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
 
         if (mesg.event == PM_EVENT_PRETHAW)
                 mesg.event = PM_EVENT_FREEZE;
-        acquire_console_sem();
+        console_lock();
         par->pm_state = mesg.event;
 
         if (mesg.event & PM_EVENT_SLEEP) {
@@ -1070,7 +1070,7 @@ static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
         }
         dev->dev.power.power_state = mesg;
 
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 
@@ -1079,7 +1079,7 @@ static int nvidiafb_resume(struct pci_dev *dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct nvidia_par *par = info->par;
 
-        acquire_console_sem();
+        console_lock();
         pci_set_power_state(dev, PCI_D0);
 
         if (par->pm_state != PM_EVENT_FREEZE) {
@@ -1097,7 +1097,7 @@ static int nvidiafb_resume(struct pci_dev *dev)
         nvidiafb_blank(FB_BLANK_UNBLANK, info);
 
 fail:
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 #else
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 9c0144ee7ae5..65560a1a0439 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -513,9 +513,9 @@ static int ps3fb_release(struct fb_info *info, int user)
         if (atomic_dec_and_test(&ps3fb.f_count)) {
                 if (atomic_read(&ps3fb.ext_flip)) {
                         atomic_set(&ps3fb.ext_flip, 0);
-                        if (!try_acquire_console_sem()) {
+                        if (console_trylock()) {
                                 ps3fb_sync(info, 0);    /* single buffer */
-                                release_console_sem();
+                                console_unlock();
                         }
                 }
         }
@@ -830,14 +830,14 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
                         if (vmode) {
                                 var = info->var;
                                 fb_videomode_to_var(&var, vmode);
-                                acquire_console_sem();
+                                console_lock();
                                 info->flags |= FBINFO_MISC_USEREVENT;
                                 /* Force, in case only special bits changed */
                                 var.activate |= FB_ACTIVATE_FORCE;
                                 par->new_mode_id = val;
                                 retval = fb_set_var(info, &var);
                                 info->flags &= ~FBINFO_MISC_USEREVENT;
-                                release_console_sem();
+                                console_unlock();
                         }
                         break;
                 }
@@ -881,9 +881,9 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
                         break;
 
                 dev_dbg(info->device, "PS3FB_IOCTL_FSEL:%d\n", val);
-                acquire_console_sem();
+                console_lock();
                 retval = ps3fb_sync(info, val);
-                release_console_sem();
+                console_unlock();
                 break;
 
         default:
@@ -903,9 +903,9 @@ static int ps3fbd(void *arg)
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (ps3fb.is_kicked) {
                         ps3fb.is_kicked = 0;
-                        acquire_console_sem();
+                        console_lock();
                         ps3fb_sync(info, 0);    /* single buffer */
-                        release_console_sem();
+                        console_unlock();
                 }
                 schedule();
         }
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index cea6403ae71c..35f61dd0cb3a 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -701,16 +701,12 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
          */
         pxa168fb_init_mode(info, mi);
 
-        ret = pxa168fb_check_var(&info->var, info);
-        if (ret)
-                goto failed_free_fbmem;
-
         /*
          * Fill in sane defaults.
          */
         ret = pxa168fb_check_var(&info->var, info);
         if (ret)
-                goto failed;
+                goto failed_free_fbmem;
 
         /*
          * enable controller clock
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index b81168df253d..cf4beb9dc9bb 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -1,5 +1,5 @@
 /*
- *  pxa3xx-gc.c - Linux kernel module for PXA3xx graphics controllers
+ *  pxa3xx-gcu.c - Linux kernel module for PXA3xx graphics controllers
  *
  *  This driver needs a DirectFB counterpart in user space, communication
  *  is handled via mmap()ed memory areas and an ioctl.
@@ -421,7 +421,7 @@ pxa3xx_gcu_misc_write(struct file *filp, const char *buff,
                 buffer->next = priv->free;
                 priv->free = buffer;
                 spin_unlock_irqrestore(&priv->spinlock, flags);
-                return ret;
+                return -EFAULT;
         }
 
         buffer->length = words;
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index dce8c97b4333..75738a928610 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -22,7 +22,7 @@
 #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 <linux/console.h> /* Why should fb driver call console functions? because console_lock() */
 #include <video/vga.h>
 
 #ifdef CONFIG_MTRR
@@ -1113,12 +1113,12 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state)
 
         dev_info(info->device, "suspend\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
                 mutex_unlock(&(par->open_lock));
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -1129,7 +1129,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state)
         pci_set_power_state(dev, pci_choose_state(dev, state));
 
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -1145,12 +1145,12 @@ static int s3_pci_resume(struct pci_dev* dev)
 
         dev_info(info->device, "resume\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if (par->ref_count == 0) {
                 mutex_unlock(&(par->open_lock));
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -1159,7 +1159,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         err = pci_enable_device(dev);
         if (err) {
                 mutex_unlock(&(par->open_lock));
-                release_console_sem();
+                console_unlock();
                 dev_err(info->device, "error %d enabling device for resume\n", err);
                 return err;
         }
@@ -1169,7 +1169,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         fb_set_suspend(info, 0);
 
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 842d157e1025..487911e2926c 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2373,7 +2373,7 @@ static int savagefb_suspend(struct pci_dev *dev, pm_message_t mesg)
         if (mesg.event == PM_EVENT_FREEZE)
                 return 0;
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(info, 1);
 
         if (info->fbops->fb_sync)
@@ -2385,7 +2385,7 @@ static int savagefb_suspend(struct pci_dev *dev, pm_message_t mesg)
         pci_save_state(dev);
         pci_disable_device(dev);
         pci_set_power_state(dev, pci_choose_state(dev, mesg));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -2409,7 +2409,7 @@ static int savagefb_resume(struct pci_dev* dev)
                 return 0;
         }
 
-        acquire_console_sem();
+        console_lock();
 
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
@@ -2423,7 +2423,7 @@ static int savagefb_resume(struct pci_dev* dev)
         savagefb_set_par(info);
         fb_set_suspend(info, 0);
         savagefb_blank(FB_BLANK_UNBLANK, info);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index 74d9f546a2e8..2b9e56a6bde4 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -1151,7 +1151,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
 
                 ch = info->par;
 
-                acquire_console_sem();
+                console_lock();
 
                 /* HDMI plug in */
                 if (!sh_hdmi_must_reconfigure(hdmi) &&
@@ -1171,7 +1171,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
                         fb_set_suspend(info, 0);
                 }
 
-                release_console_sem();
+                console_unlock();
         } else {
                 ret = 0;
                 if (!hdmi->info)
@@ -1181,12 +1181,12 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
                 fb_destroy_modedb(hdmi->monspec.modedb);
                 hdmi->monspec.modedb = NULL;
 
-                acquire_console_sem();
+                console_lock();
 
                 /* HDMI disconnect */
                 fb_set_suspend(hdmi->info, 1);
 
-                release_console_sem();
+                console_unlock();
                 pm_runtime_put(hdmi->dev);
         }
 
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index bd4840a8a6b7..bf12e53aed5c 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -912,9 +912,9 @@ static int sh_mobile_release(struct fb_info *info, int user)
 
         /* Nothing to reconfigure, when called from fbcon */
         if (user) {
-                acquire_console_sem();
+                console_lock();
                 sh_mobile_fb_reconfig(info);
-                release_console_sem();
+                console_unlock();
         }
 
         mutex_unlock(&ch->open_lock);
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index b7dc1800efa9..bcb44a594ebc 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -2010,9 +2010,9 @@ static int sm501fb_suspend_fb(struct sm501fb_info *info,
 
         /* tell console/fb driver we are suspending */
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(fbi, 1);
-        release_console_sem();
+        console_unlock();
 
         /* backup copies in case chip is powered down over suspend */
 
@@ -2069,9 +2069,9 @@ static void sm501fb_resume_fb(struct sm501fb_info *info,
                 memcpy_toio(par->cursor.k_addr, par->store_cursor,
                             par->cursor.size);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(fbi, 0);
-        release_console_sem();
+        console_unlock();
 
         vfree(par->store_fb);
         vfree(par->store_cursor);
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 6913fe168c25..dfef88c803d4 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -25,7 +25,7 @@
 #include <linux/fb.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-/* Why should fb driver call console functions? because acquire_console_sem() */
+/* Why should fb driver call console functions? because console_lock() */
 #include <linux/console.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tmio.h>
@@ -944,7 +944,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
         struct mfd_cell *cell = dev->dev.platform_data;
         int retval = 0;
 
-        acquire_console_sem();
+        console_lock();
 
         fb_set_suspend(info, 1);
 
@@ -965,7 +965,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
         if (cell->suspend)
                 retval = cell->suspend(dev);
 
-        release_console_sem();
+        console_unlock();
 
         return retval;
 }
@@ -976,7 +976,7 @@ static int tmiofb_resume(struct platform_device *dev)
         struct mfd_cell *cell = dev->dev.platform_data;
         int retval = 0;
 
-        acquire_console_sem();
+        console_lock();
 
         if (cell->resume) {
                 retval = cell->resume(dev);
@@ -992,7 +992,7 @@ static int tmiofb_resume(struct platform_device *dev)
 
         fb_set_suspend(info, 0);
 out:
-        release_console_sem();
+        console_unlock();
         return retval;
 }
 #else
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 289edd519527..4e66349e4366 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1674,17 +1674,17 @@ static int parse_mode(const char *str, u32 *xres, u32 *yres)
 #ifdef CONFIG_PM
 static int viafb_suspend(void *unused)
 {
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(viafbinfo, 1);
         viafb_sync(viafbinfo);
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
 
 static int viafb_resume(void *unused)
 {
-        acquire_console_sem();
+        console_lock();
         if (viaparinfo->shared->vdev->engine_mmio)
                 viafb_reset_engine(viaparinfo);
         viafb_set_par(viafbinfo);
@@ -1692,7 +1692,7 @@ static int viafb_resume(void *unused)
                 viafb_set_par(viafbinfo1);
         fb_set_suspend(viafbinfo, 0);
 
-        release_console_sem();
+        console_unlock();
         return 0;
 }
 
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 85d76ec4c63e..a2965ab92cfb 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -23,7 +23,7 @@
 #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 <linux/console.h> /* Why should fb driver call console functions? because console_lock() */
 #include <video/vga.h>
 
 #ifdef CONFIG_MTRR
@@ -819,12 +819,12 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
 
         dev_info(info->device, "suspend\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
                 mutex_unlock(&(par->open_lock));
-                release_console_sem();
+                console_unlock();
                 return 0;
         }
 
@@ -835,7 +835,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
         pci_set_power_state(dev, pci_choose_state(dev, state));
 
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -850,7 +850,7 @@ static int vt8623_pci_resume(struct pci_dev* dev)
 
         dev_info(info->device, "resume\n");
 
-        acquire_console_sem();
+        console_lock();
         mutex_lock(&(par->open_lock));
 
         if (par->ref_count == 0)
@@ -869,7 +869,7 @@ static int vt8623_pci_resume(struct pci_dev* dev)
 
 fail:
         mutex_unlock(&(par->open_lock));
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 3e6934d4bea8..a20218c2fda8 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -491,12 +491,12 @@ xenfb_make_preferred_console(void)
         if (console_set_on_cmdline)
                 return;
 
-        acquire_console_sem();
+        console_lock();
         for_each_console(c) {
                 if (!strcmp(c->name, "tty") && c->index == 0)
                         break;
         }
-        release_console_sem();
+        console_unlock();
         if (c) {
                 unregister_console(c);
                 c->flags |= CON_CONSDEV;
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index ef8d9d558fc7..4fb5b2bf2348 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -96,11 +96,6 @@ static struct pci_device_id virtio_pci_id_table[] = {
 
 MODULE_DEVICE_TABLE(pci, virtio_pci_id_table);
 
-/* A PCI device has it's own struct device and so does a virtio device so
- * we create a place for the virtio devices to show up in sysfs.  I think it
- * would make more sense for virtio to not insist on having it's own device. */
-static struct device *virtio_pci_root;
-
 /* Convert a generic virtio device to our structure */
 static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev)
 {
@@ -629,7 +624,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
         if (vp_dev == NULL)
                 return -ENOMEM;
 
-        vp_dev->vdev.dev.parent = virtio_pci_root;
+        vp_dev->vdev.dev.parent = &pci_dev->dev;
         vp_dev->vdev.dev.release = virtio_pci_release_dev;
         vp_dev->vdev.config = &virtio_pci_config_ops;
         vp_dev->pci_dev = pci_dev;
@@ -717,17 +712,7 @@ static struct pci_driver virtio_pci_driver = {
 
 static int __init virtio_pci_init(void)
 {
-        int err;
-
-        virtio_pci_root = root_device_register("virtio-pci");
-        if (IS_ERR(virtio_pci_root))
-                return PTR_ERR(virtio_pci_root);
-
-        err = pci_register_driver(&virtio_pci_driver);
-        if (err)
-                root_device_unregister(virtio_pci_root);
-
-        return err;
+        return pci_register_driver(&virtio_pci_driver);
 }
 
 module_init(virtio_pci_init);
@@ -735,7 +720,6 @@ module_init(virtio_pci_init);
 static void __exit virtio_pci_exit(void)
 {
         pci_unregister_driver(&virtio_pci_driver);
-        root_device_unregister(virtio_pci_root);
 }
 
 module_exit(virtio_pci_exit);
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 3a7e9ff8a746..38e96ab90945 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -593,19 +593,17 @@ static int __devinit omap_hdq_probe(struct platform_device *pdev)
 
         /* get interface & functional clock objects */
         hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
-        hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(hdq_data->hdq_ick)) {
+                dev_dbg(&pdev->dev, "Can't get HDQ ick clock object\n");
+                ret = PTR_ERR(hdq_data->hdq_ick);
+                goto err_ick;
+        }
 
-        if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
-                dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");
-                if (IS_ERR(hdq_data->hdq_ick)) {
-                        ret = PTR_ERR(hdq_data->hdq_ick);
-                        goto err_clk;
-                }
-                if (IS_ERR(hdq_data->hdq_fck)) {
-                        ret = PTR_ERR(hdq_data->hdq_fck);
-                        clk_put(hdq_data->hdq_ick);
-                        goto err_clk;
-                }
+        hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(hdq_data->hdq_fck)) {
+                dev_dbg(&pdev->dev, "Can't get HDQ fck clock object\n");
+                ret = PTR_ERR(hdq_data->hdq_fck);
+                goto err_fck;
         }
 
         hdq_data->hdq_usecount = 0;
@@ -665,10 +663,12 @@ err_fnclk:
         clk_disable(hdq_data->hdq_ick);
 
 err_intfclk:
-        clk_put(hdq_data->hdq_ick);
         clk_put(hdq_data->hdq_fck);
 
-err_clk:
+err_fck:
+        clk_put(hdq_data->hdq_ick);
+
+err_ick:
         iounmap(hdq_data->hdq_base);
 
 err_ioremap:
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 5a48ce996dea..07bec09d1dad 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -71,11 +71,18 @@ config XEN_SYS_HYPERVISOR
          but will have no xen contents.
 
 config XEN_XENBUS_FRONTEND
-       tristate
+        tristate
+
+config XEN_GNTDEV
+        tristate "userspace grant access device driver"
+        depends on XEN
+        select MMU_NOTIFIER
+        help
+          Allows userspace processes to use grants.
 
 config XEN_PLATFORM_PCI
         tristate "xen platform pci device driver"
-        depends on XEN_PVHVM
+        depends on XEN_PVHVM && PCI
         default m
         help
           Driver for the Xen PCI Platform device: it is responsible for
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 533a199e7a3f..5088cc2e6fe2 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -9,11 +9,14 @@ obj-$(CONFIG_HOTPLUG_CPU)	+= cpu_hotplug.o
 obj-$(CONFIG_XEN_XENCOMM)       += xencomm.o
 obj-$(CONFIG_XEN_BALLOON)       += balloon.o
 obj-$(CONFIG_XEN_DEV_EVTCHN)    += xen-evtchn.o
+obj-$(CONFIG_XEN_GNTDEV)        += xen-gntdev.o
 obj-$(CONFIG_XENFS)             += xenfs/
 obj-$(CONFIG_XEN_SYS_HYPERVISOR)        += sys-hypervisor.o
-obj-$(CONFIG_XEN_PLATFORM_PCI)  += platform-pci.o
+obj-$(CONFIG_XEN_PLATFORM_PCI)  += xen-platform-pci.o
 obj-$(CONFIG_SWIOTLB_XEN)       += swiotlb-xen.o
 obj-$(CONFIG_XEN_DOM0)          += pci.o
 
 xen-evtchn-y                    := evtchn.o
+xen-gntdev-y                            := gntdev.o
 
+xen-platform-pci-y              := platform-pci.o
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
new file mode 100644
index 000000000000..1e31cdcdae1e
--- /dev/null
+++ b/drivers/xen/gntdev.c
@@ -0,0 +1,665 @@
+/******************************************************************************
+ * gntdev.c
+ *
+ * Device for accessing (in user-space) pages that have been granted by other
+ * domains.
+ *
+ * Copyright (c) 2006-2007, D G Murray.
+ *           (c) 2009 Gerd Hoffmann <kraxel@redhat.com>
+ *
+ * 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
+ */
+
+#undef DEBUG
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/mman.h>
+#include <linux/mmu_notifier.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/slab.h>
+
+#include <xen/xen.h>
+#include <xen/grant_table.h>
+#include <xen/gntdev.h>
+#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
+#include <asm/xen/page.h>
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Derek G. Murray <Derek.Murray@cl.cam.ac.uk>, "
+              "Gerd Hoffmann <kraxel@redhat.com>");
+MODULE_DESCRIPTION("User-space granted page access driver");
+
+static int limit = 1024;
+module_param(limit, int, 0644);
+MODULE_PARM_DESC(limit, "Maximum number of grants that may be mapped at "
+                "once by a gntdev instance");
+
+struct gntdev_priv {
+        struct list_head maps;
+        uint32_t used;
+        uint32_t limit;
+        /* lock protects maps from concurrent changes */
+        spinlock_t lock;
+        struct mm_struct *mm;
+        struct mmu_notifier mn;
+};
+
+struct grant_map {
+        struct list_head next;
+        struct gntdev_priv *priv;
+        struct vm_area_struct *vma;
+        int index;
+        int count;
+        int flags;
+        int is_mapped;
+        struct ioctl_gntdev_grant_ref *grants;
+        struct gnttab_map_grant_ref   *map_ops;
+        struct gnttab_unmap_grant_ref *unmap_ops;
+        struct page **pages;
+};
+
+/* ------------------------------------------------------------------ */
+
+static void gntdev_print_maps(struct gntdev_priv *priv,
+                              char *text, int text_index)
+{
+#ifdef DEBUG
+        struct grant_map *map;
+
+        pr_debug("maps list (priv %p, usage %d/%d)\n",
+               priv, priv->used, priv->limit);
+
+        list_for_each_entry(map, &priv->maps, next)
+                pr_debug("  index %2d, count %2d %s\n",
+                       map->index, map->count,
+                       map->index == text_index && text ? text : "");
+#endif
+}
+
+static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count)
+{
+        struct grant_map *add;
+        int i;
+
+        add = kzalloc(sizeof(struct grant_map), GFP_KERNEL);
+        if (NULL == add)
+                return NULL;
+
+        add->grants    = kzalloc(sizeof(add->grants[0])    * count, GFP_KERNEL);
+        add->map_ops   = kzalloc(sizeof(add->map_ops[0])   * count, GFP_KERNEL);
+        add->unmap_ops = kzalloc(sizeof(add->unmap_ops[0]) * count, GFP_KERNEL);
+        add->pages     = kzalloc(sizeof(add->pages[0])     * count, GFP_KERNEL);
+        if (NULL == add->grants    ||
+            NULL == add->map_ops   ||
+            NULL == add->unmap_ops ||
+            NULL == add->pages)
+                goto err;
+
+        for (i = 0; i < count; i++) {
+                add->pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
+                if (add->pages[i] == NULL)
+                        goto err;
+        }
+
+        add->index = 0;
+        add->count = count;
+        add->priv  = priv;
+
+        if (add->count + priv->used > priv->limit)
+                goto err;
+
+        return add;
+
+err:
+        if (add->pages)
+                for (i = 0; i < count; i++) {
+                        if (add->pages[i])
+                                __free_page(add->pages[i]);
+                }
+        kfree(add->pages);
+        kfree(add->grants);
+        kfree(add->map_ops);
+        kfree(add->unmap_ops);
+        kfree(add);
+        return NULL;
+}
+
+static void gntdev_add_map(struct gntdev_priv *priv, struct grant_map *add)
+{
+        struct grant_map *map;
+
+        list_for_each_entry(map, &priv->maps, next) {
+                if (add->index + add->count < map->index) {
+                        list_add_tail(&add->next, &map->next);
+                        goto done;
+                }
+                add->index = map->index + map->count;
+        }
+        list_add_tail(&add->next, &priv->maps);
+
+done:
+        priv->used += add->count;
+        gntdev_print_maps(priv, "[new]", add->index);
+}
+
+static struct grant_map *gntdev_find_map_index(struct gntdev_priv *priv,
+                int index, int count)
+{
+        struct grant_map *map;
+
+        list_for_each_entry(map, &priv->maps, next) {
+                if (map->index != index)
+                        continue;
+                if (map->count != count)
+                        continue;
+                return map;
+        }
+        return NULL;
+}
+
+static struct grant_map *gntdev_find_map_vaddr(struct gntdev_priv *priv,
+                                               unsigned long vaddr)
+{
+        struct grant_map *map;
+
+        list_for_each_entry(map, &priv->maps, next) {
+                if (!map->vma)
+                        continue;
+                if (vaddr < map->vma->vm_start)
+                        continue;
+                if (vaddr >= map->vma->vm_end)
+                        continue;
+                return map;
+        }
+        return NULL;
+}
+
+static int gntdev_del_map(struct grant_map *map)
+{
+        int i;
+
+        if (map->vma)
+                return -EBUSY;
+        for (i = 0; i < map->count; i++)
+                if (map->unmap_ops[i].handle)
+                        return -EBUSY;
+
+        map->priv->used -= map->count;
+        list_del(&map->next);
+        return 0;
+}
+
+static void gntdev_free_map(struct grant_map *map)
+{
+        int i;
+
+        if (!map)
+                return;
+
+        if (map->pages)
+                for (i = 0; i < map->count; i++) {
+                        if (map->pages[i])
+                                __free_page(map->pages[i]);
+                }
+        kfree(map->pages);
+        kfree(map->grants);
+        kfree(map->map_ops);
+        kfree(map->unmap_ops);
+        kfree(map);
+}
+
+/* ------------------------------------------------------------------ */
+
+static int find_grant_ptes(pte_t *pte, pgtable_t token,
+                unsigned long addr, void *data)
+{
+        struct grant_map *map = data;
+        unsigned int pgnr = (addr - map->vma->vm_start) >> PAGE_SHIFT;
+        u64 pte_maddr;
+
+        BUG_ON(pgnr >= map->count);
+        pte_maddr = arbitrary_virt_to_machine(pte).maddr;
+
+        gnttab_set_map_op(&map->map_ops[pgnr], pte_maddr,
+                          GNTMAP_contains_pte | map->flags,
+                          map->grants[pgnr].ref,
+                          map->grants[pgnr].domid);
+        gnttab_set_unmap_op(&map->unmap_ops[pgnr], pte_maddr,
+                            GNTMAP_contains_pte | map->flags,
+                            0 /* handle */);
+        return 0;
+}
+
+static int map_grant_pages(struct grant_map *map)
+{
+        int i, err = 0;
+
+        pr_debug("map %d+%d\n", map->index, map->count);
+        err = gnttab_map_refs(map->map_ops, map->pages, map->count);
+        if (err)
+                return err;
+
+        for (i = 0; i < map->count; i++) {
+                if (map->map_ops[i].status)
+                        err = -EINVAL;
+                map->unmap_ops[i].handle = map->map_ops[i].handle;
+        }
+        return err;
+}
+
+static int unmap_grant_pages(struct grant_map *map, int offset, int pages)
+{
+        int i, err = 0;
+
+        pr_debug("map %d+%d [%d+%d]\n", map->index, map->count, offset, pages);
+        err = gnttab_unmap_refs(map->unmap_ops + offset, map->pages, pages);
+        if (err)
+                return err;
+
+        for (i = 0; i < pages; i++) {
+                if (map->unmap_ops[offset+i].status)
+                        err = -EINVAL;
+                map->unmap_ops[offset+i].handle = 0;
+        }
+        return err;
+}
+
+/* ------------------------------------------------------------------ */
+
+static void gntdev_vma_close(struct vm_area_struct *vma)
+{
+        struct grant_map *map = vma->vm_private_data;
+
+        pr_debug("close %p\n", vma);
+        map->is_mapped = 0;
+        map->vma = NULL;
+        vma->vm_private_data = NULL;
+}
+
+static int gntdev_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        pr_debug("vaddr %p, pgoff %ld (shouldn't happen)\n",
+                        vmf->virtual_address, vmf->pgoff);
+        vmf->flags = VM_FAULT_ERROR;
+        return 0;
+}
+
+static struct vm_operations_struct gntdev_vmops = {
+        .close = gntdev_vma_close,
+        .fault = gntdev_vma_fault,
+};
+
+/* ------------------------------------------------------------------ */
+
+static void mn_invl_range_start(struct mmu_notifier *mn,
+                                struct mm_struct *mm,
+                                unsigned long start, unsigned long end)
+{
+        struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn);
+        struct grant_map *map;
+        unsigned long mstart, mend;
+        int err;
+
+        spin_lock(&priv->lock);
+        list_for_each_entry(map, &priv->maps, next) {
+                if (!map->vma)
+                        continue;
+                if (!map->is_mapped)
+                        continue;
+                if (map->vma->vm_start >= end)
+                        continue;
+                if (map->vma->vm_end <= start)
+                        continue;
+                mstart = max(start, map->vma->vm_start);
+                mend   = min(end,   map->vma->vm_end);
+                pr_debug("map %d+%d (%lx %lx), range %lx %lx, mrange %lx %lx\n",
+                                map->index, map->count,
+                                map->vma->vm_start, map->vma->vm_end,
+                                start, end, mstart, mend);
+                err = unmap_grant_pages(map,
+                                        (mstart - map->vma->vm_start) >> PAGE_SHIFT,
+                                        (mend - mstart) >> PAGE_SHIFT);
+                WARN_ON(err);
+        }
+        spin_unlock(&priv->lock);
+}
+
+static void mn_invl_page(struct mmu_notifier *mn,
+                         struct mm_struct *mm,
+                         unsigned long address)
+{
+        mn_invl_range_start(mn, mm, address, address + PAGE_SIZE);
+}
+
+static void mn_release(struct mmu_notifier *mn,
+                       struct mm_struct *mm)
+{
+        struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn);
+        struct grant_map *map;
+        int err;
+
+        spin_lock(&priv->lock);
+        list_for_each_entry(map, &priv->maps, next) {
+                if (!map->vma)
+                        continue;
+                pr_debug("map %d+%d (%lx %lx)\n",
+                                map->index, map->count,
+                                map->vma->vm_start, map->vma->vm_end);
+                err = unmap_grant_pages(map, /* offset */ 0, map->count);
+                WARN_ON(err);
+        }
+        spin_unlock(&priv->lock);
+}
+
+struct mmu_notifier_ops gntdev_mmu_ops = {
+        .release                = mn_release,
+        .invalidate_page        = mn_invl_page,
+        .invalidate_range_start = mn_invl_range_start,
+};
+
+/* ------------------------------------------------------------------ */
+
+static int gntdev_open(struct inode *inode, struct file *flip)
+{
+        struct gntdev_priv *priv;
+        int ret = 0;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&priv->maps);
+        spin_lock_init(&priv->lock);
+        priv->limit = limit;
+
+        priv->mm = get_task_mm(current);
+        if (!priv->mm) {
+                kfree(priv);
+                return -ENOMEM;
+        }
+        priv->mn.ops = &gntdev_mmu_ops;
+        ret = mmu_notifier_register(&priv->mn, priv->mm);
+        mmput(priv->mm);
+
+        if (ret) {
+                kfree(priv);
+                return ret;
+        }
+
+        flip->private_data = priv;
+        pr_debug("priv %p\n", priv);
+
+        return 0;
+}
+
+static int gntdev_release(struct inode *inode, struct file *flip)
+{
+        struct gntdev_priv *priv = flip->private_data;
+        struct grant_map *map;
+        int err;
+
+        pr_debug("priv %p\n", priv);
+
+        spin_lock(&priv->lock);
+        while (!list_empty(&priv->maps)) {
+                map = list_entry(priv->maps.next, struct grant_map, next);
+                err = gntdev_del_map(map);
+                if (WARN_ON(err))
+                        gntdev_free_map(map);
+
+        }
+        spin_unlock(&priv->lock);
+
+        mmu_notifier_unregister(&priv->mn, priv->mm);
+        kfree(priv);
+        return 0;
+}
+
+static long gntdev_ioctl_map_grant_ref(struct gntdev_priv *priv,
+                                       struct ioctl_gntdev_map_grant_ref __user *u)
+{
+        struct ioctl_gntdev_map_grant_ref op;
+        struct grant_map *map;
+        int err;
+
+        if (copy_from_user(&op, u, sizeof(op)) != 0)
+                return -EFAULT;
+        pr_debug("priv %p, add %d\n", priv, op.count);
+        if (unlikely(op.count <= 0))
+                return -EINVAL;
+        if (unlikely(op.count > priv->limit))
+                return -EINVAL;
+
+        err = -ENOMEM;
+        map = gntdev_alloc_map(priv, op.count);
+        if (!map)
+                return err;
+        if (copy_from_user(map->grants, &u->refs,
+                           sizeof(map->grants[0]) * op.count) != 0) {
+                gntdev_free_map(map);
+                return err;
+        }
+
+        spin_lock(&priv->lock);
+        gntdev_add_map(priv, map);
+        op.index = map->index << PAGE_SHIFT;
+        spin_unlock(&priv->lock);
+
+        if (copy_to_user(u, &op, sizeof(op)) != 0) {
+                spin_lock(&priv->lock);
+                gntdev_del_map(map);
+                spin_unlock(&priv->lock);
+                gntdev_free_map(map);
+                return err;
+        }
+        return 0;
+}
+
+static long gntdev_ioctl_unmap_grant_ref(struct gntdev_priv *priv,
+                                         struct ioctl_gntdev_unmap_grant_ref __user *u)
+{
+        struct ioctl_gntdev_unmap_grant_ref op;
+        struct grant_map *map;
+        int err = -ENOENT;
+
+        if (copy_from_user(&op, u, sizeof(op)) != 0)
+                return -EFAULT;
+        pr_debug("priv %p, del %d+%d\n", priv, (int)op.index, (int)op.count);
+
+        spin_lock(&priv->lock);
+        map = gntdev_find_map_index(priv, op.index >> PAGE_SHIFT, op.count);
+        if (map)
+                err = gntdev_del_map(map);
+        spin_unlock(&priv->lock);
+        if (!err)
+                gntdev_free_map(map);
+        return err;
+}
+
+static long gntdev_ioctl_get_offset_for_vaddr(struct gntdev_priv *priv,
+                                              struct ioctl_gntdev_get_offset_for_vaddr __user *u)
+{
+        struct ioctl_gntdev_get_offset_for_vaddr op;
+        struct grant_map *map;
+
+        if (copy_from_user(&op, u, sizeof(op)) != 0)
+                return -EFAULT;
+        pr_debug("priv %p, offset for vaddr %lx\n", priv, (unsigned long)op.vaddr);
+
+        spin_lock(&priv->lock);
+        map = gntdev_find_map_vaddr(priv, op.vaddr);
+        if (map == NULL ||
+            map->vma->vm_start != op.vaddr) {
+                spin_unlock(&priv->lock);
+                return -EINVAL;
+        }
+        op.offset = map->index << PAGE_SHIFT;
+        op.count = map->count;
+        spin_unlock(&priv->lock);
+
+        if (copy_to_user(u, &op, sizeof(op)) != 0)
+                return -EFAULT;
+        return 0;
+}
+
+static long gntdev_ioctl_set_max_grants(struct gntdev_priv *priv,
+                                        struct ioctl_gntdev_set_max_grants __user *u)
+{
+        struct ioctl_gntdev_set_max_grants op;
+
+        if (copy_from_user(&op, u, sizeof(op)) != 0)
+                return -EFAULT;
+        pr_debug("priv %p, limit %d\n", priv, op.count);
+        if (op.count > limit)
+                return -E2BIG;
+
+        spin_lock(&priv->lock);
+        priv->limit = op.count;
+        spin_unlock(&priv->lock);
+        return 0;
+}
+
+static long gntdev_ioctl(struct file *flip,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct gntdev_priv *priv = flip->private_data;
+        void __user *ptr = (void __user *)arg;
+
+        switch (cmd) {
+        case IOCTL_GNTDEV_MAP_GRANT_REF:
+                return gntdev_ioctl_map_grant_ref(priv, ptr);
+
+        case IOCTL_GNTDEV_UNMAP_GRANT_REF:
+                return gntdev_ioctl_unmap_grant_ref(priv, ptr);
+
+        case IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR:
+                return gntdev_ioctl_get_offset_for_vaddr(priv, ptr);
+
+        case IOCTL_GNTDEV_SET_MAX_GRANTS:
+                return gntdev_ioctl_set_max_grants(priv, ptr);
+
+        default:
+                pr_debug("priv %p, unknown cmd %x\n", priv, cmd);
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+
+static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
+{
+        struct gntdev_priv *priv = flip->private_data;
+        int index = vma->vm_pgoff;
+        int count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        struct grant_map *map;
+        int err = -EINVAL;
+
+        if ((vma->vm_flags & VM_WRITE) && !(vma->vm_flags & VM_SHARED))
+                return -EINVAL;
+
+        pr_debug("map %d+%d at %lx (pgoff %lx)\n",
+                        index, count, vma->vm_start, vma->vm_pgoff);
+
+        spin_lock(&priv->lock);
+        map = gntdev_find_map_index(priv, index, count);
+        if (!map)
+                goto unlock_out;
+        if (map->vma)
+                goto unlock_out;
+        if (priv->mm != vma->vm_mm) {
+                printk(KERN_WARNING "Huh? Other mm?\n");
+                goto unlock_out;
+        }
+
+        vma->vm_ops = &gntdev_vmops;
+
+        vma->vm_flags |= VM_RESERVED|VM_DONTCOPY|VM_DONTEXPAND|VM_PFNMAP;
+
+        vma->vm_private_data = map;
+        map->vma = vma;
+
+        map->flags = GNTMAP_host_map | GNTMAP_application_map;
+        if (!(vma->vm_flags & VM_WRITE))
+                map->flags |= GNTMAP_readonly;
+
+        spin_unlock(&priv->lock);
+
+        err = apply_to_page_range(vma->vm_mm, vma->vm_start,
+                                  vma->vm_end - vma->vm_start,
+                                  find_grant_ptes, map);
+        if (err) {
+                printk(KERN_WARNING "find_grant_ptes() failure.\n");
+                return err;
+        }
+
+        err = map_grant_pages(map);
+        if (err) {
+                printk(KERN_WARNING "map_grant_pages() failure.\n");
+                return err;
+        }
+
+        map->is_mapped = 1;
+
+        return 0;
+
+unlock_out:
+        spin_unlock(&priv->lock);
+        return err;
+}
+
+static const struct file_operations gntdev_fops = {
+        .owner = THIS_MODULE,
+        .open = gntdev_open,
+        .release = gntdev_release,
+        .mmap = gntdev_mmap,
+        .unlocked_ioctl = gntdev_ioctl
+};
+
+static struct miscdevice gntdev_miscdev = {
+        .minor        = MISC_DYNAMIC_MINOR,
+        .name         = "xen/gntdev",
+        .fops         = &gntdev_fops,
+};
+
+/* ------------------------------------------------------------------ */
+
+static int __init gntdev_init(void)
+{
+        int err;
+
+        if (!xen_domain())
+                return -ENODEV;
+
+        err = misc_register(&gntdev_miscdev);
+        if (err != 0) {
+                printk(KERN_ERR "Could not register gntdev device\n");
+                return err;
+        }
+        return 0;
+}
+
+static void __exit gntdev_exit(void)
+{
+        misc_deregister(&gntdev_miscdev);
+}
+
+module_init(gntdev_init);
+module_exit(gntdev_exit);
+
+/* ------------------------------------------------------------------ */
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 6c4531816496..9ef54ebc1194 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -447,6 +447,52 @@ unsigned int gnttab_max_grant_frames(void)
 }
 EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
 
+int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
+                    struct page **pages, unsigned int count)
+{
+        int i, ret;
+        pte_t *pte;
+        unsigned long mfn;
+
+        ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, map_ops, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count; i++) {
+                /* m2p override only supported for GNTMAP_contains_pte mappings */
+                if (!(map_ops[i].flags & GNTMAP_contains_pte))
+                        continue;
+                pte = (pte_t *) (mfn_to_virt(PFN_DOWN(map_ops[i].host_addr)) +
+                                (map_ops[i].host_addr & ~PAGE_MASK));
+                mfn = pte_mfn(*pte);
+                ret = m2p_add_override(mfn, pages[i]);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(gnttab_map_refs);
+
+int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
+                struct page **pages, unsigned int count)
+{
+        int i, ret;
+
+        ret = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap_ops, count);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < count; i++) {
+                ret = m2p_remove_override(pages[i]);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(gnttab_unmap_refs);
+
 static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
 {
         struct gnttab_setup_table setup;
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index c01b5ddce529..afbe041f42c5 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -105,7 +105,7 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
                                        const struct pci_device_id *ent)
 {
         int i, ret;
-        long ioaddr, iolen;
+        long ioaddr;
         long mmio_addr, mmio_len;
         unsigned int max_nr_gframes;
 
@@ -114,7 +114,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
                 return i;
 
         ioaddr = pci_resource_start(pdev, 0);
-        iolen = pci_resource_len(pdev, 0);
 
         mmio_addr = pci_resource_start(pdev, 1);
         mmio_len = pci_resource_len(pdev, 1);
@@ -125,19 +124,13 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
                 goto pci_out;
         }
 
-        if (request_mem_region(mmio_addr, mmio_len, DRV_NAME) == NULL) {
-                dev_err(&pdev->dev, "MEM I/O resource 0x%lx @ 0x%lx busy\n",
-                       mmio_addr, mmio_len);
-                ret = -EBUSY;
+        ret = pci_request_region(pdev, 1, DRV_NAME);
+        if (ret < 0)
                 goto pci_out;
-        }
 
-        if (request_region(ioaddr, iolen, DRV_NAME) == NULL) {
-                dev_err(&pdev->dev, "I/O resource 0x%lx @ 0x%lx busy\n",
-                       iolen, ioaddr);
-                ret = -EBUSY;
+        ret = pci_request_region(pdev, 0, DRV_NAME);
+        if (ret < 0)
                 goto mem_out;
-        }
 
         platform_mmio = mmio_addr;
         platform_mmiolen = mmio_len;
@@ -169,9 +162,9 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
         return 0;
 
 out:
-        release_region(ioaddr, iolen);
+        pci_release_region(pdev, 0);
 mem_out:
-        release_mem_region(mmio_addr, mmio_len);
+        pci_release_region(pdev, 1);
 pci_out:
         pci_disable_device(pdev);
         return ret;
diff --git a/drivers/xen/xenfs/xenbus.c b/drivers/xen/xenfs/xenbus.c
index 1c1236087f78..bbd000f88af7 100644
--- a/drivers/xen/xenfs/xenbus.c
+++ b/drivers/xen/xenfs/xenbus.c
@@ -122,6 +122,7 @@ static ssize_t xenbus_file_read(struct file *filp,
         int ret;
 
         mutex_lock(&u->reply_mutex);
+again:
         while (list_empty(&u->read_buffers)) {
                 mutex_unlock(&u->reply_mutex);
                 if (filp->f_flags & O_NONBLOCK)
@@ -144,7 +145,7 @@ static ssize_t xenbus_file_read(struct file *filp,
                 i += sz - ret;
                 rb->cons += sz - ret;
 
-                if (ret != sz) {
+                if (ret != 0) {
                         if (i == 0)
                                 i = -EFAULT;
                         goto out;
@@ -160,6 +161,8 @@ static ssize_t xenbus_file_read(struct file *filp,
                                         struct read_buffer, list);
                 }
         }
+        if (i == 0)
+                goto again;
 
 out:
         mutex_unlock(&u->reply_mutex);
@@ -407,6 +410,7 @@ static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
 
                 mutex_lock(&u->reply_mutex);
                 rc = queue_reply(&u->read_buffers, &reply, sizeof(reply));
+                wake_up(&u->read_waitq);
                 mutex_unlock(&u->reply_mutex);
         }
 
@@ -455,7 +459,7 @@ static ssize_t xenbus_file_write(struct file *filp,
 
         ret = copy_from_user(u->u.buffer + u->len, ubuf, len);
 
-        if (ret == len) {
+        if (ret != 0) {
                 rc = -EFAULT;
                 goto out;
         }
@@ -488,21 +492,6 @@ static ssize_t xenbus_file_write(struct file *filp,
         msg_type = u->u.msg.type;
 
         switch (msg_type) {
-        case XS_TRANSACTION_START:
-        case XS_TRANSACTION_END:
-        case XS_DIRECTORY:
-        case XS_READ:
-        case XS_GET_PERMS:
-        case XS_RELEASE:
-        case XS_GET_DOMAIN_PATH:
-        case XS_WRITE:
-        case XS_MKDIR:
-        case XS_RM:
-        case XS_SET_PERMS:
-                /* Send out a transaction */
-                ret = xenbus_write_transaction(msg_type, u);
-                break;
-
         case XS_WATCH:
         case XS_UNWATCH:
                 /* (Un)Ask for some path to be watched for changes */
@@ -510,7 +499,8 @@ static ssize_t xenbus_file_write(struct file *filp,
                 break;
 
         default:
-                ret = -EINVAL;
+                /* Send out a transaction */
+                ret = xenbus_write_transaction(msg_type, u);
                 break;
         }
         if (ret != 0)
@@ -555,6 +545,7 @@ static int xenbus_file_release(struct inode *inode, struct file *filp)
         struct xenbus_file_priv *u = filp->private_data;
         struct xenbus_transaction_holder *trans, *tmp;
         struct watch_adapter *watch, *tmp_watch;
+        struct read_buffer *rb, *tmp_rb;
 
         /*
          * No need for locking here because there are no other users,
@@ -573,6 +564,10 @@ static int xenbus_file_release(struct inode *inode, struct file *filp)
                 free_watch_adapter(watch);
         }
 
+        list_for_each_entry_safe(rb, tmp_rb, &u->read_buffers, list) {
+                list_del(&rb->list);
+                kfree(rb);
+        }
         kfree(u);
 
         return 0;