Merge tag 'v3.5-rc4' into drm-intel-next-queued

I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(

Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ringbuffer.c

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

561 files changed, 27568 insertions, 7936 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 47768ff87343..80998958cf45 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -208,7 +208,7 @@ config ACPI_IPMI
 
 config ACPI_HOTPLUG_CPU
         bool
-        depends on ACPI_PROCESSOR && HOTPLUG_CPU
+        depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU
         select ACPI_CONTAINER
         default y
 
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 86933ca8b472..7dd3f9fb9f3f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -643,11 +643,19 @@ static int acpi_battery_update(struct acpi_battery *battery)
 
 static void acpi_battery_refresh(struct acpi_battery *battery)
 {
+        int power_unit;
+
         if (!battery->bat.dev)
                 return;
 
+        power_unit = battery->power_unit;
+
         acpi_battery_get_info(battery);
-        /* The battery may have changed its reporting units. */
+
+        if (power_unit == battery->power_unit)
+                return;
+
+        /* The battery has changed its reporting units. */
         sysfs_remove_battery(battery);
         sysfs_add_battery(battery);
 }
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 3188da3df8da..adceafda9c17 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -182,41 +182,66 @@ EXPORT_SYMBOL(acpi_bus_get_private_data);
                                  Power Management
    -------------------------------------------------------------------------- */
 
+static const char *state_string(int state)
+{
+        switch (state) {
+        case ACPI_STATE_D0:
+                return "D0";
+        case ACPI_STATE_D1:
+                return "D1";
+        case ACPI_STATE_D2:
+                return "D2";
+        case ACPI_STATE_D3_HOT:
+                return "D3hot";
+        case ACPI_STATE_D3_COLD:
+                return "D3";
+        default:
+                return "(unknown)";
+        }
+}
+
 static int __acpi_bus_get_power(struct acpi_device *device, int *state)
 {
-        int result = 0;
-        acpi_status status = 0;
-        unsigned long long psc = 0;
+        int result = ACPI_STATE_UNKNOWN;
 
         if (!device || !state)
                 return -EINVAL;
 
-        *state = ACPI_STATE_UNKNOWN;
-
-        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, state);
-                        if (result)
-                                return result;
-                } else if (device->power.flags.explicit_get) {
-                        status = acpi_evaluate_integer(device->handle, "_PSC",
-                                                       NULL, &psc);
-                        if (ACPI_FAILURE(status))
-                                return -ENODEV;
-                        *state = (int)psc;
-                }
-        } else {
+        if (!device->flags.power_manageable) {
                 /* TBD: Non-recursive algorithm for walking up hierarchy. */
                 *state = device->parent ?
                         device->parent->power.state : ACPI_STATE_D0;
+                goto out;
+        }
+
+        /*
+         * Get the device's power state either directly (via _PSC) or
+         * indirectly (via power resources).
+         */
+        if (device->power.flags.explicit_get) {
+                unsigned long long psc;
+                acpi_status status = acpi_evaluate_integer(device->handle,
+                                                           "_PSC", NULL, &psc);
+                if (ACPI_FAILURE(status))
+                        return -ENODEV;
+
+                result = psc;
+        }
+        /* The test below covers ACPI_STATE_UNKNOWN too. */
+        if (result <= ACPI_STATE_D2) {
+          ; /* Do nothing. */
+        } else if (device->power.flags.power_resources) {
+                int error = acpi_power_get_inferred_state(device, &result);
+                if (error)
+                        return error;
+        } else if (result == ACPI_STATE_D3_HOT) {
+                result = ACPI_STATE_D3;
         }
+        *state = result;
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
-                          device->pnp.bus_id, *state));
+ out:
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n",
+                          device->pnp.bus_id, state_string(*state)));
 
         return 0;
 }
@@ -234,13 +259,14 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state)
         /* Make sure this is a valid target state */
 
         if (state == device->power.state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
-                                  state));
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n",
+                                  state_string(state)));
                 return 0;
         }
 
         if (!device->power.states[state].flags.valid) {
-                printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
+                printk(KERN_WARNING PREFIX "Device does not support %s\n",
+                       state_string(state));
                 return -ENODEV;
         }
         if (device->parent && (state < device->parent->power.state)) {
@@ -294,13 +320,13 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state)
       end:
         if (result)
                 printk(KERN_WARNING PREFIX
-                              "Device [%s] failed to transition to D%d\n",
-                              device->pnp.bus_id, state);
+                              "Device [%s] failed to transition to %s\n",
+                              device->pnp.bus_id, state_string(state));
         else {
                 device->power.state = state;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Device [%s] transitioned to D%d\n",
-                                  device->pnp.bus_id, state));
+                                  "Device [%s] transitioned to %s\n",
+                                  device->pnp.bus_id, state_string(state)));
         }
 
         return result;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 0500f719f63e..dd6d6a3c6780 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -631,7 +631,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state)
          * We know a device's inferred power state when all the resources
          * required for a given D-state are 'on'.
          */
-        for (i = ACPI_STATE_D0; i < ACPI_STATE_D3_HOT; i++) {
+        for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) {
                 list = &device->power.states[i].resources;
                 if (list->count < 1)
                         continue;
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 0af48a8554cd..a093dc163a42 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -333,6 +333,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
         struct acpi_buffer state = { 0, NULL };
         union acpi_object *pss = NULL;
         int i;
+        int last_invalid = -1;
 
 
         status = acpi_evaluate_object(pr->handle, "_PSS", NULL, &buffer);
@@ -394,14 +395,33 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
                     ((u32)(px->core_frequency * 1000) !=
                      (px->core_frequency * 1000))) {
                         printk(KERN_ERR FW_BUG PREFIX
-                               "Invalid BIOS _PSS frequency: 0x%llx MHz\n",
-                               px->core_frequency);
-                        result = -EFAULT;
-                        kfree(pr->performance->states);
-                        goto end;
+                               "Invalid BIOS _PSS frequency found for processor %d: 0x%llx MHz\n",
+                               pr->id, px->core_frequency);
+                        if (last_invalid == -1)
+                                last_invalid = i;
+                } else {
+                        if (last_invalid != -1) {
+                                /*
+                                 * Copy this valid entry over last_invalid entry
+                                 */
+                                memcpy(&(pr->performance->states[last_invalid]),
+                                       px, sizeof(struct acpi_processor_px));
+                                ++last_invalid;
+                        }
                 }
         }
 
+        if (last_invalid == 0) {
+                printk(KERN_ERR FW_BUG PREFIX
+                       "No valid BIOS _PSS frequency found for processor %d\n", pr->id);
+                result = -EFAULT;
+                kfree(pr->performance->states);
+                pr->performance->states = NULL;
+        }
+
+        if (last_invalid > 0)
+                pr->performance->state_count = last_invalid;
+
       end:
         kfree(buffer.pointer);
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 85cbfdccc97c..c8a1f3b68110 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1567,6 +1567,7 @@ static int acpi_bus_scan_fixed(void)
                                                 ACPI_BUS_TYPE_POWER_BUTTON,
                                                 ACPI_STA_DEFAULT,
                                                 &ops);
+                device_init_wakeup(&device->dev, true);
         }
 
         if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index ebaa04593236..88561029cca8 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -25,8 +25,6 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-#include <asm/realmode.h>
-
 #include "internal.h"
 #include "sleep.h"
 
@@ -59,6 +57,7 @@ MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
 MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
 
 static u8 sleep_states[ACPI_S_STATE_COUNT];
+static bool pwr_btn_event_pending;
 
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
@@ -93,13 +92,11 @@ static struct notifier_block tts_notifier = {
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
-        unsigned long wakeup_pa = real_mode_header->wakeup_start;
         /* do we have a wakeup address for S2 and S3? */
         if (acpi_state == ACPI_STATE_S3) {
-                if (!wakeup_pa)
+                if (!acpi_wakeup_address)
                         return -EFAULT;
-                acpi_set_firmware_waking_vector(
-                                (acpi_physical_address)wakeup_pa);
+                acpi_set_firmware_waking_vector(acpi_wakeup_address);
 
         }
         ACPI_FLUSH_CPU_CACHE();
@@ -188,6 +185,14 @@ static int acpi_pm_prepare(void)
         return error;
 }
 
+static int find_powerf_dev(struct device *dev, void *data)
+{
+        struct acpi_device *device = to_acpi_device(dev);
+        const char *hid = acpi_device_hid(device);
+
+        return !strcmp(hid, ACPI_BUTTON_HID_POWERF);
+}
+
 /**
  *      acpi_pm_finish - Instruct the platform to leave a sleep state.
  *
@@ -196,6 +201,7 @@ static int acpi_pm_prepare(void)
  */
 static void acpi_pm_finish(void)
 {
+        struct device *pwr_btn_dev;
         u32 acpi_state = acpi_target_sleep_state;
 
         acpi_ec_unblock_transactions();
@@ -213,6 +219,23 @@ static void acpi_pm_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
+
+        /* If we were woken with the fixed power button, provide a small
+         * hint to userspace in the form of a wakeup event on the fixed power
+         * button device (if it can be found).
+         *
+         * We delay the event generation til now, as the PM layer requires
+         * timekeeping to be running before we generate events. */
+        if (!pwr_btn_event_pending)
+                return;
+
+        pwr_btn_event_pending = false;
+        pwr_btn_dev = bus_find_device(&acpi_bus_type, NULL, NULL,
+                                      find_powerf_dev);
+        if (pwr_btn_dev) {
+                pm_wakeup_event(pwr_btn_dev, 0);
+                put_device(pwr_btn_dev);
+        }
 }
 
 /**
@@ -302,9 +325,23 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
         /* ACPI 3.0 specs (P62) says that it's the responsibility
          * of the OSPM to clear the status bit [ implying that the
          * POWER_BUTTON event should not reach userspace ]
+         *
+         * However, we do generate a small hint for userspace in the form of
+         * a wakeup event. We flag this condition for now and generate the
+         * event later, as we're currently too early in resume to be able to
+         * generate wakeup events.
          */
-        if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
-                acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
+        if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) {
+                acpi_event_status pwr_btn_status;
+
+                acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status);
+
+                if (pwr_btn_status & ACPI_EVENT_FLAG_SET) {
+                        acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
+                        /* Flag for later */
+                        pwr_btn_event_pending = true;
+                }
+        }
 
         /*
          * Disable and clear GPE status before interrupt is enabled. Some GPEs
@@ -734,8 +771,8 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
          * can wake the system.  _S0W may be valid, too.
          */
         if (acpi_target_sleep_state == ACPI_STATE_S0 ||
-            (device_may_wakeup(dev) &&
-             adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
+            (device_may_wakeup(dev) && adev->wakeup.flags.valid &&
+             adev->wakeup.sleep_state >= acpi_target_sleep_state)) {
                 acpi_status status;
 
                 acpi_method[3] = 'W';
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9577b6fa2650..a576575617d7 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1687,10 +1687,6 @@ static int acpi_video_bus_add(struct acpi_device *device)
         set_bit(KEY_BRIGHTNESS_ZERO, input->keybit);
         set_bit(KEY_DISPLAY_OFF, input->keybit);
 
-        error = input_register_device(input);
-        if (error)
-                goto err_stop_video;
-
         printk(KERN_INFO PREFIX "%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
                ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
                video->flags.multihead ? "yes" : "no",
@@ -1701,12 +1697,16 @@ static int acpi_video_bus_add(struct acpi_device *device)
         video->pm_nb.priority = 0;
         error = register_pm_notifier(&video->pm_nb);
         if (error)
-                goto err_unregister_input_dev;
+                goto err_stop_video;
+
+        error = input_register_device(input);
+        if (error)
+                goto err_unregister_pm_notifier;
 
         return 0;
 
- err_unregister_input_dev:
-        input_unregister_device(input);
+ err_unregister_pm_notifier:
+        unregister_pm_notifier(&video->pm_nb);
  err_stop_video:
         acpi_video_bus_stop_devices(video);
  err_free_input_dev:
@@ -1743,9 +1743,18 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
         return 0;
 }
 
+static int __init is_i740(struct pci_dev *dev)
+{
+        if (dev->device == 0x00D1)
+                return 1;
+        if (dev->device == 0x7000)
+                return 1;
+        return 0;
+}
+
 static int __init intel_opregion_present(void)
 {
-#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
+        int opregion = 0;
         struct pci_dev *dev = NULL;
         u32 address;
 
@@ -1754,13 +1763,15 @@ static int __init intel_opregion_present(void)
                         continue;
                 if (dev->vendor != PCI_VENDOR_ID_INTEL)
                         continue;
+                /* We don't want to poke around undefined i740 registers */
+                if (is_i740(dev))
+                        continue;
                 pci_read_config_dword(dev, 0xfc, &address);
                 if (!address)
                         continue;
-                return 1;
+                opregion = 1;
         }
-#endif
-        return 0;
+        return opregion;
 }
 
 int acpi_video_register(void)
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 3239517f4d90..ac6a5beb28f3 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -4,7 +4,7 @@
  * Arasan Compact Flash host controller source file
  *
  * Copyright (C) 2011 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -959,7 +959,7 @@ static struct platform_driver arasan_cf_driver = {
 
 module_platform_driver(arasan_cf_driver);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("Arasan ATA Compact Flash driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index e8cd652d2017..98510931c815 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card)
                         } else if (skb && card->using_dma) {
                                 SKB_CB(skb)->dma_addr = pci_map_single(card->dev, skb->data,
                                                                        skb->len, PCI_DMA_TODEVICE);
+                                card->tx_skb[port] = skb;
                                 iowrite32(SKB_CB(skb)->dma_addr,
                                           card->config_regs + TX_DMA_ADDR(port));
                         }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 db_fpga_upgrade = db_firmware_upgrade = 0;
         }
 
-        if (card->fpga_version >= DMA_SUPPORTED){
+        if (card->fpga_version >= DMA_SUPPORTED) {
+                pci_set_master(dev);
                 card->using_dma = 1;
         } else {
                 card->using_dma = 0;
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 1b1cbb571d38..dcb8a6e48692 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -100,7 +100,7 @@ static void driver_deferred_probe_add(struct device *dev)
         mutex_lock(&deferred_probe_mutex);
         if (list_empty(&dev->p->deferred_probe)) {
                 dev_dbg(dev, "Added to deferred list\n");
-                list_add(&dev->p->deferred_probe, &deferred_probe_pending_list);
+                list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list);
         }
         mutex_unlock(&deferred_probe_mutex);
 }
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 0bcda488f11c..c89aa01fb1de 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -246,11 +246,11 @@ struct regmap *regmap_init(struct device *dev,
                 map->lock = regmap_lock_mutex;
                 map->unlock = regmap_unlock_mutex;
         }
-        map->format.buf_size = (config->reg_bits + config->val_bits) / 8;
         map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
         map->format.pad_bytes = config->pad_bits / 8;
         map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
-        map->format.buf_size += map->format.pad_bytes;
+        map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
+                        config->val_bits + config->pad_bits, 8);
         map->reg_shift = config->pad_bits % 8;
         if (config->reg_stride)
                 map->reg_stride = config->reg_stride;
@@ -368,7 +368,7 @@ struct regmap *regmap_init(struct device *dev,
 
         ret = regcache_init(map, config);
         if (ret < 0)
-                goto err_free_workbuf;
+                goto err_debugfs;
 
         /* Add a devres resource for dev_get_regmap() */
         m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
@@ -383,7 +383,8 @@ struct regmap *regmap_init(struct device *dev,
 
 err_cache:
         regcache_exit(map);
-err_free_workbuf:
+err_debugfs:
+        regmap_debugfs_exit(map);
         kfree(map->work_buf);
 err_map:
         kfree(map);
@@ -471,6 +472,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(regmap_reinit_cache);
 
 /**
  * regmap_exit(): Free a previously allocated register map
diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index ba29b2e73d48..72b5e7280d14 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -42,7 +42,7 @@ struct device *soc_device_to_device(struct soc_device *soc_dev)
         return &soc_dev->dev;
 }
 
-static mode_t soc_attribute_mode(struct kobject *kobj,
+static umode_t soc_attribute_mode(struct kobject *kobj,
                                  struct attribute *attr,
                                  int index)
 {
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index a058842f14fd..61ce4054b3c3 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -139,7 +139,9 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
                 bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);
                 break;
         case 0x4331:
-                /* BCM4331 workaround is SPROM-related, we put it in sprom.c */
+        case 43431:
+                /* Ext PA lines must be enabled for tx on BCM4331 */
+                bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true);
                 break;
         case 43224:
                 if (bus->chipinfo.rev == 0) {
diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c
index 9a96f14c8f47..c32ebd537abe 100644
--- a/drivers/bcma/driver_pci.c
+++ b/drivers/bcma/driver_pci.c
@@ -232,17 +232,19 @@ void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
 int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,
                           bool enable)
 {
-        struct pci_dev *pdev = pc->core->bus->host_pci;
+        struct pci_dev *pdev;
         u32 coremask, tmp;
         int err = 0;
 
-        if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
+        if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {
                 /* This bcma device is not on a PCI host-bus. So the IRQs are
                  * not routed through the PCI core.
                  * So we must not enable routing through the PCI core. */
                 goto out;
         }
 
+        pdev = pc->core->bus->host_pci;
+
         err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);
         if (err)
                 goto out;
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index c7f93359acb0..f16f42d36071 100644
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
@@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus)
         if (!sprom)
                 return -ENOMEM;
 
-        if (bus->chipinfo.id == 0x4331)
+        if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)
                 bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
 
         pr_debug("SPROM offset 0x%x\n", offset);
         bcma_sprom_read(bus, offset, sprom);
 
-        if (bus->chipinfo.id == 0x4331)
+        if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)
                 bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);
 
         err = bcma_sprom_valid(sprom);
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 304000c3d433..264bc77dcb91 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -294,18 +294,16 @@ static int hba_reset_nosleep(struct driver_data *dd)
  */
 static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag)
 {
-        unsigned long flags = 0;
-
         atomic_set(&port->commands[tag].active, 1);
 
-        spin_lock_irqsave(&port->cmd_issue_lock, flags);
+        spin_lock(&port->cmd_issue_lock);
 
         writel((1 << MTIP_TAG_BIT(tag)),
                         port->s_active[MTIP_TAG_INDEX(tag)]);
         writel((1 << MTIP_TAG_BIT(tag)),
                         port->cmd_issue[MTIP_TAG_INDEX(tag)]);
 
-        spin_unlock_irqrestore(&port->cmd_issue_lock, flags);
+        spin_unlock(&port->cmd_issue_lock);
 
         /* Set the command's timeout value.*/
         port->commands[tag].comp_time = jiffies + msecs_to_jiffies(
@@ -436,8 +434,7 @@ static void mtip_init_port(struct mtip_port *port)
                 writel(0xFFFFFFFF, port->completed[i]);
 
         /* Clear any pending interrupts for this port */
-        writel(readl(port->dd->mmio + PORT_IRQ_STAT),
-                                        port->dd->mmio + PORT_IRQ_STAT);
+        writel(readl(port->mmio + PORT_IRQ_STAT), port->mmio + PORT_IRQ_STAT);
 
         /* Clear any pending interrupts on the HBA. */
         writel(readl(port->dd->mmio + HOST_IRQ_STAT),
@@ -782,13 +779,24 @@ static void mtip_handle_tfe(struct driver_data *dd)
 
         /* Stop the timer to prevent command timeouts. */
         del_timer(&port->cmd_timer);
+        set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
+
+        if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) &&
+                        test_bit(MTIP_TAG_INTERNAL, port->allocated)) {
+                cmd = &port->commands[MTIP_TAG_INTERNAL];
+                dbg_printk(MTIP_DRV_NAME " TFE for the internal command\n");
+
+                atomic_inc(&cmd->active); /* active > 1 indicates error */
+                if (cmd->comp_data && cmd->comp_func) {
+                        cmd->comp_func(port, MTIP_TAG_INTERNAL,
+                                        cmd->comp_data, PORT_IRQ_TF_ERR);
+                }
+                goto handle_tfe_exit;
+        }
 
         /* clear the tag accumulator */
         memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));
 
-        /* Set eh_active */
-        set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
-
         /* Loop through all the groups */
         for (group = 0; group < dd->slot_groups; group++) {
                 completed = readl(port->completed[group]);
@@ -940,6 +948,7 @@ static void mtip_handle_tfe(struct driver_data *dd)
         }
         print_tags(dd, "reissued (TFE)", tagaccum, cmd_cnt);
 
+handle_tfe_exit:
         /* clear eh_active */
         clear_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
         wake_up_interruptible(&port->svc_wait);
@@ -961,6 +970,8 @@ static inline void mtip_process_sdbf(struct driver_data *dd)
         /* walk all bits in all slot groups */
         for (group = 0; group < dd->slot_groups; group++) {
                 completed = readl(port->completed[group]);
+                if (!completed)
+                        continue;
 
                 /* clear completed status register in the hardware.*/
                 writel(completed, port->completed[group]);
@@ -1329,22 +1340,6 @@ static int mtip_exec_internal_command(struct mtip_port *port,
                         }
                         rv = -EAGAIN;
                 }
-
-                if (readl(port->cmd_issue[MTIP_TAG_INTERNAL])
-                        & (1 << MTIP_TAG_INTERNAL)) {
-                        dev_warn(&port->dd->pdev->dev,
-                                "Retiring internal command but CI is 1.\n");
-                        if (test_bit(MTIP_DDF_REMOVE_PENDING_BIT,
-                                                &port->dd->dd_flag)) {
-                                hba_reset_nosleep(port->dd);
-                                rv = -ENXIO;
-                        } else {
-                                mtip_restart_port(port);
-                                rv = -EAGAIN;
-                        }
-                        goto exec_ic_exit;
-                }
-
         } else {
                 /* Spin for <timeout> checking if command still outstanding */
                 timeout = jiffies + msecs_to_jiffies(timeout);
@@ -1361,21 +1356,25 @@ static int mtip_exec_internal_command(struct mtip_port *port,
                                 rv = -ENXIO;
                                 goto exec_ic_exit;
                         }
+                        if (readl(port->mmio + PORT_IRQ_STAT) & PORT_IRQ_ERR) {
+                                atomic_inc(&int_cmd->active); /* error */
+                                break;
+                        }
                 }
+        }
 
-                if (readl(port->cmd_issue[MTIP_TAG_INTERNAL])
+        if (atomic_read(&int_cmd->active) > 1) {
+                dev_err(&port->dd->pdev->dev,
+                        "Internal command [%02X] failed\n", fis->command);
+                rv = -EIO;
+        }
+        if (readl(port->cmd_issue[MTIP_TAG_INTERNAL])
                         & (1 << MTIP_TAG_INTERNAL)) {
-                        dev_err(&port->dd->pdev->dev,
-                                "Internal command did not complete [atomic]\n");
+                rv = -ENXIO;
+                if (!test_bit(MTIP_DDF_REMOVE_PENDING_BIT,
+                                        &port->dd->dd_flag)) {
+                        mtip_restart_port(port);
                         rv = -EAGAIN;
-                        if (test_bit(MTIP_DDF_REMOVE_PENDING_BIT,
-                                                &port->dd->dd_flag)) {
-                                hba_reset_nosleep(port->dd);
-                                rv = -ENXIO;
-                        } else {
-                                mtip_restart_port(port);
-                                rv = -EAGAIN;
-                        }
                 }
         }
 exec_ic_exit:
@@ -1893,13 +1892,33 @@ static int exec_drive_command(struct mtip_port *port, u8 *command,
                                 void __user *user_buffer)
 {
         struct host_to_dev_fis  fis;
-        struct host_to_dev_fis *reply = (port->rxfis + RX_FIS_D2H_REG);
+        struct host_to_dev_fis *reply;
+        u8 *buf = NULL;
+        dma_addr_t dma_addr = 0;
+        int rv = 0, xfer_sz = command[3];
+
+        if (xfer_sz) {
+                if (user_buffer)
+                        return -EFAULT;
+
+                buf = dmam_alloc_coherent(&port->dd->pdev->dev,
+                                ATA_SECT_SIZE * xfer_sz,
+                                &dma_addr,
+                                GFP_KERNEL);
+                if (!buf) {
+                        dev_err(&port->dd->pdev->dev,
+                                "Memory allocation failed (%d bytes)\n",
+                                ATA_SECT_SIZE * xfer_sz);
+                        return -ENOMEM;
+                }
+                memset(buf, 0, ATA_SECT_SIZE * xfer_sz);
+        }
 
         /* Build the FIS. */
         memset(&fis, 0, sizeof(struct host_to_dev_fis));
-        fis.type                = 0x27;
-        fis.opts                = 1 << 7;
-        fis.command             = command[0];
+        fis.type        = 0x27;
+        fis.opts        = 1 << 7;
+        fis.command     = command[0];
         fis.features    = command[2];
         fis.sect_count  = command[3];
         if (fis.command == ATA_CMD_SMART) {
@@ -1908,6 +1927,11 @@ static int exec_drive_command(struct mtip_port *port, u8 *command,
                 fis.cyl_hi      = 0xC2;
         }
 
+        if (xfer_sz)
+                reply = (port->rxfis + RX_FIS_PIO_SETUP);
+        else
+                reply = (port->rxfis + RX_FIS_D2H_REG);
+
         dbg_printk(MTIP_DRV_NAME
                 " %s: User Command: cmd %x, sect %x, "
                 "feat %x, sectcnt %x\n",
@@ -1917,43 +1941,46 @@ static int exec_drive_command(struct mtip_port *port, u8 *command,
                 command[2],
                 command[3]);
 
-        memset(port->sector_buffer, 0x00, ATA_SECT_SIZE);
-
         /* Execute the command. */
         if (mtip_exec_internal_command(port,
                                 &fis,
                                  5,
-                                 port->sector_buffer_dma,
-                                 (command[3] != 0) ? ATA_SECT_SIZE : 0,
+                                 (xfer_sz ? dma_addr : 0),
+                                 (xfer_sz ? ATA_SECT_SIZE * xfer_sz : 0),
                                  0,
                                  GFP_KERNEL,
                                  MTIP_IOCTL_COMMAND_TIMEOUT_MS)
                                  < 0) {
-                return -1;
+                rv = -EFAULT;
+                goto exit_drive_command;
         }
 
         /* Collect the completion status. */
         command[0] = reply->command; /* Status*/
         command[1] = reply->features; /* Error*/
-        command[2] = command[3];
+        command[2] = reply->sect_count;
 
         dbg_printk(MTIP_DRV_NAME
                 " %s: Completion Status: stat %x, "
-                "err %x, cmd %x\n",
+                "err %x, nsect %x\n",
                 __func__,
                 command[0],
                 command[1],
                 command[2]);
 
-        if (user_buffer && command[3]) {
+        if (xfer_sz) {
                 if (copy_to_user(user_buffer,
-                                 port->sector_buffer,
+                                 buf,
                                  ATA_SECT_SIZE * command[3])) {
-                        return -EFAULT;
+                        rv = -EFAULT;
+                        goto exit_drive_command;
                 }
         }
-
-        return 0;
+exit_drive_command:
+        if (buf)
+                dmam_free_coherent(&port->dd->pdev->dev,
+                                ATA_SECT_SIZE * xfer_sz, buf, dma_addr);
+        return rv;
 }
 
 /*
@@ -2003,6 +2030,32 @@ static unsigned int implicit_sector(unsigned char command,
         return rv;
 }
 
+static void mtip_set_timeout(struct host_to_dev_fis *fis, unsigned int *timeout)
+{
+        switch (fis->command) {
+        case ATA_CMD_DOWNLOAD_MICRO:
+                *timeout = 120000; /* 2 minutes */
+                break;
+        case ATA_CMD_SEC_ERASE_UNIT:
+        case 0xFC:
+                *timeout = 240000; /* 4 minutes */
+                break;
+        case ATA_CMD_STANDBYNOW1:
+                *timeout = 10000;  /* 10 seconds */
+                break;
+        case 0xF7:
+        case 0xFA:
+                *timeout = 60000;  /* 60 seconds */
+                break;
+        case ATA_CMD_SMART:
+                *timeout = 15000;  /* 15 seconds */
+                break;
+        default:
+                *timeout = MTIP_IOCTL_COMMAND_TIMEOUT_MS;
+                break;
+        }
+}
+
 /*
  * Executes a taskfile
  * See ide_taskfile_ioctl() for derivation
@@ -2023,7 +2076,7 @@ static int exec_drive_taskfile(struct driver_data *dd,
         unsigned int taskin = 0;
         unsigned int taskout = 0;
         u8 nsect = 0;
-        unsigned int timeout = MTIP_IOCTL_COMMAND_TIMEOUT_MS;
+        unsigned int timeout;
         unsigned int force_single_sector;
         unsigned int transfer_size;
         unsigned long task_file_data;
@@ -2153,32 +2206,7 @@ static int exec_drive_taskfile(struct driver_data *dd,
                 fis.lba_hi,
                 fis.device);
 
-        switch (fis.command) {
-        case ATA_CMD_DOWNLOAD_MICRO:
-                /* Change timeout for Download Microcode to 2 minutes */
-                timeout = 120000;
-                break;
-        case ATA_CMD_SEC_ERASE_UNIT:
-                /* Change timeout for Security Erase Unit to 4 minutes.*/
-                timeout = 240000;
-                break;
-        case ATA_CMD_STANDBYNOW1:
-                /* Change timeout for standby immediate to 10 seconds.*/
-                timeout = 10000;
-                break;
-        case 0xF7:
-        case 0xFA:
-                /* Change timeout for vendor unique command to 10 secs */
-                timeout = 10000;
-                break;
-        case ATA_CMD_SMART:
-                /* Change timeout for vendor unique command to 15 secs */
-                timeout = 15000;
-                break;
-        default:
-                timeout = MTIP_IOCTL_COMMAND_TIMEOUT_MS;
-                break;
-        }
+        mtip_set_timeout(&fis, &timeout);
 
         /* Determine the correct transfer size.*/
         if (force_single_sector)
@@ -2295,13 +2323,12 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,
 {
         switch (cmd) {
         case HDIO_GET_IDENTITY:
-                if (mtip_get_identify(dd->port, (void __user *) arg) < 0) {
-                        dev_warn(&dd->pdev->dev,
-                                "Unable to read identity\n");
-                        return -EIO;
-                }
-
+        {
+                if (copy_to_user((void __user *)arg, dd->port->identify,
+                                                sizeof(u16) * ATA_ID_WORDS))
+                        return -EFAULT;
                 break;
+        }
         case HDIO_DRIVE_CMD:
         {
                 u8 drive_command[4];
@@ -2537,40 +2564,58 @@ static ssize_t mtip_hw_show_registers(struct device *dev,
         int size = 0;
         int n;
 
-        size += sprintf(&buf[size], "S ACTive:\n");
+        size += sprintf(&buf[size], "Hardware\n--------\n");
+        size += sprintf(&buf[size], "S ACTive      : [ 0x");
 
-        for (n = 0; n < dd->slot_groups; n++)
-                size += sprintf(&buf[size], "0x%08x\n",
+        for (n = dd->slot_groups-1; n >= 0; n--)
+                size += sprintf(&buf[size], "%08X ",
                                          readl(dd->port->s_active[n]));
 
-        size += sprintf(&buf[size], "Command Issue:\n");
+        size += sprintf(&buf[size], "]\n");
+        size += sprintf(&buf[size], "Command Issue : [ 0x");
 
-        for (n = 0; n < dd->slot_groups; n++)
-                size += sprintf(&buf[size], "0x%08x\n",
+        for (n = dd->slot_groups-1; n >= 0; n--)
+                size += sprintf(&buf[size], "%08X ",
                                         readl(dd->port->cmd_issue[n]));
 
-        size += sprintf(&buf[size], "Allocated:\n");
+        size += sprintf(&buf[size], "]\n");
+        size += sprintf(&buf[size], "Completed     : [ 0x");
+
+        for (n = dd->slot_groups-1; n >= 0; n--)
+                size += sprintf(&buf[size], "%08X ",
+                                readl(dd->port->completed[n]));
+
+        size += sprintf(&buf[size], "]\n");
+        size += sprintf(&buf[size], "PORT IRQ STAT : [ 0x%08X ]\n",
+                                readl(dd->port->mmio + PORT_IRQ_STAT));
+        size += sprintf(&buf[size], "HOST IRQ STAT : [ 0x%08X ]\n",
+                                readl(dd->mmio + HOST_IRQ_STAT));
+        size += sprintf(&buf[size], "\n");
 
-        for (n = 0; n < dd->slot_groups; n++) {
+        size += sprintf(&buf[size], "Local\n-----\n");
+        size += sprintf(&buf[size], "Allocated    : [ 0x");
+
+        for (n = dd->slot_groups-1; n >= 0; n--) {
                 if (sizeof(long) > sizeof(u32))
                         group_allocated =
                                 dd->port->allocated[n/2] >> (32*(n&1));
                 else
                         group_allocated = dd->port->allocated[n];
-                size += sprintf(&buf[size], "0x%08x\n",
-                                 group_allocated);
+                size += sprintf(&buf[size], "%08X ", group_allocated);
         }
+        size += sprintf(&buf[size], "]\n");
 
-        size += sprintf(&buf[size], "Completed:\n");
-
-        for (n = 0; n < dd->slot_groups; n++)
-                size += sprintf(&buf[size], "0x%08x\n",
-                                readl(dd->port->completed[n]));
+        size += sprintf(&buf[size], "Commands in Q: [ 0x");
 
-        size += sprintf(&buf[size], "PORT IRQ STAT : 0x%08x\n",
-                                readl(dd->port->mmio + PORT_IRQ_STAT));
-        size += sprintf(&buf[size], "HOST IRQ STAT : 0x%08x\n",
-                                readl(dd->mmio + HOST_IRQ_STAT));
+        for (n = dd->slot_groups-1; n >= 0; n--) {
+                if (sizeof(long) > sizeof(u32))
+                        group_allocated =
+                                dd->port->cmds_to_issue[n/2] >> (32*(n&1));
+                else
+                        group_allocated = dd->port->cmds_to_issue[n];
+                size += sprintf(&buf[size], "%08X ", group_allocated);
+        }
+        size += sprintf(&buf[size], "]\n");
 
         return size;
 }
@@ -2592,8 +2637,24 @@ static ssize_t mtip_hw_show_status(struct device *dev,
         return size;
 }
 
+static ssize_t mtip_hw_show_flags(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        struct driver_data *dd = dev_to_disk(dev)->private_data;
+        int size = 0;
+
+        size += sprintf(&buf[size], "Flag in port struct : [ %08lX ]\n",
+                                                        dd->port->flags);
+        size += sprintf(&buf[size], "Flag in dd struct   : [ %08lX ]\n",
+                                                        dd->dd_flag);
+
+        return size;
+}
+
 static DEVICE_ATTR(registers, S_IRUGO, mtip_hw_show_registers, NULL);
 static DEVICE_ATTR(status, S_IRUGO, mtip_hw_show_status, NULL);
+static DEVICE_ATTR(flags, S_IRUGO, mtip_hw_show_flags, NULL);
 
 /*
  * Create the sysfs related attributes.
@@ -2616,6 +2677,9 @@ static int mtip_hw_sysfs_init(struct driver_data *dd, struct kobject *kobj)
         if (sysfs_create_file(kobj, &dev_attr_status.attr))
                 dev_warn(&dd->pdev->dev,
                         "Error creating 'status' sysfs entry\n");
+        if (sysfs_create_file(kobj, &dev_attr_flags.attr))
+                dev_warn(&dd->pdev->dev,
+                        "Error creating 'flags' sysfs entry\n");
         return 0;
 }
 
@@ -2636,6 +2700,7 @@ static int mtip_hw_sysfs_exit(struct driver_data *dd, struct kobject *kobj)
 
         sysfs_remove_file(kobj, &dev_attr_registers.attr);
         sysfs_remove_file(kobj, &dev_attr_status.attr);
+        sysfs_remove_file(kobj, &dev_attr_flags.attr);
 
         return 0;
 }
@@ -3634,7 +3699,10 @@ skip_create_disk:
         set_bit(QUEUE_FLAG_NONROT, &dd->queue->queue_flags);
         blk_queue_max_segments(dd->queue, MTIP_MAX_SG);
         blk_queue_physical_block_size(dd->queue, 4096);
+        blk_queue_max_hw_sectors(dd->queue, 0xffff);
+        blk_queue_max_segment_size(dd->queue, 0x400000);
         blk_queue_io_min(dd->queue, 4096);
+
         /*
          * write back cache is not supported in the device. FUA depends on
          * write back cache support, hence setting flush support to zero.
diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index 4ef58336310a..b2c88da26b2a 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -113,33 +113,35 @@
 
 #define __force_bit2int (unsigned int __force)
 
-/* below are bit numbers in 'flags' defined in mtip_port */
-#define MTIP_PF_IC_ACTIVE_BIT           0 /* pio/ioctl */
-#define MTIP_PF_EH_ACTIVE_BIT           1 /* error handling */
-#define MTIP_PF_SE_ACTIVE_BIT           2 /* secure erase */
-#define MTIP_PF_DM_ACTIVE_BIT           3 /* download microcde */
-#define MTIP_PF_PAUSE_IO        ((1 << MTIP_PF_IC_ACTIVE_BIT) | \
+enum {
+        /* below are bit numbers in 'flags' defined in mtip_port */
+        MTIP_PF_IC_ACTIVE_BIT       = 0, /* pio/ioctl */
+        MTIP_PF_EH_ACTIVE_BIT       = 1, /* error handling */
+        MTIP_PF_SE_ACTIVE_BIT       = 2, /* secure erase */
+        MTIP_PF_DM_ACTIVE_BIT       = 3, /* download microcde */
+        MTIP_PF_PAUSE_IO      = ((1 << MTIP_PF_IC_ACTIVE_BIT) | \
                                 (1 << MTIP_PF_EH_ACTIVE_BIT) | \
                                 (1 << MTIP_PF_SE_ACTIVE_BIT) | \
-                                (1 << MTIP_PF_DM_ACTIVE_BIT))
-
-#define MTIP_PF_SVC_THD_ACTIVE_BIT      4
-#define MTIP_PF_ISSUE_CMDS_BIT          5
-#define MTIP_PF_REBUILD_BIT             6
-#define MTIP_PF_SVC_THD_STOP_BIT        8
-
-/* below are bit numbers in 'dd_flag' defined in driver_data */
-#define MTIP_DDF_REMOVE_PENDING_BIT     1
-#define MTIP_DDF_OVER_TEMP_BIT          2
-#define MTIP_DDF_WRITE_PROTECT_BIT      3
-#define MTIP_DDF_STOP_IO        ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \
+                                (1 << MTIP_PF_DM_ACTIVE_BIT)),
+
+        MTIP_PF_SVC_THD_ACTIVE_BIT  = 4,
+        MTIP_PF_ISSUE_CMDS_BIT      = 5,
+        MTIP_PF_REBUILD_BIT         = 6,
+        MTIP_PF_SVC_THD_STOP_BIT    = 8,
+
+        /* below are bit numbers in 'dd_flag' defined in driver_data */
+        MTIP_DDF_REMOVE_PENDING_BIT = 1,
+        MTIP_DDF_OVER_TEMP_BIT      = 2,
+        MTIP_DDF_WRITE_PROTECT_BIT  = 3,
+        MTIP_DDF_STOP_IO      = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \
                                 (1 << MTIP_DDF_OVER_TEMP_BIT) | \
-                                (1 << MTIP_DDF_WRITE_PROTECT_BIT))
+                                (1 << MTIP_DDF_WRITE_PROTECT_BIT)),
 
-#define MTIP_DDF_CLEANUP_BIT            5
-#define MTIP_DDF_RESUME_BIT             6
-#define MTIP_DDF_INIT_DONE_BIT          7
-#define MTIP_DDF_REBUILD_FAILED_BIT     8
+        MTIP_DDF_CLEANUP_BIT        = 5,
+        MTIP_DDF_RESUME_BIT         = 6,
+        MTIP_DDF_INIT_DONE_BIT      = 7,
+        MTIP_DDF_REBUILD_FAILED_BIT = 8,
+};
 
 __packed struct smart_attr{
         u8 attr_id;
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index c98c5689bb0b..92622d44e12d 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -899,6 +899,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_B43_HB),
         ID(PCI_DEVICE_ID_INTEL_B43_1_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB),
+        ID(PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB),
         ID(PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB),
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index cf2e764b1760..57226424690c 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -212,6 +212,7 @@
 #define PCI_DEVICE_ID_INTEL_G41_HB          0x2E30
 #define PCI_DEVICE_ID_INTEL_G41_IG          0x2E32
 #define PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB           0x0040
+#define PCI_DEVICE_ID_INTEL_IRONLAKE_D2_HB          0x0069
 #define PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG           0x0042
 #define PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB           0x0044
 #define PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB          0x0062
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index f518b99f53f5..731c9046cf7b 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -34,8 +34,15 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max,
         u32 *data = buf;
 
         /* data ready? */
-        if (readl(trng->base + TRNG_ODATA) & 1) {
+        if (readl(trng->base + TRNG_ISR) & 1) {
                 *data = readl(trng->base + TRNG_ODATA);
+                /*
+                  ensure data ready is only set again AFTER the next data
+                  word is ready in case it got set between checking ISR
+                  and reading ODATA, so we don't risk re-reading the
+                  same word
+                */
+                readl(trng->base + TRNG_ISR);
                 return 4;
         } else
                 return 0;
diff --git a/drivers/clk/spear/clk-aux-synth.c b/drivers/clk/spear/clk-aux-synth.c
index af34074e702b..6756e7c3bc07 100644
--- a/drivers/clk/spear/clk-aux-synth.c
+++ b/drivers/clk/spear/clk-aux-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c
index 4dbdb3fe18e0..958aa3ad1d60 100644
--- a/drivers/clk/spear/clk-frac-synth.c
+++ b/drivers/clk/spear/clk-frac-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-gpt-synth.c b/drivers/clk/spear/clk-gpt-synth.c
index b471c9762a97..1afc18c4effc 100644
--- a/drivers/clk/spear/clk-gpt-synth.c
+++ b/drivers/clk/spear/clk-gpt-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c
index dcd4bdf4b0d9..5f1b6badeb15 100644
--- a/drivers/clk/spear/clk-vco-pll.c
+++ b/drivers/clk/spear/clk-vco-pll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk.c b/drivers/clk/spear/clk.c
index 376d4e5ff326..7cd63788d546 100644
--- a/drivers/clk/spear/clk.c
+++ b/drivers/clk/spear/clk.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/clk.h b/drivers/clk/spear/clk.h
index 3321c46a071c..931737677dfa 100644
--- a/drivers/clk/spear/clk.h
+++ b/drivers/clk/spear/clk.h
@@ -2,7 +2,7 @@
  * Clock framework definitions for SPEAr platform
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear1310_clock.c b/drivers/clk/spear/spear1310_clock.c
index 42b68df9aeef..8f05652d53e6 100644
--- a/drivers/clk/spear/spear1310_clock.c
+++ b/drivers/clk/spear/spear1310_clock.c
@@ -4,7 +4,7 @@
  * SPEAr1310 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear1340_clock.c b/drivers/clk/spear/spear1340_clock.c
index f130919d5bf8..e3ea72162236 100644
--- a/drivers/clk/spear/spear1340_clock.c
+++ b/drivers/clk/spear/spear1340_clock.c
@@ -4,7 +4,7 @@
  * SPEAr1340 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c
index 440bb3e4c971..01dd6daff2a1 100644
--- a/drivers/clk/spear/spear3xx_clock.c
+++ b/drivers/clk/spear/spear3xx_clock.c
@@ -2,7 +2,7 @@
  * SPEAr3xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clk/spear/spear6xx_clock.c b/drivers/clk/spear/spear6xx_clock.c
index f9a20b382304..554d64b062a1 100644
--- a/drivers/clk/spear/spear6xx_clock.c
+++ b/drivers/clk/spear/spear6xx_clock.c
@@ -2,7 +2,7 @@
  * SPEAr6xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 8d81a1d32653..dd3e661a124d 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)	+= cs5535-clockevt.o
 obj-$(CONFIG_SH_TIMER_CMT)      += sh_cmt.o
 obj-$(CONFIG_SH_TIMER_MTU2)     += sh_mtu2.o
 obj-$(CONFIG_SH_TIMER_TMU)      += sh_tmu.o
+obj-$(CONFIG_EM_TIMER_STI)      += em_sti.o
 obj-$(CONFIG_CLKBLD_I8253)      += i8253.o
 obj-$(CONFIG_CLKSRC_MMIO)       += mmio.o
 obj-$(CONFIG_DW_APB_TIMER)      += dw_apb_timer.o
diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
new file mode 100644
index 000000000000..372051d1bba8
--- /dev/null
+++ b/drivers/clocksource/em_sti.c
@@ -0,0 +1,406 @@
+/*
+ * Emma Mobile Timer Support - STI
+ *
+ *  Copyright (C) 2012 Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/irq.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/clocksource.h>
+#include <linux/clockchips.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+
+enum { USER_CLOCKSOURCE, USER_CLOCKEVENT, USER_NR };
+
+struct em_sti_priv {
+        void __iomem *base;
+        struct clk *clk;
+        struct platform_device *pdev;
+        unsigned int active[USER_NR];
+        unsigned long rate;
+        raw_spinlock_t lock;
+        struct clock_event_device ced;
+        struct clocksource cs;
+};
+
+#define STI_CONTROL 0x00
+#define STI_COMPA_H 0x10
+#define STI_COMPA_L 0x14
+#define STI_COMPB_H 0x18
+#define STI_COMPB_L 0x1c
+#define STI_COUNT_H 0x20
+#define STI_COUNT_L 0x24
+#define STI_COUNT_RAW_H 0x28
+#define STI_COUNT_RAW_L 0x2c
+#define STI_SET_H 0x30
+#define STI_SET_L 0x34
+#define STI_INTSTATUS 0x40
+#define STI_INTRAWSTATUS 0x44
+#define STI_INTENSET 0x48
+#define STI_INTENCLR 0x4c
+#define STI_INTFFCLR 0x50
+
+static inline unsigned long em_sti_read(struct em_sti_priv *p, int offs)
+{
+        return ioread32(p->base + offs);
+}
+
+static inline void em_sti_write(struct em_sti_priv *p, int offs,
+                                unsigned long value)
+{
+        iowrite32(value, p->base + offs);
+}
+
+static int em_sti_enable(struct em_sti_priv *p)
+{
+        int ret;
+
+        /* enable clock */
+        ret = clk_enable(p->clk);
+        if (ret) {
+                dev_err(&p->pdev->dev, "cannot enable clock\n");
+                return ret;
+        }
+
+        /* configure channel, periodic mode and maximum timeout */
+        p->rate = clk_get_rate(p->clk);
+
+        /* reset the counter */
+        em_sti_write(p, STI_SET_H, 0x40000000);
+        em_sti_write(p, STI_SET_L, 0x00000000);
+
+        /* mask and clear pending interrupts */
+        em_sti_write(p, STI_INTENCLR, 3);
+        em_sti_write(p, STI_INTFFCLR, 3);
+
+        /* enable updates of counter registers */
+        em_sti_write(p, STI_CONTROL, 1);
+
+        return 0;
+}
+
+static void em_sti_disable(struct em_sti_priv *p)
+{
+        /* mask interrupts */
+        em_sti_write(p, STI_INTENCLR, 3);
+
+        /* stop clock */
+        clk_disable(p->clk);
+}
+
+static cycle_t em_sti_count(struct em_sti_priv *p)
+{
+        cycle_t ticks;
+        unsigned long flags;
+
+        /* the STI hardware buffers the 48-bit count, but to
+         * break it out into two 32-bit access the registers
+         * must be accessed in a certain order.
+         * Always read STI_COUNT_H before STI_COUNT_L.
+         */
+        raw_spin_lock_irqsave(&p->lock, flags);
+        ticks = (cycle_t)(em_sti_read(p, STI_COUNT_H) & 0xffff) << 32;
+        ticks |= em_sti_read(p, STI_COUNT_L);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
+
+        return ticks;
+}
+
+static cycle_t em_sti_set_next(struct em_sti_priv *p, cycle_t next)
+{
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&p->lock, flags);
+
+        /* mask compare A interrupt */
+        em_sti_write(p, STI_INTENCLR, 1);
+
+        /* update compare A value */
+        em_sti_write(p, STI_COMPA_H, next >> 32);
+        em_sti_write(p, STI_COMPA_L, next & 0xffffffff);
+
+        /* clear compare A interrupt source */
+        em_sti_write(p, STI_INTFFCLR, 1);
+
+        /* unmask compare A interrupt */
+        em_sti_write(p, STI_INTENSET, 1);
+
+        raw_spin_unlock_irqrestore(&p->lock, flags);
+
+        return next;
+}
+
+static irqreturn_t em_sti_interrupt(int irq, void *dev_id)
+{
+        struct em_sti_priv *p = dev_id;
+
+        p->ced.event_handler(&p->ced);
+        return IRQ_HANDLED;
+}
+
+static int em_sti_start(struct em_sti_priv *p, unsigned int user)
+{
+        unsigned long flags;
+        int used_before;
+        int ret = 0;
+
+        raw_spin_lock_irqsave(&p->lock, flags);
+        used_before = p->active[USER_CLOCKSOURCE] | p->active[USER_CLOCKEVENT];
+        if (!used_before)
+                ret = em_sti_enable(p);
+
+        if (!ret)
+                p->active[user] = 1;
+        raw_spin_unlock_irqrestore(&p->lock, flags);
+
+        return ret;
+}
+
+static void em_sti_stop(struct em_sti_priv *p, unsigned int user)
+{
+        unsigned long flags;
+        int used_before, used_after;
+
+        raw_spin_lock_irqsave(&p->lock, flags);
+        used_before = p->active[USER_CLOCKSOURCE] | p->active[USER_CLOCKEVENT];
+        p->active[user] = 0;
+        used_after = p->active[USER_CLOCKSOURCE] | p->active[USER_CLOCKEVENT];
+
+        if (used_before && !used_after)
+                em_sti_disable(p);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
+}
+
+static struct em_sti_priv *cs_to_em_sti(struct clocksource *cs)
+{
+        return container_of(cs, struct em_sti_priv, cs);
+}
+
+static cycle_t em_sti_clocksource_read(struct clocksource *cs)
+{
+        return em_sti_count(cs_to_em_sti(cs));
+}
+
+static int em_sti_clocksource_enable(struct clocksource *cs)
+{
+        int ret;
+        struct em_sti_priv *p = cs_to_em_sti(cs);
+
+        ret = em_sti_start(p, USER_CLOCKSOURCE);
+        if (!ret)
+                __clocksource_updatefreq_hz(cs, p->rate);
+        return ret;
+}
+
+static void em_sti_clocksource_disable(struct clocksource *cs)
+{
+        em_sti_stop(cs_to_em_sti(cs), USER_CLOCKSOURCE);
+}
+
+static void em_sti_clocksource_resume(struct clocksource *cs)
+{
+        em_sti_clocksource_enable(cs);
+}
+
+static int em_sti_register_clocksource(struct em_sti_priv *p)
+{
+        struct clocksource *cs = &p->cs;
+
+        memset(cs, 0, sizeof(*cs));
+        cs->name = dev_name(&p->pdev->dev);
+        cs->rating = 200;
+        cs->read = em_sti_clocksource_read;
+        cs->enable = em_sti_clocksource_enable;
+        cs->disable = em_sti_clocksource_disable;
+        cs->suspend = em_sti_clocksource_disable;
+        cs->resume = em_sti_clocksource_resume;
+        cs->mask = CLOCKSOURCE_MASK(48);
+        cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
+
+        dev_info(&p->pdev->dev, "used as clock source\n");
+
+        /* Register with dummy 1 Hz value, gets updated in ->enable() */
+        clocksource_register_hz(cs, 1);
+        return 0;
+}
+
+static struct em_sti_priv *ced_to_em_sti(struct clock_event_device *ced)
+{
+        return container_of(ced, struct em_sti_priv, ced);
+}
+
+static void em_sti_clock_event_mode(enum clock_event_mode mode,
+                                    struct clock_event_device *ced)
+{
+        struct em_sti_priv *p = ced_to_em_sti(ced);
+
+        /* deal with old setting first */
+        switch (ced->mode) {
+        case CLOCK_EVT_MODE_ONESHOT:
+                em_sti_stop(p, USER_CLOCKEVENT);
+                break;
+        default:
+                break;
+        }
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_ONESHOT:
+                dev_info(&p->pdev->dev, "used for oneshot clock events\n");
+                em_sti_start(p, USER_CLOCKEVENT);
+                clockevents_config(&p->ced, p->rate);
+                break;
+        case CLOCK_EVT_MODE_SHUTDOWN:
+        case CLOCK_EVT_MODE_UNUSED:
+                em_sti_stop(p, USER_CLOCKEVENT);
+                break;
+        default:
+                break;
+        }
+}
+
+static int em_sti_clock_event_next(unsigned long delta,
+                                   struct clock_event_device *ced)
+{
+        struct em_sti_priv *p = ced_to_em_sti(ced);
+        cycle_t next;
+        int safe;
+
+        next = em_sti_set_next(p, em_sti_count(p) + delta);
+        safe = em_sti_count(p) < (next - 1);
+
+        return !safe;
+}
+
+static void em_sti_register_clockevent(struct em_sti_priv *p)
+{
+        struct clock_event_device *ced = &p->ced;
+
+        memset(ced, 0, sizeof(*ced));
+        ced->name = dev_name(&p->pdev->dev);
+        ced->features = CLOCK_EVT_FEAT_ONESHOT;
+        ced->rating = 200;
+        ced->cpumask = cpumask_of(0);
+        ced->set_next_event = em_sti_clock_event_next;
+        ced->set_mode = em_sti_clock_event_mode;
+
+        dev_info(&p->pdev->dev, "used for clock events\n");
+
+        /* Register with dummy 1 Hz value, gets updated in ->set_mode() */
+        clockevents_config_and_register(ced, 1, 2, 0xffffffff);
+}
+
+static int __devinit em_sti_probe(struct platform_device *pdev)
+{
+        struct em_sti_priv *p;
+        struct resource *res;
+        int irq, ret;
+
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
+        if (p == NULL) {
+                dev_err(&pdev->dev, "failed to allocate driver data\n");
+                ret = -ENOMEM;
+                goto err0;
+        }
+
+        p->pdev = pdev;
+        platform_set_drvdata(pdev, p);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get I/O memory\n");
+                ret = -EINVAL;
+                goto err0;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "failed to get irq\n");
+                ret = -EINVAL;
+                goto err0;
+        }
+
+        /* map memory, let base point to the STI instance */
+        p->base = ioremap_nocache(res->start, resource_size(res));
+        if (p->base == NULL) {
+                dev_err(&pdev->dev, "failed to remap I/O memory\n");
+                ret = -ENXIO;
+                goto err0;
+        }
+
+        /* get hold of clock */
+        p->clk = clk_get(&pdev->dev, "sclk");
+        if (IS_ERR(p->clk)) {
+                dev_err(&pdev->dev, "cannot get clock\n");
+                ret = PTR_ERR(p->clk);
+                goto err1;
+        }
+
+        if (request_irq(irq, em_sti_interrupt,
+                        IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
+                        dev_name(&pdev->dev), p)) {
+                dev_err(&pdev->dev, "failed to request low IRQ\n");
+                ret = -ENOENT;
+                goto err2;
+        }
+
+        raw_spin_lock_init(&p->lock);
+        em_sti_register_clockevent(p);
+        em_sti_register_clocksource(p);
+        return 0;
+
+err2:
+        clk_put(p->clk);
+err1:
+        iounmap(p->base);
+err0:
+        kfree(p);
+        return ret;
+}
+
+static int __devexit em_sti_remove(struct platform_device *pdev)
+{
+        return -EBUSY; /* cannot unregister clockevent and clocksource */
+}
+
+static const struct of_device_id em_sti_dt_ids[] __devinitconst = {
+        { .compatible = "renesas,em-sti", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, em_sti_dt_ids);
+
+static struct platform_driver em_sti_device_driver = {
+        .probe          = em_sti_probe,
+        .remove         = __devexit_p(em_sti_remove),
+        .driver         = {
+                .name   = "em_sti",
+                .of_match_table = em_sti_dt_ids,
+        }
+};
+
+module_platform_driver(em_sti_device_driver);
+
+MODULE_AUTHOR("Magnus Damm");
+MODULE_DESCRIPTION("Renesas Emma Mobile STI Timer Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 32fe9ef5cc5c..98b06baafcc6 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -48,13 +48,13 @@ struct sh_cmt_priv {
         unsigned long next_match_value;
         unsigned long max_match_value;
         unsigned long rate;
-        spinlock_t lock;
+        raw_spinlock_t lock;
         struct clock_event_device ced;
         struct clocksource cs;
         unsigned long total_cycles;
 };
 
-static DEFINE_SPINLOCK(sh_cmt_lock);
+static DEFINE_RAW_SPINLOCK(sh_cmt_lock);
 
 #define CMSTR -1 /* shared register */
 #define CMCSR 0 /* channel register */
@@ -139,7 +139,7 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_cmt_lock, flags);
+        raw_spin_lock_irqsave(&sh_cmt_lock, flags);
         value = sh_cmt_read(p, CMSTR);
 
         if (start)
@@ -148,7 +148,7 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_cmt_write(p, CMSTR, value);
-        spin_unlock_irqrestore(&sh_cmt_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_cmt_lock, flags);
 }
 
 static int sh_cmt_enable(struct sh_cmt_priv *p, unsigned long *rate)
@@ -328,9 +328,9 @@ static void sh_cmt_set_next(struct sh_cmt_priv *p, unsigned long delta)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
         __sh_cmt_set_next(p, delta);
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 }
 
 static irqreturn_t sh_cmt_interrupt(int irq, void *dev_id)
@@ -385,7 +385,7 @@ static int sh_cmt_start(struct sh_cmt_priv *p, unsigned long flag)
         int ret = 0;
         unsigned long flags;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
 
         if (!(p->flags & (FLAG_CLOCKEVENT | FLAG_CLOCKSOURCE)))
                 ret = sh_cmt_enable(p, &p->rate);
@@ -398,7 +398,7 @@ static int sh_cmt_start(struct sh_cmt_priv *p, unsigned long flag)
         if ((flag == FLAG_CLOCKSOURCE) && (!(p->flags & FLAG_CLOCKEVENT)))
                 __sh_cmt_set_next(p, p->max_match_value);
  out:
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 
         return ret;
 }
@@ -408,7 +408,7 @@ static void sh_cmt_stop(struct sh_cmt_priv *p, unsigned long flag)
         unsigned long flags;
         unsigned long f;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
 
         f = p->flags & (FLAG_CLOCKEVENT | FLAG_CLOCKSOURCE);
         p->flags &= ~flag;
@@ -420,7 +420,7 @@ static void sh_cmt_stop(struct sh_cmt_priv *p, unsigned long flag)
         if ((flag == FLAG_CLOCKEVENT) && (p->flags & FLAG_CLOCKSOURCE))
                 __sh_cmt_set_next(p, p->max_match_value);
 
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 }
 
 static struct sh_cmt_priv *cs_to_sh_cmt(struct clocksource *cs)
@@ -435,13 +435,13 @@ static cycle_t sh_cmt_clocksource_read(struct clocksource *cs)
         unsigned long value;
         int has_wrapped;
 
-        spin_lock_irqsave(&p->lock, flags);
+        raw_spin_lock_irqsave(&p->lock, flags);
         value = p->total_cycles;
         raw = sh_cmt_get_counter(p, &has_wrapped);
 
         if (unlikely(has_wrapped))
                 raw += p->match_value + 1;
-        spin_unlock_irqrestore(&p->lock, flags);
+        raw_spin_unlock_irqrestore(&p->lock, flags);
 
         return value + raw;
 }
@@ -591,7 +591,7 @@ static int sh_cmt_register(struct sh_cmt_priv *p, char *name,
                 p->max_match_value = (1 << p->width) - 1;
 
         p->match_value = p->max_match_value;
-        spin_lock_init(&p->lock);
+        raw_spin_lock_init(&p->lock);
 
         if (clockevent_rating)
                 sh_cmt_register_clockevent(p, name, clockevent_rating);
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index a2172f690418..d9b76ca64a61 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -43,7 +43,7 @@ struct sh_mtu2_priv {
         struct clock_event_device ced;
 };
 
-static DEFINE_SPINLOCK(sh_mtu2_lock);
+static DEFINE_RAW_SPINLOCK(sh_mtu2_lock);
 
 #define TSTR -1 /* shared register */
 #define TCR  0 /* channel register */
@@ -107,7 +107,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_mtu2_lock, flags);
+        raw_spin_lock_irqsave(&sh_mtu2_lock, flags);
         value = sh_mtu2_read(p, TSTR);
 
         if (start)
@@ -116,7 +116,7 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_mtu2_write(p, TSTR, value);
-        spin_unlock_irqrestore(&sh_mtu2_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_mtu2_lock, flags);
 }
 
 static int sh_mtu2_enable(struct sh_mtu2_priv *p)
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 97f54b634be4..c1b51d49d106 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -45,7 +45,7 @@ struct sh_tmu_priv {
         struct clocksource cs;
 };
 
-static DEFINE_SPINLOCK(sh_tmu_lock);
+static DEFINE_RAW_SPINLOCK(sh_tmu_lock);
 
 #define TSTR -1 /* shared register */
 #define TCOR  0 /* channel register */
@@ -95,7 +95,7 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start)
         unsigned long flags, value;
 
         /* start stop register shared by multiple timer channels */
-        spin_lock_irqsave(&sh_tmu_lock, flags);
+        raw_spin_lock_irqsave(&sh_tmu_lock, flags);
         value = sh_tmu_read(p, TSTR);
 
         if (start)
@@ -104,7 +104,7 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start)
                 value &= ~(1 << cfg->timer_bit);
 
         sh_tmu_write(p, TSTR, value);
-        spin_unlock_irqrestore(&sh_tmu_lock, flags);
+        raw_spin_unlock_irqrestore(&sh_tmu_lock, flags);
 }
 
 static int sh_tmu_enable(struct sh_tmu_priv *p)
@@ -245,12 +245,7 @@ static void sh_tmu_clock_event_start(struct sh_tmu_priv *p, int periodic)
 
         sh_tmu_enable(p);
 
-        /* TODO: calculate good shift from rate and counter bit width */
-
-        ced->shift = 32;
-        ced->mult = div_sc(p->rate, NSEC_PER_SEC, ced->shift);
-        ced->max_delta_ns = clockevent_delta2ns(0xffffffff, ced);
-        ced->min_delta_ns = 5000;
+        clockevents_config(ced, p->rate);
 
         if (periodic) {
                 p->periodic = (p->rate + HZ/2) / HZ;
@@ -323,7 +318,8 @@ static void sh_tmu_register_clockevent(struct sh_tmu_priv *p,
         ced->set_mode = sh_tmu_clock_event_mode;
 
         dev_info(&p->pdev->dev, "used for clock events\n");
-        clockevents_register_device(ced);
+
+        clockevents_config_and_register(ced, 1, 0x300, 0xffffffff);
 
         ret = setup_irq(p->irqaction.irq, &p->irqaction);
         if (ret) {
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index e23dc82d43ac..721296157577 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1626,4 +1626,4 @@ module_exit(dw_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fb4f4990f5eb..1dc2a4ad0026 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -815,8 +815,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
 
         init_completion(&sdmac->done);
 
-        sdmac->buf_tail = 0;
-
         return 0;
 out:
 
@@ -927,6 +925,8 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
 
         sdmac->flags = 0;
 
+        sdmac->buf_tail = 0;
+
         dev_dbg(sdma->dev, "setting up %d entries for channel %d.\n",
                         sg_len, channel);
 
@@ -1027,6 +1027,8 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
 
         sdmac->status = DMA_IN_PROGRESS;
 
+        sdmac->buf_tail = 0;
+
         sdmac->flags |= IMX_DMA_SG_LOOP;
         sdmac->direction = direction;
         ret = sdma_load_context(sdmac);
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index cbcc28e79be6..e4feba6b03c0 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -392,6 +392,8 @@ struct pl330_req {
         struct pl330_reqcfg *cfg;
         /* Pointer to first xfer in the request. */
         struct pl330_xfer *x;
+        /* Hook to attach to DMAC's list of reqs with due callback */
+        struct list_head rqd;
 };
 
 /*
@@ -461,8 +463,6 @@ struct _pl330_req {
         /* Number of bytes taken to setup MC for the req */
         u32 mc_len;
         struct pl330_req *r;
-        /* Hook to attach to DMAC's list of reqs with due callback */
-        struct list_head rqd;
 };
 
 /* ToBeDone for tasklet */
@@ -1683,7 +1683,7 @@ static void pl330_dotask(unsigned long data)
 /* Returns 1 if state was updated, 0 otherwise */
 static int pl330_update(const struct pl330_info *pi)
 {
-        struct _pl330_req *rqdone;
+        struct pl330_req *rqdone, *tmp;
         struct pl330_dmac *pl330;
         unsigned long flags;
         void __iomem *regs;
@@ -1750,7 +1750,10 @@ static int pl330_update(const struct pl330_info *pi)
                         if (active == -1) /* Aborted */
                                 continue;
 
-                        rqdone = &thrd->req[active];
+                        /* Detach the req */
+                        rqdone = thrd->req[active].r;
+                        thrd->req[active].r = NULL;
+
                         mark_free(thrd, active);
 
                         /* Get going again ASAP */
@@ -1762,20 +1765,11 @@ static int pl330_update(const struct pl330_info *pi)
         }
 
         /* Now that we are in no hurry, do the callbacks */
-        while (!list_empty(&pl330->req_done)) {
-                struct pl330_req *r;
-
-                rqdone = container_of(pl330->req_done.next,
-                                        struct _pl330_req, rqd);
-
-                list_del_init(&rqdone->rqd);
-
-                /* Detach the req */
-                r = rqdone->r;
-                rqdone->r = NULL;
+        list_for_each_entry_safe(rqdone, tmp, &pl330->req_done, rqd) {
+                list_del(&rqdone->rqd);
 
                 spin_unlock_irqrestore(&pl330->lock, flags);
-                _callback(r, PL330_ERR_NONE);
+                _callback(rqdone, PL330_ERR_NONE);
                 spin_lock_irqsave(&pl330->lock, flags);
         }
 
@@ -2321,7 +2315,7 @@ static void pl330_tasklet(unsigned long data)
         /* Pick up ripe tomatoes */
         list_for_each_entry_safe(desc, _dt, &pch->work_list, node)
                 if (desc->status == DONE) {
-                        if (pch->cyclic)
+                        if (!pch->cyclic)
                                 dma_cookie_complete(&desc->txd);
                         list_move_tail(&desc->node, &list);
                 }
@@ -2539,7 +2533,7 @@ static inline void _init_desc(struct dma_pl330_desc *desc)
 }
 
 /* Returns the number of descriptors added to the DMAC pool */
-int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count)
+static int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count)
 {
         struct dma_pl330_desc *desc;
         unsigned long flags;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 10f375032e96..de5ba86e8b89 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -164,7 +164,7 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems)
         else
                 return (char *)ptr;
 
-        r = size % align;
+        r = (unsigned long)p % align;
 
         if (r == 0)
                 return (char *)ptr;
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index d27778f65a5d..a499c7ed820a 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1814,12 +1814,6 @@ static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val,
         if (mce->bank != 8)
                 return NOTIFY_DONE;
 
-#ifdef CONFIG_SMP
-        /* Only handle if it is the right mc controller */
-        if (mce->socketid != pvt->i7core_dev->socket)
-                return NOTIFY_DONE;
-#endif
-
         smp_rmb();
         if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
                 smp_wmb();
@@ -2116,8 +2110,6 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
         if (pvt->enable_scrub)
                 disable_sdram_scrub_setting(mci);
 
-        mce_unregister_decode_chain(&i7_mce_dec);
-
         /* Disable EDAC polling */
         i7core_pci_ctl_release(pvt);
 
@@ -2222,8 +2214,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
         /* DCLK for scrub rate setting */
         pvt->dclk_freq = get_dclk_freq();
 
-        mce_register_decode_chain(&i7_mce_dec);
-
         return 0;
 
 fail0:
@@ -2367,8 +2357,10 @@ static int __init i7core_init(void)
 
         pci_rc = pci_register_driver(&i7core_driver);
 
-        if (pci_rc >= 0)
+        if (pci_rc >= 0) {
+                mce_register_decode_chain(&i7_mce_dec);
                 return 0;
+        }
 
         i7core_printk(KERN_ERR, "Failed to register device with error %d.\n",
                       pci_rc);
@@ -2384,6 +2376,7 @@ static void __exit i7core_exit(void)
 {
         debugf2("MC: " __FILE__ ": %s()\n", __func__);
         pci_unregister_driver(&i7core_driver);
+        mce_unregister_decode_chain(&i7_mce_dec);
 }
 
 module_init(i7core_init);
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
index c6074c5cd1ef..8c87a5e87057 100644
--- a/drivers/edac/mce_amd.h
+++ b/drivers/edac/mce_amd.h
@@ -5,8 +5,6 @@
 
 #include <asm/mce.h>
 
-#define BIT_64(n)                       (U64_C(1) << (n))
-
 #define EC(x)                           ((x) & 0xffff)
 #define XEC(x, mask)                    (((x) >> 16) & mask)
 
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 4c402353ba98..0e374625f6f8 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -980,7 +980,8 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
         layers[1].type = EDAC_MC_LAYER_CHANNEL;
         layers[1].size = 1;
         layers[1].is_virt_csrow = false;
-        mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata));
+        mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
+                            sizeof(*pdata));
         if (!mci) {
                 devres_release_group(&op->dev, mpc85xx_mc_err_probe);
                 return -ENOMEM;
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 4adaf4b7da99..36ad17e79d61 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -555,7 +555,7 @@ static int get_dimm_config(struct mem_ctl_info *mci)
                 pvt->is_close_pg = false;
         }
 
-        pci_read_config_dword(pvt->pci_ta, RANK_CFG_A, &reg);
+        pci_read_config_dword(pvt->pci_ddrio, RANK_CFG_A, &reg);
         if (IS_RDIMM_ENABLED(reg)) {
                 /* FIXME: Can also be LRDIMM */
                 debugf0("Memory is registered\n");
@@ -1604,8 +1604,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
         debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
                 __func__, mci, &sbridge_dev->pdev[0]->dev);
 
-        mce_unregister_decode_chain(&sbridge_mce_dec);
-
         /* Remove MC sysfs nodes */
         edac_mc_del_mc(mci->dev);
 
@@ -1682,7 +1680,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
                 goto fail0;
         }
 
-        mce_register_decode_chain(&sbridge_mce_dec);
         return 0;
 
 fail0:
@@ -1811,8 +1808,10 @@ static int __init sbridge_init(void)
 
         pci_rc = pci_register_driver(&sbridge_driver);
 
-        if (pci_rc >= 0)
+        if (pci_rc >= 0) {
+                mce_register_decode_chain(&sbridge_mce_dec);
                 return 0;
+        }
 
         sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n",
                       pci_rc);
@@ -1828,6 +1827,7 @@ static void __exit sbridge_exit(void)
 {
         debugf2("MC: " __FILE__ ": %s()\n", __func__);
         pci_unregister_driver(&sbridge_driver);
+        mce_unregister_decode_chain(&sbridge_mce_dec);
 }
 
 module_init(sbridge_init);
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 23416e443765..a4ed30bd9a41 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -116,8 +116,8 @@ const char *max8997_extcon_cable[] = {
         [5] = "Charge-downstream",
         [6] = "MHL",
         [7] = "Dock-desk",
-        [7] = "Dock-card",
-        [8] = "JIG",
+        [8] = "Dock-card",
+        [9] = "JIG",
 
         NULL,
 };
@@ -514,6 +514,7 @@ static int __devexit max8997_muic_remove(struct platform_device *pdev)
 
         extcon_dev_unregister(info->edev);
 
+        kfree(info->edev);
         kfree(info);
 
         return 0;
diff --git a/drivers/extcon/extcon_class.c b/drivers/extcon/extcon_class.c
index f598a700ec15..159aeb07b3ba 100644
--- a/drivers/extcon/extcon_class.c
+++ b/drivers/extcon/extcon_class.c
@@ -762,7 +762,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
 #if defined(CONFIG_ANDROID)
         if (switch_class)
                 ret = class_compat_create_link(switch_class, edev->dev,
-                                               dev);
+                                               NULL);
 #endif /* CONFIG_ANDROID */
 
         spin_lock_init(&edev->lock);
diff --git a/drivers/extcon/extcon_gpio.c b/drivers/extcon/extcon_gpio.c
index fe7a07b47336..8a0dcc11c7c7 100644
--- a/drivers/extcon/extcon_gpio.c
+++ b/drivers/extcon/extcon_gpio.c
@@ -125,6 +125,7 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_request_irq;
 
+        platform_set_drvdata(pdev, extcon_data);
         /* Perform initial detection */
         gpio_extcon_work(&extcon_data->work.work);
 
@@ -146,6 +147,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev)
         struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev);
 
         cancel_delayed_work_sync(&extcon_data->work);
+        free_irq(extcon_data->irq, extcon_data);
         gpio_free(extcon_data->gpio);
         extcon_dev_unregister(&extcon_data->edev);
         devm_kfree(&pdev->dev, extcon_data);
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 7bb00448e13d..b6453d0e44ad 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2833,7 +2833,7 @@ static __init void exynos5_gpiolib_init(void)
         }
 
         /* need to set base address for gpc4 */
-        exonys5_gpios_1[11].base = gpio_base1 + 0x2E0;
+        exynos5_gpios_1[11].base = gpio_base1 + 0x2E0;
 
         /* need to set base address for gpx */
         chip = &exynos5_gpios_1[21];
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index d7038230b71e..7053140c6596 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -35,9 +35,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
         {0,}
 };
 
+
+static void cirrus_kick_out_firmware_fb(struct pci_dev *pdev)
+{
+        struct apertures_struct *ap;
+        bool primary = false;
+
+        ap = alloc_apertures(1);
+        ap->ranges[0].base = pci_resource_start(pdev, 0);
+        ap->ranges[0].size = pci_resource_len(pdev, 0);
+
+#ifdef CONFIG_X86
+        primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
+#endif
+        remove_conflicting_framebuffers(ap, "cirrusdrmfb", primary);
+        kfree(ap);
+}
+
 static int __devinit
 cirrus_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        cirrus_kick_out_firmware_fb(pdev);
+
         return drm_get_pci_dev(pdev, ent, &driver);
 }
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h
index 21bdfa8836f7..64ea597cb6d3 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.h
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.h
@@ -145,7 +145,7 @@ struct cirrus_device {
                 struct ttm_bo_device bdev;
                 atomic_t validate_sequence;
         } ttm;
-
+        bool mm_inited;
 };
 
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 2ebcd11a5023..50e170f879de 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -275,12 +275,17 @@ int cirrus_mm_init(struct cirrus_device *cirrus)
                                     pci_resource_len(dev->pdev, 0),
                                     DRM_MTRR_WC);
 
+        cirrus->mm_inited = true;
         return 0;
 }
 
 void cirrus_mm_fini(struct cirrus_device *cirrus)
 {
         struct drm_device *dev = cirrus->dev;
+
+        if (!cirrus->mm_inited)
+                return;
+
         ttm_bo_device_release(&cirrus->ttm.bdev);
 
         cirrus_ttm_global_release(cirrus);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index c3b5139eba7f..5873e481e5d2 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -30,7 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include "drmP.h"
 #include "drm_edid.h"
 #include "drm_edid_modes.h"
@@ -149,6 +149,10 @@ int drm_edid_header_is_valid(const u8 *raw_edid)
 }
 EXPORT_SYMBOL(drm_edid_header_is_valid);
 
+static int edid_fixup __read_mostly = 6;
+module_param_named(edid_fixup, edid_fixup, int, 0400);
+MODULE_PARM_DESC(edid_fixup,
+                 "Minimum number of valid EDID header bytes (0-8, default 6)");
 
 /*
  * Sanity check the EDID block (base or extension).  Return 0 if the block
@@ -160,10 +164,13 @@ bool drm_edid_block_valid(u8 *raw_edid, int block)
         u8 csum = 0;
         struct edid *edid = (struct edid *)raw_edid;
 
+        if (edid_fixup > 8 || edid_fixup < 0)
+                edid_fixup = 6;
+
         if (block == 0) {
                 int score = drm_edid_header_is_valid(raw_edid);
                 if (score == 8) ;
-                else if (score >= 6) {
+                else if (score >= edid_fixup) {
                         DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
                         memcpy(raw_edid, edid_header, sizeof(edid_header));
                 } else {
@@ -603,7 +610,7 @@ static bool
 drm_monitor_supports_rb(struct edid *edid)
 {
         if (edid->revision >= 4) {
-                bool ret;
+                bool ret = false;
                 drm_for_each_detailed_block((u8 *)edid, is_rb, &ret);
                 return ret;
         }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 420953197d0a..d6de2e07fa03 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -244,8 +244,8 @@ static const struct file_operations exynos_drm_driver_fops = {
 };
 
 static struct drm_driver exynos_drm_driver = {
-        .driver_features        = DRIVER_HAVE_IRQ | DRIVER_BUS_PLATFORM |
-                                  DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
+        .driver_features        = DRIVER_HAVE_IRQ | DRIVER_MODESET |
+                                        DRIVER_GEM | DRIVER_PRIME,
         .load                   = exynos_drm_load,
         .unload                 = exynos_drm_unload,
         .open                   = exynos_drm_open,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 6e9ac7bd1dcf..23d5ad379f86 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -172,19 +172,12 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder)
                 manager_ops->commit(manager->dev);
 }
 
-static struct drm_crtc *
-exynos_drm_encoder_get_crtc(struct drm_encoder *encoder)
-{
-        return encoder->crtc;
-}
-
 static struct drm_encoder_helper_funcs exynos_encoder_helper_funcs = {
         .dpms           = exynos_drm_encoder_dpms,
         .mode_fixup     = exynos_drm_encoder_mode_fixup,
         .mode_set       = exynos_drm_encoder_mode_set,
         .prepare        = exynos_drm_encoder_prepare,
         .commit         = exynos_drm_encoder_commit,
-        .get_crtc       = exynos_drm_encoder_get_crtc,
 };
 
 static void exynos_drm_encoder_destroy(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index f82a299553fb..4ccfe4328fab 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -51,11 +51,22 @@ struct exynos_drm_fb {
 static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
 {
         struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);
+        unsigned int i;
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
         drm_framebuffer_cleanup(fb);
 
+        for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {
+                struct drm_gem_object *obj;
+
+                if (exynos_fb->exynos_gem_obj[i] == NULL)
+                        continue;
+
+                obj = &exynos_fb->exynos_gem_obj[i]->base;
+                drm_gem_object_unreference_unlocked(obj);
+        }
+
         kfree(exynos_fb);
         exynos_fb = NULL;
 }
@@ -134,11 +145,11 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                 return ERR_PTR(-ENOENT);
         }
 
-        drm_gem_object_unreference_unlocked(obj);
-
         fb = exynos_drm_framebuffer_init(dev, mode_cmd, obj);
-        if (IS_ERR(fb))
+        if (IS_ERR(fb)) {
+                drm_gem_object_unreference_unlocked(obj);
                 return fb;
+        }
 
         exynos_fb = to_exynos_fb(fb);
         nr = exynos_drm_format_num_buffers(fb->pixel_format);
@@ -152,8 +163,6 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                         return ERR_PTR(-ENOENT);
                 }
 
-                drm_gem_object_unreference_unlocked(obj);
-
                 exynos_fb->exynos_gem_obj[i] = to_exynos_gem_obj(obj);
         }
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.h b/drivers/gpu/drm/exynos/exynos_drm_fb.h
index 3ecb30d93552..50823756cdea 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.h
@@ -31,10 +31,10 @@
 static inline int exynos_drm_format_num_buffers(uint32_t format)
 {
         switch (format) {
-        case DRM_FORMAT_NV12M:
+        case DRM_FORMAT_NV12:
         case DRM_FORMAT_NV12MT:
                 return 2;
-        case DRM_FORMAT_YUV420M:
+        case DRM_FORMAT_YUV420:
                 return 3;
         default:
                 return 1;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index fc91293c4560..5c8b683029ea 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -689,7 +689,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
                                    struct drm_device *dev, uint32_t handle,
                                    uint64_t *offset)
 {
-        struct exynos_drm_gem_obj *exynos_gem_obj;
         struct drm_gem_object *obj;
         int ret = 0;
 
@@ -710,15 +709,13 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
                 goto unlock;
         }
 
-        exynos_gem_obj = to_exynos_gem_obj(obj);
-
-        if (!exynos_gem_obj->base.map_list.map) {
-                ret = drm_gem_create_mmap_offset(&exynos_gem_obj->base);
+        if (!obj->map_list.map) {
+                ret = drm_gem_create_mmap_offset(obj);
                 if (ret)
                         goto out;
         }
 
-        *offset = (u64)exynos_gem_obj->base.map_list.hash.key << PAGE_SHIFT;
+        *offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
         DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);
 
 out:
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 68ef01028375..e2147a2ddcec 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -365,7 +365,7 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
         switch (win_data->pixel_format) {
         case DRM_FORMAT_NV12MT:
                 tiled_mode = true;
-        case DRM_FORMAT_NV12M:
+        case DRM_FORMAT_NV12:
                 crcb_mode = false;
                 buf_num = 2;
                 break;
@@ -601,18 +601,20 @@ static void mixer_win_reset(struct mixer_context *ctx)
         mixer_reg_write(res, MXR_BG_COLOR2, 0x008080);
 
         /* setting graphical layers */
-
         val  = MXR_GRP_CFG_COLOR_KEY_DISABLE; /* no blank key */
         val |= MXR_GRP_CFG_WIN_BLEND_EN;
+        val |= MXR_GRP_CFG_BLEND_PRE_MUL;
+        val |= MXR_GRP_CFG_PIXEL_BLEND_EN;
         val |= MXR_GRP_CFG_ALPHA_VAL(0xff); /* non-transparent alpha */
 
         /* the same configuration for both layers */
         mixer_reg_write(res, MXR_GRAPHIC_CFG(0), val);
-
-        val |= MXR_GRP_CFG_BLEND_PRE_MUL;
-        val |= MXR_GRP_CFG_PIXEL_BLEND_EN;
         mixer_reg_write(res, MXR_GRAPHIC_CFG(1), val);
 
+        /* setting video layers */
+        val = MXR_GRP_CFG_ALPHA_VAL(0);
+        mixer_reg_write(res, MXR_VIDEO_CFG, val);
+
         /* configuration of Video Processor Registers */
         vp_win_reset(ctx);
         vp_default_filter(res);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index f920fb5e42b6..fa9439159ebd 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -130,11 +130,10 @@ static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
                 return -EINVAL;
 
         /* This is all entirely broken */
-        down_write(&current->mm->mmap_sem);
         old_fops = file_priv->filp->f_op;
         file_priv->filp->f_op = &i810_buffer_fops;
         dev_priv->mmap_buffer = buf;
-        buf_priv->virtual = (void *)do_mmap(file_priv->filp, 0, buf->total,
+        buf_priv->virtual = (void *)vm_mmap(file_priv->filp, 0, buf->total,
                                             PROT_READ | PROT_WRITE,
                                             MAP_SHARED, buf->bus_address);
         dev_priv->mmap_buffer = NULL;
@@ -145,7 +144,6 @@ static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
                 retcode = PTR_ERR(buf_priv->virtual);
                 buf_priv->virtual = NULL;
         }
-        up_write(&current->mm->mmap_sem);
 
         return retcode;
 }
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 05adbf23951a..a378c0800304 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -233,6 +233,7 @@ static const struct intel_device_info intel_sandybridge_d_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct intel_device_info intel_sandybridge_m_info = {
@@ -243,6 +244,7 @@ static const struct intel_device_info intel_sandybridge_m_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct intel_device_info intel_ivybridge_d_info = {
@@ -252,6 +254,7 @@ static const struct intel_device_info intel_ivybridge_d_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct intel_device_info intel_ivybridge_m_info = {
@@ -262,6 +265,7 @@ static const struct intel_device_info intel_ivybridge_m_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct intel_device_info intel_valleyview_m_info = {
@@ -289,6 +293,7 @@ static const struct intel_device_info intel_haswell_d_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct intel_device_info intel_haswell_m_info = {
@@ -298,6 +303,7 @@ static const struct intel_device_info intel_haswell_m_info = {
         .has_blt_ring = 1,
         .has_llc = 1,
         .has_pch_split = 1,
+        .has_force_wake = 1,
 };
 
 static const struct pci_device_id pciidlist[] = {               /* aka */
@@ -1144,10 +1150,9 @@ MODULE_LICENSE("GPL and additional rights");
 
 /* We give fast paths for the really cool registers */
 #define NEEDS_FORCE_WAKE(dev_priv, reg) \
-       (((dev_priv)->info->gen >= 6) && \
-        ((reg) < 0x40000) &&            \
-        ((reg) != FORCEWAKE)) && \
-       (!IS_VALLEYVIEW((dev_priv)->dev))
+        ((HAS_FORCE_WAKE((dev_priv)->dev)) && \
+         ((reg) < 0x40000) &&            \
+         ((reg) != FORCEWAKE))
 
 static bool IS_DISPLAYREG(u32 reg)
 {
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 24ef5d77927f..a0c15abbdcef 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -286,6 +286,7 @@ struct intel_device_info {
         u8 is_ivybridge:1;
         u8 is_valleyview:1;
         u8 has_pch_split:1;
+        u8 has_force_wake:1;
         u8 is_haswell:1;
         u8 has_fbc:1;
         u8 has_pipe_cxsr:1;
@@ -1122,6 +1123,8 @@ struct drm_i915_file_private {
 #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)
 #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)
 
+#define HAS_FORCE_WAKE(dev) (INTEL_INFO(dev)->has_force_wake)
+
 #include "i915_trace.h"
 
 /**
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 84975e1e1f05..23f2ea0f0651 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -585,7 +585,7 @@ out:
         return ret;
 }
 
-static void pch_irq_handler(struct drm_device *dev, u32 pch_iir)
+static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         int pipe;
@@ -625,6 +625,35 @@ static void pch_irq_handler(struct drm_device *dev, u32 pch_iir)
                 DRM_DEBUG_DRIVER("PCH transcoder A underrun interrupt\n");
 }
 
+static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        int pipe;
+
+        if (pch_iir & SDE_AUDIO_POWER_MASK_CPT)
+                DRM_DEBUG_DRIVER("PCH audio power change on port %d\n",
+                                 (pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
+                                 SDE_AUDIO_POWER_SHIFT_CPT);
+
+        if (pch_iir & SDE_AUX_MASK_CPT)
+                DRM_DEBUG_DRIVER("AUX channel interrupt\n");
+
+        if (pch_iir & SDE_GMBUS_CPT)
+                DRM_DEBUG_DRIVER("PCH GMBUS interrupt\n");
+
+        if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
+                DRM_DEBUG_DRIVER("Audio CP request interrupt\n");
+
+        if (pch_iir & SDE_AUDIO_CP_CHG_CPT)
+                DRM_DEBUG_DRIVER("Audio CP change interrupt\n");
+
+        if (pch_iir & SDE_FDI_MASK_CPT)
+                for_each_pipe(pipe)
+                        DRM_DEBUG_DRIVER("  pipe %c FDI IIR: 0x%08x\n",
+                                         pipe_name(pipe),
+                                         I915_READ(FDI_RX_IIR(pipe)));
+}
+
 static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
@@ -666,7 +695,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
 
                         if (pch_iir & SDE_HOTPLUG_MASK_CPT)
                                 queue_work(dev_priv->wq, &dev_priv->hotplug_work);
-                        pch_irq_handler(dev, pch_iir);
+                        cpt_irq_handler(dev, pch_iir);
 
                         /* clear PCH hotplug event before clear CPU irq */
                         I915_WRITE(SDEIIR, pch_iir);
@@ -759,7 +788,10 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
         if (de_iir & DE_PCH_EVENT) {
                 if (pch_iir & hotplug_mask)
                         queue_work(dev_priv->wq, &dev_priv->hotplug_work);
-                pch_irq_handler(dev, pch_iir);
+                if (HAS_PCH_CPT(dev))
+                        cpt_irq_handler(dev, pch_iir);
+                else
+                        ibx_irq_handler(dev, pch_iir);
         }
 
         if (de_iir & DE_PCU_EVENT) {
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0a61481cd2c2..9dfc4c5ff31e 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -210,9 +210,17 @@
 #define MI_DISPLAY_FLIP         MI_INSTR(0x14, 2)
 #define MI_DISPLAY_FLIP_I915    MI_INSTR(0x14, 1)
 #define   MI_DISPLAY_FLIP_PLANE(n) ((n) << 20)
+/* IVB has funny definitions for which plane to flip. */
+#define   MI_DISPLAY_FLIP_IVB_PLANE_A  (0 << 19)
+#define   MI_DISPLAY_FLIP_IVB_PLANE_B  (1 << 19)
+#define   MI_DISPLAY_FLIP_IVB_SPRITE_A (2 << 19)
+#define   MI_DISPLAY_FLIP_IVB_SPRITE_B (3 << 19)
+#define   MI_DISPLAY_FLIP_IVB_PLANE_C  (4 << 19)
+#define   MI_DISPLAY_FLIP_IVB_SPRITE_C (5 << 19)
 #define MI_ARB_ON_OFF           MI_INSTR(0x08, 0)
 #define   MI_ARB_ENABLE                 (1<<0)
 #define   MI_ARB_DISABLE                (0<<0)
+
 #define MI_SET_CONTEXT          MI_INSTR(0x18, 0)
 #define   MI_MM_SPACE_GTT               (1<<8)
 #define   MI_MM_SPACE_PHYSICAL          (0<<8)
@@ -3391,7 +3399,7 @@
 
 /* PCH */
 
-/* south display engine interrupt */
+/* south display engine interrupt: IBX */
 #define SDE_AUDIO_POWER_D       (1 << 27)
 #define SDE_AUDIO_POWER_C       (1 << 26)
 #define SDE_AUDIO_POWER_B       (1 << 25)
@@ -3427,15 +3435,44 @@
 #define SDE_TRANSA_CRC_ERR      (1 << 1)
 #define SDE_TRANSA_FIFO_UNDER   (1 << 0)
 #define SDE_TRANS_MASK          (0x3f)
-/* CPT */
-#define SDE_CRT_HOTPLUG_CPT     (1 << 19)
+
+/* south display engine interrupt: CPT/PPT */
+#define SDE_AUDIO_POWER_D_CPT   (1 << 31)
+#define SDE_AUDIO_POWER_C_CPT   (1 << 30)
+#define SDE_AUDIO_POWER_B_CPT   (1 << 29)
+#define SDE_AUDIO_POWER_SHIFT_CPT   29
+#define SDE_AUDIO_POWER_MASK_CPT    (7 << 29)
+#define SDE_AUXD_CPT            (1 << 27)
+#define SDE_AUXC_CPT            (1 << 26)
+#define SDE_AUXB_CPT            (1 << 25)
+#define SDE_AUX_MASK_CPT        (7 << 25)
 #define SDE_PORTD_HOTPLUG_CPT   (1 << 23)
 #define SDE_PORTC_HOTPLUG_CPT   (1 << 22)
 #define SDE_PORTB_HOTPLUG_CPT   (1 << 21)
+#define SDE_CRT_HOTPLUG_CPT     (1 << 19)
 #define SDE_HOTPLUG_MASK_CPT    (SDE_CRT_HOTPLUG_CPT |          \
                                  SDE_PORTD_HOTPLUG_CPT |        \
                                  SDE_PORTC_HOTPLUG_CPT |        \
                                  SDE_PORTB_HOTPLUG_CPT)
+#define SDE_GMBUS_CPT           (1 << 17)
+#define SDE_AUDIO_CP_REQ_C_CPT  (1 << 10)
+#define SDE_AUDIO_CP_CHG_C_CPT  (1 << 9)
+#define SDE_FDI_RXC_CPT         (1 << 8)
+#define SDE_AUDIO_CP_REQ_B_CPT  (1 << 6)
+#define SDE_AUDIO_CP_CHG_B_CPT  (1 << 5)
+#define SDE_FDI_RXB_CPT         (1 << 4)
+#define SDE_AUDIO_CP_REQ_A_CPT  (1 << 2)
+#define SDE_AUDIO_CP_CHG_A_CPT  (1 << 1)
+#define SDE_FDI_RXA_CPT         (1 << 0)
+#define SDE_AUDIO_CP_REQ_CPT    (SDE_AUDIO_CP_REQ_C_CPT | \
+                                 SDE_AUDIO_CP_REQ_B_CPT | \
+                                 SDE_AUDIO_CP_REQ_A_CPT)
+#define SDE_AUDIO_CP_CHG_CPT    (SDE_AUDIO_CP_CHG_C_CPT | \
+                                 SDE_AUDIO_CP_CHG_B_CPT | \
+                                 SDE_AUDIO_CP_CHG_A_CPT)
+#define SDE_FDI_MASK_CPT        (SDE_FDI_RXC_CPT | \
+                                 SDE_FDI_RXB_CPT | \
+                                 SDE_FDI_RXA_CPT)
 
 #define SDEISR  0xc4000
 #define SDEIMR  0xc4004
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 06721c0e9f98..b3052ef70d16 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6377,17 +6377,34 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
         struct intel_ring_buffer *ring = &dev_priv->ring[BCS];
+        uint32_t plane_bit = 0;
         int ret;
 
         ret = intel_pin_and_fence_fb_obj(dev, obj, ring);
         if (ret)
                 goto err;
 
+        switch(intel_crtc->plane) {
+        case PLANE_A:
+                plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_A;
+                break;
+        case PLANE_B:
+                plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_B;
+                break;
+        case PLANE_C:
+                plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C;
+                break;
+        default:
+                WARN_ONCE(1, "unknown plane in flip command\n");
+                ret = -ENODEV;
+                goto err;
+        }
+
         ret = intel_ring_begin(ring, 4);
         if (ret)
                 goto err_unpin;
 
-        intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | (intel_crtc->plane << 19));
+        intel_ring_emit(ring, MI_DISPLAY_FLIP_I915 | plane_bit);
         intel_ring_emit(ring, (fb->pitches[0] | obj->tiling_mode));
         intel_ring_emit(ring, (obj->gtt_offset));
         intel_ring_emit(ring, (MI_NOOP));
@@ -6760,7 +6777,7 @@ static void intel_setup_outputs(struct drm_device *dev)
                 if (I915_READ(HDMIC) & PORT_DETECTED)
                         intel_hdmi_init(dev, HDMIC);
 
-                if (I915_READ(HDMID) & PORT_DETECTED)
+                if (!dpd_is_edp && I915_READ(HDMID) & PORT_DETECTED)
                         intel_hdmi_init(dev, HDMID);
 
                 if (I915_READ(PCH_DP_C) & DP_DETECTED)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 6538c46fe959..76a708029dcb 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -32,6 +32,7 @@
 #include "drm.h"
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
+#include "drm_edid.h"
 #include "intel_drv.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
@@ -67,6 +68,8 @@ struct intel_dp {
         struct drm_display_mode *panel_fixed_mode;  /* for eDP */
         struct delayed_work panel_vdd_work;
         bool want_panel_vdd;
+        struct edid *edid; /* cached EDID for eDP */
+        int edid_mode_count;
 };
 
 /**
@@ -383,7 +386,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
         int recv_bytes;
         uint32_t status;
         uint32_t aux_clock_divider;
-        int try, precharge = 5;
+        int try, precharge;
 
         intel_dp_check_edp(intel_dp);
         /* The clock divider is based off the hrawclk,
@@ -403,6 +406,11 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
         else
                 aux_clock_divider = intel_hrawclk(dev) / 2;
 
+        if (IS_GEN6(dev))
+                precharge = 3;
+        else
+                precharge = 5;
+
         /* Try to wait for any previous AUX channel activity */
         for (try = 0; try < 3; try++) {
                 status = I915_READ(ch_ctl);
@@ -1980,6 +1988,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
         if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
                 return;
 
+        ironlake_edp_panel_vdd_on(intel_dp);
+
         if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3))
                 DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
                               buf[0], buf[1], buf[2]);
@@ -1987,6 +1997,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp)
         if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
                 DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
                               buf[0], buf[1], buf[2]);
+
+        ironlake_edp_panel_vdd_off(intel_dp, false);
 }
 
 static bool
@@ -2121,10 +2133,22 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
 {
         struct intel_dp *intel_dp = intel_attached_dp(connector);
         struct edid     *edid;
+        int size;
+
+        if (is_edp(intel_dp)) {
+                if (!intel_dp->edid)
+                        return NULL;
+
+                size = (intel_dp->edid->extensions + 1) * EDID_LENGTH;
+                edid = kmalloc(size, GFP_KERNEL);
+                if (!edid)
+                        return NULL;
+
+                memcpy(edid, intel_dp->edid, size);
+                return edid;
+        }
 
-        ironlake_edp_panel_vdd_on(intel_dp);
         edid = drm_get_edid(connector, adapter);
-        ironlake_edp_panel_vdd_off(intel_dp, false);
         return edid;
 }
 
@@ -2134,9 +2158,17 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada
         struct intel_dp *intel_dp = intel_attached_dp(connector);
         int     ret;
 
-        ironlake_edp_panel_vdd_on(intel_dp);
+        if (is_edp(intel_dp)) {
+                drm_mode_connector_update_edid_property(connector,
+                                                        intel_dp->edid);
+                ret = drm_add_edid_modes(connector, intel_dp->edid);
+                drm_edid_to_eld(connector,
+                                intel_dp->edid);
+                connector->display_info.raw_edid = NULL;
+                return intel_dp->edid_mode_count;
+        }
+
         ret = intel_ddc_get_modes(connector, adapter);
-        ironlake_edp_panel_vdd_off(intel_dp, false);
         return ret;
 }
 
@@ -2326,6 +2358,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
         i2c_del_adapter(&intel_dp->adapter);
         drm_encoder_cleanup(encoder);
         if (is_edp(intel_dp)) {
+                kfree(intel_dp->edid);
                 cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
                 ironlake_panel_vdd_off_sync(intel_dp);
         }
@@ -2509,11 +2542,14 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                         break;
         }
 
+        intel_dp_i2c_init(intel_dp, intel_connector, name);
+
         /* Cache some DPCD data in the eDP case */
         if (is_edp(intel_dp)) {
                 bool ret;
                 struct edp_power_seq    cur, vbt;
                 u32 pp_on, pp_off, pp_div;
+                struct edid *edid;
 
                 pp_on = I915_READ(PCH_PP_ON_DELAYS);
                 pp_off = I915_READ(PCH_PP_OFF_DELAYS);
@@ -2581,9 +2617,19 @@ intel_dp_init(struct drm_device *dev, int output_reg)
                         intel_dp_destroy(&intel_connector->base);
                         return;
                 }
-        }
 
-        intel_dp_i2c_init(intel_dp, intel_connector, name);
+                ironlake_edp_panel_vdd_on(intel_dp);
+                edid = drm_get_edid(connector, &intel_dp->adapter);
+                if (edid) {
+                        drm_mode_connector_update_edid_property(connector,
+                                                                edid);
+                        intel_dp->edid_mode_count =
+                                drm_add_edid_modes(connector, edid);
+                        drm_edid_to_eld(connector, edid);
+                        intel_dp->edid = edid;
+                }
+                ironlake_edp_panel_vdd_off(intel_dp, false);
+        }
 
         intel_encoder->hot_plug = intel_dp_hot_plug;
 
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 7a16f16371e6..f30a53a8917e 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -267,10 +267,15 @@ u32 intel_ring_get_active_head(struct intel_ring_buffer *ring)
 
 static int init_ring_common(struct intel_ring_buffer *ring)
 {
-        drm_i915_private_t *dev_priv = ring->dev->dev_private;
+        struct drm_device *dev = ring->dev;
+        drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj = ring->obj;
+        int ret = 0;
         u32 head;
 
+        if (HAS_FORCE_WAKE(dev))
+                gen6_gt_force_wake_get(dev_priv);
+
         /* Stop the ring if it's running. */
         I915_WRITE_CTL(ring, 0);
         I915_WRITE_HEAD(ring, 0);
@@ -318,7 +323,8 @@ static int init_ring_common(struct intel_ring_buffer *ring)
                                 I915_READ_HEAD(ring),
                                 I915_READ_TAIL(ring),
                                 I915_READ_START(ring));
-                return -EIO;
+                ret = -EIO;
+                goto out;
         }
 
         if (!drm_core_check_feature(ring->dev, DRIVER_MODESET))
@@ -327,9 +333,14 @@ static int init_ring_common(struct intel_ring_buffer *ring)
                 ring->head = I915_READ_HEAD(ring);
                 ring->tail = I915_READ_TAIL(ring) & TAIL_ADDR;
                 ring->space = ring_space(ring);
+                ring->last_retired_head = -1;
         }
 
-        return 0;
+out:
+        if (HAS_FORCE_WAKE(dev))
+                gen6_gt_force_wake_put(dev_priv);
+
+        return ret;
 }
 
 static int
@@ -1006,6 +1017,10 @@ static int intel_init_ring_buffer(struct drm_device *dev,
         if (ret)
                 goto err_unref;
 
+        ret = i915_gem_object_set_to_gtt_domain(obj, true);
+        if (ret)
+                goto err_unpin;
+
         ring->virtual_start =
                 ioremap_wc(dev_priv->mm.gtt->gma_bus_addr + obj->gtt_offset,
                            ring->size);
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 3c8e04f54713..93e832d6c328 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -41,9 +41,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
 
 MODULE_DEVICE_TABLE(pci, pciidlist);
 
+static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev)
+{
+        struct apertures_struct *ap;
+        bool primary = false;
+
+        ap = alloc_apertures(1);
+        ap->ranges[0].base = pci_resource_start(pdev, 0);
+        ap->ranges[0].size = pci_resource_len(pdev, 0);
+
+#ifdef CONFIG_X86
+        primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
+#endif
+        remove_conflicting_framebuffers(ap, "mgag200drmfb", primary);
+        kfree(ap);
+}
+
+
 static int __devinit
 mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        mgag200_kick_out_firmware_fb(pdev);
+
         return drm_get_pci_dev(pdev, ent, &driver);
 }
 
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 01d77d1554f4..3904d7964a4b 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1149,7 +1149,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         }
 
         if (tiling_flags & RADEON_TILING_MACRO) {
-                if (rdev->family >= CHIP_CAYMAN)
+                if (rdev->family >= CHIP_TAHITI)
+                        tmp = rdev->config.si.tile_config;
+                else if (rdev->family >= CHIP_CAYMAN)
                         tmp = rdev->config.cayman.tile_config;
                 else
                         tmp = rdev->config.evergreen.tile_config;
@@ -1177,6 +1179,12 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         } else if (tiling_flags & RADEON_TILING_MICRO)
                 fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1);
 
+        if ((rdev->family == CHIP_TAHITI) ||
+            (rdev->family == CHIP_PITCAIRN))
+                fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16);
+        else if (rdev->family == CHIP_VERDE)
+                fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P4_8x16);
+
         switch (radeon_crtc->crtc_id) {
         case 0:
                 WREG32(AVIVO_D1VGA_CONTROL, 0);
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index e7b1ec5ae8c6..486ccdf4aacd 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
 
         if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) {
                 r600_hdmi_enable(encoder);
-                if (ASIC_IS_DCE4(rdev))
+                if (ASIC_IS_DCE6(rdev))
+                        ; /* TODO (use pointers instead of if-s?) */
+                else if (ASIC_IS_DCE4(rdev))
                         evergreen_hdmi_setmode(encoder, adjusted_mode);
                 else
                         r600_hdmi_setmode(encoder, adjusted_mode);
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 58991af90502..7fb3d2e0434c 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1029,6 +1029,11 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev)
                 WREG32(MC_VM_MD_L1_TLB0_CNTL, tmp);
                 WREG32(MC_VM_MD_L1_TLB1_CNTL, tmp);
                 WREG32(MC_VM_MD_L1_TLB2_CNTL, tmp);
+                if ((rdev->family == CHIP_JUNIPER) ||
+                    (rdev->family == CHIP_CYPRESS) ||
+                    (rdev->family == CHIP_HEMLOCK) ||
+                    (rdev->family == CHIP_BARTS))
+                        WREG32(MC_VM_MD_L1_TLB3_CNTL, tmp);
         }
         WREG32(MC_VM_MB_L1_TLB0_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);
@@ -1553,163 +1558,10 @@ int evergreen_cp_resume(struct radeon_device *rdev)
 /*
  * Core functions
  */
-static u32 evergreen_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
-                                                  u32 num_tile_pipes,
-                                                  u32 num_backends,
-                                                  u32 backend_disable_mask)
-{
-        u32 backend_map = 0;
-        u32 enabled_backends_mask = 0;
-        u32 enabled_backends_count = 0;
-        u32 cur_pipe;
-        u32 swizzle_pipe[EVERGREEN_MAX_PIPES];
-        u32 cur_backend = 0;
-        u32 i;
-        bool force_no_swizzle;
-
-        if (num_tile_pipes > EVERGREEN_MAX_PIPES)
-                num_tile_pipes = EVERGREEN_MAX_PIPES;
-        if (num_tile_pipes < 1)
-                num_tile_pipes = 1;
-        if (num_backends > EVERGREEN_MAX_BACKENDS)
-                num_backends = EVERGREEN_MAX_BACKENDS;
-        if (num_backends < 1)
-                num_backends = 1;
-
-        for (i = 0; i < EVERGREEN_MAX_BACKENDS; ++i) {
-                if (((backend_disable_mask >> i) & 1) == 0) {
-                        enabled_backends_mask |= (1 << i);
-                        ++enabled_backends_count;
-                }
-                if (enabled_backends_count == num_backends)
-                        break;
-        }
-
-        if (enabled_backends_count == 0) {
-                enabled_backends_mask = 1;
-                enabled_backends_count = 1;
-        }
-
-        if (enabled_backends_count != num_backends)
-                num_backends = enabled_backends_count;
-
-        memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * EVERGREEN_MAX_PIPES);
-        switch (rdev->family) {
-        case CHIP_CEDAR:
-        case CHIP_REDWOOD:
-        case CHIP_PALM:
-        case CHIP_SUMO:
-        case CHIP_SUMO2:
-        case CHIP_TURKS:
-        case CHIP_CAICOS:
-                force_no_swizzle = false;
-                break;
-        case CHIP_CYPRESS:
-        case CHIP_HEMLOCK:
-        case CHIP_JUNIPER:
-        case CHIP_BARTS:
-        default:
-                force_no_swizzle = true;
-                break;
-        }
-        if (force_no_swizzle) {
-                bool last_backend_enabled = false;
-
-                force_no_swizzle = false;
-                for (i = 0; i < EVERGREEN_MAX_BACKENDS; ++i) {
-                        if (((enabled_backends_mask >> i) & 1) == 1) {
-                                if (last_backend_enabled)
-                                        force_no_swizzle = true;
-                                last_backend_enabled = true;
-                        } else
-                                last_backend_enabled = false;
-                }
-        }
-
-        switch (num_tile_pipes) {
-        case 1:
-        case 3:
-        case 5:
-        case 7:
-                DRM_ERROR("odd number of pipes!\n");
-                break;
-        case 2:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                break;
-        case 4:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 1;
-                        swizzle_pipe[3] = 3;
-                }
-                break;
-        case 6:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 1;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 5;
-                }
-                break;
-        case 8:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                        swizzle_pipe[6] = 6;
-                        swizzle_pipe[7] = 7;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 6;
-                        swizzle_pipe[4] = 1;
-                        swizzle_pipe[5] = 3;
-                        swizzle_pipe[6] = 5;
-                        swizzle_pipe[7] = 7;
-                }
-                break;
-        }
-
-        for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
-                while (((1 << cur_backend) & enabled_backends_mask) == 0)
-                        cur_backend = (cur_backend + 1) % EVERGREEN_MAX_BACKENDS;
-
-                backend_map |= (((cur_backend & 0xf) << (swizzle_pipe[cur_pipe] * 4)));
-
-                cur_backend = (cur_backend + 1) % EVERGREEN_MAX_BACKENDS;
-        }
-
-        return backend_map;
-}
-
 static void evergreen_gpu_init(struct radeon_device *rdev)
 {
-        u32 cc_rb_backend_disable = 0;
-        u32 cc_gc_shader_pipe_config;
-        u32 gb_addr_config = 0;
+        u32 gb_addr_config;
         u32 mc_shared_chmap, mc_arb_ramcfg;
-        u32 gb_backend_map;
-        u32 grbm_gfx_index;
         u32 sx_debug_1;
         u32 smx_dc_ctl0;
         u32 sq_config;
@@ -1724,6 +1576,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         u32 sq_stack_resource_mgmt_3;
         u32 vgt_cache_invalidation;
         u32 hdp_host_path_cntl, tmp;
+        u32 disabled_rb_mask;
         int i, j, num_shader_engines, ps_thread_count;
 
         switch (rdev->family) {
@@ -1748,6 +1601,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x100;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = CYPRESS_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_JUNIPER:
                 rdev->config.evergreen.num_ses = 1;
@@ -1769,6 +1623,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x100;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = JUNIPER_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_REDWOOD:
                 rdev->config.evergreen.num_ses = 1;
@@ -1790,6 +1645,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x100;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = REDWOOD_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_CEDAR:
         default:
@@ -1812,6 +1668,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x40;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = CEDAR_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_PALM:
                 rdev->config.evergreen.num_ses = 1;
@@ -1833,6 +1690,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x40;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = CEDAR_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_SUMO:
                 rdev->config.evergreen.num_ses = 1;
@@ -1860,6 +1718,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x40;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = REDWOOD_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_SUMO2:
                 rdev->config.evergreen.num_ses = 1;
@@ -1881,6 +1740,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x40;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = REDWOOD_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_BARTS:
                 rdev->config.evergreen.num_ses = 2;
@@ -1902,6 +1762,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x100;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = BARTS_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_TURKS:
                 rdev->config.evergreen.num_ses = 1;
@@ -1923,6 +1784,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x100;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = TURKS_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_CAICOS:
                 rdev->config.evergreen.num_ses = 1;
@@ -1944,6 +1806,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
                 rdev->config.evergreen.sc_prim_fifo_size = 0x40;
                 rdev->config.evergreen.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.evergreen.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = CAICOS_GB_ADDR_CONFIG_GOLDEN;
                 break;
         }
 
@@ -1960,20 +1823,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
 
         evergreen_fix_pci_max_read_req_size(rdev);
 
-        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & ~2;
-
-        cc_gc_shader_pipe_config |=
-                INACTIVE_QD_PIPES((EVERGREEN_MAX_PIPES_MASK << rdev->config.evergreen.max_pipes)
-                                  & EVERGREEN_MAX_PIPES_MASK);
-        cc_gc_shader_pipe_config |=
-                INACTIVE_SIMDS((EVERGREEN_MAX_SIMDS_MASK << rdev->config.evergreen.max_simds)
-                               & EVERGREEN_MAX_SIMDS_MASK);
-
-        cc_rb_backend_disable =
-                BACKEND_DISABLE((EVERGREEN_MAX_BACKENDS_MASK << rdev->config.evergreen.max_backends)
-                                & EVERGREEN_MAX_BACKENDS_MASK);
-
-
         mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
         if ((rdev->family == CHIP_PALM) ||
             (rdev->family == CHIP_SUMO) ||
@@ -1982,134 +1831,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         else
                 mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
 
-        switch (rdev->config.evergreen.max_tile_pipes) {
-        case 1:
-        default:
-                gb_addr_config |= NUM_PIPES(0);
-                break;
-        case 2:
-                gb_addr_config |= NUM_PIPES(1);
-                break;
-        case 4:
-                gb_addr_config |= NUM_PIPES(2);
-                break;
-        case 8:
-                gb_addr_config |= NUM_PIPES(3);
-                break;
-        }
-
-        gb_addr_config |= PIPE_INTERLEAVE_SIZE((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT);
-        gb_addr_config |= BANK_INTERLEAVE_SIZE(0);
-        gb_addr_config |= NUM_SHADER_ENGINES(rdev->config.evergreen.num_ses - 1);
-        gb_addr_config |= SHADER_ENGINE_TILE_SIZE(1);
-        gb_addr_config |= NUM_GPUS(0); /* Hemlock? */
-        gb_addr_config |= MULTI_GPU_TILE_SIZE(2);
-
-        if (((mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT) > 2)
-                gb_addr_config |= ROW_SIZE(2);
-        else
-                gb_addr_config |= ROW_SIZE((mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT);
-
-        if (rdev->ddev->pdev->device == 0x689e) {
-                u32 efuse_straps_4;
-                u32 efuse_straps_3;
-                u8 efuse_box_bit_131_124;
-
-                WREG32(RCU_IND_INDEX, 0x204);
-                efuse_straps_4 = RREG32(RCU_IND_DATA);
-                WREG32(RCU_IND_INDEX, 0x203);
-                efuse_straps_3 = RREG32(RCU_IND_DATA);
-                efuse_box_bit_131_124 = (u8)(((efuse_straps_4 & 0xf) << 4) | ((efuse_straps_3 & 0xf0000000) >> 28));
-
-                switch(efuse_box_bit_131_124) {
-                case 0x00:
-                        gb_backend_map = 0x76543210;
-                        break;
-                case 0x55:
-                        gb_backend_map = 0x77553311;
-                        break;
-                case 0x56:
-                        gb_backend_map = 0x77553300;
-                        break;
-                case 0x59:
-                        gb_backend_map = 0x77552211;
-                        break;
-                case 0x66:
-                        gb_backend_map = 0x77443300;
-                        break;
-                case 0x99:
-                        gb_backend_map = 0x66552211;
-                        break;
-                case 0x5a:
-                        gb_backend_map = 0x77552200;
-                        break;
-                case 0xaa:
-                        gb_backend_map = 0x66442200;
-                        break;
-                case 0x95:
-                        gb_backend_map = 0x66553311;
-                        break;
-                default:
-                        DRM_ERROR("bad backend map, using default\n");
-                        gb_backend_map =
-                                evergreen_get_tile_pipe_to_backend_map(rdev,
-                                                                       rdev->config.evergreen.max_tile_pipes,
-                                                                       rdev->config.evergreen.max_backends,
-                                                                       ((EVERGREEN_MAX_BACKENDS_MASK <<
-                                                                   rdev->config.evergreen.max_backends) &
-                                                                        EVERGREEN_MAX_BACKENDS_MASK));
-                        break;
-                }
-        } else if (rdev->ddev->pdev->device == 0x68b9) {
-                u32 efuse_straps_3;
-                u8 efuse_box_bit_127_124;
-
-                WREG32(RCU_IND_INDEX, 0x203);
-                efuse_straps_3 = RREG32(RCU_IND_DATA);
-                efuse_box_bit_127_124 = (u8)((efuse_straps_3 & 0xF0000000) >> 28);
-
-                switch(efuse_box_bit_127_124) {
-                case 0x0:
-                        gb_backend_map = 0x00003210;
-                        break;
-                case 0x5:
-                case 0x6:
-                case 0x9:
-                case 0xa:
-                        gb_backend_map = 0x00003311;
-                        break;
-                default:
-                        DRM_ERROR("bad backend map, using default\n");
-                        gb_backend_map =
-                                evergreen_get_tile_pipe_to_backend_map(rdev,
-                                                                       rdev->config.evergreen.max_tile_pipes,
-                                                                       rdev->config.evergreen.max_backends,
-                                                                       ((EVERGREEN_MAX_BACKENDS_MASK <<
-                                                                   rdev->config.evergreen.max_backends) &
-                                                                        EVERGREEN_MAX_BACKENDS_MASK));
-                        break;
-                }
-        } else {
-                switch (rdev->family) {
-                case CHIP_CYPRESS:
-                case CHIP_HEMLOCK:
-                case CHIP_BARTS:
-                        gb_backend_map = 0x66442200;
-                        break;
-                case CHIP_JUNIPER:
-                        gb_backend_map = 0x00002200;
-                        break;
-                default:
-                        gb_backend_map =
-                                evergreen_get_tile_pipe_to_backend_map(rdev,
-                                                                       rdev->config.evergreen.max_tile_pipes,
-                                                                       rdev->config.evergreen.max_backends,
-                                                                       ((EVERGREEN_MAX_BACKENDS_MASK <<
-                                                                         rdev->config.evergreen.max_backends) &
-                                                                        EVERGREEN_MAX_BACKENDS_MASK));
-                }
-        }
-
         /* setup tiling info dword.  gb_addr_config is not adequate since it does
          * not have bank info, so create a custom tiling dword.
          * bits 3:0   num_pipes
@@ -2136,45 +1857,54 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         /* num banks is 8 on all fusion asics. 0 = 4, 1 = 8, 2 = 16 */
         if (rdev->flags & RADEON_IS_IGP)
                 rdev->config.evergreen.tile_config |= 1 << 4;
-        else
-                rdev->config.evergreen.tile_config |=
-                        ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4;
-        rdev->config.evergreen.tile_config |=
-                ((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT) << 8;
+        else {
+                if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT)
+                        rdev->config.evergreen.tile_config |= 1 << 4;
+                else
+                        rdev->config.evergreen.tile_config |= 0 << 4;
+        }
+        rdev->config.evergreen.tile_config |= 0 << 8;
         rdev->config.evergreen.tile_config |=
                 ((gb_addr_config & 0x30000000) >> 28) << 12;
 
-        rdev->config.evergreen.backend_map = gb_backend_map;
-        WREG32(GB_BACKEND_MAP, gb_backend_map);
-        WREG32(GB_ADDR_CONFIG, gb_addr_config);
-        WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
-        WREG32(HDP_ADDR_CONFIG, gb_addr_config);
+        num_shader_engines = (gb_addr_config & NUM_SHADER_ENGINES(3) >> 12) + 1;
 
-        num_shader_engines = ((RREG32(GB_ADDR_CONFIG) & NUM_SHADER_ENGINES(3)) >> 12) + 1;
-        grbm_gfx_index = INSTANCE_BROADCAST_WRITES;
-
-        for (i = 0; i < rdev->config.evergreen.num_ses; i++) {
-                u32 rb = cc_rb_backend_disable | (0xf0 << 16);
-                u32 sp = cc_gc_shader_pipe_config;
-                u32 gfx = grbm_gfx_index | SE_INDEX(i);
+        if ((rdev->family >= CHIP_CEDAR) && (rdev->family <= CHIP_HEMLOCK)) {
+                u32 efuse_straps_4;
+                u32 efuse_straps_3;
 
-                if (i == num_shader_engines) {
-                        rb |= BACKEND_DISABLE(EVERGREEN_MAX_BACKENDS_MASK);
-                        sp |= INACTIVE_SIMDS(EVERGREEN_MAX_SIMDS_MASK);
+                WREG32(RCU_IND_INDEX, 0x204);
+                efuse_straps_4 = RREG32(RCU_IND_DATA);
+                WREG32(RCU_IND_INDEX, 0x203);
+                efuse_straps_3 = RREG32(RCU_IND_DATA);
+                tmp = (((efuse_straps_4 & 0xf) << 4) |
+                      ((efuse_straps_3 & 0xf0000000) >> 28));
+        } else {
+                tmp = 0;
+                for (i = (rdev->config.evergreen.num_ses - 1); i >= 0; i--) {
+                        u32 rb_disable_bitmap;
+
+                        WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
+                        WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
+                        rb_disable_bitmap = (RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000) >> 16;
+                        tmp <<= 4;
+                        tmp |= rb_disable_bitmap;
                 }
+        }
+        /* enabled rb are just the one not disabled :) */
+        disabled_rb_mask = tmp;
 
-                WREG32(GRBM_GFX_INDEX, gfx);
-                WREG32(RLC_GFX_INDEX, gfx);
+        WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
+        WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
 
-                WREG32(CC_RB_BACKEND_DISABLE, rb);
-                WREG32(CC_SYS_RB_BACKEND_DISABLE, rb);
-                WREG32(GC_USER_RB_BACKEND_DISABLE, rb);
-                WREG32(CC_GC_SHADER_PIPE_CONFIG, sp);
-        }
+        WREG32(GB_ADDR_CONFIG, gb_addr_config);
+        WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
+        WREG32(HDP_ADDR_CONFIG, gb_addr_config);
 
-        grbm_gfx_index |= SE_BROADCAST_WRITES;
-        WREG32(GRBM_GFX_INDEX, grbm_gfx_index);
-        WREG32(RLC_GFX_INDEX, grbm_gfx_index);
+        tmp = gb_addr_config & NUM_PIPES_MASK;
+        tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.evergreen.max_backends,
+                                        EVERGREEN_MAX_BACKENDS, disabled_rb_mask);
+        WREG32(GB_BACKEND_MAP, tmp);
 
         WREG32(CGTS_SYS_TCC_DISABLE, 0);
         WREG32(CGTS_TCC_DISABLE, 0);
@@ -2202,6 +1932,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
         smx_dc_ctl0 |= NUMBER_OF_SETS(rdev->config.evergreen.sx_num_of_sets);
         WREG32(SMX_DC_CTL0, smx_dc_ctl0);
 
+        if (rdev->family <= CHIP_SUMO2)
+                WREG32(SMX_SAR_CTL0, 0x00010000);
+
         WREG32(SX_EXPORT_BUFFER_SIZES, (COLOR_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_size / 4) - 1) |
                                         POSITION_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_pos_size / 4) - 1) |
                                         SMX_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_smx_size / 4) - 1)));
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index 4e7dd2b4843d..c16554122ccd 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -52,6 +52,7 @@ struct evergreen_cs_track {
         u32                     cb_color_view[12];
         u32                     cb_color_pitch[12];
         u32                     cb_color_slice[12];
+        u32                     cb_color_slice_idx[12];
         u32                     cb_color_attrib[12];
         u32                     cb_color_cmask_slice[8];/* unused */
         u32                     cb_color_fmask_slice[8];/* unused */
@@ -127,12 +128,14 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track)
                 track->cb_color_info[i] = 0;
                 track->cb_color_view[i] = 0xFFFFFFFF;
                 track->cb_color_pitch[i] = 0;
-                track->cb_color_slice[i] = 0;
+                track->cb_color_slice[i] = 0xfffffff;
+                track->cb_color_slice_idx[i] = 0;
         }
         track->cb_target_mask = 0xFFFFFFFF;
         track->cb_shader_mask = 0xFFFFFFFF;
         track->cb_dirty = true;
 
+        track->db_depth_slice = 0xffffffff;
         track->db_depth_view = 0xFFFFC000;
         track->db_depth_size = 0xFFFFFFFF;
         track->db_depth_control = 0xFFFFFFFF;
@@ -250,10 +253,9 @@ static int evergreen_surface_check_2d(struct radeon_cs_parser *p,
 {
         struct evergreen_cs_track *track = p->track;
         unsigned palign, halign, tileb, slice_pt;
+        unsigned mtile_pr, mtile_ps, mtileb;
 
         tileb = 64 * surf->bpe * surf->nsamples;
-        palign = track->group_size / (8 * surf->bpe * surf->nsamples);
-        palign = MAX(8, palign);
         slice_pt = 1;
         if (tileb > surf->tsplit) {
                 slice_pt = tileb / surf->tsplit;
@@ -262,7 +264,10 @@ static int evergreen_surface_check_2d(struct radeon_cs_parser *p,
         /* macro tile width & height */
         palign = (8 * surf->bankw * track->npipes) * surf->mtilea;
         halign = (8 * surf->bankh * surf->nbanks) / surf->mtilea;
-        surf->layer_size = surf->nbx * surf->nby * surf->bpe * slice_pt;
+        mtileb = (palign / 8) * (halign / 8) * tileb;;
+        mtile_pr = surf->nbx / palign;
+        mtile_ps = (mtile_pr * surf->nby) / halign;
+        surf->layer_size = mtile_ps * mtileb * slice_pt;
         surf->base_align = (palign / 8) * (halign / 8) * tileb;
         surf->palign = palign;
         surf->halign = halign;
@@ -434,6 +439,39 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
 
         offset += surf.layer_size * mslice;
         if (offset > radeon_bo_size(track->cb_color_bo[id])) {
+                /* old ddx are broken they allocate bo with w*h*bpp but
+                 * program slice with ALIGN(h, 8), catch this and patch
+                 * command stream.
+                 */
+                if (!surf.mode) {
+                        volatile u32 *ib = p->ib.ptr;
+                        unsigned long tmp, nby, bsize, size, min = 0;
+
+                        /* find the height the ddx wants */
+                        if (surf.nby > 8) {
+                                min = surf.nby - 8;
+                        }
+                        bsize = radeon_bo_size(track->cb_color_bo[id]);
+                        tmp = track->cb_color_bo_offset[id] << 8;
+                        for (nby = surf.nby; nby > min; nby--) {
+                                size = nby * surf.nbx * surf.bpe * surf.nsamples;
+                                if ((tmp + size * mslice) <= bsize) {
+                                        break;
+                                }
+                        }
+                        if (nby > min) {
+                                surf.nby = nby;
+                                slice = ((nby * surf.nbx) / 64) - 1;
+                                if (!evergreen_surface_check(p, &surf, "cb")) {
+                                        /* check if this one works */
+                                        tmp += surf.layer_size * mslice;
+                                        if (tmp <= bsize) {
+                                                ib[track->cb_color_slice_idx[id]] = slice;
+                                                goto old_ddx_ok;
+                                        }
+                                }
+                        }
+                }
                 dev_warn(p->dev, "%s:%d cb[%d] bo too small (layer size %d, "
                          "offset %d, max layer %d, bo size %ld, slice %d)\n",
                          __func__, __LINE__, id, surf.layer_size,
@@ -446,6 +484,7 @@ static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, unsigned i
                         surf.tsplit, surf.mtilea);
                 return -EINVAL;
         }
+old_ddx_ok:
 
         return 0;
 }
@@ -1532,6 +1571,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
         case CB_COLOR7_SLICE:
                 tmp = (reg - CB_COLOR0_SLICE) / 0x3c;
                 track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx);
+                track->cb_color_slice_idx[tmp] = idx;
                 track->cb_dirty = true;
                 break;
         case CB_COLOR8_SLICE:
@@ -1540,6 +1580,7 @@ static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
         case CB_COLOR11_SLICE:
                 tmp = ((reg - CB_COLOR8_SLICE) / 0x1c) + 8;
                 track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx);
+                track->cb_color_slice_idx[tmp] = idx;
                 track->cb_dirty = true;
                 break;
         case CB_COLOR0_ATTRIB:
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index a51f880985f8..65c54160028b 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
-                return;
-
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (!dig->afmt->enabled)
                 return;
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index 79130bfd1d6f..b50b15c70498 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -37,6 +37,15 @@
 #define EVERGREEN_MAX_PIPES_MASK        0xFF
 #define EVERGREEN_MAX_LDS_NUM           0xFFFF
 
+#define CYPRESS_GB_ADDR_CONFIG_GOLDEN        0x02011003
+#define BARTS_GB_ADDR_CONFIG_GOLDEN          0x02011003
+#define CAYMAN_GB_ADDR_CONFIG_GOLDEN         0x02011003
+#define JUNIPER_GB_ADDR_CONFIG_GOLDEN        0x02010002
+#define REDWOOD_GB_ADDR_CONFIG_GOLDEN        0x02010002
+#define TURKS_GB_ADDR_CONFIG_GOLDEN          0x02010002
+#define CEDAR_GB_ADDR_CONFIG_GOLDEN          0x02010001
+#define CAICOS_GB_ADDR_CONFIG_GOLDEN         0x02010001
+
 /* Registers */
 
 #define RCU_IND_INDEX                                   0x100
@@ -54,6 +63,7 @@
 #define         BACKEND_DISABLE(x)                      ((x) << 16)
 #define GB_ADDR_CONFIG                                  0x98F8
 #define         NUM_PIPES(x)                            ((x) << 0)
+#define         NUM_PIPES_MASK                          0x0000000f
 #define         PIPE_INTERLEAVE_SIZE(x)                 ((x) << 4)
 #define         BANK_INTERLEAVE_SIZE(x)                 ((x) << 8)
 #define         NUM_SHADER_ENGINES(x)                   ((x) << 12)
@@ -452,6 +462,7 @@
 #define MC_VM_MD_L1_TLB0_CNTL                           0x2654
 #define MC_VM_MD_L1_TLB1_CNTL                           0x2658
 #define MC_VM_MD_L1_TLB2_CNTL                           0x265C
+#define MC_VM_MD_L1_TLB3_CNTL                           0x2698
 
 #define FUS_MC_VM_MD_L1_TLB0_CNTL                       0x265C
 #define FUS_MC_VM_MD_L1_TLB1_CNTL                       0x2660
@@ -492,6 +503,7 @@
 #define SCRATCH_UMSK                                    0x8540
 #define SCRATCH_ADDR                                    0x8544
 
+#define SMX_SAR_CTL0                                    0xA008
 #define SMX_DC_CTL0                                     0xA020
 #define         USE_HASH_FUNCTION                               (1 << 0)
 #define         NUMBER_OF_SETS(x)                               ((x) << 1)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ce4e7cc6c905..b7bf18e40215 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -417,215 +417,17 @@ out:
 /*
  * Core functions
  */
-static u32 cayman_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
-                                               u32 num_tile_pipes,
-                                               u32 num_backends_per_asic,
-                                               u32 *backend_disable_mask_per_asic,
-                                               u32 num_shader_engines)
-{
-        u32 backend_map = 0;
-        u32 enabled_backends_mask = 0;
-        u32 enabled_backends_count = 0;
-        u32 num_backends_per_se;
-        u32 cur_pipe;
-        u32 swizzle_pipe[CAYMAN_MAX_PIPES];
-        u32 cur_backend = 0;
-        u32 i;
-        bool force_no_swizzle;
-
-        /* force legal values */
-        if (num_tile_pipes < 1)
-                num_tile_pipes = 1;
-        if (num_tile_pipes > rdev->config.cayman.max_tile_pipes)
-                num_tile_pipes = rdev->config.cayman.max_tile_pipes;
-        if (num_shader_engines < 1)
-                num_shader_engines = 1;
-        if (num_shader_engines > rdev->config.cayman.max_shader_engines)
-                num_shader_engines = rdev->config.cayman.max_shader_engines;
-        if (num_backends_per_asic < num_shader_engines)
-                num_backends_per_asic = num_shader_engines;
-        if (num_backends_per_asic > (rdev->config.cayman.max_backends_per_se * num_shader_engines))
-                num_backends_per_asic = rdev->config.cayman.max_backends_per_se * num_shader_engines;
-
-        /* make sure we have the same number of backends per se */
-        num_backends_per_asic = ALIGN(num_backends_per_asic, num_shader_engines);
-        /* set up the number of backends per se */
-        num_backends_per_se = num_backends_per_asic / num_shader_engines;
-        if (num_backends_per_se > rdev->config.cayman.max_backends_per_se) {
-                num_backends_per_se = rdev->config.cayman.max_backends_per_se;
-                num_backends_per_asic = num_backends_per_se * num_shader_engines;
-        }
-
-        /* create enable mask and count for enabled backends */
-        for (i = 0; i < CAYMAN_MAX_BACKENDS; ++i) {
-                if (((*backend_disable_mask_per_asic >> i) & 1) == 0) {
-                        enabled_backends_mask |= (1 << i);
-                        ++enabled_backends_count;
-                }
-                if (enabled_backends_count == num_backends_per_asic)
-                        break;
-        }
-
-        /* force the backends mask to match the current number of backends */
-        if (enabled_backends_count != num_backends_per_asic) {
-                u32 this_backend_enabled;
-                u32 shader_engine;
-                u32 backend_per_se;
-
-                enabled_backends_mask = 0;
-                enabled_backends_count = 0;
-                *backend_disable_mask_per_asic = CAYMAN_MAX_BACKENDS_MASK;
-                for (i = 0; i < CAYMAN_MAX_BACKENDS; ++i) {
-                        /* calc the current se */
-                        shader_engine = i / rdev->config.cayman.max_backends_per_se;
-                        /* calc the backend per se */
-                        backend_per_se = i % rdev->config.cayman.max_backends_per_se;
-                        /* default to not enabled */
-                        this_backend_enabled = 0;
-                        if ((shader_engine < num_shader_engines) &&
-                            (backend_per_se < num_backends_per_se))
-                                this_backend_enabled = 1;
-                        if (this_backend_enabled) {
-                                enabled_backends_mask |= (1 << i);
-                                *backend_disable_mask_per_asic &= ~(1 << i);
-                                ++enabled_backends_count;
-                        }
-                }
-        }
-
-
-        memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * CAYMAN_MAX_PIPES);
-        switch (rdev->family) {
-        case CHIP_CAYMAN:
-        case CHIP_ARUBA:
-                force_no_swizzle = true;
-                break;
-        default:
-                force_no_swizzle = false;
-                break;
-        }
-        if (force_no_swizzle) {
-                bool last_backend_enabled = false;
-
-                force_no_swizzle = false;
-                for (i = 0; i < CAYMAN_MAX_BACKENDS; ++i) {
-                        if (((enabled_backends_mask >> i) & 1) == 1) {
-                                if (last_backend_enabled)
-                                        force_no_swizzle = true;
-                                last_backend_enabled = true;
-                        } else
-                                last_backend_enabled = false;
-                }
-        }
-
-        switch (num_tile_pipes) {
-        case 1:
-        case 3:
-        case 5:
-        case 7:
-                DRM_ERROR("odd number of pipes!\n");
-                break;
-        case 2:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                break;
-        case 4:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 1;
-                        swizzle_pipe[3] = 3;
-                }
-                break;
-        case 6:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 1;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 5;
-                }
-                break;
-        case 8:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                        swizzle_pipe[6] = 6;
-                        swizzle_pipe[7] = 7;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 6;
-                        swizzle_pipe[4] = 1;
-                        swizzle_pipe[5] = 3;
-                        swizzle_pipe[6] = 5;
-                        swizzle_pipe[7] = 7;
-                }
-                break;
-        }
-
-        for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
-                while (((1 << cur_backend) & enabled_backends_mask) == 0)
-                        cur_backend = (cur_backend + 1) % CAYMAN_MAX_BACKENDS;
-
-                backend_map |= (((cur_backend & 0xf) << (swizzle_pipe[cur_pipe] * 4)));
-
-                cur_backend = (cur_backend + 1) % CAYMAN_MAX_BACKENDS;
-        }
-
-        return backend_map;
-}
-
-static u32 cayman_get_disable_mask_per_asic(struct radeon_device *rdev,
-                                            u32 disable_mask_per_se,
-                                            u32 max_disable_mask_per_se,
-                                            u32 num_shader_engines)
-{
-        u32 disable_field_width_per_se = r600_count_pipe_bits(disable_mask_per_se);
-        u32 disable_mask_per_asic = disable_mask_per_se & max_disable_mask_per_se;
-
-        if (num_shader_engines == 1)
-                return disable_mask_per_asic;
-        else if (num_shader_engines == 2)
-                return disable_mask_per_asic | (disable_mask_per_asic << disable_field_width_per_se);
-        else
-                return 0xffffffff;
-}
-
 static void cayman_gpu_init(struct radeon_device *rdev)
 {
-        u32 cc_rb_backend_disable = 0;
-        u32 cc_gc_shader_pipe_config;
         u32 gb_addr_config = 0;
         u32 mc_shared_chmap, mc_arb_ramcfg;
-        u32 gb_backend_map;
         u32 cgts_tcc_disable;
         u32 sx_debug_1;
         u32 smx_dc_ctl0;
-        u32 gc_user_shader_pipe_config;
-        u32 gc_user_rb_backend_disable;
-        u32 cgts_user_tcc_disable;
         u32 cgts_sm_ctrl_reg;
         u32 hdp_host_path_cntl;
         u32 tmp;
+        u32 disabled_rb_mask;
         int i, j;
 
         switch (rdev->family) {
@@ -650,6 +452,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
                 rdev->config.cayman.sc_prim_fifo_size = 0x100;
                 rdev->config.cayman.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.cayman.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = CAYMAN_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_ARUBA:
         default:
@@ -657,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev)
                 rdev->config.cayman.max_pipes_per_simd = 4;
                 rdev->config.cayman.max_tile_pipes = 2;
                 if ((rdev->pdev->device == 0x9900) ||
-                    (rdev->pdev->device == 0x9901)) {
+                    (rdev->pdev->device == 0x9901) ||
+                    (rdev->pdev->device == 0x9905) ||
+                    (rdev->pdev->device == 0x9906) ||
+                    (rdev->pdev->device == 0x9907) ||
+                    (rdev->pdev->device == 0x9908) ||
+                    (rdev->pdev->device == 0x9909) ||
+                    (rdev->pdev->device == 0x9910) ||
+                    (rdev->pdev->device == 0x9917)) {
                         rdev->config.cayman.max_simds_per_se = 6;
                         rdev->config.cayman.max_backends_per_se = 2;
                 } else if ((rdev->pdev->device == 0x9903) ||
-                           (rdev->pdev->device == 0x9904)) {
+                           (rdev->pdev->device == 0x9904) ||
+                           (rdev->pdev->device == 0x990A) ||
+                           (rdev->pdev->device == 0x9913) ||
+                           (rdev->pdev->device == 0x9918)) {
                         rdev->config.cayman.max_simds_per_se = 4;
                         rdev->config.cayman.max_backends_per_se = 2;
-                } else if ((rdev->pdev->device == 0x9990) ||
-                           (rdev->pdev->device == 0x9991)) {
+                } else if ((rdev->pdev->device == 0x9919) ||
+                           (rdev->pdev->device == 0x9990) ||
+                           (rdev->pdev->device == 0x9991) ||
+                           (rdev->pdev->device == 0x9994) ||
+                           (rdev->pdev->device == 0x99A0)) {
                         rdev->config.cayman.max_simds_per_se = 3;
                         rdev->config.cayman.max_backends_per_se = 1;
                 } else {
@@ -687,6 +503,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
                 rdev->config.cayman.sc_prim_fifo_size = 0x40;
                 rdev->config.cayman.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.cayman.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = ARUBA_GB_ADDR_CONFIG_GOLDEN;
                 break;
         }
 
@@ -706,39 +523,6 @@ static void cayman_gpu_init(struct radeon_device *rdev)
         mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
         mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
 
-        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE);
-        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG);
-        cgts_tcc_disable = 0xffff0000;
-        for (i = 0; i < rdev->config.cayman.max_texture_channel_caches; i++)
-                cgts_tcc_disable &= ~(1 << (16 + i));
-        gc_user_rb_backend_disable = RREG32(GC_USER_RB_BACKEND_DISABLE);
-        gc_user_shader_pipe_config = RREG32(GC_USER_SHADER_PIPE_CONFIG);
-        cgts_user_tcc_disable = RREG32(CGTS_USER_TCC_DISABLE);
-
-        rdev->config.cayman.num_shader_engines = rdev->config.cayman.max_shader_engines;
-        tmp = ((~gc_user_shader_pipe_config) & INACTIVE_QD_PIPES_MASK) >> INACTIVE_QD_PIPES_SHIFT;
-        rdev->config.cayman.num_shader_pipes_per_simd = r600_count_pipe_bits(tmp);
-        rdev->config.cayman.num_tile_pipes = rdev->config.cayman.max_tile_pipes;
-        tmp = ((~gc_user_shader_pipe_config) & INACTIVE_SIMDS_MASK) >> INACTIVE_SIMDS_SHIFT;
-        rdev->config.cayman.num_simds_per_se = r600_count_pipe_bits(tmp);
-        tmp = ((~gc_user_rb_backend_disable) & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT;
-        rdev->config.cayman.num_backends_per_se = r600_count_pipe_bits(tmp);
-        tmp = (gc_user_rb_backend_disable & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT;
-        rdev->config.cayman.backend_disable_mask_per_asic =
-                cayman_get_disable_mask_per_asic(rdev, tmp, CAYMAN_MAX_BACKENDS_PER_SE_MASK,
-                                                 rdev->config.cayman.num_shader_engines);
-        rdev->config.cayman.backend_map =
-                cayman_get_tile_pipe_to_backend_map(rdev, rdev->config.cayman.num_tile_pipes,
-                                                    rdev->config.cayman.num_backends_per_se *
-                                                    rdev->config.cayman.num_shader_engines,
-                                                    &rdev->config.cayman.backend_disable_mask_per_asic,
-                                                    rdev->config.cayman.num_shader_engines);
-        tmp = ((~cgts_user_tcc_disable) & TCC_DISABLE_MASK) >> TCC_DISABLE_SHIFT;
-        rdev->config.cayman.num_texture_channel_caches = r600_count_pipe_bits(tmp);
-        tmp = (mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT;
-        rdev->config.cayman.mem_max_burst_length_bytes = (tmp + 1) * 256;
-        if (rdev->config.cayman.mem_max_burst_length_bytes > 512)
-                rdev->config.cayman.mem_max_burst_length_bytes = 512;
         tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT;
         rdev->config.cayman.mem_row_size_in_kb = (4 * (1 << (8 + tmp))) / 1024;
         if (rdev->config.cayman.mem_row_size_in_kb > 4)
@@ -748,73 +532,6 @@ static void cayman_gpu_init(struct radeon_device *rdev)
         rdev->config.cayman.num_gpus = 1;
         rdev->config.cayman.multi_gpu_tile_size = 64;
 
-        //gb_addr_config = 0x02011003
-#if 0
-        gb_addr_config = RREG32(GB_ADDR_CONFIG);
-#else
-        gb_addr_config = 0;
-        switch (rdev->config.cayman.num_tile_pipes) {
-        case 1:
-        default:
-                gb_addr_config |= NUM_PIPES(0);
-                break;
-        case 2:
-                gb_addr_config |= NUM_PIPES(1);
-                break;
-        case 4:
-                gb_addr_config |= NUM_PIPES(2);
-                break;
-        case 8:
-                gb_addr_config |= NUM_PIPES(3);
-                break;
-        }
-
-        tmp = (rdev->config.cayman.mem_max_burst_length_bytes / 256) - 1;
-        gb_addr_config |= PIPE_INTERLEAVE_SIZE(tmp);
-        gb_addr_config |= NUM_SHADER_ENGINES(rdev->config.cayman.num_shader_engines - 1);
-        tmp = (rdev->config.cayman.shader_engine_tile_size / 16) - 1;
-        gb_addr_config |= SHADER_ENGINE_TILE_SIZE(tmp);
-        switch (rdev->config.cayman.num_gpus) {
-        case 1:
-        default:
-                gb_addr_config |= NUM_GPUS(0);
-                break;
-        case 2:
-                gb_addr_config |= NUM_GPUS(1);
-                break;
-        case 4:
-                gb_addr_config |= NUM_GPUS(2);
-                break;
-        }
-        switch (rdev->config.cayman.multi_gpu_tile_size) {
-        case 16:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(0);
-                break;
-        case 32:
-        default:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(1);
-                break;
-        case 64:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(2);
-                break;
-        case 128:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(3);
-                break;
-        }
-        switch (rdev->config.cayman.mem_row_size_in_kb) {
-        case 1:
-        default:
-                gb_addr_config |= ROW_SIZE(0);
-                break;
-        case 2:
-                gb_addr_config |= ROW_SIZE(1);
-                break;
-        case 4:
-                gb_addr_config |= ROW_SIZE(2);
-                break;
-        }
-#endif
-
         tmp = (gb_addr_config & NUM_PIPES_MASK) >> NUM_PIPES_SHIFT;
         rdev->config.cayman.num_tile_pipes = (1 << tmp);
         tmp = (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT;
@@ -828,17 +545,7 @@ static void cayman_gpu_init(struct radeon_device *rdev)
         tmp = (gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT;
         rdev->config.cayman.mem_row_size_in_kb = 1 << tmp;
 
-        //gb_backend_map = 0x76541032;
-#if 0
-        gb_backend_map = RREG32(GB_BACKEND_MAP);
-#else
-        gb_backend_map =
-                cayman_get_tile_pipe_to_backend_map(rdev, rdev->config.cayman.num_tile_pipes,
-                                                    rdev->config.cayman.num_backends_per_se *
-                                                    rdev->config.cayman.num_shader_engines,
-                                                    &rdev->config.cayman.backend_disable_mask_per_asic,
-                                                    rdev->config.cayman.num_shader_engines);
-#endif
+
         /* setup tiling info dword.  gb_addr_config is not adequate since it does
          * not have bank info, so create a custom tiling dword.
          * bits 3:0   num_pipes
@@ -866,33 +573,49 @@ static void cayman_gpu_init(struct radeon_device *rdev)
         /* num banks is 8 on all fusion asics. 0 = 4, 1 = 8, 2 = 16 */
         if (rdev->flags & RADEON_IS_IGP)
                 rdev->config.cayman.tile_config |= 1 << 4;
-        else
-                rdev->config.cayman.tile_config |=
-                        ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4;
+        else {
+                if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT)
+                        rdev->config.cayman.tile_config |= 1 << 4;
+                else
+                        rdev->config.cayman.tile_config |= 0 << 4;
+        }
         rdev->config.cayman.tile_config |=
                 ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8;
         rdev->config.cayman.tile_config |=
                 ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12;
 
-        rdev->config.cayman.backend_map = gb_backend_map;
-        WREG32(GB_BACKEND_MAP, gb_backend_map);
+        tmp = 0;
+        for (i = (rdev->config.cayman.max_shader_engines - 1); i >= 0; i--) {
+                u32 rb_disable_bitmap;
+
+                WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
+                WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_INDEX(i));
+                rb_disable_bitmap = (RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000) >> 16;
+                tmp <<= 4;
+                tmp |= rb_disable_bitmap;
+        }
+        /* enabled rb are just the one not disabled :) */
+        disabled_rb_mask = tmp;
+
+        WREG32(GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
+        WREG32(RLC_GFX_INDEX, INSTANCE_BROADCAST_WRITES | SE_BROADCAST_WRITES);
+
         WREG32(GB_ADDR_CONFIG, gb_addr_config);
         WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
         WREG32(HDP_ADDR_CONFIG, gb_addr_config);
 
-        /* primary versions */
-        WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
+        tmp = gb_addr_config & NUM_PIPES_MASK;
+        tmp = r6xx_remap_render_backend(rdev, tmp,
+                                        rdev->config.cayman.max_backends_per_se *
+                                        rdev->config.cayman.max_shader_engines,
+                                        CAYMAN_MAX_BACKENDS, disabled_rb_mask);
+        WREG32(GB_BACKEND_MAP, tmp);
 
+        cgts_tcc_disable = 0xffff0000;
+        for (i = 0; i < rdev->config.cayman.max_texture_channel_caches; i++)
+                cgts_tcc_disable &= ~(1 << (16 + i));
         WREG32(CGTS_TCC_DISABLE, cgts_tcc_disable);
         WREG32(CGTS_SYS_TCC_DISABLE, cgts_tcc_disable);
-
-        /* user versions */
-        WREG32(GC_USER_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(GC_USER_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
-
         WREG32(CGTS_USER_SYS_TCC_DISABLE, cgts_tcc_disable);
         WREG32(CGTS_USER_TCC_DISABLE, cgts_tcc_disable);
 
@@ -1580,6 +1303,10 @@ static int cayman_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r)
+                return r;
+
         return 0;
 }
 
@@ -1606,6 +1333,7 @@ int cayman_resume(struct radeon_device *rdev)
 
 int cayman_suspend(struct radeon_device *rdev)
 {
+        r600_audio_fini(rdev);
         /* FIXME: we should wait for ring to be empty */
         radeon_ib_pool_suspend(rdev);
         radeon_vm_manager_suspend(rdev);
diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h
index 2aa7046ada56..a0b98066e207 100644
--- a/drivers/gpu/drm/radeon/nid.h
+++ b/drivers/gpu/drm/radeon/nid.h
@@ -41,6 +41,9 @@
 #define CAYMAN_MAX_TCC               16
 #define CAYMAN_MAX_TCC_MASK          0xFF
 
+#define CAYMAN_GB_ADDR_CONFIG_GOLDEN       0x02011003
+#define ARUBA_GB_ADDR_CONFIG_GOLDEN        0x12010001
+
 #define DMIF_ADDR_CONFIG                                0xBD4
 #define SRBM_GFX_CNTL                                   0x0E44
 #define         RINGID(x)                                       (((x) & 0x3) << 0)
@@ -148,6 +151,8 @@
 #define CGTS_SYS_TCC_DISABLE                            0x3F90
 #define CGTS_USER_SYS_TCC_DISABLE                       0x3F94
 
+#define RLC_GFX_INDEX                                   0x3FC4
+
 #define CONFIG_MEMSIZE                                  0x5428
 
 #define HDP_MEM_COHERENCY_FLUSH_CNTL                    0x5480
@@ -212,6 +217,12 @@
 #define         SOFT_RESET_VGT                                  (1 << 14)
 #define         SOFT_RESET_IA                                   (1 << 15)
 
+#define GRBM_GFX_INDEX                                  0x802C
+#define         INSTANCE_INDEX(x)                       ((x) << 0)
+#define         SE_INDEX(x)                             ((x) << 16)
+#define         INSTANCE_BROADCAST_WRITES               (1 << 30)
+#define         SE_BROADCAST_WRITES                     (1 << 31)
+
 #define SCRATCH_REG0                                    0x8500
 #define SCRATCH_REG1                                    0x8504
 #define SCRATCH_REG2                                    0x8508
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index f388a1d73b63..bff627293812 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1376,113 +1376,51 @@ int r600_asic_reset(struct radeon_device *rdev)
         return r600_gpu_soft_reset(rdev);
 }
 
-static u32 r600_get_tile_pipe_to_backend_map(u32 num_tile_pipes,
-                                             u32 num_backends,
-                                             u32 backend_disable_mask)
-{
-        u32 backend_map = 0;
-        u32 enabled_backends_mask;
-        u32 enabled_backends_count;
-        u32 cur_pipe;
-        u32 swizzle_pipe[R6XX_MAX_PIPES];
-        u32 cur_backend;
-        u32 i;
-
-        if (num_tile_pipes > R6XX_MAX_PIPES)
-                num_tile_pipes = R6XX_MAX_PIPES;
-        if (num_tile_pipes < 1)
-                num_tile_pipes = 1;
-        if (num_backends > R6XX_MAX_BACKENDS)
-                num_backends = R6XX_MAX_BACKENDS;
-        if (num_backends < 1)
-                num_backends = 1;
-
-        enabled_backends_mask = 0;
-        enabled_backends_count = 0;
-        for (i = 0; i < R6XX_MAX_BACKENDS; ++i) {
-                if (((backend_disable_mask >> i) & 1) == 0) {
-                        enabled_backends_mask |= (1 << i);
-                        ++enabled_backends_count;
-                }
-                if (enabled_backends_count == num_backends)
-                        break;
-        }
-
-        if (enabled_backends_count == 0) {
-                enabled_backends_mask = 1;
-                enabled_backends_count = 1;
-        }
-
-        if (enabled_backends_count != num_backends)
-                num_backends = enabled_backends_count;
-
-        memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * R6XX_MAX_PIPES);
-        switch (num_tile_pipes) {
-        case 1:
-                swizzle_pipe[0] = 0;
-                break;
-        case 2:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                break;
-        case 3:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                swizzle_pipe[2] = 2;
-                break;
-        case 4:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                swizzle_pipe[2] = 2;
-                swizzle_pipe[3] = 3;
-                break;
-        case 5:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                swizzle_pipe[2] = 2;
-                swizzle_pipe[3] = 3;
-                swizzle_pipe[4] = 4;
-                break;
-        case 6:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 2;
-                swizzle_pipe[2] = 4;
-                swizzle_pipe[3] = 5;
-                swizzle_pipe[4] = 1;
-                swizzle_pipe[5] = 3;
-                break;
-        case 7:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 2;
-                swizzle_pipe[2] = 4;
-                swizzle_pipe[3] = 6;
-                swizzle_pipe[4] = 1;
-                swizzle_pipe[5] = 3;
-                swizzle_pipe[6] = 5;
-                break;
-        case 8:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 2;
-                swizzle_pipe[2] = 4;
-                swizzle_pipe[3] = 6;
-                swizzle_pipe[4] = 1;
-                swizzle_pipe[5] = 3;
-                swizzle_pipe[6] = 5;
-                swizzle_pipe[7] = 7;
-                break;
+u32 r6xx_remap_render_backend(struct radeon_device *rdev,
+                              u32 tiling_pipe_num,
+                              u32 max_rb_num,
+                              u32 total_max_rb_num,
+                              u32 disabled_rb_mask)
+{
+        u32 rendering_pipe_num, rb_num_width, req_rb_num;
+        u32 pipe_rb_ratio, pipe_rb_remain;
+        u32 data = 0, mask = 1 << (max_rb_num - 1);
+        unsigned i, j;
+
+        /* mask out the RBs that don't exist on that asic */
+        disabled_rb_mask |= (0xff << max_rb_num) & 0xff;
+
+        rendering_pipe_num = 1 << tiling_pipe_num;
+        req_rb_num = total_max_rb_num - r600_count_pipe_bits(disabled_rb_mask);
+        BUG_ON(rendering_pipe_num < req_rb_num);
+
+        pipe_rb_ratio = rendering_pipe_num / req_rb_num;
+        pipe_rb_remain = rendering_pipe_num - pipe_rb_ratio * req_rb_num;
+
+        if (rdev->family <= CHIP_RV740) {
+                /* r6xx/r7xx */
+                rb_num_width = 2;
+        } else {
+                /* eg+ */
+                rb_num_width = 4;
         }
 
-        cur_backend = 0;
-        for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
-                while (((1 << cur_backend) & enabled_backends_mask) == 0)
-                        cur_backend = (cur_backend + 1) % R6XX_MAX_BACKENDS;
-
-                backend_map |= (u32)(((cur_backend & 3) << (swizzle_pipe[cur_pipe] * 2)));
-
-                cur_backend = (cur_backend + 1) % R6XX_MAX_BACKENDS;
+        for (i = 0; i < max_rb_num; i++) {
+                if (!(mask & disabled_rb_mask)) {
+                        for (j = 0; j < pipe_rb_ratio; j++) {
+                                data <<= rb_num_width;
+                                data |= max_rb_num - i - 1;
+                        }
+                        if (pipe_rb_remain) {
+                                data <<= rb_num_width;
+                                data |= max_rb_num - i - 1;
+                                pipe_rb_remain--;
+                        }
+                }
+                mask >>= 1;
         }
 
-        return backend_map;
+        return data;
 }
 
 int r600_count_pipe_bits(uint32_t val)
@@ -1500,7 +1438,6 @@ void r600_gpu_init(struct radeon_device *rdev)
 {
         u32 tiling_config;
         u32 ramcfg;
-        u32 backend_map;
         u32 cc_rb_backend_disable;
         u32 cc_gc_shader_pipe_config;
         u32 tmp;
@@ -1511,8 +1448,9 @@ void r600_gpu_init(struct radeon_device *rdev)
         u32 sq_thread_resource_mgmt = 0;
         u32 sq_stack_resource_mgmt_1 = 0;
         u32 sq_stack_resource_mgmt_2 = 0;
+        u32 disabled_rb_mask;
 
-        /* FIXME: implement */
+        rdev->config.r600.tiling_group_size = 256;
         switch (rdev->family) {
         case CHIP_R600:
                 rdev->config.r600.max_pipes = 4;
@@ -1616,10 +1554,7 @@ void r600_gpu_init(struct radeon_device *rdev)
         rdev->config.r600.tiling_nbanks = 4 << ((ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT);
         tiling_config |= BANK_TILING((ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT);
         tiling_config |= GROUP_SIZE((ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT);
-        if ((ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT)
-                rdev->config.r600.tiling_group_size = 512;
-        else
-                rdev->config.r600.tiling_group_size = 256;
+
         tmp = (ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT;
         if (tmp > 3) {
                 tiling_config |= ROW_TILING(3);
@@ -1631,32 +1566,36 @@ void r600_gpu_init(struct radeon_device *rdev)
         tiling_config |= BANK_SWAPS(1);
 
         cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
-        cc_rb_backend_disable |=
-                BACKEND_DISABLE((R6XX_MAX_BACKENDS_MASK << rdev->config.r600.max_backends) & R6XX_MAX_BACKENDS_MASK);
-
-        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffffff00;
-        cc_gc_shader_pipe_config |=
-                INACTIVE_QD_PIPES((R6XX_MAX_PIPES_MASK << rdev->config.r600.max_pipes) & R6XX_MAX_PIPES_MASK);
-        cc_gc_shader_pipe_config |=
-                INACTIVE_SIMDS((R6XX_MAX_SIMDS_MASK << rdev->config.r600.max_simds) & R6XX_MAX_SIMDS_MASK);
-
-        backend_map = r600_get_tile_pipe_to_backend_map(rdev->config.r600.max_tile_pipes,
-                                                        (R6XX_MAX_BACKENDS -
-                                                         r600_count_pipe_bits((cc_rb_backend_disable &
-                                                                               R6XX_MAX_BACKENDS_MASK) >> 16)),
-                                                        (cc_rb_backend_disable >> 16));
+        tmp = R6XX_MAX_BACKENDS -
+                r600_count_pipe_bits((cc_rb_backend_disable >> 16) & R6XX_MAX_BACKENDS_MASK);
+        if (tmp < rdev->config.r600.max_backends) {
+                rdev->config.r600.max_backends = tmp;
+        }
+
+        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0x00ffff00;
+        tmp = R6XX_MAX_PIPES -
+                r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R6XX_MAX_PIPES_MASK);
+        if (tmp < rdev->config.r600.max_pipes) {
+                rdev->config.r600.max_pipes = tmp;
+        }
+        tmp = R6XX_MAX_SIMDS -
+                r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
+        if (tmp < rdev->config.r600.max_simds) {
+                rdev->config.r600.max_simds = tmp;
+        }
+
+        disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R6XX_MAX_BACKENDS_MASK;
+        tmp = (tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
+        tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.r600.max_backends,
+                                        R6XX_MAX_BACKENDS, disabled_rb_mask);
+        tiling_config |= tmp << 16;
+        rdev->config.r600.backend_map = tmp;
+
         rdev->config.r600.tile_config = tiling_config;
-        rdev->config.r600.backend_map = backend_map;
-        tiling_config |= BACKEND_MAP(backend_map);
         WREG32(GB_TILING_CONFIG, tiling_config);
         WREG32(DCP_TILING_CONFIG, tiling_config & 0xffff);
         WREG32(HDP_TILING_CONFIG, tiling_config & 0xffff);
 
-        /* Setup pipes */
-        WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
-        WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
-
         tmp = R6XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8);
         WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK);
         WREG32(VGT_VERTEX_REUSE_BLOCK_CNTL, ((tmp * 4) - 2) & VTX_REUSE_DEPTH_MASK);
@@ -1900,6 +1839,7 @@ void r600_gpu_init(struct radeon_device *rdev)
         WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
                                NUM_CLIP_SEQ(3)));
         WREG32(PA_SC_ENHANCE, FORCE_EOV_MAX_CLK_CNT(4095));
+        WREG32(VC_ENHANCE, 0);
 }
 
 
@@ -2487,6 +2427,12 @@ int r600_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r) {
+                DRM_ERROR("radeon: audio init failed\n");
+                return r;
+        }
+
         return 0;
 }
 
@@ -2523,12 +2469,6 @@ int r600_resume(struct radeon_device *rdev)
                 return r;
         }
 
-        r = r600_audio_init(rdev);
-        if (r) {
-                DRM_ERROR("radeon: audio resume failed\n");
-                return r;
-        }
-
         return r;
 }
 
@@ -2638,9 +2578,6 @@ int r600_init(struct radeon_device *rdev)
                 rdev->accel_working = false;
         }
 
-        r = r600_audio_init(rdev);
-        if (r)
-                return r; /* TODO error handling */
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 7c4fa77f018f..79b55916cf90 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder)
  */
 static int r600_audio_chipset_supported(struct radeon_device *rdev)
 {
-        return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev))
+        return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev))
                 || rdev->family == CHIP_RS600
                 || rdev->family == CHIP_RS690
                 || rdev->family == CHIP_RS740;
@@ -192,6 +192,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
         struct radeon_device *rdev = dev->dev_private;
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
+        struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
         int base_rate = 48000;
 
         switch (radeon_encoder->encoder_id) {
@@ -217,8 +218,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
                 WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);
                 WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);
 
-                /* Some magic trigger or src sel? */
-                WREG32_P(0x5ac, 0x01, ~0x77);
+                /* Select DTO source */
+                WREG32(0x5ac, radeon_crtc->crtc_id);
         } else {
                 switch (dig->dig_encoder) {
                 case 0:
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 0133f5f09bd6..ca87f7afaf23 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -2079,6 +2079,48 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                         return -EINVAL;
                 }
                 break;
+        case PACKET3_STRMOUT_BASE_UPDATE:
+                if (p->family < CHIP_RV770) {
+                        DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n");
+                        return -EINVAL;
+                }
+                if (pkt->count != 1) {
+                        DRM_ERROR("bad STRMOUT_BASE_UPDATE packet count\n");
+                        return -EINVAL;
+                }
+                if (idx_value > 3) {
+                        DRM_ERROR("bad STRMOUT_BASE_UPDATE index\n");
+                        return -EINVAL;
+                }
+                {
+                        u64 offset;
+
+                        r = r600_cs_packet_next_reloc(p, &reloc);
+                        if (r) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE reloc\n");
+                                return -EINVAL;
+                        }
+
+                        if (reloc->robj != track->vgt_strmout_bo[idx_value]) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo does not match\n");
+                                return -EINVAL;
+                        }
+
+                        offset = radeon_get_ib_value(p, idx+1) << 8;
+                        if (offset != track->vgt_strmout_bo_offset[idx_value]) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo offset does not match: 0x%llx, 0x%x\n",
+                                          offset, track->vgt_strmout_bo_offset[idx_value]);
+                                return -EINVAL;
+                        }
+
+                        if ((offset + 4) > radeon_bo_size(reloc->robj)) {
+                                DRM_ERROR("bad STRMOUT_BASE_UPDATE bo too small: 0x%llx, 0x%lx\n",
+                                          offset + 4, radeon_bo_size(reloc->robj));
+                                return -EINVAL;
+                        }
+                        ib[idx+1] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff);
+                }
+                break;
         case PACKET3_SURFACE_BASE_UPDATE:
                 if (p->family >= CHIP_RV770 || p->family == CHIP_R600) {
                         DRM_ERROR("bad SURFACE_BASE_UPDATE\n");
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 226379e00ac1..82a0a4c919c0 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
-                return;
-
         /* Silent, r600_hdmi_enable will raise WARN for us */
         if (!dig->afmt->enabled)
                 return;
@@ -348,7 +345,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
                 WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset,
                        HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */
                        HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */
-                       HDMI0_AUDIO_SEND_MAX_PACKETS | /* send NULL packets if no audio is available */
                        HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */
                        HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */
         }
@@ -484,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
         uint32_t offset;
         u32 hdmi;
 
-        if (ASIC_IS_DCE5(rdev))
+        if (ASIC_IS_DCE6(rdev))
                 return;
 
         /* Silent, r600_hdmi_enable will raise WARN for us */
@@ -544,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
         struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         uint32_t offset;
 
-        if (ASIC_IS_DCE5(rdev))
+        if (ASIC_IS_DCE6(rdev))
                 return;
 
         /* Called for ATOM_ENCODER_MODE_HDMI only */
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index 15bd3b216243..025fd5b6c08c 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -219,6 +219,8 @@
 #define         BACKEND_MAP(x)                                  ((x) << 16)
 
 #define GB_TILING_CONFIG                                0x98F0
+#define     PIPE_TILING__SHIFT              1
+#define     PIPE_TILING__MASK               0x0000000e
 
 #define GC_USER_SHADER_PIPE_CONFIG                      0x8954
 #define         INACTIVE_QD_PIPES(x)                            ((x) << 8)
@@ -483,6 +485,7 @@
 #define         TC_L2_SIZE(x)                                   ((x)<<5)
 #define         L2_DISABLE_LATE_HIT                             (1<<9)
 
+#define VC_ENHANCE                                      0x9714
 
 #define VGT_CACHE_INVALIDATION                          0x88C4
 #define         CACHE_INVALIDATION(x)                           ((x)<<0)
@@ -1161,6 +1164,7 @@
 #define PACKET3_SET_CTL_CONST                           0x6F
 #define         PACKET3_SET_CTL_CONST_OFFSET                    0x0003cff0
 #define         PACKET3_SET_CTL_CONST_END                       0x0003e200
+#define PACKET3_STRMOUT_BASE_UPDATE                     0x72 /* r7xx */
 #define PACKET3_SURFACE_BASE_UPDATE                     0x73
 
 
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 2e24022b389a..fefcca55c1eb 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1374,9 +1374,9 @@ struct cayman_asic {
 
 struct si_asic {
         unsigned max_shader_engines;
-        unsigned max_pipes_per_simd;
         unsigned max_tile_pipes;
-        unsigned max_simds_per_se;
+        unsigned max_cu_per_sh;
+        unsigned max_sh_per_se;
         unsigned max_backends_per_se;
         unsigned max_texture_channel_caches;
         unsigned max_gprs;
@@ -1387,7 +1387,6 @@ struct si_asic {
         unsigned sc_hiz_tile_fifo_size;
         unsigned sc_earlyz_tile_fifo_size;
 
-        unsigned num_shader_engines;
         unsigned num_tile_pipes;
         unsigned num_backends_per_se;
         unsigned backend_disable_mask_per_asic;
@@ -1848,6 +1847,11 @@ extern struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock);
 extern void r600_hdmi_enable(struct drm_encoder *encoder);
 extern void r600_hdmi_disable(struct drm_encoder *encoder);
 extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode);
+extern u32 r6xx_remap_render_backend(struct radeon_device *rdev,
+                                     u32 tiling_pipe_num,
+                                     u32 max_rb_num,
+                                     u32 total_max_rb_num,
+                                     u32 enabled_rb_mask);
 
 /*
  * evergreen functions used by radeon_encoder.c
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 0137689ed461..142f89462aa4 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -147,6 +147,7 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
                                            sync_to_ring, p->ring);
 }
 
+/* XXX: note that this is called from the legacy UMS CS ioctl as well */
 int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
 {
         struct drm_radeon_cs *cs = data;
@@ -245,22 +246,24 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
                 }
         }
 
-        if ((p->cs_flags & RADEON_CS_USE_VM) &&
-            !p->rdev->vm_manager.enabled) {
-                DRM_ERROR("VM not active on asic!\n");
-                return -EINVAL;
-        }
-
-        /* we only support VM on SI+ */
-        if ((p->rdev->family >= CHIP_TAHITI) &&
-            ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
-                DRM_ERROR("VM required on SI+!\n");
-                return -EINVAL;
-        }
+        /* these are KMS only */
+        if (p->rdev) {
+                if ((p->cs_flags & RADEON_CS_USE_VM) &&
+                    !p->rdev->vm_manager.enabled) {
+                        DRM_ERROR("VM not active on asic!\n");
+                        return -EINVAL;
+                }
 
-        if (radeon_cs_get_ring(p, ring, priority))
-                return -EINVAL;
+                /* we only support VM on SI+ */
+                if ((p->rdev->family >= CHIP_TAHITI) &&
+                    ((p->cs_flags & RADEON_CS_USE_VM) == 0)) {
+                        DRM_ERROR("VM required on SI+!\n");
+                        return -EINVAL;
+                }
 
+                if (radeon_cs_get_ring(p, ring, priority))
+                        return -EINVAL;
+        }
 
         /* deal with non-vm */
         if ((p->chunk_ib_idx != -1) &&
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index f0bb2b543b13..2c4d53fd20c5 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -57,9 +57,11 @@
  *   2.13.0 - virtual memory support, streamout
  *   2.14.0 - add evergreen tiling informations
  *   2.15.0 - add max_pipes query
+ *   2.16.0 - fix evergreen 2D tiled surface calculation
+ *   2.17.0 - add STRMOUT_BASE_UPDATE for r7xx
  */
 #define KMS_DRIVER_MAJOR        2
-#define KMS_DRIVER_MINOR        15
+#define KMS_DRIVER_MINOR        17
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index 79db56e6c2ac..59d44937dd9f 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -476,12 +476,18 @@ int radeon_vm_bo_add(struct radeon_device *rdev,
 
         mutex_lock(&vm->mutex);
         if (last_pfn > vm->last_pfn) {
-                /* grow va space 32M by 32M */
-                unsigned align = ((32 << 20) >> 12) - 1;
+                /* release mutex and lock in right order */
+                mutex_unlock(&vm->mutex);
                 radeon_mutex_lock(&rdev->cs_mutex);
-                radeon_vm_unbind_locked(rdev, vm);
+                mutex_lock(&vm->mutex);
+                /* and check again */
+                if (last_pfn > vm->last_pfn) {
+                        /* grow va space 32M by 32M */
+                        unsigned align = ((32 << 20) >> 12) - 1;
+                        radeon_vm_unbind_locked(rdev, vm);
+                        vm->last_pfn = (last_pfn + align) & ~align;
+                }
                 radeon_mutex_unlock(&rdev->cs_mutex);
-                vm->last_pfn = (last_pfn + align) & ~align;
         }
         head = &vm->va;
         last_offset = 0;
@@ -595,8 +601,8 @@ int radeon_vm_bo_rmv(struct radeon_device *rdev,
         if (bo_va == NULL)
                 return 0;
 
-        mutex_lock(&vm->mutex);
         radeon_mutex_lock(&rdev->cs_mutex);
+        mutex_lock(&vm->mutex);
         radeon_vm_bo_update_pte(rdev, vm, bo, NULL);
         radeon_mutex_unlock(&rdev->cs_mutex);
         list_del(&bo_va->vm_list);
@@ -641,9 +647,8 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm)
         struct radeon_bo_va *bo_va, *tmp;
         int r;
 
-        mutex_lock(&vm->mutex);
-
         radeon_mutex_lock(&rdev->cs_mutex);
+        mutex_lock(&vm->mutex);
         radeon_vm_unbind_locked(rdev, vm);
         radeon_mutex_unlock(&rdev->cs_mutex);
 
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index f1016a5820d1..5c58d7d90cb2 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -273,7 +273,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                 break;
         case RADEON_INFO_MAX_PIPES:
                 if (rdev->family >= CHIP_TAHITI)
-                        value = rdev->config.si.max_pipes_per_simd;
+                        value = rdev->config.si.max_cu_per_sh;
                 else if (rdev->family >= CHIP_CAYMAN)
                         value = rdev->config.cayman.max_pipes_per_simd;
                 else if (rdev->family >= CHIP_CEDAR)
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 08825548ee69..5b37e283ec38 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -801,9 +801,13 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work)
                 int i;
 
                 for (i = 0; i < RADEON_NUM_RINGS; ++i) {
-                        not_processed += radeon_fence_count_emitted(rdev, i);
-                        if (not_processed >= 3)
-                                break;
+                        struct radeon_ring *ring = &rdev->ring[i];
+
+                        if (ring->ready) {
+                                not_processed += radeon_fence_count_emitted(rdev, i);
+                                if (not_processed >= 3)
+                                        break;
+                        }
                 }
 
                 if (not_processed >= 3) { /* should upclock */
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 8ddab4c76710..6bef46ace831 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
         struct radeon_bo *bo = gem_to_radeon_bo(obj);
         int ret = 0;
 
+        ret = radeon_bo_reserve(bo, false);
+        if (unlikely(ret != 0))
+                return ERR_PTR(ret);
+
         /* pin buffer into GTT */
         ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);
-        if (ret)
+        if (ret) {
+                radeon_bo_unreserve(bo);
                 return ERR_PTR(ret);
-
+        }
+        radeon_bo_unreserve(bo);
         return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags);
 }
 
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 25f9eef12c42..e95c5e61d4e2 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -908,12 +908,6 @@ static int rs600_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = r600_audio_init(rdev);
-        if (r) {
-                dev_err(rdev->dev, "failed initializing audio\n");
-                return r;
-        }
-
         r = radeon_ib_pool_start(rdev);
         if (r)
                 return r;
@@ -922,6 +916,12 @@ static int rs600_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r) {
+                dev_err(rdev->dev, "failed initializing audio\n");
+                return r;
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 3277ddecfe9f..159b6a43fda0 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -637,12 +637,6 @@ static int rs690_startup(struct radeon_device *rdev)
                 return r;
         }
 
-        r = r600_audio_init(rdev);
-        if (r) {
-                dev_err(rdev->dev, "failed initializing audio\n");
-                return r;
-        }
-
         r = radeon_ib_pool_start(rdev);
         if (r)
                 return r;
@@ -651,6 +645,12 @@ static int rs690_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r) {
+                dev_err(rdev->dev, "failed initializing audio\n");
+                return r;
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index c2f473bc13b8..b4f51c569c36 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -151,6 +151,8 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)
         WREG32(MC_VM_MD_L1_TLB0_CNTL, tmp);
         WREG32(MC_VM_MD_L1_TLB1_CNTL, tmp);
         WREG32(MC_VM_MD_L1_TLB2_CNTL, tmp);
+        if (rdev->family == CHIP_RV740)
+                WREG32(MC_VM_MD_L1_TLB3_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB0_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
@@ -363,180 +365,6 @@ void r700_cp_fini(struct radeon_device *rdev)
 /*
  * Core functions
  */
-static u32 r700_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
-                                             u32 num_tile_pipes,
-                                             u32 num_backends,
-                                             u32 backend_disable_mask)
-{
-        u32 backend_map = 0;
-        u32 enabled_backends_mask;
-        u32 enabled_backends_count;
-        u32 cur_pipe;
-        u32 swizzle_pipe[R7XX_MAX_PIPES];
-        u32 cur_backend;
-        u32 i;
-        bool force_no_swizzle;
-
-        if (num_tile_pipes > R7XX_MAX_PIPES)
-                num_tile_pipes = R7XX_MAX_PIPES;
-        if (num_tile_pipes < 1)
-                num_tile_pipes = 1;
-        if (num_backends > R7XX_MAX_BACKENDS)
-                num_backends = R7XX_MAX_BACKENDS;
-        if (num_backends < 1)
-                num_backends = 1;
-
-        enabled_backends_mask = 0;
-        enabled_backends_count = 0;
-        for (i = 0; i < R7XX_MAX_BACKENDS; ++i) {
-                if (((backend_disable_mask >> i) & 1) == 0) {
-                        enabled_backends_mask |= (1 << i);
-                        ++enabled_backends_count;
-                }
-                if (enabled_backends_count == num_backends)
-                        break;
-        }
-
-        if (enabled_backends_count == 0) {
-                enabled_backends_mask = 1;
-                enabled_backends_count = 1;
-        }
-
-        if (enabled_backends_count != num_backends)
-                num_backends = enabled_backends_count;
-
-        switch (rdev->family) {
-        case CHIP_RV770:
-        case CHIP_RV730:
-                force_no_swizzle = false;
-                break;
-        case CHIP_RV710:
-        case CHIP_RV740:
-        default:
-                force_no_swizzle = true;
-                break;
-        }
-
-        memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * R7XX_MAX_PIPES);
-        switch (num_tile_pipes) {
-        case 1:
-                swizzle_pipe[0] = 0;
-                break;
-        case 2:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                break;
-        case 3:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 1;
-                }
-                break;
-        case 4:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 3;
-                        swizzle_pipe[3] = 1;
-                }
-                break;
-        case 5:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 1;
-                        swizzle_pipe[4] = 3;
-                }
-                break;
-        case 6:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 5;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 1;
-                }
-                break;
-        case 7:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                        swizzle_pipe[6] = 6;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 6;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 1;
-                        swizzle_pipe[6] = 5;
-                }
-                break;
-        case 8:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                        swizzle_pipe[6] = 6;
-                        swizzle_pipe[7] = 7;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 6;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 1;
-                        swizzle_pipe[6] = 7;
-                        swizzle_pipe[7] = 5;
-                }
-                break;
-        }
-
-        cur_backend = 0;
-        for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
-                while (((1 << cur_backend) & enabled_backends_mask) == 0)
-                        cur_backend = (cur_backend + 1) % R7XX_MAX_BACKENDS;
-
-                backend_map |= (u32)(((cur_backend & 3) << (swizzle_pipe[cur_pipe] * 2)));
-
-                cur_backend = (cur_backend + 1) % R7XX_MAX_BACKENDS;
-        }
-
-        return backend_map;
-}
-
 static void rv770_gpu_init(struct radeon_device *rdev)
 {
         int i, j, num_qd_pipes;
@@ -552,14 +380,17 @@ static void rv770_gpu_init(struct radeon_device *rdev)
         u32 sq_thread_resource_mgmt;
         u32 hdp_host_path_cntl;
         u32 sq_dyn_gpr_size_simd_ab_0;
-        u32 backend_map;
         u32 gb_tiling_config = 0;
         u32 cc_rb_backend_disable = 0;
         u32 cc_gc_shader_pipe_config = 0;
         u32 mc_arb_ramcfg;
-        u32 db_debug4;
+        u32 db_debug4, tmp;
+        u32 inactive_pipes, shader_pipe_config;
+        u32 disabled_rb_mask;
+        unsigned active_number;
 
         /* setup chip specs */
+        rdev->config.rv770.tiling_group_size = 256;
         switch (rdev->family) {
         case CHIP_RV770:
                 rdev->config.rv770.max_pipes = 4;
@@ -670,33 +501,70 @@ static void rv770_gpu_init(struct radeon_device *rdev)
         /* setup tiling, simd, pipe config */
         mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
 
+        shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG);
+        inactive_pipes = (shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> INACTIVE_QD_PIPES_SHIFT;
+        for (i = 0, tmp = 1, active_number = 0; i < R7XX_MAX_PIPES; i++) {
+                if (!(inactive_pipes & tmp)) {
+                        active_number++;
+                }
+                tmp <<= 1;
+        }
+        if (active_number == 1) {
+                WREG32(SPI_CONFIG_CNTL, DISABLE_INTERP_1);
+        } else {
+                WREG32(SPI_CONFIG_CNTL, 0);
+        }
+
+        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
+        tmp = R7XX_MAX_BACKENDS - r600_count_pipe_bits(cc_rb_backend_disable >> 16);
+        if (tmp < rdev->config.rv770.max_backends) {
+                rdev->config.rv770.max_backends = tmp;
+        }
+
+        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffffff00;
+        tmp = R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R7XX_MAX_PIPES_MASK);
+        if (tmp < rdev->config.rv770.max_pipes) {
+                rdev->config.rv770.max_pipes = tmp;
+        }
+        tmp = R7XX_MAX_SIMDS - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
+        if (tmp < rdev->config.rv770.max_simds) {
+                rdev->config.rv770.max_simds = tmp;
+        }
+
         switch (rdev->config.rv770.max_tile_pipes) {
         case 1:
         default:
-                gb_tiling_config |= PIPE_TILING(0);
+                gb_tiling_config = PIPE_TILING(0);
                 break;
         case 2:
-                gb_tiling_config |= PIPE_TILING(1);
+                gb_tiling_config = PIPE_TILING(1);
                 break;
         case 4:
-                gb_tiling_config |= PIPE_TILING(2);
+                gb_tiling_config = PIPE_TILING(2);
                 break;
         case 8:
-                gb_tiling_config |= PIPE_TILING(3);
+                gb_tiling_config = PIPE_TILING(3);
                 break;
         }
         rdev->config.rv770.tiling_npipes = rdev->config.rv770.max_tile_pipes;
 
+        disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R7XX_MAX_BACKENDS_MASK;
+        tmp = (gb_tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
+        tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.rv770.max_backends,
+                                        R7XX_MAX_BACKENDS, disabled_rb_mask);
+        gb_tiling_config |= tmp << 16;
+        rdev->config.rv770.backend_map = tmp;
+
         if (rdev->family == CHIP_RV770)
                 gb_tiling_config |= BANK_TILING(1);
-        else
-                gb_tiling_config |= BANK_TILING((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT);
+        else {
+                if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT)
+                        gb_tiling_config |= BANK_TILING(1);
+                else
+                        gb_tiling_config |= BANK_TILING(0);
+        }
         rdev->config.rv770.tiling_nbanks = 4 << ((gb_tiling_config >> 4) & 0x3);
         gb_tiling_config |= GROUP_SIZE((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT);
-        if ((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT)
-                rdev->config.rv770.tiling_group_size = 512;
-        else
-                rdev->config.rv770.tiling_group_size = 256;
         if (((mc_arb_ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT) > 3) {
                 gb_tiling_config |= ROW_TILING(3);
                 gb_tiling_config |= SAMPLE_SPLIT(3);
@@ -708,47 +576,19 @@ static void rv770_gpu_init(struct radeon_device *rdev)
         }
 
         gb_tiling_config |= BANK_SWAPS(1);
-
-        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
-        cc_rb_backend_disable |=
-                BACKEND_DISABLE((R7XX_MAX_BACKENDS_MASK << rdev->config.rv770.max_backends) & R7XX_MAX_BACKENDS_MASK);
-
-        cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffffff00;
-        cc_gc_shader_pipe_config |=
-                INACTIVE_QD_PIPES((R7XX_MAX_PIPES_MASK << rdev->config.rv770.max_pipes) & R7XX_MAX_PIPES_MASK);
-        cc_gc_shader_pipe_config |=
-                INACTIVE_SIMDS((R7XX_MAX_SIMDS_MASK << rdev->config.rv770.max_simds) & R7XX_MAX_SIMDS_MASK);
-
-        if (rdev->family == CHIP_RV740)
-                backend_map = 0x28;
-        else
-                backend_map = r700_get_tile_pipe_to_backend_map(rdev,
-                                                                rdev->config.rv770.max_tile_pipes,
-                                                                (R7XX_MAX_BACKENDS -
-                                                                 r600_count_pipe_bits((cc_rb_backend_disable &
-                                                                                       R7XX_MAX_BACKENDS_MASK) >> 16)),
-                                                                (cc_rb_backend_disable >> 16));
-
         rdev->config.rv770.tile_config = gb_tiling_config;
-        rdev->config.rv770.backend_map = backend_map;
-        gb_tiling_config |= BACKEND_MAP(backend_map);
 
         WREG32(GB_TILING_CONFIG, gb_tiling_config);
         WREG32(DCP_TILING_CONFIG, (gb_tiling_config & 0xffff));
         WREG32(HDP_TILING_CONFIG, (gb_tiling_config & 0xffff));
 
-        WREG32(CC_RB_BACKEND_DISABLE,      cc_rb_backend_disable);
-        WREG32(CC_GC_SHADER_PIPE_CONFIG,   cc_gc_shader_pipe_config);
-        WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
-        WREG32(CC_SYS_RB_BACKEND_DISABLE,  cc_rb_backend_disable);
-
         WREG32(CGTS_SYS_TCC_DISABLE, 0);
         WREG32(CGTS_TCC_DISABLE, 0);
         WREG32(CGTS_USER_SYS_TCC_DISABLE, 0);
         WREG32(CGTS_USER_TCC_DISABLE, 0);
 
-        num_qd_pipes =
-                R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8);
+
+        num_qd_pipes = R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8);
         WREG32(VGT_OUT_DEALLOC_CNTL, (num_qd_pipes * 4) & DEALLOC_DIST_MASK);
         WREG32(VGT_VERTEX_REUSE_BLOCK_CNTL, ((num_qd_pipes * 4) - 2) & VTX_REUSE_DEPTH_MASK);
 
@@ -776,6 +616,9 @@ static void rv770_gpu_init(struct radeon_device *rdev)
                                        ACK_FLUSH_CTL(3) |
                                        SYNC_FLUSH_CTL));
 
+        if (rdev->family != CHIP_RV770)
+                WREG32(SMX_SAR_CTL0, 0x00003f3f);
+
         db_debug3 = RREG32(DB_DEBUG3);
         db_debug3 &= ~DB_CLK_OFF_DELAY(0x1f);
         switch (rdev->family) {
@@ -809,8 +652,6 @@ static void rv770_gpu_init(struct radeon_device *rdev)
 
         WREG32(VGT_NUM_INSTANCES, 1);
 
-        WREG32(SPI_CONFIG_CNTL, GPR_WRITE_PRIORITY(0));
-
         WREG32(SPI_CONFIG_CNTL_1, VTX_DONE_DELAY(4));
 
         WREG32(CP_PERFMON_CNTL, 0);
@@ -954,7 +795,7 @@ static void rv770_gpu_init(struct radeon_device *rdev)
 
         WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA |
                                           NUM_CLIP_SEQ(3)));
-
+        WREG32(VC_ENHANCE, 0);
 }
 
 void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
@@ -1118,6 +959,12 @@ static int rv770_startup(struct radeon_device *rdev)
         if (r)
                 return r;
 
+        r = r600_audio_init(rdev);
+        if (r) {
+                DRM_ERROR("radeon: audio init failed\n");
+                return r;
+        }
+
         return 0;
 }
 
@@ -1140,12 +987,6 @@ int rv770_resume(struct radeon_device *rdev)
                 return r;
         }
 
-        r = r600_audio_init(rdev);
-        if (r) {
-                dev_err(rdev->dev, "radeon: audio init failed\n");
-                return r;
-        }
-
         return r;
 
 }
@@ -1254,12 +1095,6 @@ int rv770_init(struct radeon_device *rdev)
                 rdev->accel_working = false;
         }
 
-        r = r600_audio_init(rdev);
-        if (r) {
-                dev_err(rdev->dev, "radeon: audio init failed\n");
-                return r;
-        }
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
index 9c549f702f2f..b0adfc595d75 100644
--- a/drivers/gpu/drm/radeon/rv770d.h
+++ b/drivers/gpu/drm/radeon/rv770d.h
@@ -106,10 +106,13 @@
 #define         BACKEND_MAP(x)                                  ((x) << 16)
 
 #define GB_TILING_CONFIG                                0x98F0
+#define     PIPE_TILING__SHIFT              1
+#define     PIPE_TILING__MASK               0x0000000e
 
 #define GC_USER_SHADER_PIPE_CONFIG                      0x8954
 #define         INACTIVE_QD_PIPES(x)                            ((x) << 8)
 #define         INACTIVE_QD_PIPES_MASK                          0x0000FF00
+#define         INACTIVE_QD_PIPES_SHIFT                     8
 #define         INACTIVE_SIMDS(x)                               ((x) << 16)
 #define         INACTIVE_SIMDS_MASK                             0x00FF0000
 
@@ -174,6 +177,7 @@
 #define MC_VM_MD_L1_TLB0_CNTL                           0x2654
 #define MC_VM_MD_L1_TLB1_CNTL                           0x2658
 #define MC_VM_MD_L1_TLB2_CNTL                           0x265C
+#define MC_VM_MD_L1_TLB3_CNTL                           0x2698
 #define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR              0x203C
 #define MC_VM_SYSTEM_APERTURE_HIGH_ADDR                 0x2038
 #define MC_VM_SYSTEM_APERTURE_LOW_ADDR                  0x2034
@@ -207,6 +211,7 @@
 #define SCRATCH_UMSK                                    0x8540
 #define SCRATCH_ADDR                                    0x8544
 
+#define SMX_SAR_CTL0                                    0xA008
 #define SMX_DC_CTL0                                     0xA020
 #define         USE_HASH_FUNCTION                               (1 << 0)
 #define         CACHE_DEPTH(x)                                  ((x) << 1)
@@ -306,6 +311,8 @@
 #define TCP_CNTL                                        0x9610
 #define TCP_CHAN_STEER                                  0x9614
 
+#define VC_ENHANCE                                      0x9714
+
 #define VGT_CACHE_INVALIDATION                          0x88C4
 #define         CACHE_INVALIDATION(x)                           ((x)<<0)
 #define                 VC_ONLY                                         0
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 549732e56ca9..c7b61f16ecfd 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -867,200 +867,6 @@ void dce6_bandwidth_update(struct radeon_device *rdev)
 /*
  * Core functions
  */
-static u32 si_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
-                                           u32 num_tile_pipes,
-                                           u32 num_backends_per_asic,
-                                           u32 *backend_disable_mask_per_asic,
-                                           u32 num_shader_engines)
-{
-        u32 backend_map = 0;
-        u32 enabled_backends_mask = 0;
-        u32 enabled_backends_count = 0;
-        u32 num_backends_per_se;
-        u32 cur_pipe;
-        u32 swizzle_pipe[SI_MAX_PIPES];
-        u32 cur_backend = 0;
-        u32 i;
-        bool force_no_swizzle;
-
-        /* force legal values */
-        if (num_tile_pipes < 1)
-                num_tile_pipes = 1;
-        if (num_tile_pipes > rdev->config.si.max_tile_pipes)
-                num_tile_pipes = rdev->config.si.max_tile_pipes;
-        if (num_shader_engines < 1)
-                num_shader_engines = 1;
-        if (num_shader_engines > rdev->config.si.max_shader_engines)
-                num_shader_engines = rdev->config.si.max_shader_engines;
-        if (num_backends_per_asic < num_shader_engines)
-                num_backends_per_asic = num_shader_engines;
-        if (num_backends_per_asic > (rdev->config.si.max_backends_per_se * num_shader_engines))
-                num_backends_per_asic = rdev->config.si.max_backends_per_se * num_shader_engines;
-
-        /* make sure we have the same number of backends per se */
-        num_backends_per_asic = ALIGN(num_backends_per_asic, num_shader_engines);
-        /* set up the number of backends per se */
-        num_backends_per_se = num_backends_per_asic / num_shader_engines;
-        if (num_backends_per_se > rdev->config.si.max_backends_per_se) {
-                num_backends_per_se = rdev->config.si.max_backends_per_se;
-                num_backends_per_asic = num_backends_per_se * num_shader_engines;
-        }
-
-        /* create enable mask and count for enabled backends */
-        for (i = 0; i < SI_MAX_BACKENDS; ++i) {
-                if (((*backend_disable_mask_per_asic >> i) & 1) == 0) {
-                        enabled_backends_mask |= (1 << i);
-                        ++enabled_backends_count;
-                }
-                if (enabled_backends_count == num_backends_per_asic)
-                        break;
-        }
-
-        /* force the backends mask to match the current number of backends */
-        if (enabled_backends_count != num_backends_per_asic) {
-                u32 this_backend_enabled;
-                u32 shader_engine;
-                u32 backend_per_se;
-
-                enabled_backends_mask = 0;
-                enabled_backends_count = 0;
-                *backend_disable_mask_per_asic = SI_MAX_BACKENDS_MASK;
-                for (i = 0; i < SI_MAX_BACKENDS; ++i) {
-                        /* calc the current se */
-                        shader_engine = i / rdev->config.si.max_backends_per_se;
-                        /* calc the backend per se */
-                        backend_per_se = i % rdev->config.si.max_backends_per_se;
-                        /* default to not enabled */
-                        this_backend_enabled = 0;
-                        if ((shader_engine < num_shader_engines) &&
-                            (backend_per_se < num_backends_per_se))
-                                this_backend_enabled = 1;
-                        if (this_backend_enabled) {
-                                enabled_backends_mask |= (1 << i);
-                                *backend_disable_mask_per_asic &= ~(1 << i);
-                                ++enabled_backends_count;
-                        }
-                }
-        }
-
-
-        memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * SI_MAX_PIPES);
-        switch (rdev->family) {
-        case CHIP_TAHITI:
-        case CHIP_PITCAIRN:
-        case CHIP_VERDE:
-                force_no_swizzle = true;
-                break;
-        default:
-                force_no_swizzle = false;
-                break;
-        }
-        if (force_no_swizzle) {
-                bool last_backend_enabled = false;
-
-                force_no_swizzle = false;
-                for (i = 0; i < SI_MAX_BACKENDS; ++i) {
-                        if (((enabled_backends_mask >> i) & 1) == 1) {
-                                if (last_backend_enabled)
-                                        force_no_swizzle = true;
-                                last_backend_enabled = true;
-                        } else
-                                last_backend_enabled = false;
-                }
-        }
-
-        switch (num_tile_pipes) {
-        case 1:
-        case 3:
-        case 5:
-        case 7:
-                DRM_ERROR("odd number of pipes!\n");
-                break;
-        case 2:
-                swizzle_pipe[0] = 0;
-                swizzle_pipe[1] = 1;
-                break;
-        case 4:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 1;
-                        swizzle_pipe[3] = 3;
-                }
-                break;
-        case 6:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 1;
-                        swizzle_pipe[4] = 3;
-                        swizzle_pipe[5] = 5;
-                }
-                break;
-        case 8:
-                if (force_no_swizzle) {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 1;
-                        swizzle_pipe[2] = 2;
-                        swizzle_pipe[3] = 3;
-                        swizzle_pipe[4] = 4;
-                        swizzle_pipe[5] = 5;
-                        swizzle_pipe[6] = 6;
-                        swizzle_pipe[7] = 7;
-                } else {
-                        swizzle_pipe[0] = 0;
-                        swizzle_pipe[1] = 2;
-                        swizzle_pipe[2] = 4;
-                        swizzle_pipe[3] = 6;
-                        swizzle_pipe[4] = 1;
-                        swizzle_pipe[5] = 3;
-                        swizzle_pipe[6] = 5;
-                        swizzle_pipe[7] = 7;
-                }
-                break;
-        }
-
-        for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) {
-                while (((1 << cur_backend) & enabled_backends_mask) == 0)
-                        cur_backend = (cur_backend + 1) % SI_MAX_BACKENDS;
-
-                backend_map |= (((cur_backend & 0xf) << (swizzle_pipe[cur_pipe] * 4)));
-
-                cur_backend = (cur_backend + 1) % SI_MAX_BACKENDS;
-        }
-
-        return backend_map;
-}
-
-static u32 si_get_disable_mask_per_asic(struct radeon_device *rdev,
-                                        u32 disable_mask_per_se,
-                                        u32 max_disable_mask_per_se,
-                                        u32 num_shader_engines)
-{
-        u32 disable_field_width_per_se = r600_count_pipe_bits(disable_mask_per_se);
-        u32 disable_mask_per_asic = disable_mask_per_se & max_disable_mask_per_se;
-
-        if (num_shader_engines == 1)
-                return disable_mask_per_asic;
-        else if (num_shader_engines == 2)
-                return disable_mask_per_asic | (disable_mask_per_asic << disable_field_width_per_se);
-        else
-                return 0xffffffff;
-}
-
 static void si_tiling_mode_table_init(struct radeon_device *rdev)
 {
         const u32 num_tile_mode_states = 32;
@@ -1562,18 +1368,151 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev)
                 DRM_ERROR("unknown asic: 0x%x\n", rdev->family);
 }
 
+static void si_select_se_sh(struct radeon_device *rdev,
+                            u32 se_num, u32 sh_num)
+{
+        u32 data = INSTANCE_BROADCAST_WRITES;
+
+        if ((se_num == 0xffffffff) && (sh_num == 0xffffffff))
+                data = SH_BROADCAST_WRITES | SE_BROADCAST_WRITES;
+        else if (se_num == 0xffffffff)
+                data |= SE_BROADCAST_WRITES | SH_INDEX(sh_num);
+        else if (sh_num == 0xffffffff)
+                data |= SH_BROADCAST_WRITES | SE_INDEX(se_num);
+        else
+                data |= SH_INDEX(sh_num) | SE_INDEX(se_num);
+        WREG32(GRBM_GFX_INDEX, data);
+}
+
+static u32 si_create_bitmask(u32 bit_width)
+{
+        u32 i, mask = 0;
+
+        for (i = 0; i < bit_width; i++) {
+                mask <<= 1;
+                mask |= 1;
+        }
+        return mask;
+}
+
+static u32 si_get_cu_enabled(struct radeon_device *rdev, u32 cu_per_sh)
+{
+        u32 data, mask;
+
+        data = RREG32(CC_GC_SHADER_ARRAY_CONFIG);
+        if (data & 1)
+                data &= INACTIVE_CUS_MASK;
+        else
+                data = 0;
+        data |= RREG32(GC_USER_SHADER_ARRAY_CONFIG);
+
+        data >>= INACTIVE_CUS_SHIFT;
+
+        mask = si_create_bitmask(cu_per_sh);
+
+        return ~data & mask;
+}
+
+static void si_setup_spi(struct radeon_device *rdev,
+                         u32 se_num, u32 sh_per_se,
+                         u32 cu_per_sh)
+{
+        int i, j, k;
+        u32 data, mask, active_cu;
+
+        for (i = 0; i < se_num; i++) {
+                for (j = 0; j < sh_per_se; j++) {
+                        si_select_se_sh(rdev, i, j);
+                        data = RREG32(SPI_STATIC_THREAD_MGMT_3);
+                        active_cu = si_get_cu_enabled(rdev, cu_per_sh);
+
+                        mask = 1;
+                        for (k = 0; k < 16; k++) {
+                                mask <<= k;
+                                if (active_cu & mask) {
+                                        data &= ~mask;
+                                        WREG32(SPI_STATIC_THREAD_MGMT_3, data);
+                                        break;
+                                }
+                        }
+                }
+        }
+        si_select_se_sh(rdev, 0xffffffff, 0xffffffff);
+}
+
+static u32 si_get_rb_disabled(struct radeon_device *rdev,
+                              u32 max_rb_num, u32 se_num,
+                              u32 sh_per_se)
+{
+        u32 data, mask;
+
+        data = RREG32(CC_RB_BACKEND_DISABLE);
+        if (data & 1)
+                data &= BACKEND_DISABLE_MASK;
+        else
+                data = 0;
+        data |= RREG32(GC_USER_RB_BACKEND_DISABLE);
+
+        data >>= BACKEND_DISABLE_SHIFT;
+
+        mask = si_create_bitmask(max_rb_num / se_num / sh_per_se);
+
+        return data & mask;
+}
+
+static void si_setup_rb(struct radeon_device *rdev,
+                        u32 se_num, u32 sh_per_se,
+                        u32 max_rb_num)
+{
+        int i, j;
+        u32 data, mask;
+        u32 disabled_rbs = 0;
+        u32 enabled_rbs = 0;
+
+        for (i = 0; i < se_num; i++) {
+                for (j = 0; j < sh_per_se; j++) {
+                        si_select_se_sh(rdev, i, j);
+                        data = si_get_rb_disabled(rdev, max_rb_num, se_num, sh_per_se);
+                        disabled_rbs |= data << ((i * sh_per_se + j) * TAHITI_RB_BITMAP_WIDTH_PER_SH);
+                }
+        }
+        si_select_se_sh(rdev, 0xffffffff, 0xffffffff);
+
+        mask = 1;
+        for (i = 0; i < max_rb_num; i++) {
+                if (!(disabled_rbs & mask))
+                        enabled_rbs |= mask;
+                mask <<= 1;
+        }
+
+        for (i = 0; i < se_num; i++) {
+                si_select_se_sh(rdev, i, 0xffffffff);
+                data = 0;
+                for (j = 0; j < sh_per_se; j++) {
+                        switch (enabled_rbs & 3) {
+                        case 1:
+                                data |= (RASTER_CONFIG_RB_MAP_0 << (i * sh_per_se + j) * 2);
+                                break;
+                        case 2:
+                                data |= (RASTER_CONFIG_RB_MAP_3 << (i * sh_per_se + j) * 2);
+                                break;
+                        case 3:
+                        default:
+                                data |= (RASTER_CONFIG_RB_MAP_2 << (i * sh_per_se + j) * 2);
+                                break;
+                        }
+                        enabled_rbs >>= 2;
+                }
+                WREG32(PA_SC_RASTER_CONFIG, data);
+        }
+        si_select_se_sh(rdev, 0xffffffff, 0xffffffff);
+}
+
 static void si_gpu_init(struct radeon_device *rdev)
 {
-        u32 cc_rb_backend_disable = 0;
-        u32 cc_gc_shader_array_config;
         u32 gb_addr_config = 0;
         u32 mc_shared_chmap, mc_arb_ramcfg;
-        u32 gb_backend_map;
-        u32 cgts_tcc_disable;
         u32 sx_debug_1;
-        u32 gc_user_shader_array_config;
-        u32 gc_user_rb_backend_disable;
-        u32 cgts_user_tcc_disable;
         u32 hdp_host_path_cntl;
         u32 tmp;
         int i, j;
@@ -1581,9 +1520,9 @@ static void si_gpu_init(struct radeon_device *rdev)
         switch (rdev->family) {
         case CHIP_TAHITI:
                 rdev->config.si.max_shader_engines = 2;
-                rdev->config.si.max_pipes_per_simd = 4;
                 rdev->config.si.max_tile_pipes = 12;
-                rdev->config.si.max_simds_per_se = 8;
+                rdev->config.si.max_cu_per_sh = 8;
+                rdev->config.si.max_sh_per_se = 2;
                 rdev->config.si.max_backends_per_se = 4;
                 rdev->config.si.max_texture_channel_caches = 12;
                 rdev->config.si.max_gprs = 256;
@@ -1594,12 +1533,13 @@ static void si_gpu_init(struct radeon_device *rdev)
                 rdev->config.si.sc_prim_fifo_size_backend = 0x100;
                 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_PITCAIRN:
                 rdev->config.si.max_shader_engines = 2;
-                rdev->config.si.max_pipes_per_simd = 4;
                 rdev->config.si.max_tile_pipes = 8;
-                rdev->config.si.max_simds_per_se = 5;
+                rdev->config.si.max_cu_per_sh = 5;
+                rdev->config.si.max_sh_per_se = 2;
                 rdev->config.si.max_backends_per_se = 4;
                 rdev->config.si.max_texture_channel_caches = 8;
                 rdev->config.si.max_gprs = 256;
@@ -1610,13 +1550,14 @@ static void si_gpu_init(struct radeon_device *rdev)
                 rdev->config.si.sc_prim_fifo_size_backend = 0x100;
                 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN;
                 break;
         case CHIP_VERDE:
         default:
                 rdev->config.si.max_shader_engines = 1;
-                rdev->config.si.max_pipes_per_simd = 4;
                 rdev->config.si.max_tile_pipes = 4;
-                rdev->config.si.max_simds_per_se = 2;
+                rdev->config.si.max_cu_per_sh = 2;
+                rdev->config.si.max_sh_per_se = 2;
                 rdev->config.si.max_backends_per_se = 4;
                 rdev->config.si.max_texture_channel_caches = 4;
                 rdev->config.si.max_gprs = 256;
@@ -1627,6 +1568,7 @@ static void si_gpu_init(struct radeon_device *rdev)
                 rdev->config.si.sc_prim_fifo_size_backend = 0x40;
                 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
                 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
+                gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN;
                 break;
         }
 
@@ -1648,31 +1590,7 @@ static void si_gpu_init(struct radeon_device *rdev)
         mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
         mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
 
-        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE);
-        cc_gc_shader_array_config = RREG32(CC_GC_SHADER_ARRAY_CONFIG);
-        cgts_tcc_disable = 0xffff0000;
-        for (i = 0; i < rdev->config.si.max_texture_channel_caches; i++)
-                cgts_tcc_disable &= ~(1 << (16 + i));
-        gc_user_rb_backend_disable = RREG32(GC_USER_RB_BACKEND_DISABLE);
-        gc_user_shader_array_config = RREG32(GC_USER_SHADER_ARRAY_CONFIG);
-        cgts_user_tcc_disable = RREG32(CGTS_USER_TCC_DISABLE);
-
-        rdev->config.si.num_shader_engines = rdev->config.si.max_shader_engines;
         rdev->config.si.num_tile_pipes = rdev->config.si.max_tile_pipes;
-        tmp = ((~gc_user_rb_backend_disable) & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT;
-        rdev->config.si.num_backends_per_se = r600_count_pipe_bits(tmp);
-        tmp = (gc_user_rb_backend_disable & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT;
-        rdev->config.si.backend_disable_mask_per_asic =
-                si_get_disable_mask_per_asic(rdev, tmp, SI_MAX_BACKENDS_PER_SE_MASK,
-                                             rdev->config.si.num_shader_engines);
-        rdev->config.si.backend_map =
-                si_get_tile_pipe_to_backend_map(rdev, rdev->config.si.num_tile_pipes,
-                                                rdev->config.si.num_backends_per_se *
-                                                rdev->config.si.num_shader_engines,
-                                                &rdev->config.si.backend_disable_mask_per_asic,
-                                                rdev->config.si.num_shader_engines);
-        tmp = ((~cgts_user_tcc_disable) & TCC_DISABLE_MASK) >> TCC_DISABLE_SHIFT;
-        rdev->config.si.num_texture_channel_caches = r600_count_pipe_bits(tmp);
         rdev->config.si.mem_max_burst_length_bytes = 256;
         tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT;
         rdev->config.si.mem_row_size_in_kb = (4 * (1 << (8 + tmp))) / 1024;
@@ -1683,55 +1601,8 @@ static void si_gpu_init(struct radeon_device *rdev)
         rdev->config.si.num_gpus = 1;
         rdev->config.si.multi_gpu_tile_size = 64;
 
-        gb_addr_config = 0;
-        switch (rdev->config.si.num_tile_pipes) {
-        case 1:
-                gb_addr_config |= NUM_PIPES(0);
-                break;
-        case 2:
-                gb_addr_config |= NUM_PIPES(1);
-                break;
-        case 4:
-                gb_addr_config |= NUM_PIPES(2);
-                break;
-        case 8:
-        default:
-                gb_addr_config |= NUM_PIPES(3);
-                break;
-        }
-
-        tmp = (rdev->config.si.mem_max_burst_length_bytes / 256) - 1;
-        gb_addr_config |= PIPE_INTERLEAVE_SIZE(tmp);
-        gb_addr_config |= NUM_SHADER_ENGINES(rdev->config.si.num_shader_engines - 1);
-        tmp = (rdev->config.si.shader_engine_tile_size / 16) - 1;
-        gb_addr_config |= SHADER_ENGINE_TILE_SIZE(tmp);
-        switch (rdev->config.si.num_gpus) {
-        case 1:
-        default:
-                gb_addr_config |= NUM_GPUS(0);
-                break;
-        case 2:
-                gb_addr_config |= NUM_GPUS(1);
-                break;
-        case 4:
-                gb_addr_config |= NUM_GPUS(2);
-                break;
-        }
-        switch (rdev->config.si.multi_gpu_tile_size) {
-        case 16:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(0);
-                break;
-        case 32:
-        default:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(1);
-                break;
-        case 64:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(2);
-                break;
-        case 128:
-                gb_addr_config |= MULTI_GPU_TILE_SIZE(3);
-                break;
-        }
+        /* fix up row size */
+        gb_addr_config &= ~ROW_SIZE_MASK;
         switch (rdev->config.si.mem_row_size_in_kb) {
         case 1:
         default:
@@ -1745,26 +1616,6 @@ static void si_gpu_init(struct radeon_device *rdev)
                 break;
         }
 
-        tmp = (gb_addr_config & NUM_PIPES_MASK) >> NUM_PIPES_SHIFT;
-        rdev->config.si.num_tile_pipes = (1 << tmp);
-        tmp = (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT;
-        rdev->config.si.mem_max_burst_length_bytes = (tmp + 1) * 256;
-        tmp = (gb_addr_config & NUM_SHADER_ENGINES_MASK) >> NUM_SHADER_ENGINES_SHIFT;
-        rdev->config.si.num_shader_engines = tmp + 1;
-        tmp = (gb_addr_config & NUM_GPUS_MASK) >> NUM_GPUS_SHIFT;
-        rdev->config.si.num_gpus = tmp + 1;
-        tmp = (gb_addr_config & MULTI_GPU_TILE_SIZE_MASK) >> MULTI_GPU_TILE_SIZE_SHIFT;
-        rdev->config.si.multi_gpu_tile_size = 1 << tmp;
-        tmp = (gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT;
-        rdev->config.si.mem_row_size_in_kb = 1 << tmp;
-
-        gb_backend_map =
-                si_get_tile_pipe_to_backend_map(rdev, rdev->config.si.num_tile_pipes,
-                                                rdev->config.si.num_backends_per_se *
-                                                rdev->config.si.num_shader_engines,
-                                                &rdev->config.si.backend_disable_mask_per_asic,
-                                                rdev->config.si.num_shader_engines);
-
         /* setup tiling info dword.  gb_addr_config is not adequate since it does
          * not have bank info, so create a custom tiling dword.
          * bits 3:0   num_pipes
@@ -1789,33 +1640,29 @@ static void si_gpu_init(struct radeon_device *rdev)
                 rdev->config.si.tile_config |= (3 << 0);
                 break;
         }
-        rdev->config.si.tile_config |=
-                ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4;
+        if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT)
+                rdev->config.si.tile_config |= 1 << 4;
+        else
+                rdev->config.si.tile_config |= 0 << 4;
         rdev->config.si.tile_config |=
                 ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8;
         rdev->config.si.tile_config |=
                 ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12;
 
-        rdev->config.si.backend_map = gb_backend_map;
         WREG32(GB_ADDR_CONFIG, gb_addr_config);
         WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
         WREG32(HDP_ADDR_CONFIG, gb_addr_config);
 
-        /* primary versions */
-        WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(CC_GC_SHADER_ARRAY_CONFIG, cc_gc_shader_array_config);
-
-        WREG32(CGTS_TCC_DISABLE, cgts_tcc_disable);
+        si_tiling_mode_table_init(rdev);
 
-        /* user versions */
-        WREG32(GC_USER_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(GC_USER_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
-        WREG32(GC_USER_SHADER_ARRAY_CONFIG, cc_gc_shader_array_config);
+        si_setup_rb(rdev, rdev->config.si.max_shader_engines,
+                    rdev->config.si.max_sh_per_se,
+                    rdev->config.si.max_backends_per_se);
 
-        WREG32(CGTS_USER_TCC_DISABLE, cgts_tcc_disable);
+        si_setup_spi(rdev, rdev->config.si.max_shader_engines,
+                     rdev->config.si.max_sh_per_se,
+                     rdev->config.si.max_cu_per_sh);
 
-        si_tiling_mode_table_init(rdev);
 
         /* set HW defaults for 3D engine */
         WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) |
diff --git a/drivers/gpu/drm/radeon/si_reg.h b/drivers/gpu/drm/radeon/si_reg.h
index eda938a7cb6e..501f9d431d57 100644
--- a/drivers/gpu/drm/radeon/si_reg.h
+++ b/drivers/gpu/drm/radeon/si_reg.h
@@ -30,4 +30,76 @@
 #define SI_DC_GPIO_HPD_EN                        0x65b8
 #define SI_DC_GPIO_HPD_Y                         0x65bc
 
+#define SI_GRPH_CONTROL                          0x6804
+#       define SI_GRPH_DEPTH(x)                  (((x) & 0x3) << 0)
+#       define SI_GRPH_DEPTH_8BPP                0
+#       define SI_GRPH_DEPTH_16BPP               1
+#       define SI_GRPH_DEPTH_32BPP               2
+#       define SI_GRPH_NUM_BANKS(x)              (((x) & 0x3) << 2)
+#       define SI_ADDR_SURF_2_BANK               0
+#       define SI_ADDR_SURF_4_BANK               1
+#       define SI_ADDR_SURF_8_BANK               2
+#       define SI_ADDR_SURF_16_BANK              3
+#       define SI_GRPH_Z(x)                      (((x) & 0x3) << 4)
+#       define SI_GRPH_BANK_WIDTH(x)             (((x) & 0x3) << 6)
+#       define SI_ADDR_SURF_BANK_WIDTH_1         0
+#       define SI_ADDR_SURF_BANK_WIDTH_2         1
+#       define SI_ADDR_SURF_BANK_WIDTH_4         2
+#       define SI_ADDR_SURF_BANK_WIDTH_8         3
+#       define SI_GRPH_FORMAT(x)                 (((x) & 0x7) << 8)
+/* 8 BPP */
+#       define SI_GRPH_FORMAT_INDEXED            0
+/* 16 BPP */
+#       define SI_GRPH_FORMAT_ARGB1555           0
+#       define SI_GRPH_FORMAT_ARGB565            1
+#       define SI_GRPH_FORMAT_ARGB4444           2
+#       define SI_GRPH_FORMAT_AI88               3
+#       define SI_GRPH_FORMAT_MONO16             4
+#       define SI_GRPH_FORMAT_BGRA5551           5
+/* 32 BPP */
+#       define SI_GRPH_FORMAT_ARGB8888           0
+#       define SI_GRPH_FORMAT_ARGB2101010        1
+#       define SI_GRPH_FORMAT_32BPP_DIG          2
+#       define SI_GRPH_FORMAT_8B_ARGB2101010     3
+#       define SI_GRPH_FORMAT_BGRA1010102        4
+#       define SI_GRPH_FORMAT_8B_BGRA1010102     5
+#       define SI_GRPH_FORMAT_RGB111110          6
+#       define SI_GRPH_FORMAT_BGR101111          7
+#       define SI_GRPH_BANK_HEIGHT(x)            (((x) & 0x3) << 11)
+#       define SI_ADDR_SURF_BANK_HEIGHT_1        0
+#       define SI_ADDR_SURF_BANK_HEIGHT_2        1
+#       define SI_ADDR_SURF_BANK_HEIGHT_4        2
+#       define SI_ADDR_SURF_BANK_HEIGHT_8        3
+#       define SI_GRPH_TILE_SPLIT(x)             (((x) & 0x7) << 13)
+#       define SI_ADDR_SURF_TILE_SPLIT_64B       0
+#       define SI_ADDR_SURF_TILE_SPLIT_128B      1
+#       define SI_ADDR_SURF_TILE_SPLIT_256B      2
+#       define SI_ADDR_SURF_TILE_SPLIT_512B      3
+#       define SI_ADDR_SURF_TILE_SPLIT_1KB       4
+#       define SI_ADDR_SURF_TILE_SPLIT_2KB       5
+#       define SI_ADDR_SURF_TILE_SPLIT_4KB       6
+#       define SI_GRPH_MACRO_TILE_ASPECT(x)      (((x) & 0x3) << 18)
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_1  0
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_2  1
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_4  2
+#       define SI_ADDR_SURF_MACRO_TILE_ASPECT_8  3
+#       define SI_GRPH_ARRAY_MODE(x)             (((x) & 0x7) << 20)
+#       define SI_GRPH_ARRAY_LINEAR_GENERAL      0
+#       define SI_GRPH_ARRAY_LINEAR_ALIGNED      1
+#       define SI_GRPH_ARRAY_1D_TILED_THIN1      2
+#       define SI_GRPH_ARRAY_2D_TILED_THIN1      4
+#       define SI_GRPH_PIPE_CONFIG(x)            (((x) & 0x1f) << 24)
+#       define SI_ADDR_SURF_P2                   0
+#       define SI_ADDR_SURF_P4_8x16              4
+#       define SI_ADDR_SURF_P4_16x16             5
+#       define SI_ADDR_SURF_P4_16x32             6
+#       define SI_ADDR_SURF_P4_32x32             7
+#       define SI_ADDR_SURF_P8_16x16_8x16        8
+#       define SI_ADDR_SURF_P8_16x32_8x16        9
+#       define SI_ADDR_SURF_P8_32x32_8x16        10
+#       define SI_ADDR_SURF_P8_16x32_16x16       11
+#       define SI_ADDR_SURF_P8_32x32_16x16       12
+#       define SI_ADDR_SURF_P8_32x32_16x32       13
+#       define SI_ADDR_SURF_P8_32x64_32x32       14
+
 #endif
diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h
index 53ea2c42dbd6..db4067962868 100644
--- a/drivers/gpu/drm/radeon/sid.h
+++ b/drivers/gpu/drm/radeon/sid.h
@@ -24,6 +24,11 @@
 #ifndef SI_H
 #define SI_H
 
+#define TAHITI_RB_BITMAP_WIDTH_PER_SH  2
+
+#define TAHITI_GB_ADDR_CONFIG_GOLDEN        0x12011003
+#define VERDE_GB_ADDR_CONFIG_GOLDEN         0x12010002
+
 #define CG_MULT_THERMAL_STATUS                                  0x714
 #define         ASIC_MAX_TEMP(x)                                ((x) << 0)
 #define         ASIC_MAX_TEMP_MASK                              0x000001ff
@@ -408,6 +413,12 @@
 #define         SOFT_RESET_IA                                   (1 << 15)
 
 #define GRBM_GFX_INDEX                                  0x802C
+#define         INSTANCE_INDEX(x)                       ((x) << 0)
+#define         SH_INDEX(x)                             ((x) << 8)
+#define         SE_INDEX(x)                             ((x) << 16)
+#define         SH_BROADCAST_WRITES                     (1 << 29)
+#define         INSTANCE_BROADCAST_WRITES               (1 << 30)
+#define         SE_BROADCAST_WRITES                     (1 << 31)
 
 #define GRBM_INT_CNTL                                   0x8060
 #       define RDERR_INT_ENABLE                         (1 << 0)
@@ -480,6 +491,8 @@
 #define VGT_TF_MEMORY_BASE                              0x89B8
 
 #define CC_GC_SHADER_ARRAY_CONFIG                       0x89bc
+#define         INACTIVE_CUS_MASK                       0xFFFF0000
+#define         INACTIVE_CUS_SHIFT                      16
 #define GC_USER_SHADER_ARRAY_CONFIG                     0x89c0
 
 #define PA_CL_ENHANCE                                   0x8A14
@@ -688,6 +701,12 @@
 #define RLC_MC_CNTL                                       0xC344
 #define RLC_UCODE_CNTL                                    0xC348
 
+#define PA_SC_RASTER_CONFIG                             0x28350
+#       define RASTER_CONFIG_RB_MAP_0                   0
+#       define RASTER_CONFIG_RB_MAP_1                   1
+#       define RASTER_CONFIG_RB_MAP_2                   2
+#       define RASTER_CONFIG_RB_MAP_3                   3
+
 #define VGT_EVENT_INITIATOR                             0x28a90
 #       define SAMPLE_STREAMOUTSTATS1                   (1 << 0)
 #       define SAMPLE_STREAMOUTSTATS2                   (2 << 0)
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 30d98d14b5c5..dd14cd1a0033 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,9 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
         if (dev_priv == NULL)
                 return -ENOMEM;
 
+        idr_init(&dev_priv->object_idr);
         dev->dev_private = (void *)dev_priv;
         dev_priv->chipset = chipset;
-        idr_init(&dev->object_name_idr);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 36792bd4da77..36f4b28c1b90 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1204,6 +1204,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
                         (*destroy)(bo);
                 else
                         kfree(bo);
+                ttm_mem_global_free(mem_glob, acc_size);
                 return -EINVAL;
         }
         bo->destroy = destroy;
@@ -1307,22 +1308,14 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
                         struct ttm_buffer_object **p_bo)
 {
         struct ttm_buffer_object *bo;
-        struct ttm_mem_global *mem_glob = bdev->glob->mem_glob;
         size_t acc_size;
         int ret;
 
-        acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
-        ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);
-        if (unlikely(ret != 0))
-                return ret;
-
         bo = kzalloc(sizeof(*bo), GFP_KERNEL);
-
-        if (unlikely(bo == NULL)) {
-                ttm_mem_global_free(mem_glob, acc_size);
+        if (unlikely(bo == NULL))
                 return -ENOMEM;
-        }
 
+        acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
         ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
                                 buffer_start, interruptible,
                           persistent_swap_storage, acc_size, NULL, NULL);
@@ -1834,6 +1827,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
                         spin_unlock(&glob->lru_lock);
                         (void) ttm_bo_cleanup_refs(bo, false, false, false);
                         kref_put(&bo->list_kref, ttm_bo_release_list);
+                        spin_lock(&glob->lru_lock);
                         continue;
                 }
 
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 4d02c46a9420..6e52069894b3 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -13,8 +13,21 @@
 
 static struct drm_driver driver;
 
+/*
+ * There are many DisplayLink-based graphics products, all with unique PIDs.
+ * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff)
+ * We also require a match on SubClass (0x00) and Protocol (0x00),
+ * which is compatible with all known USB 2.0 era graphics chips and firmware,
+ * but allows DisplayLink to increment those for any future incompatible chips
+ */
 static struct usb_device_id id_table[] = {
-        {.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,},
+        {.idVendor = 0x17e9, .bInterfaceClass = 0xff,
+         .bInterfaceSubClass = 0x00,
+         .bInterfaceProtocol = 0x00,
+         .match_flags = USB_DEVICE_ID_MATCH_VENDOR |
+                        USB_DEVICE_ID_MATCH_INT_CLASS |
+                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
+                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
         {},
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index 1f182254e81e..c126182ac07e 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -100,12 +100,11 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
         if (dev_priv == NULL)
                 return -ENOMEM;
 
+        idr_init(&dev_priv->object_idr);
         dev->dev_private = (void *)dev_priv;
 
         dev_priv->chipset = chipset;
 
-        idr_init(&dev->object_name_idr);
-
         pci_set_master(dev->pdev);
 
         ret = drm_vblank_init(dev, 1);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
index 51c9ba5cd2fb..21ee78226560 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c
@@ -66,7 +66,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv,
         cmd += sizeof(remap_cmd) / sizeof(uint32);
 
         for (i = 0; i < num_pages; ++i) {
-                if (VMW_PPN_SIZE > 4)
+                if (VMW_PPN_SIZE <= 4)
                         *cmd = page_to_pfn(*pages++);
                 else
                         *((uint64_t *)cmd) = page_to_pfn(*pages++);
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 38f9534ac513..5b3c7d135dc9 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -190,6 +190,19 @@ find_active_client(struct list_head *head)
         return NULL;
 }
 
+int vga_switcheroo_get_client_state(struct pci_dev *pdev)
+{
+        struct vga_switcheroo_client *client;
+
+        client = find_client_from_pci(&vgasr_priv.clients, pdev);
+        if (!client)
+                return VGA_SWITCHEROO_NOT_FOUND;
+        if (!vgasr_priv.active)
+                return VGA_SWITCHEROO_INIT;
+        return client->pwr_state;
+}
+EXPORT_SYMBOL(vga_switcheroo_get_client_state);
+
 void vga_switcheroo_unregister_client(struct pci_dev *pdev)
 {
         struct vga_switcheroo_client *client;
@@ -291,8 +304,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
                 vga_switchon(new_client);
 
         vga_set_default_device(new_client->pdev);
-        set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
-
         return 0;
 }
 
@@ -308,6 +319,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 
         active->active = false;
 
+        set_audio_state(active->id, VGA_SWITCHEROO_OFF);
+
         if (new_client->fb_info) {
                 struct fb_event event;
                 event.info = new_client->fb_info;
@@ -321,11 +334,11 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
         if (new_client->ops->reprobe)
                 new_client->ops->reprobe(new_client->pdev);
 
-        set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-
         if (active->pwr_state == VGA_SWITCHEROO_ON)
                 vga_switchoff(active);
 
+        set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
+
         new_client->active = true;
         return 0;
 }
@@ -371,8 +384,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
         /* pwr off the device not in use */
         if (strncmp(usercmd, "OFF", 3) == 0) {
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active)
+                        if (client->active || client_is_audio(client))
                                 continue;
+                        set_audio_state(client->id, VGA_SWITCHEROO_OFF);
                         if (client->pwr_state == VGA_SWITCHEROO_ON)
                                 vga_switchoff(client);
                 }
@@ -381,10 +395,11 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
         /* pwr on the device not in use */
         if (strncmp(usercmd, "ON", 2) == 0) {
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active)
+                        if (client->active || client_is_audio(client))
                                 continue;
                         if (client->pwr_state == VGA_SWITCHEROO_OFF)
                                 vga_switchon(client);
+                        set_audio_state(client->id, VGA_SWITCHEROO_ON);
                 }
                 goto out;
         }
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index f082e48ab113..70d62f5bc909 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -215,7 +215,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
         int i;
 
         if (send_command(cmd) || send_argument(key)) {
-                pr_warn("%s: read arg fail\n", key);
+                pr_warn("%.4s: read arg fail\n", key);
                 return -EIO;
         }
 
@@ -223,7 +223,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)
 
         for (i = 0; i < len; i++) {
                 if (__wait_status(0x05)) {
-                        pr_warn("%s: read data fail\n", key);
+                        pr_warn("%.4s: read data fail\n", key);
                         return -EIO;
                 }
                 buffer[i] = inb(APPLESMC_DATA_PORT);
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index b9d512331ed4..7f1feb2f467a 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -191,6 +191,24 @@ static ssize_t show_temp(struct device *dev,
         return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN;
 }
 
+struct tjmax {
+        char const *id;
+        int tjmax;
+};
+
+static struct tjmax __cpuinitconst tjmax_table[] = {
+        { "CPU D410", 100000 },
+        { "CPU D425", 100000 },
+        { "CPU D510", 100000 },
+        { "CPU D525", 100000 },
+        { "CPU N450", 100000 },
+        { "CPU N455", 100000 },
+        { "CPU N470", 100000 },
+        { "CPU N475", 100000 },
+        { "CPU  230", 100000 },
+        { "CPU  330", 125000 },
+};
+
 static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
                                   struct device *dev)
 {
@@ -202,6 +220,13 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
         int err;
         u32 eax, edx;
         struct pci_dev *host_bridge;
+        int i;
+
+        /* explicit tjmax table entries override heuristics */
+        for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) {
+                if (strstr(c->x86_model_id, tjmax_table[i].id))
+                        return tjmax_table[i].tjmax;
+        }
 
         /* Early chips have no MSR for TjMax */
 
@@ -210,7 +235,8 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
 
         /* Atom CPUs */
 
-        if (c->x86_model == 0x1c) {
+        if (c->x86_model == 0x1c || c->x86_model == 0x26
+            || c->x86_model == 0x27) {
                 usemsr_ee = 0;
 
                 host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
@@ -223,6 +249,9 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
                         tjmax = 90000;
 
                 pci_dev_put(host_bridge);
+        } else if (c->x86_model == 0x36) {
+                usemsr_ee = 0;
+                tjmax = 100000;
         }
 
         if (c->x86_model > 0xe && usemsr_ee) {
@@ -772,7 +801,7 @@ MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);
 
 static int __init coretemp_init(void)
 {
-        int i, err = -ENODEV;
+        int i, err;
 
         /*
          * CPUID.06H.EAX[0] indicates whether the CPU has thermal
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c
index 9691f664c76e..e7d234b59312 100644
--- a/drivers/hwmon/emc2103.c
+++ b/drivers/hwmon/emc2103.c
@@ -451,11 +451,15 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,
                 data->fan_rpm_control = true;
                 break;
         default:
-                mutex_unlock(&data->update_lock);
-                return -EINVAL;
+                count = -EINVAL;
+                goto err;
         }
 
-        read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);
+        result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg);
+        if (result) {
+                count = result;
+                goto err;
+        }
 
         if (data->fan_rpm_control)
                 conf_reg |= 0x80;
@@ -463,7 +467,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,
                 conf_reg &= ~0x80;
 
         i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg);
-
+err:
         mutex_unlock(&data->update_lock);
         return count;
 }
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index beb2491db274..a0edd9854218 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -37,4 +37,16 @@ config I2C_MUX_PCA954x
           This driver can also be built as a module.  If so, the module
           will be called i2c-mux-pca954x.
 
+config I2C_MUX_PINCTRL
+        tristate "pinctrl-based I2C multiplexer"
+        depends on PINCTRL
+        help
+          If you say yes to this option, support will be included for an I2C
+          multiplexer that uses the pinctrl subsystem, i.e. pin multiplexing.
+          This is useful for SoCs whose I2C module's signals can be routed to
+          different sets of pins at run-time.
+
+          This driver can also be built as a module. If so, the module will be
+          called pinctrl-i2cmux.
+
 endmenu
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index 5826249b29ca..76da8692afff 100644
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -4,5 +4,6 @@
 obj-$(CONFIG_I2C_MUX_GPIO)      += i2c-mux-gpio.o
 obj-$(CONFIG_I2C_MUX_PCA9541)   += i2c-mux-pca9541.o
 obj-$(CONFIG_I2C_MUX_PCA954x)   += i2c-mux-pca954x.o
+obj-$(CONFIG_I2C_MUX_PINCTRL)   += i2c-mux-pinctrl.o
 
 ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
new file mode 100644
index 000000000000..46a669763476
--- /dev/null
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -0,0 +1,279 @@
+/*
+ * I2C multiplexer using pinctrl API
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/i2c.h>
+#include <linux/i2c-mux.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_i2c.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/i2c-mux-pinctrl.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+struct i2c_mux_pinctrl {
+        struct device *dev;
+        struct i2c_mux_pinctrl_platform_data *pdata;
+        struct pinctrl *pinctrl;
+        struct pinctrl_state **states;
+        struct pinctrl_state *state_idle;
+        struct i2c_adapter *parent;
+        struct i2c_adapter **busses;
+};
+
+static int i2c_mux_pinctrl_select(struct i2c_adapter *adap, void *data,
+                                  u32 chan)
+{
+        struct i2c_mux_pinctrl *mux = data;
+
+        return pinctrl_select_state(mux->pinctrl, mux->states[chan]);
+}
+
+static int i2c_mux_pinctrl_deselect(struct i2c_adapter *adap, void *data,
+                                    u32 chan)
+{
+        struct i2c_mux_pinctrl *mux = data;
+
+        return pinctrl_select_state(mux->pinctrl, mux->state_idle);
+}
+
+#ifdef CONFIG_OF
+static int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
+                                struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        int num_names, i, ret;
+        struct device_node *adapter_np;
+        struct i2c_adapter *adapter;
+
+        if (!np)
+                return 0;
+
+        mux->pdata = devm_kzalloc(&pdev->dev, sizeof(*mux->pdata), GFP_KERNEL);
+        if (!mux->pdata) {
+                dev_err(mux->dev,
+                        "Cannot allocate i2c_mux_pinctrl_platform_data\n");
+                return -ENOMEM;
+        }
+
+        num_names = of_property_count_strings(np, "pinctrl-names");
+        if (num_names < 0) {
+                dev_err(mux->dev, "Cannot parse pinctrl-names: %d\n",
+                        num_names);
+                return num_names;
+        }
+
+        mux->pdata->pinctrl_states = devm_kzalloc(&pdev->dev,
+                sizeof(*mux->pdata->pinctrl_states) * num_names,
+                GFP_KERNEL);
+        if (!mux->pdata->pinctrl_states) {
+                dev_err(mux->dev, "Cannot allocate pinctrl_states\n");
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < num_names; i++) {
+                ret = of_property_read_string_index(np, "pinctrl-names", i,
+                        &mux->pdata->pinctrl_states[mux->pdata->bus_count]);
+                if (ret < 0) {
+                        dev_err(mux->dev, "Cannot parse pinctrl-names: %d\n",
+                                ret);
+                        return ret;
+                }
+                if (!strcmp(mux->pdata->pinctrl_states[mux->pdata->bus_count],
+                            "idle")) {
+                        if (i != num_names - 1) {
+                                dev_err(mux->dev, "idle state must be last\n");
+                                return -EINVAL;
+                        }
+                        mux->pdata->pinctrl_state_idle = "idle";
+                } else {
+                        mux->pdata->bus_count++;
+                }
+        }
+
+        adapter_np = of_parse_phandle(np, "i2c-parent", 0);
+        if (!adapter_np) {
+                dev_err(mux->dev, "Cannot parse i2c-parent\n");
+                return -ENODEV;
+        }
+        adapter = of_find_i2c_adapter_by_node(adapter_np);
+        if (!adapter) {
+                dev_err(mux->dev, "Cannot find parent bus\n");
+                return -ENODEV;
+        }
+        mux->pdata->parent_bus_num = i2c_adapter_id(adapter);
+        put_device(&adapter->dev);
+
+        return 0;
+}
+#else
+static inline int i2c_mux_pinctrl_parse_dt(struct i2c_mux_pinctrl *mux,
+                                           struct platform_device *pdev)
+{
+        return 0;
+}
+#endif
+
+static int __devinit i2c_mux_pinctrl_probe(struct platform_device *pdev)
+{
+        struct i2c_mux_pinctrl *mux;
+        int (*deselect)(struct i2c_adapter *, void *, u32);
+        int i, ret;
+
+        mux = devm_kzalloc(&pdev->dev, sizeof(*mux), GFP_KERNEL);
+        if (!mux) {
+                dev_err(&pdev->dev, "Cannot allocate i2c_mux_pinctrl\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+        platform_set_drvdata(pdev, mux);
+
+        mux->dev = &pdev->dev;
+
+        mux->pdata = pdev->dev.platform_data;
+        if (!mux->pdata) {
+                ret = i2c_mux_pinctrl_parse_dt(mux, pdev);
+                if (ret < 0)
+                        goto err;
+        }
+        if (!mux->pdata) {
+                dev_err(&pdev->dev, "Missing platform data\n");
+                ret = -ENODEV;
+                goto err;
+        }
+
+        mux->states = devm_kzalloc(&pdev->dev,
+                                   sizeof(*mux->states) * mux->pdata->bus_count,
+                                   GFP_KERNEL);
+        if (!mux->states) {
+                dev_err(&pdev->dev, "Cannot allocate states\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        mux->busses = devm_kzalloc(&pdev->dev,
+                                   sizeof(mux->busses) * mux->pdata->bus_count,
+                                   GFP_KERNEL);
+        if (!mux->states) {
+                dev_err(&pdev->dev, "Cannot allocate busses\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        mux->pinctrl = devm_pinctrl_get(&pdev->dev);
+        if (IS_ERR(mux->pinctrl)) {
+                ret = PTR_ERR(mux->pinctrl);
+                dev_err(&pdev->dev, "Cannot get pinctrl: %d\n", ret);
+                goto err;
+        }
+        for (i = 0; i < mux->pdata->bus_count; i++) {
+                mux->states[i] = pinctrl_lookup_state(mux->pinctrl,
+                                                mux->pdata->pinctrl_states[i]);
+                        if (IS_ERR(mux->states[i])) {
+                                ret = PTR_ERR(mux->states[i]);
+                                dev_err(&pdev->dev,
+                                        "Cannot look up pinctrl state %s: %d\n",
+                                        mux->pdata->pinctrl_states[i], ret);
+                                goto err;
+                        }
+        }
+        if (mux->pdata->pinctrl_state_idle) {
+                mux->state_idle = pinctrl_lookup_state(mux->pinctrl,
+                                                mux->pdata->pinctrl_state_idle);
+                if (IS_ERR(mux->state_idle)) {
+                        ret = PTR_ERR(mux->state_idle);
+                        dev_err(&pdev->dev,
+                                "Cannot look up pinctrl state %s: %d\n",
+                                mux->pdata->pinctrl_state_idle, ret);
+                        goto err;
+                }
+
+                deselect = i2c_mux_pinctrl_deselect;
+        } else {
+                deselect = NULL;
+        }
+
+        mux->parent = i2c_get_adapter(mux->pdata->parent_bus_num);
+        if (!mux->parent) {
+                dev_err(&pdev->dev, "Parent adapter (%d) not found\n",
+                        mux->pdata->parent_bus_num);
+                ret = -ENODEV;
+                goto err;
+        }
+
+        for (i = 0; i < mux->pdata->bus_count; i++) {
+                u32 bus = mux->pdata->base_bus_num ?
+                                (mux->pdata->base_bus_num + i) : 0;
+
+                mux->busses[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev,
+                                                     mux, bus, i,
+                                                     i2c_mux_pinctrl_select,
+                                                     deselect);
+                if (!mux->busses[i]) {
+                        ret = -ENODEV;
+                        dev_err(&pdev->dev, "Failed to add adapter %d\n", i);
+                        goto err_del_adapter;
+                }
+        }
+
+        return 0;
+
+err_del_adapter:
+        for (; i > 0; i--)
+                i2c_del_mux_adapter(mux->busses[i - 1]);
+        i2c_put_adapter(mux->parent);
+err:
+        return ret;
+}
+
+static int __devexit i2c_mux_pinctrl_remove(struct platform_device *pdev)
+{
+        struct i2c_mux_pinctrl *mux = platform_get_drvdata(pdev);
+        int i;
+
+        for (i = 0; i < mux->pdata->bus_count; i++)
+                i2c_del_mux_adapter(mux->busses[i]);
+
+        i2c_put_adapter(mux->parent);
+
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id i2c_mux_pinctrl_of_match[] __devinitconst = {
+        { .compatible = "i2c-mux-pinctrl", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, i2c_mux_pinctrl_of_match);
+#endif
+
+static struct platform_driver i2c_mux_pinctrl_driver = {
+        .driver = {
+                .name   = "i2c-mux-pinctrl",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match),
+        },
+        .probe  = i2c_mux_pinctrl_probe,
+        .remove = __devexit_p(i2c_mux_pinctrl_remove),
+};
+module_platform_driver(i2c_mux_pinctrl_driver);
+
+MODULE_DESCRIPTION("pinctrl-based I2C multiplexer driver");
+MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:i2c-mux-pinctrl");
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 8716066a2f2b..bcb507b0cfd4 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -236,7 +236,7 @@ static const struct ide_port_ops icside_v6_no_dma_port_ops = {
  */
 static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-        unsigned long cycle_time;
+        unsigned long cycle_time = 0;
         int use_dma_info = 0;
         const u8 xfer_mode = drive->dma_mode;
 
@@ -271,9 +271,9 @@ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 
         ide_set_drivedata(drive, (void *)cycle_time);
 
-        printk("%s: %s selected (peak %dMB/s)\n", drive->name,
-                ide_xfer_verbose(xfer_mode),
-                2000 / (unsigned long)ide_get_drivedata(drive));
+        printk(KERN_INFO "%s: %s selected (peak %luMB/s)\n",
+               drive->name, ide_xfer_verbose(xfer_mode),
+               2000 / (cycle_time ? cycle_time : (unsigned long) -1));
 }
 
 static const struct ide_port_ops icside_v6_port_ops = {
@@ -375,8 +375,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = {
         .dma_test_irq           = icside_dma_test_irq,
         .dma_lost_irq           = ide_dma_lost_irq,
 };
-#else
-#define icside_v6_dma_ops NULL
 #endif
 
 static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
@@ -456,7 +454,6 @@ err_free:
 static const struct ide_port_info icside_v6_port_info __initdata = {
         .init_dma               = icside_dma_off_init,
         .port_ops               = &icside_v6_no_dma_port_ops,
-        .dma_ops                = &icside_v6_dma_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
         .mwdma_mask             = ATA_MWDMA2,
         .swdma_mask             = ATA_SWDMA2,
@@ -518,11 +515,13 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
 
         ecard_set_drvdata(ec, state);
 
+#ifdef CONFIG_BLK_DEV_IDEDMA_ICS
         if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {
                 d.init_dma = icside_dma_init;
                 d.port_ops = &icside_v6_port_ops;
-        } else
-                d.dma_ops = NULL;
+                d.dma_ops  = &icside_v6_dma_ops;
+        }
+#endif
 
         ret = ide_host_register(host, &d, hws);
         if (ret)
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 28e344ea514c..f1e922e2479a 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -167,7 +167,8 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev, void *priv_data)
 {
         int *is_kme = priv_data;
 
-        if (!(pdev->resource[0]->flags & IO_DATA_PATH_WIDTH_8)) {
+        if ((pdev->resource[0]->flags & IO_DATA_PATH_WIDTH)
+            != IO_DATA_PATH_WIDTH_8) {
                 pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
                 pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
         }
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 56eecefcec75..2ec93da41e2c 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -8,8 +8,7 @@ menuconfig IIO
         help
           The industrial I/O subsystem provides a unified framework for
           drivers for many different types of embedded sensors using a
-          number of different physical interfaces (i2c, spi, etc). See
-          Documentation/iio for more information.
+          number of different physical interfaces (i2c, spi, etc).
 
 if IIO
 
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 1ddd8861c71b..4f947e4377ef 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -661,7 +661,6 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
          * New channel registration method - relies on the fact a group does
          * not need to be initialized if it is name is NULL.
          */
-        INIT_LIST_HEAD(&indio_dev->channel_attr_list);
         if (indio_dev->channels)
                 for (i = 0; i < indio_dev->num_channels; i++) {
                         ret = iio_device_add_channel_sysfs(indio_dev,
@@ -725,12 +724,16 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
 static void iio_dev_release(struct device *device)
 {
         struct iio_dev *indio_dev = dev_to_iio_dev(device);
-        cdev_del(&indio_dev->chrdev);
+        if (indio_dev->chrdev.dev)
+                cdev_del(&indio_dev->chrdev);
         if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
                 iio_device_unregister_trigger_consumer(indio_dev);
         iio_device_unregister_eventset(indio_dev);
         iio_device_unregister_sysfs(indio_dev);
         iio_device_unregister_debugfs(indio_dev);
+
+        ida_simple_remove(&iio_ida, indio_dev->id);
+        kfree(indio_dev);
 }
 
 static struct device_type iio_dev_type = {
@@ -761,6 +764,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)
                 dev_set_drvdata(&dev->dev, (void *)dev);
                 mutex_init(&dev->mlock);
                 mutex_init(&dev->info_exist_lock);
+                INIT_LIST_HEAD(&dev->channel_attr_list);
 
                 dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL);
                 if (dev->id < 0) {
@@ -778,10 +782,8 @@ EXPORT_SYMBOL(iio_device_alloc);
 
 void iio_device_free(struct iio_dev *dev)
 {
-        if (dev) {
-                ida_simple_remove(&iio_ida, dev->id);
-                kfree(dev);
-        }
+        if (dev)
+                put_device(&dev->dev);
 }
 EXPORT_SYMBOL(iio_device_free);
 
@@ -902,7 +904,7 @@ void iio_device_unregister(struct iio_dev *indio_dev)
         mutex_lock(&indio_dev->info_exist_lock);
         indio_dev->info = NULL;
         mutex_unlock(&indio_dev->info_exist_lock);
-        device_unregister(&indio_dev->dev);
+        device_del(&indio_dev->dev);
 }
 EXPORT_SYMBOL(iio_device_unregister);
 subsys_initcall(iio_init);
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 55d5642eb10a..2e826f9702c6 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1184,7 +1184,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event,
 
 static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_event)
 {
-        return (((ib_event->event == IB_CM_REQ_RECEIVED) ||
+        return (((ib_event->event == IB_CM_REQ_RECEIVED) &&
                  (ib_event->param.req_rcvd.qp_type == id->qp_type)) ||
                 ((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) &&
                  (id->qp_type == IB_QPT_UD)) ||
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 55ab284e22f2..b18870c455ad 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -1593,6 +1593,10 @@ static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst,
                 struct net_device *pdev;
 
                 pdev = ip_dev_find(&init_net, peer_ip);
+                if (!pdev) {
+                        err = -ENODEV;
+                        goto out;
+                }
                 ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t,
                                         n, pdev, 0);
                 if (!ep->l2t)
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index ee1c577238f7..3530c41fcd1f 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -140,7 +140,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
         props->max_mr_size         = ~0ull;
         props->page_size_cap       = dev->dev->caps.page_size_cap;
         props->max_qp              = dev->dev->caps.num_qps - dev->dev->caps.reserved_qps;
-        props->max_qp_wr           = dev->dev->caps.max_wqes;
+        props->max_qp_wr           = dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE;
         props->max_sge             = min(dev->dev->caps.max_sq_sg,
                                          dev->dev->caps.max_rq_sg);
         props->max_cq              = dev->dev->caps.num_cqs - dev->dev->caps.reserved_cqs;
@@ -1084,12 +1084,9 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
         int total_eqs = 0;
         int i, j, eq;
 
-        /* Init eq table */
-        ibdev->eq_table = NULL;
-        ibdev->eq_added = 0;
-
-        /* Legacy mode? */
-        if (dev->caps.comp_pool == 0)
+        /* Legacy mode or comp_pool is not large enough */
+        if (dev->caps.comp_pool == 0 ||
+            dev->caps.num_ports > dev->caps.comp_pool)
                 return;
 
         eq_per_port = rounddown_pow_of_two(dev->caps.comp_pool/
@@ -1135,7 +1132,10 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
 static void mlx4_ib_free_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
 {
         int i;
-        int total_eqs;
+
+        /* no additional eqs were added */
+        if (!ibdev->eq_table)
+                return;
 
         /* Reset the advertised EQ number */
         ibdev->ib_dev.num_comp_vectors = dev->caps.num_comp_vectors;
@@ -1148,12 +1148,7 @@ static void mlx4_ib_free_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
                 mlx4_release_eq(dev, ibdev->eq_table[i]);
         }
 
-        total_eqs = dev->caps.num_comp_vectors + ibdev->eq_added;
-        memset(ibdev->eq_table, 0, total_eqs * sizeof(int));
         kfree(ibdev->eq_table);
-
-        ibdev->eq_table = NULL;
-        ibdev->eq_added = 0;
 }
 
 static void *mlx4_ib_add(struct mlx4_dev *dev)
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index e62297cc77cc..ff36655d23d3 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -44,6 +44,14 @@
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/doorbell.h>
 
+enum {
+        MLX4_IB_SQ_MIN_WQE_SHIFT = 6,
+        MLX4_IB_MAX_HEADROOM     = 2048
+};
+
+#define MLX4_IB_SQ_HEADROOM(shift)      ((MLX4_IB_MAX_HEADROOM >> (shift)) + 1)
+#define MLX4_IB_SQ_MAX_SPARE            (MLX4_IB_SQ_HEADROOM(MLX4_IB_SQ_MIN_WQE_SHIFT))
+
 struct mlx4_ib_ucontext {
         struct ib_ucontext      ibucontext;
         struct mlx4_uar         uar;
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index ceb33327091a..8d4ed24aef93 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -310,8 +310,8 @@ static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
                        int is_user, int has_rq, struct mlx4_ib_qp *qp)
 {
         /* Sanity check RQ size before proceeding */
-        if (cap->max_recv_wr  > dev->dev->caps.max_wqes  ||
-            cap->max_recv_sge > dev->dev->caps.max_rq_sg)
+        if (cap->max_recv_wr > dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE ||
+            cap->max_recv_sge > min(dev->dev->caps.max_sq_sg, dev->dev->caps.max_rq_sg))
                 return -EINVAL;
 
         if (!has_rq) {
@@ -329,8 +329,17 @@ static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
                 qp->rq.wqe_shift = ilog2(qp->rq.max_gs * sizeof (struct mlx4_wqe_data_seg));
         }
 
-        cap->max_recv_wr  = qp->rq.max_post = qp->rq.wqe_cnt;
-        cap->max_recv_sge = qp->rq.max_gs;
+        /* leave userspace return values as they were, so as not to break ABI */
+        if (is_user) {
+                cap->max_recv_wr  = qp->rq.max_post = qp->rq.wqe_cnt;
+                cap->max_recv_sge = qp->rq.max_gs;
+        } else {
+                cap->max_recv_wr  = qp->rq.max_post =
+                        min(dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE, qp->rq.wqe_cnt);
+                cap->max_recv_sge = min(qp->rq.max_gs,
+                                        min(dev->dev->caps.max_sq_sg,
+                                            dev->dev->caps.max_rq_sg));
+        }
 
         return 0;
 }
@@ -341,8 +350,8 @@ static int set_kernel_sq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
         int s;
 
         /* Sanity check SQ size before proceeding */
-        if (cap->max_send_wr     > dev->dev->caps.max_wqes  ||
-            cap->max_send_sge    > dev->dev->caps.max_sq_sg ||
+        if (cap->max_send_wr  > (dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE) ||
+            cap->max_send_sge > min(dev->dev->caps.max_sq_sg, dev->dev->caps.max_rq_sg) ||
             cap->max_inline_data + send_wqe_overhead(type, qp->flags) +
             sizeof (struct mlx4_wqe_inline_seg) > dev->dev->caps.max_sq_desc_sz)
                 return -EINVAL;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 85a69c958559..48970af23679 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -61,6 +61,7 @@ struct ocrdma_dev_attr {
         u32 max_inline_data;
         int max_send_sge;
         int max_recv_sge;
+        int max_srq_sge;
         int max_mr;
         u64 max_mr_size;
         u32 max_num_mr_pbl;
@@ -231,7 +232,6 @@ struct ocrdma_qp_hwq_info {
         u32 entry_size;
         u32 max_cnt;
         u32 max_wqe_idx;
-        u32 free_delta;
         u16 dbid;               /* qid, where to ring the doorbell. */
         u32 len;
         dma_addr_t pa;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_abi.h b/drivers/infiniband/hw/ocrdma/ocrdma_abi.h
index a411a4e3193d..517ab20b727c 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_abi.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_abi.h
@@ -101,8 +101,6 @@ struct ocrdma_create_qp_uresp {
         u32 rsvd1;
         u32 num_wqe_allocated;
         u32 num_rqe_allocated;
-        u32 free_wqe_delta;
-        u32 free_rqe_delta;
         u32 db_sq_offset;
         u32 db_rq_offset;
         u32 db_shift;
@@ -126,8 +124,7 @@ struct ocrdma_create_srq_uresp {
         u32 db_rq_offset;
         u32 db_shift;
 
-        u32 free_rqe_delta;
-        u32 rsvd2;
+        u64 rsvd2;
         u64 rsvd3;
 } __packed;
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 9b204b1ba336..71942af4fce9 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -732,7 +732,7 @@ static void ocrdma_dispatch_ibevent(struct ocrdma_dev *dev,
                 break;
         case OCRDMA_SRQ_LIMIT_EVENT:
                 ib_evt.element.srq = &qp->srq->ibsrq;
-                ib_evt.event = IB_EVENT_QP_LAST_WQE_REACHED;
+                ib_evt.event = IB_EVENT_SRQ_LIMIT_REACHED;
                 srq_event = 1;
                 qp_event = 0;
                 break;
@@ -990,8 +990,6 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
                               struct ocrdma_dev_attr *attr,
                               struct ocrdma_mbx_query_config *rsp)
 {
-        int max_q_mem;
-
         attr->max_pd =
             (rsp->max_pd_ca_ack_delay & OCRDMA_MBX_QUERY_CFG_MAX_PD_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_PD_SHIFT;
@@ -1004,6 +1002,9 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
         attr->max_recv_sge = (rsp->max_write_send_sge &
                               OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT;
+        attr->max_srq_sge = (rsp->max_srq_rqe_sge &
+                              OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK) >>
+            OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET;
         attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp &
                                 OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >>
             OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT;
@@ -1037,18 +1038,15 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev,
         attr->max_inline_data =
             attr->wqe_size - (sizeof(struct ocrdma_hdr_wqe) +
                               sizeof(struct ocrdma_sge));
-        max_q_mem = OCRDMA_Q_PAGE_BASE_SIZE << (OCRDMA_MAX_Q_PAGE_SIZE_CNT - 1);
-        /* hw can queue one less then the configured size,
-         * so publish less by one to stack.
-         */
         if (dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) {
-                dev->attr.max_wqe = max_q_mem / dev->attr.wqe_size;
                 attr->ird = 1;
                 attr->ird_page_size = OCRDMA_MIN_Q_PAGE_SIZE;
                 attr->num_ird_pages = MAX_OCRDMA_IRD_PAGES;
-        } else
-                dev->attr.max_wqe = (max_q_mem / dev->attr.wqe_size) - 1;
-        dev->attr.max_rqe = (max_q_mem / dev->attr.rqe_size) - 1;
+        }
+        dev->attr.max_wqe = rsp->max_wqes_rqes_per_q >>
+                 OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET;
+        dev->attr.max_rqe = rsp->max_wqes_rqes_per_q &
+                OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK;
 }
 
 static int ocrdma_check_fw_config(struct ocrdma_dev *dev,
@@ -1990,19 +1988,12 @@ static void ocrdma_get_create_qp_rsp(struct ocrdma_create_qp_rsp *rsp,
         max_wqe_allocated = 1 << max_wqe_allocated;
         max_rqe_allocated = 1 << ((u16)rsp->max_wqe_rqe);
 
-        if (qp->dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) {
-                qp->sq.free_delta = 0;
-                qp->rq.free_delta = 1;
-        } else
-                qp->sq.free_delta = 1;
-
         qp->sq.max_cnt = max_wqe_allocated;
         qp->sq.max_wqe_idx = max_wqe_allocated - 1;
 
         if (!attrs->srq) {
                 qp->rq.max_cnt = max_rqe_allocated;
                 qp->rq.max_wqe_idx = max_rqe_allocated - 1;
-                qp->rq.free_delta = 1;
         }
 }
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index a20d16eaae71..b050e629e9c3 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -26,7 +26,6 @@
  *******************************************************************/
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/idr.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_user_verbs.h>
@@ -98,13 +97,11 @@ static void ocrdma_build_sgid_mac(union ib_gid *sgid, unsigned char *mac_addr,
         sgid->raw[15] = mac_addr[5];
 }
 
-static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
+static bool ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
                             bool is_vlan, u16 vlan_id)
 {
         int i;
-        bool found = false;
         union ib_gid new_sgid;
-        int free_idx = OCRDMA_MAX_SGID;
         unsigned long flags;
 
         memset(&ocrdma_zero_sgid, 0, sizeof(union ib_gid));
@@ -116,23 +113,19 @@ static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
                 if (!memcmp(&dev->sgid_tbl[i], &ocrdma_zero_sgid,
                             sizeof(union ib_gid))) {
                         /* found free entry */
-                        if (!found) {
-                                free_idx = i;
-                                found = true;
-                                break;
-                        }
+                        memcpy(&dev->sgid_tbl[i], &new_sgid,
+                               sizeof(union ib_gid));
+                        spin_unlock_irqrestore(&dev->sgid_lock, flags);
+                        return true;
                 } else if (!memcmp(&dev->sgid_tbl[i], &new_sgid,
                                    sizeof(union ib_gid))) {
                         /* entry already present, no addition is required. */
                         spin_unlock_irqrestore(&dev->sgid_lock, flags);
-                        return;
+                        return false;
                 }
         }
-        /* if entry doesn't exist and if table has some space, add entry */
-        if (found)
-                memcpy(&dev->sgid_tbl[free_idx], &new_sgid,
-                       sizeof(union ib_gid));
         spin_unlock_irqrestore(&dev->sgid_lock, flags);
+        return false;
 }
 
 static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr,
@@ -168,7 +161,8 @@ static void ocrdma_add_default_sgid(struct ocrdma_dev *dev)
         ocrdma_get_guid(dev, &sgid->raw[8]);
 }
 
-static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
 {
         struct net_device *netdev, *tmp;
         u16 vlan_id;
@@ -176,8 +170,6 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
 
         netdev = dev->nic_info.netdev;
 
-        ocrdma_add_default_sgid(dev);
-
         rcu_read_lock();
         for_each_netdev_rcu(&init_net, tmp) {
                 if (netdev == tmp || vlan_dev_real_dev(tmp) == netdev) {
@@ -195,10 +187,23 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
                 }
         }
         rcu_read_unlock();
+}
+#else
+static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev)
+{
+
+}
+#endif /* VLAN */
+
+static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev)
+{
+        ocrdma_add_default_sgid(dev);
+        ocrdma_add_vlan_sgids(dev);
         return 0;
 }
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \
+defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 
 static int ocrdma_inet6addr_event(struct notifier_block *notifier,
                                   unsigned long event, void *ptr)
@@ -209,6 +214,7 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
         struct ib_event gid_event;
         struct ocrdma_dev *dev;
         bool found = false;
+        bool updated = false;
         bool is_vlan = false;
         u16 vid = 0;
 
@@ -234,23 +240,21 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier,
         mutex_lock(&dev->dev_lock);
         switch (event) {
         case NETDEV_UP:
-                ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid);
+                updated = ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid);
                 break;
         case NETDEV_DOWN:
-                found = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid);
-                if (found) {
-                        /* found the matching entry, notify
-                         * the consumers about it
-                         */
-                        gid_event.device = &dev->ibdev;
-                        gid_event.element.port_num = 1;
-                        gid_event.event = IB_EVENT_GID_CHANGE;
-                        ib_dispatch_event(&gid_event);
-                }
+                updated = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid);
                 break;
         default:
                 break;
         }
+        if (updated) {
+                /* GID table updated, notify the consumers about it */
+                gid_event.device = &dev->ibdev;
+                gid_event.element.port_num = 1;
+                gid_event.event = IB_EVENT_GID_CHANGE;
+                ib_dispatch_event(&gid_event);
+        }
         mutex_unlock(&dev->dev_lock);
         return NOTIFY_OK;
 }
@@ -259,7 +263,7 @@ static struct notifier_block ocrdma_inet6addr_notifier = {
         .notifier_call = ocrdma_inet6addr_event
 };
 
-#endif /* IPV6 */
+#endif /* IPV6 and VLAN */
 
 static enum rdma_link_layer ocrdma_link_layer(struct ib_device *device,
                                               u8 port_num)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
index 7fd80cc0f037..c75cbdfa87e7 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_sli.h
@@ -418,6 +418,9 @@ enum {
 
         OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT         = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK          = 0xFFFF,
+        OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT        = 16,
+        OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK         = 0xFFFF <<
+                                OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT,
 
         OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT       = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK        = 0xFFFF,
@@ -458,7 +461,7 @@ enum {
                                 OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET,
         OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET     = 0,
         OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK       = 0xFFFF <<
-                                OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET,
+                                OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET,
 
         OCRDMA_MBX_QUERY_CFG_MAX_CQ_OFFSET              = 16,
         OCRDMA_MBX_QUERY_CFG_MAX_CQ_MASK                = 0xFFFF <<
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index e9f74d1b48f6..2e2e7aecc990 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -53,7 +53,7 @@ int ocrdma_query_gid(struct ib_device *ibdev, u8 port,
 
         dev = get_ocrdma_dev(ibdev);
         memset(sgid, 0, sizeof(*sgid));
-        if (index > OCRDMA_MAX_SGID)
+        if (index >= OCRDMA_MAX_SGID)
                 return -EINVAL;
 
         memcpy(sgid, &dev->sgid_tbl[index], sizeof(*sgid));
@@ -83,8 +83,8 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
                                         IB_DEVICE_SHUTDOWN_PORT |
                                         IB_DEVICE_SYS_IMAGE_GUID |
                                         IB_DEVICE_LOCAL_DMA_LKEY;
-        attr->max_sge = dev->attr.max_send_sge;
-        attr->max_sge_rd = dev->attr.max_send_sge;
+        attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge);
+        attr->max_sge_rd = 0;
         attr->max_cq = dev->attr.max_cq;
         attr->max_cqe = dev->attr.max_cqe;
         attr->max_mr = dev->attr.max_mr;
@@ -97,7 +97,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr)
             min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
         attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
         attr->max_srq = (dev->attr.max_qp - 1);
-        attr->max_srq_sge = attr->max_sge;
+        attr->max_srq_sge = attr->max_srq_sge;
         attr->max_srq_wr = dev->attr.max_rqe;
         attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay;
         attr->max_fast_reg_page_list_len = 0;
@@ -940,8 +940,6 @@ static int ocrdma_copy_qp_uresp(struct ocrdma_qp *qp,
                 uresp.db_rq_offset = OCRDMA_DB_RQ_OFFSET;
                 uresp.db_shift = 16;
         }
-        uresp.free_wqe_delta = qp->sq.free_delta;
-        uresp.free_rqe_delta = qp->rq.free_delta;
 
         if (qp->dpp_enabled) {
                 uresp.dpp_credit = dpp_credit_lmt;
@@ -1307,8 +1305,6 @@ static int ocrdma_hwq_free_cnt(struct ocrdma_qp_hwq_info *q)
                 free_cnt = (q->max_cnt - q->head) + q->tail;
         else
                 free_cnt = q->tail - q->head;
-        if (q->free_delta)
-                free_cnt -= q->free_delta;
         return free_cnt;
 }
 
@@ -1501,7 +1497,6 @@ static int ocrdma_copy_srq_uresp(struct ocrdma_srq *srq, struct ib_udata *udata)
             (srq->pd->id * srq->dev->nic_info.db_page_size);
         uresp.db_page_size = srq->dev->nic_info.db_page_size;
         uresp.num_rqe_allocated = srq->rq.max_cnt;
-        uresp.free_rqe_delta = 1;
         if (srq->dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) {
                 uresp.db_rq_offset = OCRDMA_DB_GEN2_RQ1_OFFSET;
                 uresp.db_shift = 24;
@@ -2306,8 +2301,10 @@ static bool ocrdma_poll_err_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe,
                         *stop = true;
                         expand = false;
                 }
-        } else
+        } else {
+                *polled = true;
                 expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status);
+        }
         return expand;
 }
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
index e6483439f25f..633f03d80274 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
@@ -28,7 +28,6 @@
 #ifndef __OCRDMA_VERBS_H__
 #define __OCRDMA_VERBS_H__
 
-#include <linux/version.h>
 int ocrdma_post_send(struct ib_qp *, struct ib_send_wr *,
                      struct ib_send_wr **bad_wr);
 int ocrdma_post_recv(struct ib_qp *, struct ib_recv_wr *,
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index d90a421e9cac..a2e418cba0ff 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -547,26 +547,12 @@ static void iommu_poll_events(struct amd_iommu *iommu)
         spin_unlock_irqrestore(&iommu->lock, flags);
 }
 
-static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u32 head)
+static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u64 *raw)
 {
         struct amd_iommu_fault fault;
-        volatile u64 *raw;
-        int i;
 
         INC_STATS_COUNTER(pri_requests);
 
-        raw = (u64 *)(iommu->ppr_log + head);
-
-        /*
-         * Hardware bug: Interrupt may arrive before the entry is written to
-         * memory. If this happens we need to wait for the entry to arrive.
-         */
-        for (i = 0; i < LOOP_TIMEOUT; ++i) {
-                if (PPR_REQ_TYPE(raw[0]) != 0)
-                        break;
-                udelay(1);
-        }
-
         if (PPR_REQ_TYPE(raw[0]) != PPR_REQ_FAULT) {
                 pr_err_ratelimited("AMD-Vi: Unknown PPR request received\n");
                 return;
@@ -578,12 +564,6 @@ static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u32 head)
         fault.tag       = PPR_TAG(raw[0]);
         fault.flags     = PPR_FLAGS(raw[0]);
 
-        /*
-         * To detect the hardware bug we need to clear the entry
-         * to back to zero.
-         */
-        raw[0] = raw[1] = 0;
-
         atomic_notifier_call_chain(&ppr_notifier, 0, &fault);
 }
 
@@ -595,25 +575,62 @@ static void iommu_poll_ppr_log(struct amd_iommu *iommu)
         if (iommu->ppr_log == NULL)
                 return;
 
+        /* enable ppr interrupts again */
+        writel(MMIO_STATUS_PPR_INT_MASK, iommu->mmio_base + MMIO_STATUS_OFFSET);
+
         spin_lock_irqsave(&iommu->lock, flags);
 
         head = readl(iommu->mmio_base + MMIO_PPR_HEAD_OFFSET);
         tail = readl(iommu->mmio_base + MMIO_PPR_TAIL_OFFSET);
 
         while (head != tail) {
+                volatile u64 *raw;
+                u64 entry[2];
+                int i;
 
-                /* Handle PPR entry */
-                iommu_handle_ppr_entry(iommu, head);
+                raw = (u64 *)(iommu->ppr_log + head);
+
+                /*
+                 * Hardware bug: Interrupt may arrive before the entry is
+                 * written to memory. If this happens we need to wait for the
+                 * entry to arrive.
+                 */
+                for (i = 0; i < LOOP_TIMEOUT; ++i) {
+                        if (PPR_REQ_TYPE(raw[0]) != 0)
+                                break;
+                        udelay(1);
+                }
+
+                /* Avoid memcpy function-call overhead */
+                entry[0] = raw[0];
+                entry[1] = raw[1];
 
-                /* Update and refresh ring-buffer state*/
+                /*
+                 * To detect the hardware bug we need to clear the entry
+                 * back to zero.
+                 */
+                raw[0] = raw[1] = 0UL;
+
+                /* Update head pointer of hardware ring-buffer */
                 head = (head + PPR_ENTRY_SIZE) % PPR_LOG_SIZE;
                 writel(head, iommu->mmio_base + MMIO_PPR_HEAD_OFFSET);
+
+                /*
+                 * Release iommu->lock because ppr-handling might need to
+                 * re-aquire it
+                 */
+                spin_unlock_irqrestore(&iommu->lock, flags);
+
+                /* Handle PPR entry */
+                iommu_handle_ppr_entry(iommu, entry);
+
+                spin_lock_irqsave(&iommu->lock, flags);
+
+                /* Refresh ring-buffer information */
+                head = readl(iommu->mmio_base + MMIO_PPR_HEAD_OFFSET);
                 tail = readl(iommu->mmio_base + MMIO_PPR_TAIL_OFFSET);
         }
 
-        /* enable ppr interrupts again */
-        writel(MMIO_STATUS_PPR_INT_MASK, iommu->mmio_base + MMIO_STATUS_OFFSET);
-
         spin_unlock_irqrestore(&iommu->lock, flags);
 }
 
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index c56790375e0f..542024ba6dba 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1029,6 +1029,9 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)
         if (!iommu->dev)
                 return 1;
 
+        iommu->root_pdev = pci_get_bus_and_slot(iommu->dev->bus->number,
+                                                PCI_DEVFN(0, 0));
+
         iommu->cap_ptr = h->cap_ptr;
         iommu->pci_seg = h->pci_seg;
         iommu->mmio_phys = h->mmio_phys;
@@ -1323,20 +1326,16 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu)
 {
         int i, j;
         u32 ioc_feature_control;
-        struct pci_dev *pdev = NULL;
+        struct pci_dev *pdev = iommu->root_pdev;
 
         /* RD890 BIOSes may not have completely reconfigured the iommu */
-        if (!is_rd890_iommu(iommu->dev))
+        if (!is_rd890_iommu(iommu->dev) || !pdev)
                 return;
 
         /*
          * First, we need to ensure that the iommu is enabled. This is
          * controlled by a register in the northbridge
          */
-        pdev = pci_get_bus_and_slot(iommu->dev->bus->number, PCI_DEVFN(0, 0));
-
-        if (!pdev)
-                return;
 
         /* Select Northbridge indirect register 0x75 and enable writing */
         pci_write_config_dword(pdev, 0x60, 0x75 | (1 << 7));
@@ -1346,8 +1345,6 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu)
         if (!(ioc_feature_control & 0x1))
                 pci_write_config_dword(pdev, 0x64, ioc_feature_control | 1);
 
-        pci_dev_put(pdev);
-
         /* Restore the iommu BAR */
         pci_write_config_dword(iommu->dev, iommu->cap_ptr + 4,
                                iommu->stored_addr_lo);
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 2452f3b71736..24355559a2ad 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -481,6 +481,9 @@ struct amd_iommu {
         /* Pointer to PCI device of this IOMMU */
         struct pci_dev *dev;
 
+        /* Cache pdev to root device for resume quirks */
+        struct pci_dev *root_pdev;
+
         /* physical address of MMIO space */
         u64 mmio_phys;
         /* virtual address of MMIO space */
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 04cb8c88d74b..12b2b55c519e 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -379,7 +379,7 @@ config LEDS_NETXBIG
 
 config LEDS_ASIC3
         bool "LED support for the HTC ASIC3"
-        depends on LEDS_CLASS
+        depends on LEDS_CLASS=y
         depends on MFD_ASIC3
         default y
         help
@@ -390,7 +390,7 @@ config LEDS_ASIC3
 
 config LEDS_RENESAS_TPU
         bool "LED support for Renesas TPU"
-        depends on LEDS_CLASS && HAVE_CLK && GENERIC_GPIO
+        depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
         help
           This option enables build of the LED TPU platform driver,
           suitable to drive any TPU channel on newer Renesas SoCs.
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 8ee92c81aec2..e663e6f413e9 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -29,7 +29,7 @@ static void led_update_brightness(struct led_classdev *led_cdev)
                 led_cdev->brightness = led_cdev->brightness_get(led_cdev);
 }
 
-static ssize_t led_brightness_show(struct device *dev, 
+static ssize_t led_brightness_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
         struct led_classdev *led_cdev = dev_get_drvdata(dev);
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index d6860043f6f9..d65353d8d3fc 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -44,13 +44,6 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
         if (!led_cdev->blink_brightness)
                 led_cdev->blink_brightness = led_cdev->max_brightness;
 
-        if (led_get_trigger_data(led_cdev) &&
-            delay_on == led_cdev->blink_delay_on &&
-            delay_off == led_cdev->blink_delay_off)
-                return;
-
-        led_stop_software_blink(led_cdev);
-
         led_cdev->blink_delay_on = delay_on;
         led_cdev->blink_delay_off = delay_off;
 
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 754f38f8a692..638dae048b4f 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/workqueue.h>
+#include <linux/delay.h>
 #include <scsi/scsi_dh.h>
 #include <linux/atomic.h>
 
@@ -61,11 +62,11 @@ struct multipath {
         struct list_head list;
         struct dm_target *ti;
 
-        spinlock_t lock;
-
         const char *hw_handler_name;
         char *hw_handler_params;
 
+        spinlock_t lock;
+
         unsigned nr_priority_groups;
         struct list_head priority_groups;
 
@@ -81,16 +82,17 @@ struct multipath {
         struct priority_group *next_pg; /* Switch to this PG if set */
         unsigned repeat_count;          /* I/Os left before calling PS again */
 
-        unsigned queue_io;              /* Must we queue all I/O? */
-        unsigned queue_if_no_path;      /* Queue I/O if last path fails? */
-        unsigned saved_queue_if_no_path;/* Saved state during suspension */
+        unsigned queue_io:1;            /* Must we queue all I/O? */
+        unsigned queue_if_no_path:1;    /* Queue I/O if last path fails? */
+        unsigned saved_queue_if_no_path:1; /* 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 */
 
+        unsigned queue_size;
         struct work_struct process_queued_ios;
         struct list_head queued_ios;
-        unsigned queue_size;
 
         struct work_struct trigger_event;
 
@@ -328,14 +330,18 @@ static void __choose_pgpath(struct multipath *m, size_t nr_bytes)
         /*
          * Loop through priority groups until we find a valid path.
          * First time we skip PGs marked 'bypassed'.
-         * Second time we only try the ones we skipped.
+         * Second time we only try the ones we skipped, but set
+         * pg_init_delay_retry so we do not hammer controllers.
          */
         do {
                 list_for_each_entry(pg, &m->priority_groups, list) {
                         if (pg->bypassed == bypassed)
                                 continue;
-                        if (!__choose_path_in_pg(m, pg, nr_bytes))
+                        if (!__choose_path_in_pg(m, pg, nr_bytes)) {
+                                if (!bypassed)
+                                        m->pg_init_delay_retry = 1;
                                 return;
+                        }
                 }
         } while (bypassed--);
 
@@ -481,9 +487,6 @@ static void process_queued_ios(struct work_struct *work)
 
         spin_lock_irqsave(&m->lock, flags);
 
-        if (!m->queue_size)
-                goto out;
-
         if (!m->current_pgpath)
                 __choose_pgpath(m, 0);
 
@@ -496,7 +499,6 @@ static void process_queued_ios(struct work_struct *work)
         if (m->pg_init_required && !m->pg_init_in_progress && pgpath)
                 __pg_init_all_paths(m);
 
-out:
         spin_unlock_irqrestore(&m->lock, flags);
         if (!must_queue)
                 dispatch_queued_ios(m);
@@ -1517,11 +1519,16 @@ out:
 static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
                            unsigned long arg)
 {
-        struct multipath *m = (struct multipath *) ti->private;
-        struct block_device *bdev = NULL;
-        fmode_t mode = 0;
+        struct multipath *m = ti->private;
+        struct block_device *bdev;
+        fmode_t mode;
         unsigned long flags;
-        int r = 0;
+        int r;
+
+again:
+        bdev = NULL;
+        mode = 0;
+        r = 0;
 
         spin_lock_irqsave(&m->lock, flags);
 
@@ -1546,6 +1553,12 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
         if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
                 r = scsi_verify_blk_ioctl(NULL, cmd);
 
+        if (r == -EAGAIN && !fatal_signal_pending(current)) {
+                queue_work(kmultipathd, &m->process_queued_ios);
+                msleep(10);
+                goto again;
+        }
+
         return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
 }
 
@@ -1643,7 +1656,7 @@ out:
  *---------------------------------------------------------------*/
 static struct target_type multipath_target = {
         .name = "multipath",
-        .version = {1, 3, 0},
+        .version = {1, 4, 0},
         .module = THIS_MODULE,
         .ctr = multipath_ctr,
         .dtr = multipath_dtr,
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index 737d38865b69..3e2907f0bc46 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -1082,12 +1082,89 @@ int dm_pool_get_metadata_transaction_id(struct dm_pool_metadata *pmd,
         return 0;
 }
 
-static int __get_held_metadata_root(struct dm_pool_metadata *pmd,
-                                    dm_block_t *result)
+static int __reserve_metadata_snap(struct dm_pool_metadata *pmd)
+{
+        int r, inc;
+        struct thin_disk_superblock *disk_super;
+        struct dm_block *copy, *sblock;
+        dm_block_t held_root;
+
+        /*
+         * Copy the superblock.
+         */
+        dm_sm_inc_block(pmd->metadata_sm, THIN_SUPERBLOCK_LOCATION);
+        r = dm_tm_shadow_block(pmd->tm, THIN_SUPERBLOCK_LOCATION,
+                               &sb_validator, &copy, &inc);
+        if (r)
+                return r;
+
+        BUG_ON(!inc);
+
+        held_root = dm_block_location(copy);
+        disk_super = dm_block_data(copy);
+
+        if (le64_to_cpu(disk_super->held_root)) {
+                DMWARN("Pool metadata snapshot already exists: release this before taking another.");
+
+                dm_tm_dec(pmd->tm, held_root);
+                dm_tm_unlock(pmd->tm, copy);
+                pmd->need_commit = 1;
+
+                return -EBUSY;
+        }
+
+        /*
+         * Wipe the spacemap since we're not publishing this.
+         */
+        memset(&disk_super->data_space_map_root, 0,
+               sizeof(disk_super->data_space_map_root));
+        memset(&disk_super->metadata_space_map_root, 0,
+               sizeof(disk_super->metadata_space_map_root));
+
+        /*
+         * Increment the data structures that need to be preserved.
+         */
+        dm_tm_inc(pmd->tm, le64_to_cpu(disk_super->data_mapping_root));
+        dm_tm_inc(pmd->tm, le64_to_cpu(disk_super->device_details_root));
+        dm_tm_unlock(pmd->tm, copy);
+
+        /*
+         * Write the held root into the superblock.
+         */
+        r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                             &sb_validator, &sblock);
+        if (r) {
+                dm_tm_dec(pmd->tm, held_root);
+                pmd->need_commit = 1;
+                return r;
+        }
+
+        disk_super = dm_block_data(sblock);
+        disk_super->held_root = cpu_to_le64(held_root);
+        dm_bm_unlock(sblock);
+
+        pmd->need_commit = 1;
+
+        return 0;
+}
+
+int dm_pool_reserve_metadata_snap(struct dm_pool_metadata *pmd)
+{
+        int r;
+
+        down_write(&pmd->root_lock);
+        r = __reserve_metadata_snap(pmd);
+        up_write(&pmd->root_lock);
+
+        return r;
+}
+
+static int __release_metadata_snap(struct dm_pool_metadata *pmd)
 {
         int r;
         struct thin_disk_superblock *disk_super;
-        struct dm_block *sblock;
+        struct dm_block *sblock, *copy;
+        dm_block_t held_root;
 
         r = dm_bm_write_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
                              &sb_validator, &sblock);
@@ -1095,18 +1172,65 @@ static int __get_held_metadata_root(struct dm_pool_metadata *pmd,
                 return r;
 
         disk_super = dm_block_data(sblock);
+        held_root = le64_to_cpu(disk_super->held_root);
+        disk_super->held_root = cpu_to_le64(0);
+        pmd->need_commit = 1;
+
+        dm_bm_unlock(sblock);
+
+        if (!held_root) {
+                DMWARN("No pool metadata snapshot found: nothing to release.");
+                return -EINVAL;
+        }
+
+        r = dm_tm_read_lock(pmd->tm, held_root, &sb_validator, &copy);
+        if (r)
+                return r;
+
+        disk_super = dm_block_data(copy);
+        dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->data_mapping_root));
+        dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->device_details_root));
+        dm_sm_dec_block(pmd->metadata_sm, held_root);
+
+        return dm_tm_unlock(pmd->tm, copy);
+}
+
+int dm_pool_release_metadata_snap(struct dm_pool_metadata *pmd)
+{
+        int r;
+
+        down_write(&pmd->root_lock);
+        r = __release_metadata_snap(pmd);
+        up_write(&pmd->root_lock);
+
+        return r;
+}
+
+static int __get_metadata_snap(struct dm_pool_metadata *pmd,
+                               dm_block_t *result)
+{
+        int r;
+        struct thin_disk_superblock *disk_super;
+        struct dm_block *sblock;
+
+        r = dm_bm_read_lock(pmd->bm, THIN_SUPERBLOCK_LOCATION,
+                            &sb_validator, &sblock);
+        if (r)
+                return r;
+
+        disk_super = dm_block_data(sblock);
         *result = le64_to_cpu(disk_super->held_root);
 
         return dm_bm_unlock(sblock);
 }
 
-int dm_pool_get_held_metadata_root(struct dm_pool_metadata *pmd,
-                                   dm_block_t *result)
+int dm_pool_get_metadata_snap(struct dm_pool_metadata *pmd,
+                              dm_block_t *result)
 {
         int r;
 
         down_read(&pmd->root_lock);
-        r = __get_held_metadata_root(pmd, result);
+        r = __get_metadata_snap(pmd, result);
         up_read(&pmd->root_lock);
 
         return r;
diff --git a/drivers/md/dm-thin-metadata.h b/drivers/md/dm-thin-metadata.h
index ed4725e67c96..b88918ccdaf6 100644
--- a/drivers/md/dm-thin-metadata.h
+++ b/drivers/md/dm-thin-metadata.h
@@ -90,11 +90,18 @@ int dm_pool_get_metadata_transaction_id(struct dm_pool_metadata *pmd,
 
 /*
  * Hold/get root for userspace transaction.
+ *
+ * The metadata snapshot is a copy of the current superblock (minus the
+ * space maps).  Userland can access the data structures for READ
+ * operations only.  A small performance hit is incurred by providing this
+ * copy of the metadata to userland due to extra copy-on-write operations
+ * on the metadata nodes.  Release this as soon as you finish with it.
  */
-int dm_pool_hold_metadata_root(struct dm_pool_metadata *pmd);
+int dm_pool_reserve_metadata_snap(struct dm_pool_metadata *pmd);
+int dm_pool_release_metadata_snap(struct dm_pool_metadata *pmd);
 
-int dm_pool_get_held_metadata_root(struct dm_pool_metadata *pmd,
-                                   dm_block_t *result);
+int dm_pool_get_metadata_snap(struct dm_pool_metadata *pmd,
+                              dm_block_t *result);
 
 /*
  * Actions on a single virtual device.
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index eb3d138ff55a..37fdaf81bd1f 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -111,7 +111,7 @@ struct cell_key {
         dm_block_t block;
 };
 
-struct cell {
+struct dm_bio_prison_cell {
         struct hlist_node list;
         struct bio_prison *prison;
         struct cell_key key;
@@ -141,6 +141,8 @@ static uint32_t calc_nr_buckets(unsigned nr_cells)
         return n;
 }
 
+static struct kmem_cache *_cell_cache;
+
 /*
  * @nr_cells should be the number of cells you want in use _concurrently_.
  * Don't confuse it with the number of distinct keys.
@@ -157,8 +159,7 @@ static struct bio_prison *prison_create(unsigned nr_cells)
                 return NULL;
 
         spin_lock_init(&prison->lock);
-        prison->cell_pool = mempool_create_kmalloc_pool(nr_cells,
-                                                        sizeof(struct cell));
+        prison->cell_pool = mempool_create_slab_pool(nr_cells, _cell_cache);
         if (!prison->cell_pool) {
                 kfree(prison);
                 return NULL;
@@ -194,10 +195,10 @@ static int keys_equal(struct cell_key *lhs, struct cell_key *rhs)
                        (lhs->block == rhs->block);
 }
 
-static struct cell *__search_bucket(struct hlist_head *bucket,
-                                    struct cell_key *key)
+static struct dm_bio_prison_cell *__search_bucket(struct hlist_head *bucket,
+                                                  struct cell_key *key)
 {
-        struct cell *cell;
+        struct dm_bio_prison_cell *cell;
         struct hlist_node *tmp;
 
         hlist_for_each_entry(cell, tmp, bucket, list)
@@ -214,12 +215,12 @@ static struct cell *__search_bucket(struct hlist_head *bucket,
  * Returns 1 if the cell was already held, 0 if @inmate is the new holder.
  */
 static int bio_detain(struct bio_prison *prison, struct cell_key *key,
-                      struct bio *inmate, struct cell **ref)
+                      struct bio *inmate, struct dm_bio_prison_cell **ref)
 {
         int r = 1;
         unsigned long flags;
         uint32_t hash = hash_key(prison, key);
-        struct cell *cell, *cell2;
+        struct dm_bio_prison_cell *cell, *cell2;
 
         BUG_ON(hash > prison->nr_buckets);
 
@@ -273,7 +274,7 @@ out:
 /*
  * @inmates must have been initialised prior to this call
  */
-static void __cell_release(struct cell *cell, struct bio_list *inmates)
+static void __cell_release(struct dm_bio_prison_cell *cell, struct bio_list *inmates)
 {
         struct bio_prison *prison = cell->prison;
 
@@ -287,7 +288,7 @@ static void __cell_release(struct cell *cell, struct bio_list *inmates)
         mempool_free(cell, prison->cell_pool);
 }
 
-static void cell_release(struct cell *cell, struct bio_list *bios)
+static void cell_release(struct dm_bio_prison_cell *cell, struct bio_list *bios)
 {
         unsigned long flags;
         struct bio_prison *prison = cell->prison;
@@ -303,7 +304,7 @@ static void cell_release(struct cell *cell, struct bio_list *bios)
  * bio may be in the cell.  This function releases the cell, and also does
  * a sanity check.
  */
-static void __cell_release_singleton(struct cell *cell, struct bio *bio)
+static void __cell_release_singleton(struct dm_bio_prison_cell *cell, struct bio *bio)
 {
         BUG_ON(cell->holder != bio);
         BUG_ON(!bio_list_empty(&cell->bios));
@@ -311,7 +312,7 @@ static void __cell_release_singleton(struct cell *cell, struct bio *bio)
         __cell_release(cell, NULL);
 }
 
-static void cell_release_singleton(struct cell *cell, struct bio *bio)
+static void cell_release_singleton(struct dm_bio_prison_cell *cell, struct bio *bio)
 {
         unsigned long flags;
         struct bio_prison *prison = cell->prison;
@@ -324,7 +325,8 @@ static void cell_release_singleton(struct cell *cell, struct bio *bio)
 /*
  * Sometimes we don't want the holder, just the additional bios.
  */
-static void __cell_release_no_holder(struct cell *cell, struct bio_list *inmates)
+static void __cell_release_no_holder(struct dm_bio_prison_cell *cell,
+                                     struct bio_list *inmates)
 {
         struct bio_prison *prison = cell->prison;
 
@@ -334,7 +336,8 @@ static void __cell_release_no_holder(struct cell *cell, struct bio_list *inmates
         mempool_free(cell, prison->cell_pool);
 }
 
-static void cell_release_no_holder(struct cell *cell, struct bio_list *inmates)
+static void cell_release_no_holder(struct dm_bio_prison_cell *cell,
+                                   struct bio_list *inmates)
 {
         unsigned long flags;
         struct bio_prison *prison = cell->prison;
@@ -344,7 +347,7 @@ static void cell_release_no_holder(struct cell *cell, struct bio_list *inmates)
         spin_unlock_irqrestore(&prison->lock, flags);
 }
 
-static void cell_error(struct cell *cell)
+static void cell_error(struct dm_bio_prison_cell *cell)
 {
         struct bio_prison *prison = cell->prison;
         struct bio_list bios;
@@ -491,7 +494,7 @@ static void build_virtual_key(struct dm_thin_device *td, dm_block_t b,
  * also provides the interface for creating and destroying internal
  * devices.
  */
-struct new_mapping;
+struct dm_thin_new_mapping;
 
 struct pool_features {
         unsigned zero_new_blocks:1;
@@ -537,7 +540,7 @@ struct pool {
         struct deferred_set shared_read_ds;
         struct deferred_set all_io_ds;
 
-        struct new_mapping *next_mapping;
+        struct dm_thin_new_mapping *next_mapping;
         mempool_t *mapping_pool;
         mempool_t *endio_hook_pool;
 };
@@ -630,11 +633,11 @@ static struct pool *__pool_table_lookup_metadata_dev(struct block_device *md_dev
 
 /*----------------------------------------------------------------*/
 
-struct endio_hook {
+struct dm_thin_endio_hook {
         struct thin_c *tc;
         struct deferred_entry *shared_read_entry;
         struct deferred_entry *all_io_entry;
-        struct new_mapping *overwrite_mapping;
+        struct dm_thin_new_mapping *overwrite_mapping;
 };
 
 static void __requeue_bio_list(struct thin_c *tc, struct bio_list *master)
@@ -647,7 +650,8 @@ static void __requeue_bio_list(struct thin_c *tc, struct bio_list *master)
         bio_list_init(master);
 
         while ((bio = bio_list_pop(&bios))) {
-                struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+                struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
+
                 if (h->tc == tc)
                         bio_endio(bio, DM_ENDIO_REQUEUE);
                 else
@@ -736,7 +740,7 @@ static void wake_worker(struct pool *pool)
 /*
  * Bio endio functions.
  */
-struct new_mapping {
+struct dm_thin_new_mapping {
         struct list_head list;
 
         unsigned quiesced:1;
@@ -746,7 +750,7 @@ struct new_mapping {
         struct thin_c *tc;
         dm_block_t virt_block;
         dm_block_t data_block;
-        struct cell *cell, *cell2;
+        struct dm_bio_prison_cell *cell, *cell2;
         int err;
 
         /*
@@ -759,7 +763,7 @@ struct new_mapping {
         bio_end_io_t *saved_bi_end_io;
 };
 
-static void __maybe_add_mapping(struct new_mapping *m)
+static void __maybe_add_mapping(struct dm_thin_new_mapping *m)
 {
         struct pool *pool = m->tc->pool;
 
@@ -772,7 +776,7 @@ static void __maybe_add_mapping(struct new_mapping *m)
 static void copy_complete(int read_err, unsigned long write_err, void *context)
 {
         unsigned long flags;
-        struct new_mapping *m = context;
+        struct dm_thin_new_mapping *m = context;
         struct pool *pool = m->tc->pool;
 
         m->err = read_err || write_err ? -EIO : 0;
@@ -786,8 +790,8 @@ static void copy_complete(int read_err, unsigned long write_err, void *context)
 static void overwrite_endio(struct bio *bio, int err)
 {
         unsigned long flags;
-        struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
-        struct new_mapping *m = h->overwrite_mapping;
+        struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
+        struct dm_thin_new_mapping *m = h->overwrite_mapping;
         struct pool *pool = m->tc->pool;
 
         m->err = err;
@@ -811,7 +815,7 @@ static void overwrite_endio(struct bio *bio, int err)
 /*
  * This sends the bios in the cell back to the deferred_bios list.
  */
-static void cell_defer(struct thin_c *tc, struct cell *cell,
+static void cell_defer(struct thin_c *tc, struct dm_bio_prison_cell *cell,
                        dm_block_t data_block)
 {
         struct pool *pool = tc->pool;
@@ -828,7 +832,7 @@ static void cell_defer(struct thin_c *tc, struct cell *cell,
  * Same as cell_defer above, except it omits one particular detainee,
  * a write bio that covers the block and has already been processed.
  */
-static void cell_defer_except(struct thin_c *tc, struct cell *cell)
+static void cell_defer_except(struct thin_c *tc, struct dm_bio_prison_cell *cell)
 {
         struct bio_list bios;
         struct pool *pool = tc->pool;
@@ -843,7 +847,7 @@ static void cell_defer_except(struct thin_c *tc, struct cell *cell)
         wake_worker(pool);
 }
 
-static void process_prepared_mapping(struct new_mapping *m)
+static void process_prepared_mapping(struct dm_thin_new_mapping *m)
 {
         struct thin_c *tc = m->tc;
         struct bio *bio;
@@ -886,7 +890,7 @@ static void process_prepared_mapping(struct new_mapping *m)
         mempool_free(m, tc->pool->mapping_pool);
 }
 
-static void process_prepared_discard(struct new_mapping *m)
+static void process_prepared_discard(struct dm_thin_new_mapping *m)
 {
         int r;
         struct thin_c *tc = m->tc;
@@ -909,11 +913,11 @@ static void process_prepared_discard(struct new_mapping *m)
 }
 
 static void process_prepared(struct pool *pool, struct list_head *head,
-                             void (*fn)(struct new_mapping *))
+                             void (*fn)(struct dm_thin_new_mapping *))
 {
         unsigned long flags;
         struct list_head maps;
-        struct new_mapping *m, *tmp;
+        struct dm_thin_new_mapping *m, *tmp;
 
         INIT_LIST_HEAD(&maps);
         spin_lock_irqsave(&pool->lock, flags);
@@ -957,9 +961,9 @@ static int ensure_next_mapping(struct pool *pool)
         return pool->next_mapping ? 0 : -ENOMEM;
 }
 
-static struct new_mapping *get_next_mapping(struct pool *pool)
+static struct dm_thin_new_mapping *get_next_mapping(struct pool *pool)
 {
-        struct new_mapping *r = pool->next_mapping;
+        struct dm_thin_new_mapping *r = pool->next_mapping;
 
         BUG_ON(!pool->next_mapping);
 
@@ -971,11 +975,11 @@ static struct new_mapping *get_next_mapping(struct pool *pool)
 static void schedule_copy(struct thin_c *tc, dm_block_t virt_block,
                           struct dm_dev *origin, dm_block_t data_origin,
                           dm_block_t data_dest,
-                          struct cell *cell, struct bio *bio)
+                          struct dm_bio_prison_cell *cell, struct bio *bio)
 {
         int r;
         struct pool *pool = tc->pool;
-        struct new_mapping *m = get_next_mapping(pool);
+        struct dm_thin_new_mapping *m = get_next_mapping(pool);
 
         INIT_LIST_HEAD(&m->list);
         m->quiesced = 0;
@@ -997,7 +1001,8 @@ static void schedule_copy(struct thin_c *tc, dm_block_t virt_block,
          * bio immediately. Otherwise we use kcopyd to clone the data first.
          */
         if (io_overwrites_block(pool, bio)) {
-                struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+                struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
+
                 h->overwrite_mapping = m;
                 m->bio = bio;
                 save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);
@@ -1025,7 +1030,7 @@ static void schedule_copy(struct thin_c *tc, dm_block_t virt_block,
 
 static void schedule_internal_copy(struct thin_c *tc, dm_block_t virt_block,
                                    dm_block_t data_origin, dm_block_t data_dest,
-                                   struct cell *cell, struct bio *bio)
+                                   struct dm_bio_prison_cell *cell, struct bio *bio)
 {
         schedule_copy(tc, virt_block, tc->pool_dev,
                       data_origin, data_dest, cell, bio);
@@ -1033,18 +1038,18 @@ static void schedule_internal_copy(struct thin_c *tc, dm_block_t virt_block,
 
 static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block,
                                    dm_block_t data_dest,
-                                   struct cell *cell, struct bio *bio)
+                                   struct dm_bio_prison_cell *cell, struct bio *bio)
 {
         schedule_copy(tc, virt_block, tc->origin_dev,
                       virt_block, data_dest, cell, bio);
 }
 
 static void schedule_zero(struct thin_c *tc, dm_block_t virt_block,
-                          dm_block_t data_block, struct cell *cell,
+                          dm_block_t data_block, struct dm_bio_prison_cell *cell,
                           struct bio *bio)
 {
         struct pool *pool = tc->pool;
-        struct new_mapping *m = get_next_mapping(pool);
+        struct dm_thin_new_mapping *m = get_next_mapping(pool);
 
         INIT_LIST_HEAD(&m->list);
         m->quiesced = 1;
@@ -1065,12 +1070,12 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block,
                 process_prepared_mapping(m);
 
         else if (io_overwrites_block(pool, bio)) {
-                struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+                struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
+
                 h->overwrite_mapping = m;
                 m->bio = bio;
                 save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);
                 remap_and_issue(tc, bio, data_block);
-
         } else {
                 int r;
                 struct dm_io_region to;
@@ -1155,7 +1160,7 @@ static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
  */
 static void retry_on_resume(struct bio *bio)
 {
-        struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+        struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
         struct thin_c *tc = h->tc;
         struct pool *pool = tc->pool;
         unsigned long flags;
@@ -1165,7 +1170,7 @@ static void retry_on_resume(struct bio *bio)
         spin_unlock_irqrestore(&pool->lock, flags);
 }
 
-static void no_space(struct cell *cell)
+static void no_space(struct dm_bio_prison_cell *cell)
 {
         struct bio *bio;
         struct bio_list bios;
@@ -1182,11 +1187,11 @@ static void process_discard(struct thin_c *tc, struct bio *bio)
         int r;
         unsigned long flags;
         struct pool *pool = tc->pool;
-        struct cell *cell, *cell2;
+        struct dm_bio_prison_cell *cell, *cell2;
         struct cell_key key, key2;
         dm_block_t block = get_bio_block(tc, bio);
         struct dm_thin_lookup_result lookup_result;
-        struct new_mapping *m;
+        struct dm_thin_new_mapping *m;
 
         build_virtual_key(tc->td, block, &key);
         if (bio_detain(tc->pool->prison, &key, bio, &cell))
@@ -1263,7 +1268,7 @@ static void process_discard(struct thin_c *tc, struct bio *bio)
 static void break_sharing(struct thin_c *tc, struct bio *bio, dm_block_t block,
                           struct cell_key *key,
                           struct dm_thin_lookup_result *lookup_result,
-                          struct cell *cell)
+                          struct dm_bio_prison_cell *cell)
 {
         int r;
         dm_block_t data_block;
@@ -1290,7 +1295,7 @@ static void process_shared_bio(struct thin_c *tc, struct bio *bio,
                                dm_block_t block,
                                struct dm_thin_lookup_result *lookup_result)
 {
-        struct cell *cell;
+        struct dm_bio_prison_cell *cell;
         struct pool *pool = tc->pool;
         struct cell_key key;
 
@@ -1305,7 +1310,7 @@ static void process_shared_bio(struct thin_c *tc, struct bio *bio,
         if (bio_data_dir(bio) == WRITE)
                 break_sharing(tc, bio, block, &key, lookup_result, cell);
         else {
-                struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+                struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
 
                 h->shared_read_entry = ds_inc(&pool->shared_read_ds);
 
@@ -1315,7 +1320,7 @@ static void process_shared_bio(struct thin_c *tc, struct bio *bio,
 }
 
 static void provision_block(struct thin_c *tc, struct bio *bio, dm_block_t block,
-                            struct cell *cell)
+                            struct dm_bio_prison_cell *cell)
 {
         int r;
         dm_block_t data_block;
@@ -1363,7 +1368,7 @@ static void process_bio(struct thin_c *tc, struct bio *bio)
 {
         int r;
         dm_block_t block = get_bio_block(tc, bio);
-        struct cell *cell;
+        struct dm_bio_prison_cell *cell;
         struct cell_key key;
         struct dm_thin_lookup_result lookup_result;
 
@@ -1432,7 +1437,7 @@ static void process_deferred_bios(struct pool *pool)
         spin_unlock_irqrestore(&pool->lock, flags);
 
         while ((bio = bio_list_pop(&bios))) {
-                struct endio_hook *h = dm_get_mapinfo(bio)->ptr;
+                struct dm_thin_endio_hook *h = dm_get_mapinfo(bio)->ptr;
                 struct thin_c *tc = h->tc;
 
                 /*
@@ -1522,10 +1527,10 @@ static void thin_defer_bio(struct thin_c *tc, struct bio *bio)
         wake_worker(pool);
 }
 
-static struct endio_hook *thin_hook_bio(struct thin_c *tc, struct bio *bio)
+static struct dm_thin_endio_hook *thin_hook_bio(struct thin_c *tc, struct bio *bio)
 {
         struct pool *pool = tc->pool;
-        struct endio_hook *h = mempool_alloc(pool->endio_hook_pool, GFP_NOIO);
+        struct dm_thin_endio_hook *h = mempool_alloc(pool->endio_hook_pool, GFP_NOIO);
 
         h->tc = tc;
         h->shared_read_entry = NULL;
@@ -1687,6 +1692,9 @@ static void __pool_destroy(struct pool *pool)
         kfree(pool);
 }
 
+static struct kmem_cache *_new_mapping_cache;
+static struct kmem_cache *_endio_hook_cache;
+
 static struct pool *pool_create(struct mapped_device *pool_md,
                                 struct block_device *metadata_dev,
                                 unsigned long block_size, char **error)
@@ -1755,16 +1763,16 @@ static struct pool *pool_create(struct mapped_device *pool_md,
         ds_init(&pool->all_io_ds);
 
         pool->next_mapping = NULL;
-        pool->mapping_pool =
-                mempool_create_kmalloc_pool(MAPPING_POOL_SIZE, sizeof(struct new_mapping));
+        pool->mapping_pool = mempool_create_slab_pool(MAPPING_POOL_SIZE,
+                                                      _new_mapping_cache);
         if (!pool->mapping_pool) {
                 *error = "Error creating pool's mapping mempool";
                 err_p = ERR_PTR(-ENOMEM);
                 goto bad_mapping_pool;
         }
 
-        pool->endio_hook_pool =
-                mempool_create_kmalloc_pool(ENDIO_HOOK_POOL_SIZE, sizeof(struct endio_hook));
+        pool->endio_hook_pool = mempool_create_slab_pool(ENDIO_HOOK_POOL_SIZE,
+                                                         _endio_hook_cache);
         if (!pool->endio_hook_pool) {
                 *error = "Error creating pool's endio_hook mempool";
                 err_p = ERR_PTR(-ENOMEM);
@@ -2276,6 +2284,36 @@ static int process_set_transaction_id_mesg(unsigned argc, char **argv, struct po
         return 0;
 }
 
+static int process_reserve_metadata_snap_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        int r;
+
+        r = check_arg_count(argc, 1);
+        if (r)
+                return r;
+
+        r = dm_pool_reserve_metadata_snap(pool->pmd);
+        if (r)
+                DMWARN("reserve_metadata_snap message failed.");
+
+        return r;
+}
+
+static int process_release_metadata_snap_mesg(unsigned argc, char **argv, struct pool *pool)
+{
+        int r;
+
+        r = check_arg_count(argc, 1);
+        if (r)
+                return r;
+
+        r = dm_pool_release_metadata_snap(pool->pmd);
+        if (r)
+                DMWARN("release_metadata_snap message failed.");
+
+        return r;
+}
+
 /*
  * Messages supported:
  *   create_thin        <dev_id>
@@ -2283,6 +2321,8 @@ static int process_set_transaction_id_mesg(unsigned argc, char **argv, struct po
  *   delete             <dev_id>
  *   trim               <dev_id> <new_size_in_sectors>
  *   set_transaction_id <current_trans_id> <new_trans_id>
+ *   reserve_metadata_snap
+ *   release_metadata_snap
  */
 static int pool_message(struct dm_target *ti, unsigned argc, char **argv)
 {
@@ -2302,6 +2342,12 @@ static int pool_message(struct dm_target *ti, unsigned argc, char **argv)
         else if (!strcasecmp(argv[0], "set_transaction_id"))
                 r = process_set_transaction_id_mesg(argc, argv, pool);
 
+        else if (!strcasecmp(argv[0], "reserve_metadata_snap"))
+                r = process_reserve_metadata_snap_mesg(argc, argv, pool);
+
+        else if (!strcasecmp(argv[0], "release_metadata_snap"))
+                r = process_release_metadata_snap_mesg(argc, argv, pool);
+
         else
                 DMWARN("Unrecognised thin pool target message received: %s", argv[0]);
 
@@ -2361,7 +2407,7 @@ static int pool_status(struct dm_target *ti, status_type_t type,
                 if (r)
                         return r;
 
-                r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
+                r = dm_pool_get_metadata_snap(pool->pmd, &held_root);
                 if (r)
                         return r;
 
@@ -2457,7 +2503,7 @@ static struct target_type pool_target = {
         .name = "thin-pool",
         .features = DM_TARGET_SINGLETON | DM_TARGET_ALWAYS_WRITEABLE |
                     DM_TARGET_IMMUTABLE,
-        .version = {1, 1, 0},
+        .version = {1, 2, 0},
         .module = THIS_MODULE,
         .ctr = pool_ctr,
         .dtr = pool_dtr,
@@ -2613,9 +2659,9 @@ static int thin_endio(struct dm_target *ti,
                       union map_info *map_context)
 {
         unsigned long flags;
-        struct endio_hook *h = map_context->ptr;
+        struct dm_thin_endio_hook *h = map_context->ptr;
         struct list_head work;
-        struct new_mapping *m, *tmp;
+        struct dm_thin_new_mapping *m, *tmp;
         struct pool *pool = h->tc->pool;
 
         if (h->shared_read_entry) {
@@ -2755,7 +2801,32 @@ static int __init dm_thin_init(void)
 
         r = dm_register_target(&pool_target);
         if (r)
-                dm_unregister_target(&thin_target);
+                goto bad_pool_target;
+
+        r = -ENOMEM;
+
+        _cell_cache = KMEM_CACHE(dm_bio_prison_cell, 0);
+        if (!_cell_cache)
+                goto bad_cell_cache;
+
+        _new_mapping_cache = KMEM_CACHE(dm_thin_new_mapping, 0);
+        if (!_new_mapping_cache)
+                goto bad_new_mapping_cache;
+
+        _endio_hook_cache = KMEM_CACHE(dm_thin_endio_hook, 0);
+        if (!_endio_hook_cache)
+                goto bad_endio_hook_cache;
+
+        return 0;
+
+bad_endio_hook_cache:
+        kmem_cache_destroy(_new_mapping_cache);
+bad_new_mapping_cache:
+        kmem_cache_destroy(_cell_cache);
+bad_cell_cache:
+        dm_unregister_target(&pool_target);
+bad_pool_target:
+        dm_unregister_target(&thin_target);
 
         return r;
 }
@@ -2764,6 +2835,10 @@ static void dm_thin_exit(void)
 {
         dm_unregister_target(&thin_target);
         dm_unregister_target(&pool_target);
+
+        kmem_cache_destroy(_cell_cache);
+        kmem_cache_destroy(_new_mapping_cache);
+        kmem_cache_destroy(_endio_hook_cache);
 }
 
 module_init(dm_thin_init);
diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
index 6f8d38747d7f..400fe144c0cd 100644
--- a/drivers/md/persistent-data/dm-transaction-manager.c
+++ b/drivers/md/persistent-data/dm-transaction-manager.c
@@ -249,6 +249,7 @@ int dm_tm_shadow_block(struct dm_transaction_manager *tm, dm_block_t orig,
 
         return r;
 }
+EXPORT_SYMBOL_GPL(dm_tm_shadow_block);
 
 int dm_tm_read_lock(struct dm_transaction_manager *tm, dm_block_t b,
                     struct dm_block_validator *v,
@@ -259,6 +260,7 @@ int dm_tm_read_lock(struct dm_transaction_manager *tm, dm_block_t b,
 
         return dm_bm_read_lock(tm->bm, b, v, blk);
 }
+EXPORT_SYMBOL_GPL(dm_tm_read_lock);
 
 int dm_tm_unlock(struct dm_transaction_manager *tm, struct dm_block *b)
 {
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 835de7168cd3..a9c7981ddd24 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2550,6 +2550,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
         err = -EINVAL;
         spin_lock_init(&conf->device_lock);
         rdev_for_each(rdev, mddev) {
+                struct request_queue *q;
                 int disk_idx = rdev->raid_disk;
                 if (disk_idx >= mddev->raid_disks
                     || disk_idx < 0)
@@ -2562,6 +2563,9 @@ static struct r1conf *setup_conf(struct mddev *mddev)
                 if (disk->rdev)
                         goto abort;
                 disk->rdev = rdev;
+                q = bdev_get_queue(rdev->bdev);
+                if (q->merge_bvec_fn)
+                        mddev->merge_check_needed = 1;
 
                 disk->head_position = 0;
         }
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 987db37cb875..99ae6068e456 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3475,6 +3475,7 @@ static int run(struct mddev *mddev)
 
         rdev_for_each(rdev, mddev) {
                 long long diff;
+                struct request_queue *q;
 
                 disk_idx = rdev->raid_disk;
                 if (disk_idx < 0)
@@ -3493,6 +3494,9 @@ static int run(struct mddev *mddev)
                                 goto out_free_conf;
                         disk->rdev = rdev;
                 }
+                q = bdev_get_queue(rdev->bdev);
+                if (q->merge_bvec_fn)
+                        mddev->merge_check_needed = 1;
                 diff = (rdev->new_data_offset - rdev->data_offset);
                 if (!mddev->reshape_backwards)
                         diff = -diff;
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index af2d9086d7e8..c370c2d87c17 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -29,6 +29,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/isa.h>
 #include <asm/io.h>
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a5c591ffe395..d99db5623acf 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1653,7 +1653,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         unsigned long    port;
         u32              msize;
         u32              psize;
-        u8               revision;
         int              r = -ENODEV;
         struct pci_dev *pdev;
 
@@ -1670,8 +1669,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)
                 return r;
         }
 
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-
         if (sizeof(dma_addr_t) > 4) {
                 const uint64_t required_mask = dma_get_required_mask
                     (&pdev->dev);
@@ -1779,7 +1776,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         MPT_ADAPTER     *ioc;
         u8               cb_idx;
         int              r = -ENODEV;
-        u8               revision;
         u8               pcixcmd;
         static int       mpt_ids = 0;
 #ifdef CONFIG_PROC_FS
@@ -1887,8 +1883,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
             ioc->name, &ioc->facts, &ioc->pfacts[0]));
 
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-        mpt_get_product_name(pdev->vendor, pdev->device, revision, ioc->prod_name);
+        mpt_get_product_name(pdev->vendor, pdev->device, pdev->revision,
+                             ioc->prod_name);
 
         switch (pdev->device)
         {
@@ -1903,7 +1899,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 break;
 
         case MPI_MANUFACTPAGE_DEVICEID_FC929X:
-                if (revision < XL_929) {
+                if (pdev->revision < XL_929) {
                         /* 929X Chip Fix. Set Split transactions level
                         * for PCIX. Set MOST bits to zero.
                         */
@@ -1934,7 +1930,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 /* 1030 Chip Fix. Disable Split transactions
                  * for PCIX. Set MOST bits to zero if Rev < C0( = 8).
                  */
-                if (revision < C0_1030) {
+                if (pdev->revision < C0_1030) {
                         pci_read_config_byte(pdev, 0x6a, &pcixcmd);
                         pcixcmd &= 0x8F;
                         pci_write_config_byte(pdev, 0x6a, pcixcmd);
@@ -6483,6 +6479,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
                                 printk(MYIOC_s_INFO_FMT "%s: host reset in"
                                         " progress mpt_config timed out.!!\n",
                                         __func__, ioc->name);
+                                mutex_unlock(&ioc->mptbase_cmds.mutex);
                                 return -EFAULT;
                         }
                         spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 6e6e16aab9da..b383b6961e59 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1250,7 +1250,6 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         int                     iocnum;
         unsigned int            port;
         int                     cim_rev;
-        u8                      revision;
         struct scsi_device      *sdev;
         VirtDevice              *vdevice;
 
@@ -1324,8 +1323,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         pdev = (struct pci_dev *) ioc->pcidev;
 
         karg->pciId = pdev->device;
-        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
-        karg->hwRev = revision;
+        karg->hwRev = pdev->revision;
         karg->subSystemDevice = pdev->subsystem_device;
         karg->subSystemVendor = pdev->subsystem_vendor;
 
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 671c8bc14bbc..50e83dc5dc49 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2735,6 +2735,7 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = {
         REGULATOR_SUPPLY("vcore", "uart2"),
         REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),
         REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),
+        REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
 };
 
 static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 373f423b1181..947a06a1845f 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -6,7 +6,7 @@
  *
  * License Terms: GNU General Public License, version 2
  * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics
+ * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics
  */
 
 #include <linux/i2c.h>
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index afd459013ecb..9edfe864cc05 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -4,7 +4,7 @@
  * Copyright (C) ST Microelectronics SA 2011
  *
  * License Terms: GNU General Public License, version 2
- * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics
+ * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics
  */
 
 #include <linux/spi/spi.h>
@@ -146,4 +146,4 @@ module_exit(stmpe_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 93936f1b75eb..23f5463d4cae 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -835,7 +835,7 @@ static int _mei_irq_thread_read(struct mei_device *dev,	s32 *slots,
                         struct mei_cl *cl,
                         struct mei_io_list *cmpl_list)
 {
-        if ((*slots * sizeof(u32)) >= (sizeof(struct mei_msg_hdr) +
+        if ((*slots * sizeof(u32)) < (sizeof(struct mei_msg_hdr) +
                         sizeof(struct hbm_flow_control))) {
                 /* return the cancel routine */
                 list_del(&cb_pos->cb_list);
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index c70333228337..7de13891e49e 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -982,7 +982,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
                 err = request_threaded_irq(pdev->irq,
                         NULL,
                         mei_interrupt_thread_handler,
-                        0, mei_driver_name, dev);
+                        IRQF_ONESHOT, mei_driver_name, dev);
         else
                 err = request_threaded_irq(pdev->irq,
                         mei_interrupt_quick_handler,
@@ -992,7 +992,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
         if (err) {
                 dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n",
                        pdev->irq);
-                goto unmap_memory;
+                goto disable_msi;
         }
         INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
         if (mei_hw_init(dev)) {
@@ -1023,8 +1023,8 @@ release_irq:
         mei_disable_interrupts(dev);
         flush_scheduled_work();
         free_irq(pdev->irq, dev);
+disable_msi:
         pci_disable_msi(pdev);
-unmap_memory:
         pci_iounmap(pdev, dev->mem_addr);
 free_device:
         kfree(dev);
@@ -1101,6 +1101,8 @@ static void __devexit mei_remove(struct pci_dev *pdev)
 
         pci_release_regions(pdev);
         pci_disable_device(pdev);
+
+        misc_deregister(&mei_misc_device);
 }
 #ifdef CONFIG_PM
 static int mei_pci_suspend(struct device *device)
@@ -1216,7 +1218,6 @@ module_init(mei_init_module);
  */
 static void __exit mei_exit_module(void)
 {
-        misc_deregister(&mei_misc_device);
         pci_unregister_driver(&mei_driver);
 
         pr_debug("unloaded successfully.\n");
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 6be5605707b4..e2ec0505eb5c 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -341,7 +341,7 @@ static const struct watchdog_ops wd_ops = {
 };
 static const struct watchdog_info wd_info = {
                 .identity = INTEL_AMT_WATCHDOG_ID,
-                .options = WDIOF_KEEPALIVEPING,
+                .options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY,
 };
 
 static struct watchdog_device amt_wd_dev = {
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2d4a4b746750..258b203397aa 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1326,7 +1326,7 @@ static int mmc_suspend(struct mmc_host *host)
                 if (!err)
                         mmc_card_set_sleep(host->card);
         } else if (!mmc_host_is_spi(host))
-                mmc_deselect_cards(host);
+                err = mmc_deselect_cards(host);
         host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
         mmc_release_host(host);
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c272c6868ecf..b2b43f624b9e 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1075,16 +1075,18 @@ static void mmc_sd_detect(struct mmc_host *host)
  */
 static int mmc_sd_suspend(struct mmc_host *host)
 {
+        int err = 0;
+
         BUG_ON(!host);
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
         if (!mmc_host_is_spi(host))
-                mmc_deselect_cards(host);
+                err = mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_release_host(host);
 
-        return 0;
+        return err;
 }
 
 /*
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 13d0e95380ab..41c5fd8848f4 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -218,6 +218,12 @@ static int sdio_enable_wide(struct mmc_card *card)
         if (ret)
                 return ret;
 
+        if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED)
+                pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n",
+                           mmc_hostname(card->host), ctrl);
+
+        /* set as 4-bit bus width */
+        ctrl &= ~SDIO_BUS_WIDTH_MASK;
         ctrl |= SDIO_BUS_WIDTH_4BIT;
 
         ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);
diff --git a/drivers/mmc/host/atmel-mci-regs.h b/drivers/mmc/host/atmel-mci-regs.h
index 787aba1682bb..ab56f7db5315 100644
--- a/drivers/mmc/host/atmel-mci-regs.h
+++ b/drivers/mmc/host/atmel-mci-regs.h
@@ -140,4 +140,18 @@
 #define atmci_writel(port,reg,value)                    \
         __raw_writel((value), (port)->regs + reg)
 
+/*
+ * Fix sconfig's burst size according to atmel MCI. We need to convert them as:
+ * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3.
+ *
+ * This can be done by finding most significant bit set.
+ */
+static inline unsigned int atmci_convert_chksize(unsigned int maxburst)
+{
+        if (maxburst > 1)
+                return fls(maxburst) - 2;
+        else
+                return 0;
+}
+
 #endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 420aca642b14..f2c115e06438 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -910,6 +910,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         enum dma_data_direction         direction;
         enum dma_transfer_direction     slave_dirn;
         unsigned int                    sglen;
+        u32                             maxburst;
         u32 iflags;
 
         data->error = -EINPROGRESS;
@@ -943,17 +944,18 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
         if (!chan)
                 return -ENODEV;
 
-        if (host->caps.has_dma)
-                atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN);
-
         if (data->flags & MMC_DATA_READ) {
                 direction = DMA_FROM_DEVICE;
                 host->dma_conf.direction = slave_dirn = DMA_DEV_TO_MEM;
+                maxburst = atmci_convert_chksize(host->dma_conf.src_maxburst);
         } else {
                 direction = DMA_TO_DEVICE;
                 host->dma_conf.direction = slave_dirn = DMA_MEM_TO_DEV;
+                maxburst = atmci_convert_chksize(host->dma_conf.dst_maxburst);
         }
 
+        atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(maxburst) | ATMCI_DMAEN);
+
         sglen = dma_map_sg(chan->device->dev, data->sg,
                         data->sg_len, direction);
 
@@ -2314,6 +2316,8 @@ static int __init atmci_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, host);
 
+        setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);
+
         /* We need at least one slot to succeed */
         nr_slots = 0;
         ret = -ENODEV;
@@ -2352,8 +2356,6 @@ static int __init atmci_probe(struct platform_device *pdev)
                 }
         }
 
-        setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);
-
         dev_info(&pdev->dev,
                         "Atmel MCI controller at 0x%08lx irq %d, %u slots\n",
                         host->mapbase, irq, nr_slots);
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 9bbf45f8c538..1ca5e72ceb65 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -418,6 +418,8 @@ static int dw_mci_idmac_init(struct dw_mci *host)
         p->des3 = host->sg_dma;
         p->des0 = IDMAC_DES0_ER;
 
+        mci_writel(host, BMOD, SDMMC_IDMAC_SWRESET);
+
         /* Mask out interrupts - get Tx & Rx complete only */
         mci_writel(host, IDINTEN, SDMMC_IDMAC_INT_NI | SDMMC_IDMAC_INT_RI |
                    SDMMC_IDMAC_INT_TI);
@@ -615,14 +617,15 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot)
         u32 div;
 
         if (slot->clock != host->current_speed) {
-                if (host->bus_hz % slot->clock)
+                div = host->bus_hz / slot->clock;
+                if (host->bus_hz % slot->clock && host->bus_hz > slot->clock)
                         /*
                          * move the + 1 after the divide to prevent
                          * over-clocking the card.
                          */
-                        div = ((host->bus_hz / slot->clock) >> 1) + 1;
-                else
-                        div = (host->bus_hz  / slot->clock) >> 1;
+                        div += 1;
+
+                div = (host->bus_hz != slot->clock) ? DIV_ROUND_UP(div, 2) : 0;
 
                 dev_info(&slot->mmc->class_dev,
                          "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ"
@@ -939,8 +942,8 @@ static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd
                         mdelay(20);
 
                 if (cmd->data) {
-                        host->data = NULL;
                         dw_mci_stop_dma(host);
+                        host->data = NULL;
                 }
         }
 }
@@ -1623,7 +1626,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
         if (pending & (SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI)) {
                 mci_writel(host, IDSTS, SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI);
                 mci_writel(host, IDSTS, SDMMC_IDMAC_INT_NI);
-                set_bit(EVENT_DATA_COMPLETE, &host->pending_events);
                 host->dma_ops->complete(host);
         }
 #endif
@@ -1725,7 +1727,8 @@ static void dw_mci_work_routine_card(struct work_struct *work)
 
 #ifdef CONFIG_MMC_DW_IDMAC
                                 ctrl = mci_readl(host, BMOD);
-                                ctrl |= 0x01; /* Software reset of DMA */
+                                /* Software reset of DMA */
+                                ctrl |= SDMMC_IDMAC_SWRESET;
                                 mci_writel(host, BMOD, ctrl);
 #endif
 
@@ -1950,10 +1953,6 @@ int dw_mci_probe(struct dw_mci *host)
         spin_lock_init(&host->lock);
         INIT_LIST_HEAD(&host->queue);
 
-
-        host->dma_ops = host->pdata->dma_ops;
-        dw_mci_init_dma(host);
-
         /*
          * Get the host data width - this assumes that HCON has been set with
          * the correct values.
@@ -1981,10 +1980,11 @@ int dw_mci_probe(struct dw_mci *host)
         }
 
         /* Reset all blocks */
-        if (!mci_wait_reset(&host->dev, host)) {
-                ret = -ENODEV;
-                goto err_dmaunmap;
-        }
+        if (!mci_wait_reset(&host->dev, host))
+                return -ENODEV;
+
+        host->dma_ops = host->pdata->dma_ops;
+        dw_mci_init_dma(host);
 
         /* Clear the interrupts for the host controller */
         mci_writel(host, RINTSTS, 0xFFFFFFFF);
@@ -2170,14 +2170,14 @@ int dw_mci_resume(struct dw_mci *host)
         if (host->vmmc)
                 regulator_enable(host->vmmc);
 
-        if (host->dma_ops->init)
-                host->dma_ops->init(host);
-
         if (!mci_wait_reset(&host->dev, host)) {
                 ret = -ENODEV;
                 return ret;
         }
 
+        if (host->dma_ops->init)
+                host->dma_ops->init(host);
+
         /* Restore the old value at FIFOTH register */
         mci_writel(host, FIFOTH, host->fifoth_val);
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f0fcce40cd8d..50ff19a62368 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1216,12 +1216,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
         int bus_width = 0;
 
         pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
-        if (!pdata->gpio_wp)
-                pdata->gpio_wp = -1;
-
         pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
-        if (!pdata->gpio_cd)
-                pdata->gpio_cd = -1;
 
         if (of_get_property(np, "cd-inverted", NULL))
                 pdata->cd_invert = true;
@@ -1276,6 +1271,12 @@ static int __devinit mmci_probe(struct amba_device *dev,
                 return -EINVAL;
         }
 
+        if (!plat) {
+                plat = devm_kzalloc(&dev->dev, sizeof(*plat), GFP_KERNEL);
+                if (!plat)
+                        return -ENOMEM;
+        }
+
         if (np)
                 mmci_dt_populate_generic_pdata(np, plat);
 
@@ -1424,6 +1425,10 @@ static int __devinit mmci_probe(struct amba_device *dev,
         writel(0, host->base + MMCIMASK1);
         writel(0xfff, host->base + MMCICLEAR);
 
+        if (plat->gpio_cd == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto err_gpio_cd;
+        }
         if (gpio_is_valid(plat->gpio_cd)) {
                 ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");
                 if (ret == 0)
@@ -1447,6 +1452,10 @@ static int __devinit mmci_probe(struct amba_device *dev,
                 if (ret >= 0)
                         host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd);
         }
+        if (plat->gpio_wp == -EPROBE_DEFER) {
+                ret = -EPROBE_DEFER;
+                goto err_gpio_wp;
+        }
         if (gpio_is_valid(plat->gpio_wp)) {
                 ret = gpio_request(plat->gpio_wp, DRIVER_NAME " (wp)");
                 if (ret == 0)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 34a90266ab11..277161d279b8 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = {
                 .owner  = THIS_MODULE,
 #ifdef CONFIG_PM
                 .pm     = &mxs_mmc_pm_ops,
-                .of_match_table = mxs_mmc_dt_ids,
 #endif
+                .of_match_table = mxs_mmc_dt_ids,
         },
 };
 
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 552196c764d4..3e8dcf8d2e05 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1300,7 +1300,7 @@ static const struct mmc_host_ops mmc_omap_ops = {
         .set_ios        = mmc_omap_set_ios,
 };
 
-static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id)
+static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id)
 {
         struct mmc_omap_slot *slot = NULL;
         struct mmc_host *mmc;
@@ -1485,24 +1485,26 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)
         }
 
         host->nr_slots = pdata->nr_slots;
+        host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
+
+        host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0);
+        if (!host->mmc_omap_wq)
+                goto err_plat_cleanup;
+
         for (i = 0; i < pdata->nr_slots; i++) {
                 ret = mmc_omap_new_slot(host, i);
                 if (ret < 0) {
                         while (--i >= 0)
                                 mmc_omap_remove_slot(host->slots[i]);
 
-                        goto err_plat_cleanup;
+                        goto err_destroy_wq;
                 }
         }
 
-        host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
-
-        host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0);
-        if (!host->mmc_omap_wq)
-                goto err_plat_cleanup;
-
         return 0;
 
+err_destroy_wq:
+        destroy_workqueue(host->mmc_omap_wq);
 err_plat_cleanup:
         if (pdata->cleanup)
                 pdata->cleanup(&pdev->dev);
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 55a164fcaa15..a50c205ea208 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -404,7 +404,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc)
                 if (sc->ext_cd_irq &&
                     request_threaded_irq(sc->ext_cd_irq, NULL,
                                          sdhci_s3c_gpio_card_detect_thread,
-                                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+                                         IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                          dev_name(dev), sc) == 0) {
                         int status = gpio_get_value(sc->ext_cd_gpio);
                         if (pdata->ext_cd_gpio_invert)
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 1fe32dfa7cd4..423da8194cd8 100644
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -4,7 +4,7 @@
  * Support of SDHCI platform devices for spear soc family
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * Inspired by sdhci-pltfm.c
  *
@@ -289,5 +289,5 @@ static struct platform_driver sdhci_driver = {
 module_platform_driver(sdhci_driver);
 
 MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver");
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e626732aff77..f4b8b4db3a9a 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -680,8 +680,8 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
         }
 
         if (count >= 0xF) {
-                pr_warning("%s: Too large timeout 0x%x requested for CMD%d!\n",
-                           mmc_hostname(host->mmc), count, cmd->opcode);
+                DBG("%s: Too large timeout 0x%x requested for CMD%d!\n",
+                    mmc_hostname(host->mmc), count, cmd->opcode);
                 count = 0xE;
         }
 
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5760c1a4b3f6..27143e042af5 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -128,7 +128,7 @@ config MTD_AFS_PARTS
 
 config MTD_OF_PARTS
         tristate "OpenFirmware partitioning information support"
-        default Y
+        default y
         depends on OF
         help
           This provides a partition parsing function which derives
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 608321ee056e..63d2a64331f7 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -4,7 +4,7 @@
  * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
  *                        Mike Albon <malbon@openwrt.org>
  * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
- * Copyright © 2011 Jonas Gorski <jonas.gorski@gmail.com>
+ * Copyright © 2011-2012  Jonas Gorski <jonas.gorski@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
         int namelen = 0;
         int i;
         u32 computed_crc;
+        bool rootfs_first = false;
 
         if (bcm63xx_detect_cfe(master))
                 return -EINVAL;
@@ -109,6 +110,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
                 char *boardid = &(buf->board_id[0]);
                 char *tagversion = &(buf->tag_version[0]);
 
+                sscanf(buf->flash_image_start, "%u", &rootfsaddr);
                 sscanf(buf->kernel_address, "%u", &kerneladdr);
                 sscanf(buf->kernel_length, "%u", &kernellen);
                 sscanf(buf->total_length, "%u", &totallen);
@@ -117,10 +119,19 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
                         tagversion, boardid);
 
                 kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
-                rootfsaddr = kerneladdr + kernellen;
+                rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
                 spareaddr = roundup(totallen, master->erasesize) + cfelen;
                 sparelen = master->size - spareaddr - nvramlen;
-                rootfslen = spareaddr - rootfsaddr;
+
+                if (rootfsaddr < kerneladdr) {
+                        /* default Broadcom layout */
+                        rootfslen = kerneladdr - rootfsaddr;
+                        rootfs_first = true;
+                } else {
+                        /* OpenWrt layout */
+                        rootfsaddr = kerneladdr + kernellen;
+                        rootfslen = spareaddr - rootfsaddr;
+                }
         } else {
                 pr_warn("CFE boot tag CRC invalid (expected %08x, actual %08x)\n",
                         buf->header_crc, computed_crc);
@@ -156,18 +167,26 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
         curpart++;
 
         if (kernellen > 0) {
-                parts[curpart].name = "kernel";
-                parts[curpart].offset = kerneladdr;
-                parts[curpart].size = kernellen;
+                int kernelpart = curpart;
+
+                if (rootfslen > 0 && rootfs_first)
+                        kernelpart++;
+                parts[kernelpart].name = "kernel";
+                parts[kernelpart].offset = kerneladdr;
+                parts[kernelpart].size = kernellen;
                 curpart++;
         }
 
         if (rootfslen > 0) {
-                parts[curpart].name = "rootfs";
-                parts[curpart].offset = rootfsaddr;
-                parts[curpart].size = rootfslen;
-                if (sparelen > 0)
-                        parts[curpart].size += sparelen;
+                int rootfspart = curpart;
+
+                if (kernellen > 0 && rootfs_first)
+                        rootfspart--;
+                parts[rootfspart].name = "rootfs";
+                parts[rootfspart].offset = rootfsaddr;
+                parts[rootfspart].size = rootfslen;
+                if (sparelen > 0  && !rootfs_first)
+                        parts[rootfspart].size += sparelen;
                 curpart++;
         }
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index d02592e6a0f0..22d0493a026f 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -317,7 +317,7 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
 
         if ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0x003f) {
                 cfi->cfiq->EraseRegionInfo[0] |= 0x0040;
-                pr_warning("%s: Bad S29GL064N CFI data, adjust from 64 to 128 sectors\n", mtd->name);
+                pr_warning("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n", mtd->name);
         }
 }
 
@@ -328,10 +328,23 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd)
 
         if ((cfi->cfiq->EraseRegionInfo[1] & 0xffff) == 0x007e) {
                 cfi->cfiq->EraseRegionInfo[1] &= ~0x0040;
-                pr_warning("%s: Bad S29GL032N CFI data, adjust from 127 to 63 sectors\n", mtd->name);
+                pr_warning("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n", mtd->name);
         }
 }
 
+static void fixup_s29ns512p_sectors(struct mtd_info *mtd)
+{
+        struct map_info *map = mtd->priv;
+        struct cfi_private *cfi = map->fldrv_priv;
+
+        /*
+         *  S29NS512P flash uses more than 8bits to report number of sectors,
+         * which is not permitted by CFI.
+         */
+        cfi->cfiq->EraseRegionInfo[0] = 0x020001ff;
+        pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);
+}
+
 /* 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 }, /* SST39VF1602 */
@@ -362,6 +375,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
         { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
         { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
         { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
+        { CFI_MFR_AMD, 0x3f00, fixup_s29ns512p_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 */
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index ddf9ec6d9168..4558e0f4d07f 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -70,7 +70,7 @@ struct cmdline_mtd_partition {
 /* mtdpart_setup() parses into here */
 static struct cmdline_mtd_partition *partitions;
 
-/* the command line passed to mtdpart_setupd() */
+/* the command line passed to mtdpart_setup() */
 static char *cmdline;
 static int cmdline_parsed = 0;
 
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index a4a80b742e65..681e2ee0f2d6 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -52,8 +52,6 @@ static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len)
 
         while (pages) {
                 page = page_read(mapping, index);
-                if (!page)
-                        return -ENOMEM;
                 if (IS_ERR(page))
                         return PTR_ERR(page);
 
@@ -112,8 +110,6 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len,
                 len = len - cpylen;
 
                 page = page_read(dev->blkdev->bd_inode->i_mapping, index);
-                if (!page)
-                        return -ENOMEM;
                 if (IS_ERR(page))
                         return PTR_ERR(page);
 
@@ -148,8 +144,6 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf,
                 len = len - cpylen;
 
                 page = page_read(mapping, index);
-                if (!page)
-                        return -ENOMEM;
                 if (IS_ERR(page))
                         return PTR_ERR(page);
 
@@ -271,7 +265,6 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
         dev->mtd.flags = MTD_CAP_RAM;
         dev->mtd._erase = block2mtd_erase;
         dev->mtd._write = block2mtd_write;
-        dev->mtd._writev = mtd_writev;
         dev->mtd._sync = block2mtd_sync;
         dev->mtd._read = block2mtd_read;
         dev->mtd.priv = dev;
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index 50aa90aa7a7f..f70854d728fe 100644
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -227,7 +227,7 @@ static void doc_read_data_area(struct docg3 *docg3, void *buf, int len,
         u8 data8, *dst8;
 
         doc_dbg("doc_read_data_area(buf=%p, len=%d)\n", buf, len);
-        cdr = len & 0x3;
+        cdr = len & 0x1;
         len4 = len - cdr;
 
         if (first)
@@ -732,12 +732,24 @@ err:
  * @len: the number of bytes to be read (must be a multiple of 4)
  * @buf: the buffer to be filled in (or NULL is forget bytes)
  * @first: 1 if first time read, DOC_READADDRESS should be set
+ * @last_odd: 1 if last read ended up on an odd byte
+ *
+ * Reads bytes from a prepared page. There is a trickery here : if the last read
+ * ended up on an odd offset in the 1024 bytes double page, ie. between the 2
+ * planes, the first byte must be read apart. If a word (16bit) read was used,
+ * the read would return the byte of plane 2 as low *and* high endian, which
+ * will mess the read.
  *
  */
 static int doc_read_page_getbytes(struct docg3 *docg3, int len, u_char *buf,
-                                  int first)
+                                  int first, int last_odd)
 {
-        doc_read_data_area(docg3, buf, len, first);
+        if (last_odd && len > 0) {
+                doc_read_data_area(docg3, buf, 1, first);
+                doc_read_data_area(docg3, buf ? buf + 1 : buf, len - 1, 0);
+        } else {
+                doc_read_data_area(docg3, buf, len, first);
+        }
         doc_delay(docg3, 2);
         return len;
 }
@@ -850,6 +862,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t from,
         u8 *buf = ops->datbuf;
         size_t len, ooblen, nbdata, nboob;
         u8 hwecc[DOC_ECC_BCH_SIZE], eccconf1;
+        int max_bitflips = 0;
 
         if (buf)
                 len = ops->len;
@@ -876,7 +889,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t from,
         ret = 0;
         skip = from % DOC_LAYOUT_PAGE_SIZE;
         mutex_lock(&docg3->cascade->lock);
-        while (!ret && (len > 0 || ooblen > 0)) {
+        while (ret >= 0 && (len > 0 || ooblen > 0)) {
                 calc_block_sector(from - skip, &block0, &block1, &page, &ofs,
                         docg3->reliable);
                 nbdata = min_t(size_t, len, DOC_LAYOUT_PAGE_SIZE - skip);
@@ -887,20 +900,20 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t from,
                 ret = doc_read_page_ecc_init(docg3, DOC_ECC_BCH_TOTAL_BYTES);
                 if (ret < 0)
                         goto err_in_read;
-                ret = doc_read_page_getbytes(docg3, skip, NULL, 1);
+                ret = doc_read_page_getbytes(docg3, skip, NULL, 1, 0);
                 if (ret < skip)
                         goto err_in_read;
-                ret = doc_read_page_getbytes(docg3, nbdata, buf, 0);
+                ret = doc_read_page_getbytes(docg3, nbdata, buf, 0, skip % 2);
                 if (ret < nbdata)
                         goto err_in_read;
                 doc_read_page_getbytes(docg3,
                                        DOC_LAYOUT_PAGE_SIZE - nbdata - skip,
-                                       NULL, 0);
-                ret = doc_read_page_getbytes(docg3, nboob, oobbuf, 0);
+                                       NULL, 0, (skip + nbdata) % 2);
+                ret = doc_read_page_getbytes(docg3, nboob, oobbuf, 0, 0);
                 if (ret < nboob)
                         goto err_in_read;
                 doc_read_page_getbytes(docg3, DOC_LAYOUT_OOB_SIZE - nboob,
-                                       NULL, 0);
+                                       NULL, 0, nboob % 2);
 
                 doc_get_bch_hw_ecc(docg3, hwecc);
                 eccconf1 = doc_register_readb(docg3, DOC_ECCCONF1);
@@ -936,7 +949,8 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t from,
                         }
                         if (ret > 0) {
                                 mtd->ecc_stats.corrected += ret;
-                                ret = -EUCLEAN;
+                                max_bitflips = max(max_bitflips, ret);
+                                ret = max_bitflips;
                         }
                 }
 
@@ -1004,7 +1018,7 @@ static int doc_reload_bbt(struct docg3 *docg3)
                                                      DOC_LAYOUT_PAGE_SIZE);
                 if (!ret)
                         doc_read_page_getbytes(docg3, DOC_LAYOUT_PAGE_SIZE,
-                                               buf, 1);
+                                               buf, 1, 0);
                 buf += DOC_LAYOUT_PAGE_SIZE;
         }
         doc_read_page_finish(docg3);
@@ -1064,10 +1078,10 @@ static int doc_get_erase_count(struct docg3 *docg3, loff_t from)
         ret = doc_reset_seq(docg3);
         if (!ret)
                 ret = doc_read_page_prepare(docg3, block0, block1, page,
-                                            ofs + DOC_LAYOUT_WEAR_OFFSET);
+                                            ofs + DOC_LAYOUT_WEAR_OFFSET, 0);
         if (!ret)
                 ret = doc_read_page_getbytes(docg3, DOC_LAYOUT_WEAR_SIZE,
-                                             buf, 1);
+                                             buf, 1, 0);
         doc_read_page_finish(docg3);
 
         if (ret || (buf[0] != DOC_ERASE_MARK) || (buf[2] != DOC_ERASE_MARK))
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1924d247c1cb..5d0d68c3fe27 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -639,12 +639,16 @@ static const struct spi_device_id m25p_ids[] = {
         { "en25q32b", INFO(0x1c3016, 0, 64 * 1024,  64, 0) },
         { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
 
+        /* Everspin */
+        { "mr25h256", CAT25_INFO(  32 * 1024, 1, 256, 2) },
+
         /* Intel/Numonyx -- xxxs33b */
         { "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
         { "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
         { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
 
         /* Macronix */
+        { "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
         { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
         { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
         { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
@@ -728,6 +732,7 @@ static const struct spi_device_id m25p_ids[] = {
         { "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },
         { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
         { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
+        { "w25q80", INFO(0xef5014, 0, 64 * 1024,  16, SECT_4K) },
 
         /* Catalyst / On Semiconductor -- non-JEDEC */
         { "cat25c11", CAT25_INFO(  16, 8, 16, 1) },
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 797d43cd3550..67960362681e 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -990,9 +990,9 @@ static int __devinit spear_smi_probe(struct platform_device *pdev)
                 goto err_clk;
         }
 
-        ret = clk_enable(dev->clk);
+        ret = clk_prepare_enable(dev->clk);
         if (ret)
-                goto err_clk_enable;
+                goto err_clk_prepare_enable;
 
         ret = request_irq(irq, spear_smi_int_handler, 0, pdev->name, dev);
         if (ret) {
@@ -1020,8 +1020,8 @@ err_bank_setup:
         free_irq(irq, dev);
         platform_set_drvdata(pdev, NULL);
 err_irq:
-        clk_disable(dev->clk);
-err_clk_enable:
+        clk_disable_unprepare(dev->clk);
+err_clk_prepare_enable:
         clk_put(dev->clk);
 err_clk:
         iounmap(dev->io_base);
@@ -1074,7 +1074,7 @@ static int __devexit spear_smi_remove(struct platform_device *pdev)
         irq = platform_get_irq(pdev, 0);
         free_irq(irq, dev);
 
-        clk_disable(dev->clk);
+        clk_disable_unprepare(dev->clk);
         clk_put(dev->clk);
         iounmap(dev->io_base);
         kfree(dev);
@@ -1091,7 +1091,7 @@ int spear_smi_suspend(struct platform_device *pdev, pm_message_t state)
         struct spear_smi *dev = platform_get_drvdata(pdev);
 
         if (dev && dev->clk)
-                clk_disable(dev->clk);
+                clk_disable_unprepare(dev->clk);
 
         return 0;
 }
@@ -1102,7 +1102,7 @@ int spear_smi_resume(struct platform_device *pdev)
         int ret = -EPERM;
 
         if (dev && dev->clk)
-                ret = clk_enable(dev->clk);
+                ret = clk_prepare_enable(dev->clk);
 
         if (!ret)
                 spear_smi_hw_init(dev);
diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
index dbfe17baf046..45abed67f1ef 100644
--- a/drivers/mtd/lpddr/qinfo_probe.c
+++ b/drivers/mtd/lpddr/qinfo_probe.c
@@ -57,7 +57,7 @@ static struct qinfo_query_info qinfo_array[] = {
 
 static long lpddr_get_qinforec_pos(struct map_info *map, char *id_str)
 {
-        int qinfo_lines = sizeof(qinfo_array)/sizeof(struct qinfo_query_info);
+        int qinfo_lines = ARRAY_SIZE(qinfo_array);
         int i;
         int bankwidth = map_bankwidth(map) * 8;
         int major, minor;
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 8af67cfd671a..5ba2458e799a 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -224,7 +224,7 @@ config MTD_CK804XROM
 
 config MTD_SCB2_FLASH
         tristate "BIOS flash chip on Intel SCB2 boards"
-        depends on X86 && MTD_JEDECPROBE
+        depends on X86 && MTD_JEDECPROBE && PCI
         help
           Support for treating the BIOS flash chip on Intel SCB2 boards
           as an MTD device - with this you can reprogram your BIOS.
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c
index 92e1f41634c7..93f03175c82d 100644
--- a/drivers/mtd/maps/intel_vr_nor.c
+++ b/drivers/mtd/maps/intel_vr_nor.c
@@ -260,18 +260,7 @@ static struct pci_driver vr_nor_pci_driver = {
         .id_table = vr_nor_pci_ids,
 };
 
-static int __init vr_nor_mtd_init(void)
-{
-        return pci_register_driver(&vr_nor_pci_driver);
-}
-
-static void __exit vr_nor_mtd_exit(void)
-{
-        pci_unregister_driver(&vr_nor_pci_driver);
-}
-
-module_init(vr_nor_mtd_init);
-module_exit(vr_nor_mtd_exit);
+module_pci_driver(vr_nor_pci_driver);
 
 MODULE_AUTHOR("Andy Lowe");
 MODULE_DESCRIPTION("MTD map driver for NOR flash on Intel Vermilion Range");
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 1d005a3e9b41..f14ce0af763f 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -352,18 +352,7 @@ static struct pci_driver mtd_pci_driver = {
         .id_table =     mtd_pci_ids,
 };
 
-static int __init mtd_pci_maps_init(void)
-{
-        return pci_register_driver(&mtd_pci_driver);
-}
-
-static void __exit mtd_pci_maps_exit(void)
-{
-        pci_unregister_driver(&mtd_pci_driver);
-}
-
-module_init(mtd_pci_maps_init);
-module_exit(mtd_pci_maps_exit);
+module_pci_driver(mtd_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 934a72c80078..9dcbc684abdb 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -234,20 +234,7 @@ static struct pci_driver scb2_flash_driver = {
         .remove =   __devexit_p(scb2_flash_remove),
 };
 
-static int __init
-scb2_flash_init(void)
-{
-        return pci_register_driver(&scb2_flash_driver);
-}
-
-static void __exit
-scb2_flash_exit(void)
-{
-        pci_unregister_driver(&scb2_flash_driver);
-}
-
-module_init(scb2_flash_init);
-module_exit(scb2_flash_exit);
+module_pci_driver(scb2_flash_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Tim Hockin <thockin@sun.com>");
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c
index 71b0ba797912..e7534c82f93a 100644
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ b/drivers/mtd/maps/wr_sbc82xx_flash.c
@@ -59,7 +59,7 @@ static struct mtd_partition bigflash_parts[] = {
         }
 };
 
-static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL};
+static const char *part_probes[] __initconst = {"cmdlinepart", "RedBoot", NULL};
 
 #define init_sbc82xx_one_flash(map, br, or)                     \
 do {                                                            \
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c837507dfb1c..575730744fdb 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -250,6 +250,43 @@ static ssize_t mtd_name_show(struct device *dev,
 }
 static DEVICE_ATTR(name, S_IRUGO, mtd_name_show, NULL);
 
+static ssize_t mtd_ecc_strength_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        struct mtd_info *mtd = dev_get_drvdata(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", mtd->ecc_strength);
+}
+static DEVICE_ATTR(ecc_strength, S_IRUGO, mtd_ecc_strength_show, NULL);
+
+static ssize_t mtd_bitflip_threshold_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct mtd_info *mtd = dev_get_drvdata(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%u\n", mtd->bitflip_threshold);
+}
+
+static ssize_t mtd_bitflip_threshold_store(struct device *dev,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        struct mtd_info *mtd = dev_get_drvdata(dev);
+        unsigned int bitflip_threshold;
+        int retval;
+
+        retval = kstrtouint(buf, 0, &bitflip_threshold);
+        if (retval)
+                return retval;
+
+        mtd->bitflip_threshold = bitflip_threshold;
+        return count;
+}
+static DEVICE_ATTR(bitflip_threshold, S_IRUGO | S_IWUSR,
+                   mtd_bitflip_threshold_show,
+                   mtd_bitflip_threshold_store);
+
 static struct attribute *mtd_attrs[] = {
         &dev_attr_type.attr,
         &dev_attr_flags.attr,
@@ -260,6 +297,8 @@ static struct attribute *mtd_attrs[] = {
         &dev_attr_oobsize.attr,
         &dev_attr_numeraseregions.attr,
         &dev_attr_name.attr,
+        &dev_attr_ecc_strength.attr,
+        &dev_attr_bitflip_threshold.attr,
         NULL,
 };
 
@@ -322,6 +361,10 @@ int add_mtd_device(struct mtd_info *mtd)
         mtd->index = i;
         mtd->usecount = 0;
 
+        /* default value if not set by driver */
+        if (mtd->bitflip_threshold == 0)
+                mtd->bitflip_threshold = mtd->ecc_strength;
+
         if (is_power_of_2(mtd->erasesize))
                 mtd->erasesize_shift = ffs(mtd->erasesize) - 1;
         else
@@ -757,12 +800,24 @@ EXPORT_SYMBOL_GPL(mtd_get_unmapped_area);
 int mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen,
              u_char *buf)
 {
+        int ret_code;
         *retlen = 0;
         if (from < 0 || from > mtd->size || len > mtd->size - from)
                 return -EINVAL;
         if (!len)
                 return 0;
-        return mtd->_read(mtd, from, len, retlen, buf);
+
+        /*
+         * In the absence of an error, drivers return a non-negative integer
+         * representing the maximum number of bitflips that were corrected on
+         * any one ecc region (if applicable; zero otherwise).
+         */
+        ret_code = mtd->_read(mtd, from, len, retlen, buf);
+        if (unlikely(ret_code < 0))
+                return ret_code;
+        if (mtd->ecc_strength == 0)
+                return 0;       /* device lacks ecc */
+        return ret_code >= mtd->bitflip_threshold ? -EUCLEAN : 0;
 }
 EXPORT_SYMBOL_GPL(mtd_read);
 
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index ae36d7e1e913..551e316e4454 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -304,32 +304,17 @@ static void find_next_position(struct mtdoops_context *cxt)
 }
 
 static void mtdoops_do_dump(struct kmsg_dumper *dumper,
-                enum kmsg_dump_reason reason, const char *s1, unsigned long l1,
-                const char *s2, unsigned long l2)
+                            enum kmsg_dump_reason reason)
 {
         struct mtdoops_context *cxt = container_of(dumper,
                         struct mtdoops_context, dump);
-        unsigned long s1_start, s2_start;
-        unsigned long l1_cpy, l2_cpy;
-        char *dst;
-
-        if (reason != KMSG_DUMP_OOPS &&
-            reason != KMSG_DUMP_PANIC)
-                return;
 
         /* Only dump oopses if dump_oops is set */
         if (reason == KMSG_DUMP_OOPS && !dump_oops)
                 return;
 
-        dst = cxt->oops_buf + MTDOOPS_HEADER_SIZE; /* Skip the header */
-        l2_cpy = min(l2, record_size - MTDOOPS_HEADER_SIZE);
-        l1_cpy = min(l1, record_size - MTDOOPS_HEADER_SIZE - l2_cpy);
-
-        s2_start = l2 - l2_cpy;
-        s1_start = l1 - l1_cpy;
-
-        memcpy(dst, s1 + s1_start, l1_cpy);
-        memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
+        kmsg_dump_get_buffer(dumper, true, cxt->oops_buf + MTDOOPS_HEADER_SIZE,
+                             record_size - MTDOOPS_HEADER_SIZE, NULL);
 
         /* Panics must be written immediately */
         if (reason != KMSG_DUMP_OOPS)
@@ -375,6 +360,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
                 return;
         }
 
+        cxt->dump.max_reason = KMSG_DUMP_OOPS;
         cxt->dump.dump = mtdoops_do_dump;
         err = kmsg_dump_register(&cxt->dump);
         if (err) {
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 9651c06de0a9..d518e4db8a0b 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -67,12 +67,12 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len,
         stats = part->master->ecc_stats;
         res = part->master->_read(part->master, from + part->offset, len,
                                   retlen, buf);
-        if (unlikely(res)) {
-                if (mtd_is_bitflip(res))
-                        mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected;
-                if (mtd_is_eccerr(res))
-                        mtd->ecc_stats.failed += part->master->ecc_stats.failed - stats.failed;
-        }
+        if (unlikely(mtd_is_eccerr(res)))
+                mtd->ecc_stats.failed +=
+                        part->master->ecc_stats.failed - stats.failed;
+        else
+                mtd->ecc_stats.corrected +=
+                        part->master->ecc_stats.corrected - stats.corrected;
         return res;
 }
 
@@ -517,6 +517,8 @@ static struct mtd_part *allocate_partition(struct mtd_info *master,
 
         slave->mtd.ecclayout = master->ecclayout;
         slave->mtd.ecc_strength = master->ecc_strength;
+        slave->mtd.bitflip_threshold = master->bitflip_threshold;
+
         if (master->_block_isbad) {
                 uint64_t offs = 0;
 
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 7d17cecad69d..31bb7e5b504a 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -115,6 +115,46 @@ config MTD_NAND_OMAP2
           Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4
           platforms.
 
+config MTD_NAND_OMAP_BCH
+        depends on MTD_NAND && MTD_NAND_OMAP2 && ARCH_OMAP3
+        bool "Enable support for hardware BCH error correction"
+        default n
+        select BCH
+        select BCH_CONST_PARAMS
+        help
+         Support for hardware BCH error correction.
+
+choice
+        prompt "BCH error correction capability"
+        depends on MTD_NAND_OMAP_BCH
+
+config MTD_NAND_OMAP_BCH8
+        bool "8 bits / 512 bytes (recommended)"
+        help
+         Support correcting up to 8 bitflips per 512-byte block.
+         This will use 13 bytes of spare area per 512 bytes of page data.
+         This is the recommended mode, as 4-bit mode does not work
+         on some OMAP3 revisions, due to a hardware bug.
+
+config MTD_NAND_OMAP_BCH4
+        bool "4 bits / 512 bytes"
+        help
+         Support correcting up to 4 bitflips per 512-byte block.
+         This will use 7 bytes of spare area per 512 bytes of page data.
+         Note that this mode does not work on some OMAP3 revisions, due to a
+         hardware bug. Please check your OMAP datasheet before selecting this
+         mode.
+
+endchoice
+
+if MTD_NAND_OMAP_BCH
+config BCH_CONST_M
+        default 13
+config BCH_CONST_T
+        default 4 if MTD_NAND_OMAP_BCH4
+        default 8 if MTD_NAND_OMAP_BCH8
+endif
+
 config MTD_NAND_IDS
         tristate
 
@@ -440,7 +480,7 @@ config MTD_NAND_NANDSIM
 
 config MTD_NAND_GPMI_NAND
         bool "GPMI NAND Flash Controller driver"
-        depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28)
+        depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q)
         help
          Enables NAND Flash support for IMX23 or IMX28.
          The GPMI controller is very powerful, with the help of BCH
diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c
index 4f20e1d8bef1..60a0dfdb0808 100644
--- a/drivers/mtd/nand/alauda.c
+++ b/drivers/mtd/nand/alauda.c
@@ -414,7 +414,7 @@ static int alauda_bounce_read(struct mtd_info *mtd, loff_t from, size_t len,
         }
         err = 0;
         if (corrected)
-                err = -EUCLEAN;
+                err = 1;        /* return max_bitflips per ecc step */
         if (uncorrected)
                 err = -EBADMSG;
 out:
@@ -446,7 +446,7 @@ static int alauda_read(struct mtd_info *mtd, loff_t from, size_t len,
         }
         err = 0;
         if (corrected)
-                err = -EUCLEAN;
+                err = 1;        /* return max_bitflips per ecc step */
         if (uncorrected)
                 err = -EBADMSG;
         return err;
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 2165576a1c67..97ac6712bb19 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -324,9 +324,10 @@ static int atmel_nand_calculate(struct mtd_info *mtd,
  * mtd:        mtd info structure
  * chip:       nand chip info structure
  * buf:        buffer to store read data
+ * oob_required:    caller expects OOB data read to chip->oob_poi
  */
-static int atmel_nand_read_page(struct mtd_info *mtd,
-                struct nand_chip *chip, uint8_t *buf, int page)
+static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+                                uint8_t *buf, int oob_required, int page)
 {
         int eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -335,6 +336,7 @@ static int atmel_nand_read_page(struct mtd_info *mtd,
         uint8_t *oob = chip->oob_poi;
         uint8_t *ecc_pos;
         int stat;
+        unsigned int max_bitflips = 0;
 
         /*
          * Errata: ALE is incorrectly wired up to the ECC controller
@@ -371,10 +373,12 @@ static int atmel_nand_read_page(struct mtd_info *mtd,
         /* check if there's an error */
         stat = chip->ecc.correct(mtd, p, oob, NULL);
 
-        if (stat < 0)
+        if (stat < 0) {
                 mtd->ecc_stats.failed++;
-        else
+        } else {
                 mtd->ecc_stats.corrected += stat;
+                max_bitflips = max_t(unsigned int, max_bitflips, stat);
+        }
 
         /* get back to oob start (end of page) */
         chip->cmdfunc(mtd, NAND_CMD_RNDOUT, mtd->writesize, -1);
@@ -382,7 +386,7 @@ static int atmel_nand_read_page(struct mtd_info *mtd,
         /* read the oob */
         chip->read_buf(mtd, oob, mtd->oobsize);
 
-        return 0;
+        return max_bitflips;
 }
 
 /*
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 73abbc3e093e..9f609d2dcf62 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -508,8 +508,6 @@ static int __devinit au1550nd_probe(struct platform_device *pdev)
         this->chip_delay = 30;
         this->ecc.mode = NAND_ECC_SOFT;
 
-        this->options = NAND_NO_AUTOINCR;
-
         if (pd->devwidth)
                 this->options |= NAND_BUSWIDTH_16;
 
diff --git a/drivers/mtd/nand/bcm_umi_bch.c b/drivers/mtd/nand/bcm_umi_bch.c
index a930666d0687..5914bb32e001 100644
--- a/drivers/mtd/nand/bcm_umi_bch.c
+++ b/drivers/mtd/nand/bcm_umi_bch.c
@@ -22,9 +22,9 @@
 
 /* ---- Private Function Prototypes -------------------------------------- */
 static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
-        struct nand_chip *chip, uint8_t *buf, int page);
+        struct nand_chip *chip, uint8_t *buf, int oob_required, int page);
 static void bcm_umi_bch_write_page_hwecc(struct mtd_info *mtd,
-        struct nand_chip *chip, const uint8_t *buf);
+        struct nand_chip *chip, const uint8_t *buf, int oob_required);
 
 /* ---- Private Variables ------------------------------------------------ */
 
@@ -103,11 +103,12 @@ static struct nand_ecclayout nand_hw_eccoob_4096 = {
 *  @mtd:        mtd info structure
 *  @chip:       nand chip info structure
 *  @buf:        buffer to store read data
+*  @oob_required:       caller expects OOB data read to chip->oob_poi
 *
 ***************************************************************************/
 static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
                                        struct nand_chip *chip, uint8_t * buf,
-                                                 int page)
+                                       int oob_required, int page)
 {
         int sectorIdx = 0;
         int eccsize = chip->ecc.size;
@@ -116,6 +117,7 @@ static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
         uint8_t eccCalc[NAND_ECC_NUM_BYTES];
         int sectorOobSize = mtd->oobsize / eccsteps;
         int stat;
+        unsigned int max_bitflips = 0;
 
         for (sectorIdx = 0; sectorIdx < eccsteps;
                         sectorIdx++, datap += eccsize) {
@@ -177,9 +179,10 @@ static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
                         }
 #endif
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
                 }
         }
-        return 0;
+        return max_bitflips;
 }
 
 /****************************************************************************
@@ -188,10 +191,11 @@ static int bcm_umi_bch_read_page_hwecc(struct mtd_info *mtd,
 *  @mtd:        mtd info structure
 *  @chip:       nand chip info structure
 *  @buf:        data buffer
+*  @oob_required:       must write chip->oob_poi to OOB
 *
 ***************************************************************************/
 static void bcm_umi_bch_write_page_hwecc(struct mtd_info *mtd,
-        struct nand_chip *chip, const uint8_t *buf)
+        struct nand_chip *chip, const uint8_t *buf, int oob_required)
 {
         int sectorIdx = 0;
         int eccsize = chip->ecc.size;
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index 6908cdde3065..c855e7cd337b 100644
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -341,7 +341,7 @@ static int bcm_umi_nand_verify_buf(struct mtd_info *mtd, const u_char * buf,
          * for MLC parts which may have permanently stuck bits.
          */
         struct nand_chip *chip = mtd->priv;
-        int ret = chip->ecc.read_page(mtd, chip, readbackbuf, 0);
+        int ret = chip->ecc.read_page(mtd, chip, readbackbuf, 0, 0);
         if (ret < 0)
                 return -EFAULT;
         else {
@@ -476,12 +476,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
                 this->badblock_pattern = &largepage_bbt;
         }
 
-        /*
-         * FIXME: ecc strength value of 6 bits per 512 bytes of data is a
-         * conservative guess, given 13 ecc bytes and using bch alg.
-         * (Assume Galois field order m=15 to allow a margin of error.)
-         */
-        this->ecc.strength = 6;
+        this->ecc.strength = 8;
 
 #endif
 
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index d7b86b925de5..3f1c18599cbd 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -558,7 +558,7 @@ static void bf5xx_nand_dma_write_buf(struct mtd_info *mtd,
 }
 
 static int bf5xx_nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                uint8_t *buf, int page)
+                uint8_t *buf, int oob_required, int page)
 {
         bf5xx_nand_read_buf(mtd, buf, mtd->writesize);
         bf5xx_nand_read_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -567,7 +567,7 @@ static int bf5xx_nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip
 }
 
 static void bf5xx_nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                const uint8_t *buf)
+                const uint8_t *buf, int oob_required)
 {
         bf5xx_nand_write_buf(mtd, buf, mtd->writesize);
         bf5xx_nand_write_buf(mtd, chip->oob_poi, mtd->oobsize);
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2a96e1a12062..41371ba1a811 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -364,25 +364,27 @@ static int cafe_nand_write_oob(struct mtd_info *mtd,
 
 /* Don't use -- use nand_read_oob_std for now */
 static int cafe_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
-                              int page, int sndcmd)
+                              int page)
 {
         chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
         chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
-        return 1;
+        return 0;
 }
 /**
  * cafe_nand_read_page_syndrome - [REPLACEABLE] hardware ecc syndrome based page read
  * @mtd:        mtd info structure
  * @chip:       nand chip info structure
  * @buf:        buffer to store read data
+ * @oob_required:       caller expects OOB data read to chip->oob_poi
  *
  * The hw generator calculates the error syndrome automatically. Therefor
  * we need a special oob layout and handling.
  */
 static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-                               uint8_t *buf, int page)
+                               uint8_t *buf, int oob_required, int page)
 {
         struct cafe_priv *cafe = mtd->priv;
+        unsigned int max_bitflips = 0;
 
         cafe_dev_dbg(&cafe->pdev->dev, "ECC result %08x SYN1,2 %08x\n",
                      cafe_readl(cafe, NAND_ECC_RESULT),
@@ -449,10 +451,11 @@ static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
                 } else {
                         dev_dbg(&cafe->pdev->dev, "Corrected %d symbol errors\n", n);
                         mtd->ecc_stats.corrected += n;
+                        max_bitflips = max_t(unsigned int, max_bitflips, n);
                 }
         }
 
-        return 0;
+        return max_bitflips;
 }
 
 static struct nand_ecclayout cafe_oobinfo_2048 = {
@@ -518,7 +521,8 @@ static struct nand_bbt_descr cafe_bbt_mirror_descr_512 = {
 
 
 static void cafe_nand_write_page_lowlevel(struct mtd_info *mtd,
-                                          struct nand_chip *chip, const uint8_t *buf)
+                                          struct nand_chip *chip,
+                                          const uint8_t *buf, int oob_required)
 {
         struct cafe_priv *cafe = mtd->priv;
 
@@ -530,16 +534,17 @@ static void cafe_nand_write_page_lowlevel(struct mtd_info *mtd,
 }
 
 static int cafe_nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
-                                const uint8_t *buf, int page, int cached, int raw)
+                                const uint8_t *buf, int oob_required, int page,
+                                int cached, int raw)
 {
         int status;
 
         chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
 
         if (unlikely(raw))
-                chip->ecc.write_page_raw(mtd, chip, buf);
+                chip->ecc.write_page_raw(mtd, chip, buf, oob_required);
         else
-                chip->ecc.write_page(mtd, chip, buf);
+                chip->ecc.write_page(mtd, chip, buf, oob_required);
 
         /*
          * Cached progamming disabled for now, Not sure if its worth the
@@ -685,7 +690,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
 
         /* Enable the following for a flash based bad block table */
         cafe->nand.bbt_options = NAND_BBT_USE_FLASH;
-        cafe->nand.options = NAND_NO_AUTOINCR | NAND_OWN_BUFFERS;
+        cafe->nand.options = NAND_OWN_BUFFERS;
 
         if (skipbbt) {
                 cafe->nand.options |= NAND_SKIP_BBTSCAN;
@@ -888,17 +893,7 @@ static struct pci_driver cafe_nand_pci_driver = {
         .resume = cafe_nand_resume,
 };
 
-static int __init cafe_nand_init(void)
-{
-        return pci_register_driver(&cafe_nand_pci_driver);
-}
-
-static void __exit cafe_nand_exit(void)
-{
-        pci_unregister_driver(&cafe_nand_pci_driver);
-}
-module_init(cafe_nand_init);
-module_exit(cafe_nand_exit);
+module_pci_driver(cafe_nand_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 821c34c62500..adb6c3ef37fb 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -240,7 +240,6 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
 
         /* Enable the following for a flash based bad block table */
         this->bbt_options = NAND_BBT_USE_FLASH;
-        this->options = NAND_NO_AUTOINCR;
 
         /* Scan to find existence of the device */
         if (nand_scan(new_mtd, 1)) {
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index a9e57d686297..0650aafa0dd2 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -924,9 +924,10 @@ bool is_erased(uint8_t *buf, int len)
 #define ECC_LAST_ERR(x)         ((x) & ERR_CORRECTION_INFO__LAST_ERR_INFO)
 
 static bool handle_ecc(struct denali_nand_info *denali, uint8_t *buf,
-                                        uint32_t irq_status)
+                       uint32_t irq_status, unsigned int *max_bitflips)
 {
         bool check_erased_page = false;
+        unsigned int bitflips = 0;
 
         if (irq_status & INTR_STATUS__ECC_ERR) {
                 /* read the ECC errors. we'll ignore them for now */
@@ -965,6 +966,7 @@ static bool handle_ecc(struct denali_nand_info *denali, uint8_t *buf,
                                         /* correct the ECC error */
                                         buf[offset] ^= err_correction_value;
                                         denali->mtd.ecc_stats.corrected++;
+                                        bitflips++;
                                 }
                         } else {
                                 /* if the error is not correctable, need to
@@ -984,6 +986,7 @@ static bool handle_ecc(struct denali_nand_info *denali, uint8_t *buf,
                 clear_interrupts(denali);
                 denali_set_intr_modes(denali, true);
         }
+        *max_bitflips = bitflips;
         return check_erased_page;
 }
 
@@ -1084,7 +1087,7 @@ static void write_page(struct mtd_info *mtd, struct nand_chip *chip,
  * by write_page above.
  * */
 static void denali_write_page(struct mtd_info *mtd, struct nand_chip *chip,
-                                const uint8_t *buf)
+                                const uint8_t *buf, int oob_required)
 {
         /* for regular page writes, we let HW handle all the ECC
          * data written to the device. */
@@ -1096,7 +1099,7 @@ static void denali_write_page(struct mtd_info *mtd, struct nand_chip *chip,
  * write_page() function above.
  */
 static void denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                                        const uint8_t *buf)
+                                        const uint8_t *buf, int oob_required)
 {
         /* for raw page writes, we want to disable ECC and simply write
            whatever data is in the buffer. */
@@ -1110,17 +1113,17 @@ static int denali_write_oob(struct mtd_info *mtd, struct nand_chip *chip,
 }
 
 static int denali_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
-                           int page, int sndcmd)
+                           int page)
 {
         read_oob_data(mtd, chip->oob_poi, page);
 
-        return 0; /* notify NAND core to send command to
-                           NAND device. */
+        return 0;
 }
 
 static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-                            uint8_t *buf, int page)
+                            uint8_t *buf, int oob_required, int page)
 {
+        unsigned int max_bitflips;
         struct denali_nand_info *denali = mtd_to_denali(mtd);
 
         dma_addr_t addr = denali->buf.dma_buf;
@@ -1153,7 +1156,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
 
         memcpy(buf, denali->buf.buf, mtd->writesize);
 
-        check_erased_page = handle_ecc(denali, buf, irq_status);
+        check_erased_page = handle_ecc(denali, buf, irq_status, &max_bitflips);
         denali_enable_dma(denali, false);
 
         if (check_erased_page) {
@@ -1167,11 +1170,11 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
                                 denali->mtd.ecc_stats.failed++;
                 }
         }
-        return 0;
+        return max_bitflips;
 }
 
 static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf, int page)
+                                uint8_t *buf, int oob_required, int page)
 {
         struct denali_nand_info *denali = mtd_to_denali(mtd);
 
@@ -1702,17 +1705,4 @@ static struct pci_driver denali_pci_driver = {
         .remove = denali_pci_remove,
 };
 
-static int __devinit denali_init(void)
-{
-        printk(KERN_INFO "Spectra MTD driver\n");
-        return pci_register_driver(&denali_pci_driver);
-}
-
-/* Free memory */
-static void __devexit denali_exit(void)
-{
-        pci_unregister_driver(&denali_pci_driver);
-}
-
-module_init(denali_init);
-module_exit(denali_exit);
+module_pci_driver(denali_pci_driver);
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index b08202664543..a225e49a5623 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -720,6 +720,7 @@ static int read_page(struct mtd_info *mtd, struct nand_chip *nand,
         struct docg4_priv *doc = nand->priv;
         void __iomem *docptr = doc->virtadr;
         uint16_t status, edc_err, *buf16;
+        int bits_corrected = 0;
 
         dev_dbg(doc->dev, "%s: page %08x\n", __func__, page);
 
@@ -772,7 +773,7 @@ static int read_page(struct mtd_info *mtd, struct nand_chip *nand,
 
                 /* If bitflips are reported, attempt to correct with ecc */
                 if (edc_err & DOC_ECCCONF1_BCH_SYNDROM_ERR) {
-                        int bits_corrected = correct_data(mtd, buf, page);
+                        bits_corrected = correct_data(mtd, buf, page);
                         if (bits_corrected == -EBADMSG)
                                 mtd->ecc_stats.failed++;
                         else
@@ -781,24 +782,24 @@ static int read_page(struct mtd_info *mtd, struct nand_chip *nand,
         }
 
         writew(0, docptr + DOC_DATAEND);
-        return 0;
+        return bits_corrected;
 }
 
 
 static int docg4_read_page_raw(struct mtd_info *mtd, struct nand_chip *nand,
-                               uint8_t *buf, int page)
+                               uint8_t *buf, int oob_required, int page)
 {
         return read_page(mtd, nand, buf, page, false);
 }
 
 static int docg4_read_page(struct mtd_info *mtd, struct nand_chip *nand,
-                           uint8_t *buf, int page)
+                           uint8_t *buf, int oob_required, int page)
 {
         return read_page(mtd, nand, buf, page, true);
 }
 
 static int docg4_read_oob(struct mtd_info *mtd, struct nand_chip *nand,
-                          int page, int sndcmd)
+                          int page)
 {
         struct docg4_priv *doc = nand->priv;
         void __iomem *docptr = doc->virtadr;
@@ -952,13 +953,13 @@ static void write_page(struct mtd_info *mtd, struct nand_chip *nand,
 }
 
 static void docg4_write_page_raw(struct mtd_info *mtd, struct nand_chip *nand,
-                                 const uint8_t *buf)
+                                 const uint8_t *buf, int oob_required)
 {
         return write_page(mtd, nand, buf, false);
 }
 
 static void docg4_write_page(struct mtd_info *mtd, struct nand_chip *nand,
-                             const uint8_t *buf)
+                             const uint8_t *buf, int oob_required)
 {
         return write_page(mtd, nand, buf, true);
 }
@@ -1002,7 +1003,7 @@ static int __init read_factory_bbt(struct mtd_info *mtd)
                 return -ENOMEM;
 
         read_page_prologue(mtd, g4_addr);
-        status = docg4_read_page(mtd, nand, buf, DOCG4_FACTORY_BBT_PAGE);
+        status = docg4_read_page(mtd, nand, buf, 0, DOCG4_FACTORY_BBT_PAGE);
         if (status)
                 goto exit;
 
@@ -1079,7 +1080,7 @@ static int docg4_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
         /* write first page of block */
         write_page_prologue(mtd, g4_addr);
-        docg4_write_page(mtd, nand, buf);
+        docg4_write_page(mtd, nand, buf, 1);
         ret = pageprog(mtd);
         if (!ret)
                 mtd->ecc_stats.badblocks++;
@@ -1192,8 +1193,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd)
         nand->ecc.prepad = 8;
         nand->ecc.bytes = 8;
         nand->ecc.strength = DOCG4_T;
-        nand->options =
-                NAND_BUSWIDTH_16 | NAND_NO_SUBPAGE_WRITE | NAND_NO_AUTOINCR;
+        nand->options = NAND_BUSWIDTH_16 | NAND_NO_SUBPAGE_WRITE;
         nand->IO_ADDR_R = nand->IO_ADDR_W = doc->virtadr + DOC_IOSPACE_DATA;
         nand->controller = &nand->hwcontrol;
         spin_lock_init(&nand->controller->lock);
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 80b5264f0a32..784293806110 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -75,6 +75,7 @@ struct fsl_elbc_fcm_ctrl {
         unsigned int use_mdr;    /* Non zero if the MDR is to be set      */
         unsigned int oob;        /* Non zero if operating on OOB data     */
         unsigned int counter;    /* counter for the initializations       */
+        unsigned int max_bitflips;  /* Saved during READ0 cmd             */
 };
 
 /* These map to the positions used by the FCM hardware ECC generator */
@@ -253,6 +254,8 @@ static int fsl_elbc_run_command(struct mtd_info *mtd)
         if (chip->ecc.mode != NAND_ECC_HW)
                 return 0;
 
+        elbc_fcm_ctrl->max_bitflips = 0;
+
         if (elbc_fcm_ctrl->read_bytes == mtd->writesize + mtd->oobsize) {
                 uint32_t lteccr = in_be32(&lbc->lteccr);
                 /*
@@ -262,11 +265,16 @@ static int fsl_elbc_run_command(struct mtd_info *mtd)
                  * bits 28-31 are uncorrectable errors, marked elsewhere.
                  * for small page nand only 1 bit is used.
                  * if the ELBC doesn't have the lteccr register it reads 0
+                 * FIXME: 4 bits can be corrected on NANDs with 2k pages, so
+                 * count the number of sub-pages with bitflips and update
+                 * ecc_stats.corrected accordingly.
                  */
                 if (lteccr & 0x000F000F)
                         out_be32(&lbc->lteccr, 0x000F000F); /* clear lteccr */
-                if (lteccr & 0x000F0000)
+                if (lteccr & 0x000F0000) {
                         mtd->ecc_stats.corrected++;
+                        elbc_fcm_ctrl->max_bitflips = 1;
+                }
         }
 
         return 0;
@@ -738,26 +746,28 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd)
         return 0;
 }
 
-static int fsl_elbc_read_page(struct mtd_info *mtd,
-                              struct nand_chip *chip,
-                              uint8_t *buf,
-                              int page)
+static int fsl_elbc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+                              uint8_t *buf, int oob_required, int page)
 {
+        struct fsl_elbc_mtd *priv = chip->priv;
+        struct fsl_lbc_ctrl *ctrl = priv->ctrl;
+        struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = ctrl->nand;
+
         fsl_elbc_read_buf(mtd, buf, mtd->writesize);
-        fsl_elbc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        if (oob_required)
+                fsl_elbc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
 
         if (fsl_elbc_wait(mtd, chip) & NAND_STATUS_FAIL)
                 mtd->ecc_stats.failed++;
 
-        return 0;
+        return elbc_fcm_ctrl->max_bitflips;
 }
 
 /* ECC will be calculated automatically, and errors will be detected in
  * waitfunc.
  */
-static void fsl_elbc_write_page(struct mtd_info *mtd,
-                                struct nand_chip *chip,
-                                const uint8_t *buf)
+static void fsl_elbc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                                const uint8_t *buf, int oob_required)
 {
         fsl_elbc_write_buf(mtd, buf, mtd->writesize);
         fsl_elbc_write_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -795,7 +805,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
         chip->bbt_md = &bbt_mirror_descr;
 
         /* set up nand options */
-        chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR;
+        chip->options = NAND_NO_READRDY;
         chip->bbt_options = NAND_BBT_USE_FLASH;
 
         chip->controller = &elbc_fcm_ctrl->controller;
@@ -814,11 +824,6 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
                 chip->ecc.size = 512;
                 chip->ecc.bytes = 3;
                 chip->ecc.strength = 1;
-                /*
-                 * FIXME: can hardware ecc correct 4 bitflips if page size is
-                 * 2k?  Then does hardware report number of corrections for this
-                 * case?  If so, ecc_stats reporting needs to be fixed as well.
-                 */
         } else {
                 /* otherwise fall back to default software ECC */
                 chip->ecc.mode = NAND_ECC_SOFT;
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index c30ac7b83d28..9602c1b7e27e 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -63,6 +63,7 @@ struct fsl_ifc_nand_ctrl {
         unsigned int oob;       /* Non zero if operating on OOB data    */
         unsigned int eccread;   /* Non zero for a full-page ECC read    */
         unsigned int counter;   /* counter for the initializations      */
+        unsigned int max_bitflips;  /* Saved during READ0 cmd           */
 };
 
 static struct fsl_ifc_nand_ctrl *ifc_nand_ctrl;
@@ -262,6 +263,8 @@ static void fsl_ifc_run_command(struct mtd_info *mtd)
         if (ctrl->nand_stat & IFC_NAND_EVTER_STAT_WPER)
                 dev_err(priv->dev, "NAND Flash Write Protect Error\n");
 
+        nctrl->max_bitflips = 0;
+
         if (nctrl->eccread) {
                 int errors;
                 int bufnum = nctrl->page & priv->bufnum_mask;
@@ -290,6 +293,9 @@ static void fsl_ifc_run_command(struct mtd_info *mtd)
                         }
 
                         mtd->ecc_stats.corrected += errors;
+                        nctrl->max_bitflips = max_t(unsigned int,
+                                                    nctrl->max_bitflips,
+                                                    errors);
                 }
 
                 nctrl->eccread = 0;
@@ -375,21 +381,31 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command,
 
                 return;
 
-        /* READID must read all 8 possible bytes */
         case NAND_CMD_READID:
+        case NAND_CMD_PARAM: {
+                int timing = IFC_FIR_OP_RB;
+                if (command == NAND_CMD_PARAM)
+                        timing = IFC_FIR_OP_RBCD;
+
                 out_be32(&ifc->ifc_nand.nand_fir0,
                                 (IFC_FIR_OP_CMD0 << IFC_NAND_FIR0_OP0_SHIFT) |
                                 (IFC_FIR_OP_UA  << IFC_NAND_FIR0_OP1_SHIFT) |
-                                (IFC_FIR_OP_RB << IFC_NAND_FIR0_OP2_SHIFT));
+                                (timing << IFC_NAND_FIR0_OP2_SHIFT));
                 out_be32(&ifc->ifc_nand.nand_fcr0,
-                                NAND_CMD_READID << IFC_NAND_FCR0_CMD0_SHIFT);
-                /* 8 bytes for manuf, device and exts */
-                out_be32(&ifc->ifc_nand.nand_fbcr, 8);
-                ifc_nand_ctrl->read_bytes = 8;
+                                command << IFC_NAND_FCR0_CMD0_SHIFT);
+                out_be32(&ifc->ifc_nand.row3, column);
+
+                /*
+                 * although currently it's 8 bytes for READID, we always read
+                 * the maximum 256 bytes(for PARAM)
+                 */
+                out_be32(&ifc->ifc_nand.nand_fbcr, 256);
+                ifc_nand_ctrl->read_bytes = 256;
 
                 set_addr(mtd, 0, 0, 0);
                 fsl_ifc_run_command(mtd);
                 return;
+        }
 
         /* ERASE1 stores the block and page address */
         case NAND_CMD_ERASE1:
@@ -682,15 +698,16 @@ static int fsl_ifc_wait(struct mtd_info *mtd, struct nand_chip *chip)
         return nand_fsr | NAND_STATUS_WP;
 }
 
-static int fsl_ifc_read_page(struct mtd_info *mtd,
-                              struct nand_chip *chip,
-                              uint8_t *buf, int page)
+static int fsl_ifc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+                             uint8_t *buf, int oob_required, int page)
 {
         struct fsl_ifc_mtd *priv = chip->priv;
         struct fsl_ifc_ctrl *ctrl = priv->ctrl;
+        struct fsl_ifc_nand_ctrl *nctrl = ifc_nand_ctrl;
 
         fsl_ifc_read_buf(mtd, buf, mtd->writesize);
-        fsl_ifc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        if (oob_required)
+                fsl_ifc_read_buf(mtd, chip->oob_poi, mtd->oobsize);
 
         if (ctrl->nand_stat & IFC_NAND_EVTER_STAT_ECCER)
                 dev_err(priv->dev, "NAND Flash ECC Uncorrectable Error\n");
@@ -698,15 +715,14 @@ static int fsl_ifc_read_page(struct mtd_info *mtd,
         if (ctrl->nand_stat != IFC_NAND_EVTER_STAT_OPC)
                 mtd->ecc_stats.failed++;
 
-        return 0;
+        return nctrl->max_bitflips;
 }
 
 /* ECC will be calculated automatically, and errors will be detected in
  * waitfunc.
  */
-static void fsl_ifc_write_page(struct mtd_info *mtd,
-                                struct nand_chip *chip,
-                                const uint8_t *buf)
+static void fsl_ifc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                               const uint8_t *buf, int oob_required)
 {
         fsl_ifc_write_buf(mtd, buf, mtd->writesize);
         fsl_ifc_write_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -789,7 +805,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
         out_be32(&ifc->ifc_nand.ncfgr, 0x0);
 
         /* set up nand options */
-        chip->options = NAND_NO_READRDY | NAND_NO_AUTOINCR;
+        chip->options = NAND_NO_READRDY;
         chip->bbt_options = NAND_BBT_USE_FLASH;
 
 
@@ -811,6 +827,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)
         /* Hardware generates ECC per 512 Bytes */
         chip->ecc.size = 512;
         chip->ecc.bytes = 8;
+        chip->ecc.strength = 4;
 
         switch (csor & CSOR_NAND_PGS_MASK) {
         case CSOR_NAND_PGS_512:
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 1b8330e1155a..38d26240d8b1 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -692,6 +692,7 @@ static void fsmc_write_buf_dma(struct mtd_info *mtd, const uint8_t *buf,
  * @mtd:        mtd info structure
  * @chip:       nand chip info structure
  * @buf:        buffer to store read data
+ * @oob_required:       caller expects OOB data read to chip->oob_poi
  * @page:       page number to read
  *
  * This routine is needed for fsmc version 8 as reading from NAND chip has to be
@@ -701,7 +702,7 @@ static void fsmc_write_buf_dma(struct mtd_info *mtd, const uint8_t *buf,
  * max of 8 bits)
  */
 static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                 uint8_t *buf, int page)
+                                 uint8_t *buf, int oob_required, int page)
 {
         struct fsmc_nand_data *host = container_of(mtd,
                                         struct fsmc_nand_data, mtd);
@@ -720,6 +721,7 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
          */
         uint16_t ecc_oob[7];
         uint8_t *oob = (uint8_t *)&ecc_oob[0];
+        unsigned int max_bitflips = 0;
 
         for (i = 0, s = 0; s < eccsteps; s++, i += eccbytes, p += eccsize) {
                 chip->cmdfunc(mtd, NAND_CMD_READ0, s * eccsize, page);
@@ -748,13 +750,15 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
                 chip->ecc.calculate(mtd, p, &ecc_calc[i]);
 
                 stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
         }
 
-        return 0;
+        return max_bitflips;
 }
 
 /*
@@ -994,9 +998,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
                 return PTR_ERR(host->clk);
         }
 
-        ret = clk_enable(host->clk);
+        ret = clk_prepare_enable(host->clk);
         if (ret)
-                goto err_clk_enable;
+                goto err_clk_prepare_enable;
 
         /*
          * This device ID is actually a common AMBA ID as used on the
@@ -1176,8 +1180,8 @@ err_req_write_chnl:
         if (host->mode == USE_DMA_ACCESS)
                 dma_release_channel(host->read_dma_chan);
 err_req_read_chnl:
-        clk_disable(host->clk);
-err_clk_enable:
+        clk_disable_unprepare(host->clk);
+err_clk_prepare_enable:
         clk_put(host->clk);
         return ret;
 }
@@ -1198,7 +1202,7 @@ static int fsmc_nand_remove(struct platform_device *pdev)
                         dma_release_channel(host->write_dma_chan);
                         dma_release_channel(host->read_dma_chan);
                 }
-                clk_disable(host->clk);
+                clk_disable_unprepare(host->clk);
                 clk_put(host->clk);
         }
 
@@ -1210,7 +1214,7 @@ static int fsmc_nand_suspend(struct device *dev)
 {
         struct fsmc_nand_data *host = dev_get_drvdata(dev);
         if (host)
-                clk_disable(host->clk);
+                clk_disable_unprepare(host->clk);
         return 0;
 }
 
@@ -1218,7 +1222,7 @@ static int fsmc_nand_resume(struct device *dev)
 {
         struct fsmc_nand_data *host = dev_get_drvdata(dev);
         if (host) {
-                clk_enable(host->clk);
+                clk_prepare_enable(host->clk);
                 fsmc_nand_setup(host->regs_va, host->bank,
                                 host->nand.options & NAND_BUSWIDTH_16,
                                 host->dev_timings);
diff --git a/drivers/mtd/nand/gpmi-nand/bch-regs.h b/drivers/mtd/nand/gpmi-nand/bch-regs.h
index 4effb8c579db..a0924515c396 100644
--- a/drivers/mtd/nand/gpmi-nand/bch-regs.h
+++ b/drivers/mtd/nand/gpmi-nand/bch-regs.h
@@ -51,15 +51,26 @@
 
 #define BP_BCH_FLASH0LAYOUT0_ECC0               12
 #define BM_BCH_FLASH0LAYOUT0_ECC0       (0xf << BP_BCH_FLASH0LAYOUT0_ECC0)
-#define BF_BCH_FLASH0LAYOUT0_ECC0(v)            \
-        (((v) << BP_BCH_FLASH0LAYOUT0_ECC0) & BM_BCH_FLASH0LAYOUT0_ECC0)
+#define MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0          11
+#define MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0  (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0)
+#define BF_BCH_FLASH0LAYOUT0_ECC0(v, x)                         \
+        (GPMI_IS_MX6Q(x)                                        \
+                ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0)      \
+                        & MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0)       \
+                : (((v) << BP_BCH_FLASH0LAYOUT0_ECC0)           \
+                        & BM_BCH_FLASH0LAYOUT0_ECC0)            \
+        )
 
 #define BP_BCH_FLASH0LAYOUT0_DATA0_SIZE         0
 #define BM_BCH_FLASH0LAYOUT0_DATA0_SIZE         \
                         (0xfff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
-#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v)      \
-        (((v) << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)\
-                                         & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)
+#define MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE    \
+                        (0x3ff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
+#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v, x)                           \
+        (GPMI_IS_MX6Q(x)                                                \
+                ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)   \
+                : ((v) & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)               \
+        )
 
 #define HW_BCH_FLASH0LAYOUT1                    0x00000090
 
@@ -72,13 +83,24 @@
 
 #define BP_BCH_FLASH0LAYOUT1_ECCN               12
 #define BM_BCH_FLASH0LAYOUT1_ECCN       (0xf << BP_BCH_FLASH0LAYOUT1_ECCN)
-#define BF_BCH_FLASH0LAYOUT1_ECCN(v)            \
-        (((v) << BP_BCH_FLASH0LAYOUT1_ECCN) & BM_BCH_FLASH0LAYOUT1_ECCN)
+#define MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN          11
+#define MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN  (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN)
+#define BF_BCH_FLASH0LAYOUT1_ECCN(v, x)                         \
+        (GPMI_IS_MX6Q(x)                                        \
+                ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN)      \
+                        & MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN)       \
+                : (((v) << BP_BCH_FLASH0LAYOUT1_ECCN)           \
+                        & BM_BCH_FLASH0LAYOUT1_ECCN)            \
+        )
 
 #define BP_BCH_FLASH0LAYOUT1_DATAN_SIZE         0
 #define BM_BCH_FLASH0LAYOUT1_DATAN_SIZE         \
                         (0xfff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
-#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v)      \
-        (((v) << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE) \
-                                         & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)
+#define MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE    \
+                        (0x3ff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
+#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v, x)                           \
+        (GPMI_IS_MX6Q(x)                                                \
+                ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)   \
+                : ((v) & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)               \
+        )
 #endif
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index e8ea7107932e..a1f43329ad43 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -21,7 +21,6 @@
 #include <linux/mtd/gpmi-nand.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
-#include <mach/mxs.h>
 
 #include "gpmi-nand.h"
 #include "gpmi-regs.h"
@@ -37,6 +36,8 @@ struct timing_threshod timing_default_threshold = {
         .max_dll_delay_in_ns         = 16,
 };
 
+#define MXS_SET_ADDR            0x4
+#define MXS_CLR_ADDR            0x8
 /*
  * Clear the bit and poll it cleared.  This is usually called with
  * a reset address and mask being either SFTRST(bit 31) or CLKGATE
@@ -47,7 +48,7 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
         int timeout = 0x400;
 
         /* clear the bit */
-        __mxs_clrl(mask, addr);
+        writel(mask, addr + MXS_CLR_ADDR);
 
         /*
          * SFTRST needs 3 GPMI clocks to settle, the reference manual
@@ -92,11 +93,11 @@ static int gpmi_reset_block(void __iomem *reset_addr, bool just_enable)
                 goto error;
 
         /* clear CLKGATE */
-        __mxs_clrl(MODULE_CLKGATE, reset_addr);
+        writel(MODULE_CLKGATE, reset_addr + MXS_CLR_ADDR);
 
         if (!just_enable) {
                 /* set SFTRST to reset the block */
-                __mxs_setl(MODULE_SFTRST, reset_addr);
+                writel(MODULE_SFTRST, reset_addr + MXS_SET_ADDR);
                 udelay(1);
 
                 /* poll CLKGATE becoming set */
@@ -223,13 +224,13 @@ int bch_set_geometry(struct gpmi_nand_data *this)
         /* Configure layout 0. */
         writel(BF_BCH_FLASH0LAYOUT0_NBLOCKS(block_count)
                         | BF_BCH_FLASH0LAYOUT0_META_SIZE(metadata_size)
-                        | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength)
-                        | BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size),
+                        | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength, this)
+                        | BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size, this),
                         r->bch_regs + HW_BCH_FLASH0LAYOUT0);
 
         writel(BF_BCH_FLASH0LAYOUT1_PAGE_SIZE(page_size)
-                        | BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength)
-                        | BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size),
+                        | BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength, this)
+                        | BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size, this),
                         r->bch_regs + HW_BCH_FLASH0LAYOUT1);
 
         /* Set *all* chip selects to use layout 0. */
@@ -255,11 +256,12 @@ static unsigned int ns_to_cycles(unsigned int time,
         return max(k, min);
 }
 
+#define DEF_MIN_PROP_DELAY      5
+#define DEF_MAX_PROP_DELAY      9
 /* Apply timing to current hardware conditions. */
 static int gpmi_nfc_compute_hardware_timing(struct gpmi_nand_data *this,
                                         struct gpmi_nfc_hardware_timing *hw)
 {
-        struct gpmi_nand_platform_data *pdata = this->pdata;
         struct timing_threshod *nfc = &timing_default_threshold;
         struct nand_chip *nand = &this->nand;
         struct nand_timing target = this->timing;
@@ -276,8 +278,8 @@ static int gpmi_nfc_compute_hardware_timing(struct gpmi_nand_data *this,
         int ideal_sample_delay_in_ns;
         unsigned int sample_delay_factor;
         int tEYE;
-        unsigned int min_prop_delay_in_ns = pdata->min_prop_delay_in_ns;
-        unsigned int max_prop_delay_in_ns = pdata->max_prop_delay_in_ns;
+        unsigned int min_prop_delay_in_ns = DEF_MIN_PROP_DELAY;
+        unsigned int max_prop_delay_in_ns = DEF_MAX_PROP_DELAY;
 
         /*
          * If there are multiple chips, we need to relax the timings to allow
@@ -803,7 +805,8 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip)
         if (GPMI_IS_MX23(this)) {
                 mask = MX23_BM_GPMI_DEBUG_READY0 << chip;
                 reg = readl(r->gpmi_regs + HW_GPMI_DEBUG);
-        } else if (GPMI_IS_MX28(this)) {
+        } else if (GPMI_IS_MX28(this) || GPMI_IS_MX6Q(this)) {
+                /* MX28 shares the same R/B register as MX6Q. */
                 mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip);
                 reg = readl(r->gpmi_regs + HW_GPMI_STAT);
         } else
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index b68e04310bd8..a05b7b444d4f 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -25,6 +25,8 @@
 #include <linux/mtd/gpmi-nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include "gpmi-nand.h"
 
 /* add our owner bbt descriptor */
@@ -387,7 +389,7 @@ static void release_bch_irq(struct gpmi_nand_data *this)
 static bool gpmi_dma_filter(struct dma_chan *chan, void *param)
 {
         struct gpmi_nand_data *this = param;
-        struct resource *r = this->private;
+        int dma_channel = (int)this->private;
 
         if (!mxs_dma_is_apbh(chan))
                 return false;
@@ -399,7 +401,7 @@ static bool gpmi_dma_filter(struct dma_chan *chan, void *param)
          *      for mx28 :      MX28_DMA_GPMI0 ~ MX28_DMA_GPMI7
          *              (These eight channels share the same IRQ!)
          */
-        if (r->start <= chan->chan_id && chan->chan_id <= r->end) {
+        if (dma_channel == chan->chan_id) {
                 chan->private = &this->dma_data;
                 return true;
         }
@@ -419,57 +421,45 @@ static void release_dma_channels(struct gpmi_nand_data *this)
 static int __devinit acquire_dma_channels(struct gpmi_nand_data *this)
 {
         struct platform_device *pdev = this->pdev;
-        struct gpmi_nand_platform_data *pdata = this->pdata;
-        struct resources *res = &this->resources;
-        struct resource *r, *r_dma;
-        unsigned int i;
+        struct resource *r_dma;
+        struct device_node *dn;
+        int dma_channel;
+        unsigned int ret;
+        struct dma_chan *dma_chan;
+        dma_cap_mask_t mask;
+
+        /* dma channel, we only use the first one. */
+        dn = pdev->dev.of_node;
+        ret = of_property_read_u32(dn, "fsl,gpmi-dma-channel", &dma_channel);
+        if (ret) {
+                pr_err("unable to get DMA channel from dt.\n");
+                goto acquire_err;
+        }
+        this->private = (void *)dma_channel;
 
-        r = platform_get_resource_byname(pdev, IORESOURCE_DMA,
-                                        GPMI_NAND_DMA_CHANNELS_RES_NAME);
+        /* gpmi dma interrupt */
         r_dma = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
                                         GPMI_NAND_DMA_INTERRUPT_RES_NAME);
-        if (!r || !r_dma) {
+        if (!r_dma) {
                 pr_err("Can't get resource for DMA\n");
-                return -ENXIO;
+                goto acquire_err;
         }
+        this->dma_data.chan_irq = r_dma->start;
 
-        /* used in gpmi_dma_filter() */
-        this->private = r;
-
-        for (i = r->start; i <= r->end; i++) {
-                struct dma_chan *dma_chan;
-                dma_cap_mask_t mask;
+        /* request dma channel */
+        dma_cap_zero(mask);
+        dma_cap_set(DMA_SLAVE, mask);
 
-                if (i - r->start >= pdata->max_chip_count)
-                        break;
-
-                dma_cap_zero(mask);
-                dma_cap_set(DMA_SLAVE, mask);
-
-                /* get the DMA interrupt */
-                if (r_dma->start == r_dma->end) {
-                        /* only register the first. */
-                        if (i == r->start)
-                                this->dma_data.chan_irq = r_dma->start;
-                        else
-                                this->dma_data.chan_irq = NO_IRQ;
-                } else
-                        this->dma_data.chan_irq = r_dma->start + (i - r->start);
-
-                dma_chan = dma_request_channel(mask, gpmi_dma_filter, this);
-                if (!dma_chan)
-                        goto acquire_err;
-
-                /* fill the first empty item */
-                this->dma_chans[i - r->start] = dma_chan;
+        dma_chan = dma_request_channel(mask, gpmi_dma_filter, this);
+        if (!dma_chan) {
+                pr_err("dma_request_channel failed.\n");
+                goto acquire_err;
         }
 
-        res->dma_low_channel = r->start;
-        res->dma_high_channel = i;
+        this->dma_chans[0] = dma_chan;
         return 0;
 
 acquire_err:
-        pr_err("Can't acquire DMA channel %u\n", i);
         release_dma_channels(this);
         return -EINVAL;
 }
@@ -851,7 +841,7 @@ static void block_mark_swapping(struct gpmi_nand_data *this,
 }
 
 static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf, int page)
+                                uint8_t *buf, int oob_required, int page)
 {
         struct gpmi_nand_data *this = chip->priv;
         struct bch_geometry *nfc_geo = &this->bch_geometry;
@@ -917,28 +907,31 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
                 mtd->ecc_stats.corrected += corrected;
         }
 
-        /*
-         * It's time to deliver the OOB bytes. See gpmi_ecc_read_oob() for
-         * details about our policy for delivering the OOB.
-         *
-         * We fill the caller's buffer with set bits, and then copy the block
-         * mark to th caller's buffer. Note that, if block mark swapping was
-         * necessary, it has already been done, so we can rely on the first
-         * byte of the auxiliary buffer to contain the block mark.
-         */
-        memset(chip->oob_poi, ~0, mtd->oobsize);
-        chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0];
+        if (oob_required) {
+                /*
+                 * It's time to deliver the OOB bytes. See gpmi_ecc_read_oob()
+                 * for details about our policy for delivering the OOB.
+                 *
+                 * We fill the caller's buffer with set bits, and then copy the
+                 * block mark to th caller's buffer. Note that, if block mark
+                 * swapping was necessary, it has already been done, so we can
+                 * rely on the first byte of the auxiliary buffer to contain
+                 * the block mark.
+                 */
+                memset(chip->oob_poi, ~0, mtd->oobsize);
+                chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0];
 
-        read_page_swap_end(this, buf, mtd->writesize,
-                        this->payload_virt, this->payload_phys,
-                        nfc_geo->payload_size,
-                        payload_virt, payload_phys);
+                read_page_swap_end(this, buf, mtd->writesize,
+                                this->payload_virt, this->payload_phys,
+                                nfc_geo->payload_size,
+                                payload_virt, payload_phys);
+        }
 exit_nfc:
         return ret;
 }
 
-static void gpmi_ecc_write_page(struct mtd_info *mtd,
-                                struct nand_chip *chip, const uint8_t *buf)
+static void gpmi_ecc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                                const uint8_t *buf, int oob_required)
 {
         struct gpmi_nand_data *this = chip->priv;
         struct bch_geometry *nfc_geo = &this->bch_geometry;
@@ -1077,7 +1070,7 @@ exit_auxiliary:
  * this driver.
  */
 static int gpmi_ecc_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
-                                int page, int sndcmd)
+                                int page)
 {
         struct gpmi_nand_data *this = chip->priv;
 
@@ -1100,11 +1093,7 @@ static int gpmi_ecc_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
                 chip->oob_poi[0] = chip->read_byte(mtd);
         }
 
-        /*
-         * Return true, indicating that the next call to this function must send
-         * a command.
-         */
-        return true;
+        return 0;
 }
 
 static int
@@ -1318,7 +1307,7 @@ static int mx23_write_transcription_stamp(struct gpmi_nand_data *this)
                 /* Write the first page of the current stride. */
                 dev_dbg(dev, "Writing an NCB fingerprint in page 0x%x\n", page);
                 chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
-                chip->ecc.write_page_raw(mtd, chip, buffer);
+                chip->ecc.write_page_raw(mtd, chip, buffer, 0);
                 chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
 
                 /* Wait for the write to finish. */
@@ -1444,6 +1433,10 @@ static int gpmi_pre_bbt_scan(struct gpmi_nand_data  *this)
         if (ret)
                 return ret;
 
+        /* Adjust the ECC strength according to the chip. */
+        this->nand.ecc.strength = this->bch_geometry.ecc_strength;
+        this->mtd.ecc_strength = this->bch_geometry.ecc_strength;
+
         /* NAND boot init, depends on the gpmi_set_geometry(). */
         return nand_boot_init(this);
 }
@@ -1471,9 +1464,9 @@ void gpmi_nfc_exit(struct gpmi_nand_data *this)
 
 static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this)
 {
-        struct gpmi_nand_platform_data *pdata = this->pdata;
         struct mtd_info  *mtd = &this->mtd;
         struct nand_chip *chip = &this->nand;
+        struct mtd_part_parser_data ppdata = {};
         int ret;
 
         /* init current chip */
@@ -1502,6 +1495,7 @@ static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this)
         chip->options           |= NAND_NO_SUBPAGE_WRITE;
         chip->ecc.mode          = NAND_ECC_HW;
         chip->ecc.size          = 1;
+        chip->ecc.strength      = 8;
         chip->ecc.layout        = &gpmi_hw_ecclayout;
 
         /* Allocate a temporary DMA buffer for reading ID in the nand_scan() */
@@ -1511,14 +1505,14 @@ static int __devinit gpmi_nfc_init(struct gpmi_nand_data *this)
         if (ret)
                 goto err_out;
 
-        ret = nand_scan(mtd, pdata->max_chip_count);
+        ret = nand_scan(mtd, 1);
         if (ret) {
                 pr_err("Chip scan failed\n");
                 goto err_out;
         }
 
-        ret = mtd_device_parse_register(mtd, NULL, NULL,
-                        pdata->partitions, pdata->partition_count);
+        ppdata.of_node = this->pdev->dev.of_node;
+        ret = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
         if (ret)
                 goto err_out;
         return 0;
@@ -1528,12 +1522,41 @@ err_out:
         return ret;
 }
 
+static const struct platform_device_id gpmi_ids[] = {
+        { .name = "imx23-gpmi-nand", .driver_data = IS_MX23, },
+        { .name = "imx28-gpmi-nand", .driver_data = IS_MX28, },
+        { .name = "imx6q-gpmi-nand", .driver_data = IS_MX6Q, },
+        {},
+};
+
+static const struct of_device_id gpmi_nand_id_table[] = {
+        {
+                .compatible = "fsl,imx23-gpmi-nand",
+                .data = (void *)&gpmi_ids[IS_MX23]
+        }, {
+                .compatible = "fsl,imx28-gpmi-nand",
+                .data = (void *)&gpmi_ids[IS_MX28]
+        }, {
+                .compatible = "fsl,imx6q-gpmi-nand",
+                .data = (void *)&gpmi_ids[IS_MX6Q]
+        }, {}
+};
+MODULE_DEVICE_TABLE(of, gpmi_nand_id_table);
+
 static int __devinit gpmi_nand_probe(struct platform_device *pdev)
 {
-        struct gpmi_nand_platform_data *pdata = pdev->dev.platform_data;
         struct gpmi_nand_data *this;
+        const struct of_device_id *of_id;
         int ret;
 
+        of_id = of_match_device(gpmi_nand_id_table, &pdev->dev);
+        if (of_id) {
+                pdev->id_entry = of_id->data;
+        } else {
+                pr_err("Failed to find the right device id.\n");
+                return -ENOMEM;
+        }
+
         this = kzalloc(sizeof(*this), GFP_KERNEL);
         if (!this) {
                 pr_err("Failed to allocate per-device memory\n");
@@ -1543,13 +1566,6 @@ static int __devinit gpmi_nand_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, this);
         this->pdev  = pdev;
         this->dev   = &pdev->dev;
-        this->pdata = pdata;
-
-        if (pdata->platform_init) {
-                ret = pdata->platform_init();
-                if (ret)
-                        goto platform_init_error;
-        }
 
         ret = acquire_resources(this);
         if (ret)
@@ -1567,7 +1583,6 @@ static int __devinit gpmi_nand_probe(struct platform_device *pdev)
 
 exit_nfc_init:
         release_resources(this);
-platform_init_error:
 exit_acquire_resources:
         platform_set_drvdata(pdev, NULL);
         kfree(this);
@@ -1585,19 +1600,10 @@ static int __exit gpmi_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct platform_device_id gpmi_ids[] = {
-        {
-                .name = "imx23-gpmi-nand",
-                .driver_data = IS_MX23,
-        }, {
-                .name = "imx28-gpmi-nand",
-                .driver_data = IS_MX28,
-        }, {},
-};
-
 static struct platform_driver gpmi_nand_driver = {
         .driver = {
                 .name = "gpmi-nand",
+                .of_match_table = gpmi_nand_id_table,
         },
         .probe   = gpmi_nand_probe,
         .remove  = __exit_p(gpmi_nand_remove),
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index ec6180d4ff8f..ce5daa160920 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -266,8 +266,10 @@ extern int gpmi_read_page(struct gpmi_nand_data *,
 #define STATUS_UNCORRECTABLE    0xfe
 
 /* Use the platform_id to distinguish different Archs. */
-#define IS_MX23                 0x1
-#define IS_MX28                 0x2
+#define IS_MX23                 0x0
+#define IS_MX28                 0x1
+#define IS_MX6Q                 0x2
 #define GPMI_IS_MX23(x)         ((x)->pdev->id_entry->driver_data == IS_MX23)
 #define GPMI_IS_MX28(x)         ((x)->pdev->id_entry->driver_data == IS_MX28)
+#define GPMI_IS_MX6Q(x)         ((x)->pdev->id_entry->driver_data == IS_MX6Q)
 #endif
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 9bf5ce5fa22d..50166e93ba96 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -124,7 +124,6 @@ static int __init h1910_init(void)
         /* 15 us command delay time */
         this->chip_delay = 50;
         this->ecc.mode = NAND_ECC_SOFT;
-        this->options = NAND_NO_AUTOINCR;
 
         /* Scan to find existence of the device */
         if (nand_scan(h1910_nand_mtd, 1)) {
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index e4147e8acb7c..a6fa884ae49b 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -332,11 +332,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
         chip->ecc.mode          = NAND_ECC_HW_OOB_FIRST;
         chip->ecc.size          = 512;
         chip->ecc.bytes         = 9;
-        chip->ecc.strength      = 2;
-        /*
-         * FIXME: ecc_strength value of 2 bits per 512 bytes of data is a
-         * conservative guess, given 9 ecc bytes and reed-solomon alg.
-         */
+        chip->ecc.strength      = 4;
 
         if (pdata)
                 chip->ecc.layout = pdata->ecc_layout;
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index c240cf1af961..c259c24d7986 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -734,7 +734,6 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
         chip->write_buf = mpc5121_nfc_write_buf;
         chip->verify_buf = mpc5121_nfc_verify_buf;
         chip->select_chip = mpc5121_nfc_select_chip;
-        chip->options = NAND_NO_AUTOINCR;
         chip->bbt_options = NAND_BBT_USE_FLASH;
         chip->ecc.mode = NAND_ECC_SOFT;
 
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 9e374e9bd296..c58e6a93f445 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -32,6 +32,8 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/completion.h>
+#include <linux/of_device.h>
+#include <linux/of_mtd.h>
 
 #include <asm/mach/flash.h>
 #include <mach/mxc_nand.h>
@@ -140,13 +142,47 @@
 
 #define NFC_V3_DELAY_LINE               (host->regs_ip + 0x34)
 
+struct mxc_nand_host;
+
+struct mxc_nand_devtype_data {
+        void (*preset)(struct mtd_info *);
+        void (*send_cmd)(struct mxc_nand_host *, uint16_t, int);
+        void (*send_addr)(struct mxc_nand_host *, uint16_t, int);
+        void (*send_page)(struct mtd_info *, unsigned int);
+        void (*send_read_id)(struct mxc_nand_host *);
+        uint16_t (*get_dev_status)(struct mxc_nand_host *);
+        int (*check_int)(struct mxc_nand_host *);
+        void (*irq_control)(struct mxc_nand_host *, int);
+        u32 (*get_ecc_status)(struct mxc_nand_host *);
+        struct nand_ecclayout *ecclayout_512, *ecclayout_2k, *ecclayout_4k;
+        void (*select_chip)(struct mtd_info *mtd, int chip);
+        int (*correct_data)(struct mtd_info *mtd, u_char *dat,
+                        u_char *read_ecc, u_char *calc_ecc);
+
+        /*
+         * On i.MX21 the CONFIG2:INT bit cannot be read if interrupts are masked
+         * (CONFIG1:INT_MSK is set). To handle this the driver uses
+         * enable_irq/disable_irq_nosync instead of CONFIG1:INT_MSK
+         */
+        int irqpending_quirk;
+        int needs_ip;
+
+        size_t regs_offset;
+        size_t spare0_offset;
+        size_t axi_offset;
+
+        int spare_len;
+        int eccbytes;
+        int eccsize;
+};
+
 struct mxc_nand_host {
         struct mtd_info         mtd;
         struct nand_chip        nand;
         struct device           *dev;
 
-        void                    *spare0;
-        void                    *main_area0;
+        void __iomem            *spare0;
+        void __iomem            *main_area0;
 
         void __iomem            *base;
         void __iomem            *regs;
@@ -163,16 +199,9 @@ struct mxc_nand_host {
 
         uint8_t                 *data_buf;
         unsigned int            buf_start;
-        int                     spare_len;
-
-        void                    (*preset)(struct mtd_info *);
-        void                    (*send_cmd)(struct mxc_nand_host *, uint16_t, int);
-        void                    (*send_addr)(struct mxc_nand_host *, uint16_t, int);
-        void                    (*send_page)(struct mtd_info *, unsigned int);
-        void                    (*send_read_id)(struct mxc_nand_host *);
-        uint16_t                (*get_dev_status)(struct mxc_nand_host *);
-        int                     (*check_int)(struct mxc_nand_host *);
-        void                    (*irq_control)(struct mxc_nand_host *, int);
+
+        const struct mxc_nand_devtype_data *devtype_data;
+        struct mxc_nand_platform_data pdata;
 };
 
 /* OOB placement block for use with hardware ecc generation */
@@ -242,21 +271,7 @@ static struct nand_ecclayout nandv2_hw_eccoob_4k = {
         }
 };
 
-static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
-
-static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
-{
-        struct mxc_nand_host *host = dev_id;
-
-        if (!host->check_int(host))
-                return IRQ_NONE;
-
-        host->irq_control(host, 0);
-
-        complete(&host->op_completion);
-
-        return IRQ_HANDLED;
-}
+static const char *part_probes[] = { "RedBoot", "cmdlinepart", "ofpart", NULL };
 
 static int check_int_v3(struct mxc_nand_host *host)
 {
@@ -280,26 +295,12 @@ static int check_int_v1_v2(struct mxc_nand_host *host)
         if (!(tmp & NFC_V1_V2_CONFIG2_INT))
                 return 0;
 
-        if (!cpu_is_mx21())
+        if (!host->devtype_data->irqpending_quirk)
                 writew(tmp & ~NFC_V1_V2_CONFIG2_INT, NFC_V1_V2_CONFIG2);
 
         return 1;
 }
 
-/*
- * It has been observed that the i.MX21 cannot read the CONFIG2:INT bit
- * if interrupts are masked (CONFIG1:INT_MSK is set). To handle this, the
- * driver can enable/disable the irq line rather than simply masking the
- * interrupts.
- */
-static void irq_control_mx21(struct mxc_nand_host *host, int activate)
-{
-        if (activate)
-                enable_irq(host->irq);
-        else
-                disable_irq_nosync(host->irq);
-}
-
 static void irq_control_v1_v2(struct mxc_nand_host *host, int activate)
 {
         uint16_t tmp;
@@ -328,6 +329,47 @@ static void irq_control_v3(struct mxc_nand_host *host, int activate)
         writel(tmp, NFC_V3_CONFIG2);
 }
 
+static void irq_control(struct mxc_nand_host *host, int activate)
+{
+        if (host->devtype_data->irqpending_quirk) {
+                if (activate)
+                        enable_irq(host->irq);
+                else
+                        disable_irq_nosync(host->irq);
+        } else {
+                host->devtype_data->irq_control(host, activate);
+        }
+}
+
+static u32 get_ecc_status_v1(struct mxc_nand_host *host)
+{
+        return readw(NFC_V1_V2_ECC_STATUS_RESULT);
+}
+
+static u32 get_ecc_status_v2(struct mxc_nand_host *host)
+{
+        return readl(NFC_V1_V2_ECC_STATUS_RESULT);
+}
+
+static u32 get_ecc_status_v3(struct mxc_nand_host *host)
+{
+        return readl(NFC_V3_ECC_STATUS_RESULT);
+}
+
+static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
+{
+        struct mxc_nand_host *host = dev_id;
+
+        if (!host->devtype_data->check_int(host))
+                return IRQ_NONE;
+
+        irq_control(host, 0);
+
+        complete(&host->op_completion);
+
+        return IRQ_HANDLED;
+}
+
 /* This function polls the NANDFC to wait for the basic operation to
  * complete by checking the INT bit of config2 register.
  */
@@ -336,14 +378,14 @@ static void wait_op_done(struct mxc_nand_host *host, int useirq)
         int max_retries = 8000;
 
         if (useirq) {
-                if (!host->check_int(host)) {
+                if (!host->devtype_data->check_int(host)) {
                         INIT_COMPLETION(host->op_completion);
-                        host->irq_control(host, 1);
+                        irq_control(host, 1);
                         wait_for_completion(&host->op_completion);
                 }
         } else {
                 while (max_retries-- > 0) {
-                        if (host->check_int(host))
+                        if (host->devtype_data->check_int(host))
                                 break;
 
                         udelay(1);
@@ -374,7 +416,7 @@ static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
         writew(cmd, NFC_V1_V2_FLASH_CMD);
         writew(NFC_CMD, NFC_V1_V2_CONFIG2);
 
-        if (cpu_is_mx21() && (cmd == NAND_CMD_RESET)) {
+        if (host->devtype_data->irqpending_quirk && (cmd == NAND_CMD_RESET)) {
                 int max_retries = 100;
                 /* Reset completion is indicated by NFC_CONFIG2 */
                 /* being set to 0 */
@@ -433,13 +475,27 @@ static void send_page_v3(struct mtd_info *mtd, unsigned int ops)
         wait_op_done(host, false);
 }
 
-static void send_page_v1_v2(struct mtd_info *mtd, unsigned int ops)
+static void send_page_v2(struct mtd_info *mtd, unsigned int ops)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
+
+        /* NANDFC buffer 0 is used for page read/write */
+        writew(host->active_cs << 4, NFC_V1_V2_BUF_ADDR);
+
+        writew(ops, NFC_V1_V2_CONFIG2);
+
+        /* Wait for operation to complete */
+        wait_op_done(host, true);
+}
+
+static void send_page_v1(struct mtd_info *mtd, unsigned int ops)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
         int bufs, i;
 
-        if (nfc_is_v1() && mtd->writesize > 512)
+        if (mtd->writesize > 512)
                 bufs = 4;
         else
                 bufs = 1;
@@ -463,7 +519,7 @@ static void send_read_id_v3(struct mxc_nand_host *host)
 
         wait_op_done(host, true);
 
-        memcpy(host->data_buf, host->main_area0, 16);
+        memcpy_fromio(host->data_buf, host->main_area0, 16);
 }
 
 /* Request the NANDFC to perform a read of the NAND device ID. */
@@ -479,7 +535,7 @@ static void send_read_id_v1_v2(struct mxc_nand_host *host)
         /* Wait for operation to complete */
         wait_op_done(host, true);
 
-        memcpy(host->data_buf, host->main_area0, 16);
+        memcpy_fromio(host->data_buf, host->main_area0, 16);
 
         if (this->options & NAND_BUSWIDTH_16) {
                 /* compress the ID info */
@@ -555,7 +611,7 @@ static int mxc_nand_correct_data_v1(struct mtd_info *mtd, u_char *dat,
          * additional correction.  2-Bit errors cannot be corrected by
          * HW ECC, so we need to return failure
          */
-        uint16_t ecc_status = readw(NFC_V1_V2_ECC_STATUS_RESULT);
+        uint16_t ecc_status = get_ecc_status_v1(host);
 
         if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
                 pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
@@ -580,10 +636,7 @@ static int mxc_nand_correct_data_v2_v3(struct mtd_info *mtd, u_char *dat,
 
         no_subpages = mtd->writesize >> 9;
 
-        if (nfc_is_v21())
-                ecc_stat = readl(NFC_V1_V2_ECC_STATUS_RESULT);
-        else
-                ecc_stat = readl(NFC_V3_ECC_STATUS_RESULT);
+        ecc_stat = host->devtype_data->get_ecc_status(host);
 
         do {
                 err = ecc_stat & ecc_bit_mask;
@@ -616,7 +669,7 @@ static u_char mxc_nand_read_byte(struct mtd_info *mtd)
 
         /* Check for status request */
         if (host->status_request)
-                return host->get_dev_status(host) & 0xFF;
+                return host->devtype_data->get_dev_status(host) & 0xFF;
 
         ret = *(uint8_t *)(host->data_buf + host->buf_start);
         host->buf_start++;
@@ -682,7 +735,7 @@ static int mxc_nand_verify_buf(struct mtd_info *mtd,
 
 /* This function is used by upper layer for select and
  * deselect of the NAND chip */
-static void mxc_nand_select_chip(struct mtd_info *mtd, int chip)
+static void mxc_nand_select_chip_v1_v3(struct mtd_info *mtd, int chip)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
@@ -701,11 +754,30 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip)
                 clk_prepare_enable(host->clk);
                 host->clk_act = 1;
         }
+}
 
-        if (nfc_is_v21()) {
-                host->active_cs = chip;
-                writew(host->active_cs << 4, NFC_V1_V2_BUF_ADDR);
+static void mxc_nand_select_chip_v2(struct mtd_info *mtd, int chip)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
+
+        if (chip == -1) {
+                /* Disable the NFC clock */
+                if (host->clk_act) {
+                        clk_disable(host->clk);
+                        host->clk_act = 0;
+                }
+                return;
+        }
+
+        if (!host->clk_act) {
+                /* Enable the NFC clock */
+                clk_enable(host->clk);
+                host->clk_act = 1;
         }
+
+        host->active_cs = chip;
+        writew(host->active_cs << 4, NFC_V1_V2_BUF_ADDR);
 }
 
 /*
@@ -718,23 +790,23 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom)
         u16 i, j;
         u16 n = mtd->writesize >> 9;
         u8 *d = host->data_buf + mtd->writesize;
-        u8 *s = host->spare0;
-        u16 t = host->spare_len;
+        u8 __iomem *s = host->spare0;
+        u16 t = host->devtype_data->spare_len;
 
         j = (mtd->oobsize / n >> 1) << 1;
 
         if (bfrom) {
                 for (i = 0; i < n - 1; i++)
-                        memcpy(d + i * j, s + i * t, j);
+                        memcpy_fromio(d + i * j, s + i * t, j);
 
                 /* the last section */
-                memcpy(d + i * j, s + i * t, mtd->oobsize - i * j);
+                memcpy_fromio(d + i * j, s + i * t, mtd->oobsize - i * j);
         } else {
                 for (i = 0; i < n - 1; i++)
-                        memcpy(&s[i * t], &d[i * j], j);
+                        memcpy_toio(&s[i * t], &d[i * j], j);
 
                 /* the last section */
-                memcpy(&s[i * t], &d[i * j], mtd->oobsize - i * j);
+                memcpy_toio(&s[i * t], &d[i * j], mtd->oobsize - i * j);
         }
 }
 
@@ -751,34 +823,44 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
                  * perform a read/write buf operation, the saved column
                   * address is used to index into the full page.
                  */
-                host->send_addr(host, 0, page_addr == -1);
+                host->devtype_data->send_addr(host, 0, page_addr == -1);
                 if (mtd->writesize > 512)
                         /* another col addr cycle for 2k page */
-                        host->send_addr(host, 0, false);
+                        host->devtype_data->send_addr(host, 0, false);
         }
 
         /* Write out page address, if necessary */
         if (page_addr != -1) {
                 /* paddr_0 - p_addr_7 */
-                host->send_addr(host, (page_addr & 0xff), false);
+                host->devtype_data->send_addr(host, (page_addr & 0xff), false);
 
                 if (mtd->writesize > 512) {
                         if (mtd->size >= 0x10000000) {
                                 /* paddr_8 - paddr_15 */
-                                host->send_addr(host, (page_addr >> 8) & 0xff, false);
-                                host->send_addr(host, (page_addr >> 16) & 0xff, true);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 8) & 0xff,
+                                                false);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 16) & 0xff,
+                                                true);
                         } else
                                 /* paddr_8 - paddr_15 */
-                                host->send_addr(host, (page_addr >> 8) & 0xff, true);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 8) & 0xff, true);
                 } else {
                         /* One more address cycle for higher density devices */
                         if (mtd->size >= 0x4000000) {
                                 /* paddr_8 - paddr_15 */
-                                host->send_addr(host, (page_addr >> 8) & 0xff, false);
-                                host->send_addr(host, (page_addr >> 16) & 0xff, true);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 8) & 0xff,
+                                                false);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 16) & 0xff,
+                                                true);
                         } else
                                 /* paddr_8 - paddr_15 */
-                                host->send_addr(host, (page_addr >> 8) & 0xff, true);
+                                host->devtype_data->send_addr(host,
+                                                (page_addr >> 8) & 0xff, true);
                 }
         }
 }
@@ -800,7 +882,35 @@ static int get_eccsize(struct mtd_info *mtd)
                 return 8;
 }
 
-static void preset_v1_v2(struct mtd_info *mtd)
+static void preset_v1(struct mtd_info *mtd)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct mxc_nand_host *host = nand_chip->priv;
+        uint16_t config1 = 0;
+
+        if (nand_chip->ecc.mode == NAND_ECC_HW)
+                config1 |= NFC_V1_V2_CONFIG1_ECC_EN;
+
+        if (!host->devtype_data->irqpending_quirk)
+                config1 |= NFC_V1_V2_CONFIG1_INT_MSK;
+
+        host->eccsize = 1;
+
+        writew(config1, NFC_V1_V2_CONFIG1);
+        /* preset operation */
+
+        /* Unlock the internal RAM Buffer */
+        writew(0x2, NFC_V1_V2_CONFIG);
+
+        /* Blocks to be unlocked */
+        writew(0x0, NFC_V1_UNLOCKSTART_BLKADDR);
+        writew(0xffff, NFC_V1_UNLOCKEND_BLKADDR);
+
+        /* Unlock Block Command for given address range */
+        writew(0x4, NFC_V1_V2_WRPROT);
+}
+
+static void preset_v2(struct mtd_info *mtd)
 {
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
@@ -809,13 +919,12 @@ static void preset_v1_v2(struct mtd_info *mtd)
         if (nand_chip->ecc.mode == NAND_ECC_HW)
                 config1 |= NFC_V1_V2_CONFIG1_ECC_EN;
 
-        if (nfc_is_v21())
-                config1 |= NFC_V2_CONFIG1_FP_INT;
+        config1 |= NFC_V2_CONFIG1_FP_INT;
 
-        if (!cpu_is_mx21())
+        if (!host->devtype_data->irqpending_quirk)
                 config1 |= NFC_V1_V2_CONFIG1_INT_MSK;
 
-        if (nfc_is_v21() && mtd->writesize) {
+        if (mtd->writesize) {
                 uint16_t pages_per_block = mtd->erasesize / mtd->writesize;
 
                 host->eccsize = get_eccsize(mtd);
@@ -834,20 +943,14 @@ static void preset_v1_v2(struct mtd_info *mtd)
         writew(0x2, NFC_V1_V2_CONFIG);
 
         /* Blocks to be unlocked */
-        if (nfc_is_v21()) {
-                writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR0);
-                writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR1);
-                writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR2);
-                writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR3);
-                writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR0);
-                writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR1);
-                writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR2);
-                writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR3);
-        } else if (nfc_is_v1()) {
-                writew(0x0, NFC_V1_UNLOCKSTART_BLKADDR);
-                writew(0xffff, NFC_V1_UNLOCKEND_BLKADDR);
-        } else
-                BUG();
+        writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR0);
+        writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR1);
+        writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR2);
+        writew(0x0, NFC_V21_UNLOCKSTART_BLKADDR3);
+        writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR0);
+        writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR1);
+        writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR2);
+        writew(0xffff, NFC_V21_UNLOCKEND_BLKADDR3);
 
         /* Unlock Block Command for given address range */
         writew(0x4, NFC_V1_V2_WRPROT);
@@ -937,15 +1040,15 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
         /* Command pre-processing step */
         switch (command) {
         case NAND_CMD_RESET:
-                host->preset(mtd);
-                host->send_cmd(host, command, false);
+                host->devtype_data->preset(mtd);
+                host->devtype_data->send_cmd(host, command, false);
                 break;
 
         case NAND_CMD_STATUS:
                 host->buf_start = 0;
                 host->status_request = true;
 
-                host->send_cmd(host, command, true);
+                host->devtype_data->send_cmd(host, command, true);
                 mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
@@ -958,15 +1061,16 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
 
                 command = NAND_CMD_READ0; /* only READ0 is valid */
 
-                host->send_cmd(host, command, false);
+                host->devtype_data->send_cmd(host, command, false);
                 mxc_do_addr_cycle(mtd, column, page_addr);
 
                 if (mtd->writesize > 512)
-                        host->send_cmd(host, NAND_CMD_READSTART, true);
+                        host->devtype_data->send_cmd(host,
+                                        NAND_CMD_READSTART, true);
 
-                host->send_page(mtd, NFC_OUTPUT);
+                host->devtype_data->send_page(mtd, NFC_OUTPUT);
 
-                memcpy(host->data_buf, host->main_area0, mtd->writesize);
+                memcpy_fromio(host->data_buf, host->main_area0, mtd->writesize);
                 copy_spare(mtd, true);
                 break;
 
@@ -977,28 +1081,28 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
 
                 host->buf_start = column;
 
-                host->send_cmd(host, command, false);
+                host->devtype_data->send_cmd(host, command, false);
                 mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
         case NAND_CMD_PAGEPROG:
-                memcpy(host->main_area0, host->data_buf, mtd->writesize);
+                memcpy_toio(host->main_area0, host->data_buf, mtd->writesize);
                 copy_spare(mtd, false);
-                host->send_page(mtd, NFC_INPUT);
-                host->send_cmd(host, command, true);
+                host->devtype_data->send_page(mtd, NFC_INPUT);
+                host->devtype_data->send_cmd(host, command, true);
                 mxc_do_addr_cycle(mtd, column, page_addr);
                 break;
 
         case NAND_CMD_READID:
-                host->send_cmd(host, command, true);
+                host->devtype_data->send_cmd(host, command, true);
                 mxc_do_addr_cycle(mtd, column, page_addr);
-                host->send_read_id(host);
+                host->devtype_data->send_read_id(host);
                 host->buf_start = column;
                 break;
 
         case NAND_CMD_ERASE1:
         case NAND_CMD_ERASE2:
-                host->send_cmd(host, command, false);
+                host->devtype_data->send_cmd(host, command, false);
                 mxc_do_addr_cycle(mtd, column, page_addr);
 
                 break;
@@ -1032,15 +1136,191 @@ static struct nand_bbt_descr bbt_mirror_descr = {
         .pattern = mirror_pattern,
 };
 
+/* v1 + irqpending_quirk: i.MX21 */
+static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
+        .preset = preset_v1,
+        .send_cmd = send_cmd_v1_v2,
+        .send_addr = send_addr_v1_v2,
+        .send_page = send_page_v1,
+        .send_read_id = send_read_id_v1_v2,
+        .get_dev_status = get_dev_status_v1_v2,
+        .check_int = check_int_v1_v2,
+        .irq_control = irq_control_v1_v2,
+        .get_ecc_status = get_ecc_status_v1,
+        .ecclayout_512 = &nandv1_hw_eccoob_smallpage,
+        .ecclayout_2k = &nandv1_hw_eccoob_largepage,
+        .ecclayout_4k = &nandv1_hw_eccoob_smallpage, /* XXX: needs fix */
+        .select_chip = mxc_nand_select_chip_v1_v3,
+        .correct_data = mxc_nand_correct_data_v1,
+        .irqpending_quirk = 1,
+        .needs_ip = 0,
+        .regs_offset = 0xe00,
+        .spare0_offset = 0x800,
+        .spare_len = 16,
+        .eccbytes = 3,
+        .eccsize = 1,
+};
+
+/* v1 + !irqpending_quirk: i.MX27, i.MX31 */
+static const struct mxc_nand_devtype_data imx27_nand_devtype_data = {
+        .preset = preset_v1,
+        .send_cmd = send_cmd_v1_v2,
+        .send_addr = send_addr_v1_v2,
+        .send_page = send_page_v1,
+        .send_read_id = send_read_id_v1_v2,
+        .get_dev_status = get_dev_status_v1_v2,
+        .check_int = check_int_v1_v2,
+        .irq_control = irq_control_v1_v2,
+        .get_ecc_status = get_ecc_status_v1,
+        .ecclayout_512 = &nandv1_hw_eccoob_smallpage,
+        .ecclayout_2k = &nandv1_hw_eccoob_largepage,
+        .ecclayout_4k = &nandv1_hw_eccoob_smallpage, /* XXX: needs fix */
+        .select_chip = mxc_nand_select_chip_v1_v3,
+        .correct_data = mxc_nand_correct_data_v1,
+        .irqpending_quirk = 0,
+        .needs_ip = 0,
+        .regs_offset = 0xe00,
+        .spare0_offset = 0x800,
+        .axi_offset = 0,
+        .spare_len = 16,
+        .eccbytes = 3,
+        .eccsize = 1,
+};
+
+/* v21: i.MX25, i.MX35 */
+static const struct mxc_nand_devtype_data imx25_nand_devtype_data = {
+        .preset = preset_v2,
+        .send_cmd = send_cmd_v1_v2,
+        .send_addr = send_addr_v1_v2,
+        .send_page = send_page_v2,
+        .send_read_id = send_read_id_v1_v2,
+        .get_dev_status = get_dev_status_v1_v2,
+        .check_int = check_int_v1_v2,
+        .irq_control = irq_control_v1_v2,
+        .get_ecc_status = get_ecc_status_v2,
+        .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
+        .ecclayout_2k = &nandv2_hw_eccoob_largepage,
+        .ecclayout_4k = &nandv2_hw_eccoob_4k,
+        .select_chip = mxc_nand_select_chip_v2,
+        .correct_data = mxc_nand_correct_data_v2_v3,
+        .irqpending_quirk = 0,
+        .needs_ip = 0,
+        .regs_offset = 0x1e00,
+        .spare0_offset = 0x1000,
+        .axi_offset = 0,
+        .spare_len = 64,
+        .eccbytes = 9,
+        .eccsize = 0,
+};
+
+/* v3: i.MX51, i.MX53 */
+static const struct mxc_nand_devtype_data imx51_nand_devtype_data = {
+        .preset = preset_v3,
+        .send_cmd = send_cmd_v3,
+        .send_addr = send_addr_v3,
+        .send_page = send_page_v3,
+        .send_read_id = send_read_id_v3,
+        .get_dev_status = get_dev_status_v3,
+        .check_int = check_int_v3,
+        .irq_control = irq_control_v3,
+        .get_ecc_status = get_ecc_status_v3,
+        .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
+        .ecclayout_2k = &nandv2_hw_eccoob_largepage,
+        .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
+        .select_chip = mxc_nand_select_chip_v1_v3,
+        .correct_data = mxc_nand_correct_data_v2_v3,
+        .irqpending_quirk = 0,
+        .needs_ip = 1,
+        .regs_offset = 0,
+        .spare0_offset = 0x1000,
+        .axi_offset = 0x1e00,
+        .spare_len = 64,
+        .eccbytes = 0,
+        .eccsize = 0,
+};
+
+#ifdef CONFIG_OF_MTD
+static const struct of_device_id mxcnd_dt_ids[] = {
+        {
+                .compatible = "fsl,imx21-nand",
+                .data = &imx21_nand_devtype_data,
+        }, {
+                .compatible = "fsl,imx27-nand",
+                .data = &imx27_nand_devtype_data,
+        }, {
+                .compatible = "fsl,imx25-nand",
+                .data = &imx25_nand_devtype_data,
+        }, {
+                .compatible = "fsl,imx51-nand",
+                .data = &imx51_nand_devtype_data,
+        },
+        { /* sentinel */ }
+};
+
+static int __init mxcnd_probe_dt(struct mxc_nand_host *host)
+{
+        struct device_node *np = host->dev->of_node;
+        struct mxc_nand_platform_data *pdata = &host->pdata;
+        const struct of_device_id *of_id =
+                of_match_device(mxcnd_dt_ids, host->dev);
+        int buswidth;
+
+        if (!np)
+                return 1;
+
+        if (of_get_nand_ecc_mode(np) >= 0)
+                pdata->hw_ecc = 1;
+
+        pdata->flash_bbt = of_get_nand_on_flash_bbt(np);
+
+        buswidth = of_get_nand_bus_width(np);
+        if (buswidth < 0)
+                return buswidth;
+
+        pdata->width = buswidth / 8;
+
+        host->devtype_data = of_id->data;
+
+        return 0;
+}
+#else
+static int __init mxcnd_probe_dt(struct mxc_nand_host *host)
+{
+        return 1;
+}
+#endif
+
+static int __init mxcnd_probe_pdata(struct mxc_nand_host *host)
+{
+        struct mxc_nand_platform_data *pdata = host->dev->platform_data;
+
+        if (!pdata)
+                return -ENODEV;
+
+        host->pdata = *pdata;
+
+        if (nfc_is_v1()) {
+                if (cpu_is_mx21())
+                        host->devtype_data = &imx21_nand_devtype_data;
+                else
+                        host->devtype_data = &imx27_nand_devtype_data;
+        } else if (nfc_is_v21()) {
+                host->devtype_data = &imx25_nand_devtype_data;
+        } else if (nfc_is_v3_2()) {
+                host->devtype_data = &imx51_nand_devtype_data;
+        } else
+                BUG();
+
+        return 0;
+}
+
 static int __init mxcnd_probe(struct platform_device *pdev)
 {
         struct nand_chip *this;
         struct mtd_info *mtd;
-        struct mxc_nand_platform_data *pdata = pdev->dev.platform_data;
         struct mxc_nand_host *host;
         struct resource *res;
         int err = 0;
-        struct nand_ecclayout *oob_smallpage, *oob_largepage;
 
         /* Allocate memory for MTD device structure and private data */
         host = kzalloc(sizeof(struct mxc_nand_host) + NAND_MAX_PAGESIZE +
@@ -1065,7 +1345,6 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         this->priv = host;
         this->dev_ready = mxc_nand_dev_ready;
         this->cmdfunc = mxc_nand_command;
-        this->select_chip = mxc_nand_select_chip;
         this->read_byte = mxc_nand_read_byte;
         this->read_word = mxc_nand_read_word;
         this->write_buf = mxc_nand_write_buf;
@@ -1095,36 +1374,26 @@ static int __init mxcnd_probe(struct platform_device *pdev)
 
         host->main_area0 = host->base;
 
-        if (nfc_is_v1() || nfc_is_v21()) {
-                host->preset = preset_v1_v2;
-                host->send_cmd = send_cmd_v1_v2;
-                host->send_addr = send_addr_v1_v2;
-                host->send_page = send_page_v1_v2;
-                host->send_read_id = send_read_id_v1_v2;
-                host->get_dev_status = get_dev_status_v1_v2;
-                host->check_int = check_int_v1_v2;
-                if (cpu_is_mx21())
-                        host->irq_control = irq_control_mx21;
-                else
-                        host->irq_control = irq_control_v1_v2;
-        }
+        err = mxcnd_probe_dt(host);
+        if (err > 0)
+                err = mxcnd_probe_pdata(host);
+        if (err < 0)
+                goto eirq;
 
-        if (nfc_is_v21()) {
-                host->regs = host->base + 0x1e00;
-                host->spare0 = host->base + 0x1000;
-                host->spare_len = 64;
-                oob_smallpage = &nandv2_hw_eccoob_smallpage;
-                oob_largepage = &nandv2_hw_eccoob_largepage;
-                this->ecc.bytes = 9;
-        } else if (nfc_is_v1()) {
-                host->regs = host->base + 0xe00;
-                host->spare0 = host->base + 0x800;
-                host->spare_len = 16;
-                oob_smallpage = &nandv1_hw_eccoob_smallpage;
-                oob_largepage = &nandv1_hw_eccoob_largepage;
-                this->ecc.bytes = 3;
-                host->eccsize = 1;
-        } else if (nfc_is_v3_2()) {
+        if (host->devtype_data->regs_offset)
+                host->regs = host->base + host->devtype_data->regs_offset;
+        host->spare0 = host->base + host->devtype_data->spare0_offset;
+        if (host->devtype_data->axi_offset)
+                host->regs_axi = host->base + host->devtype_data->axi_offset;
+
+        this->ecc.bytes = host->devtype_data->eccbytes;
+        host->eccsize = host->devtype_data->eccsize;
+
+        this->select_chip = host->devtype_data->select_chip;
+        this->ecc.size = 512;
+        this->ecc.layout = host->devtype_data->ecclayout_512;
+
+        if (host->devtype_data->needs_ip) {
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
                 if (!res) {
                         err = -ENODEV;
@@ -1135,42 +1404,22 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                         err = -ENOMEM;
                         goto eirq;
                 }
-                host->regs_axi = host->base + 0x1e00;
-                host->spare0 = host->base + 0x1000;
-                host->spare_len = 64;
-                host->preset = preset_v3;
-                host->send_cmd = send_cmd_v3;
-                host->send_addr = send_addr_v3;
-                host->send_page = send_page_v3;
-                host->send_read_id = send_read_id_v3;
-                host->check_int = check_int_v3;
-                host->get_dev_status = get_dev_status_v3;
-                host->irq_control = irq_control_v3;
-                oob_smallpage = &nandv2_hw_eccoob_smallpage;
-                oob_largepage = &nandv2_hw_eccoob_largepage;
-        } else
-                BUG();
-
-        this->ecc.size = 512;
-        this->ecc.layout = oob_smallpage;
+        }
 
-        if (pdata->hw_ecc) {
+        if (host->pdata.hw_ecc) {
                 this->ecc.calculate = mxc_nand_calculate_ecc;
                 this->ecc.hwctl = mxc_nand_enable_hwecc;
-                if (nfc_is_v1())
-                        this->ecc.correct = mxc_nand_correct_data_v1;
-                else
-                        this->ecc.correct = mxc_nand_correct_data_v2_v3;
+                this->ecc.correct = host->devtype_data->correct_data;
                 this->ecc.mode = NAND_ECC_HW;
         } else {
                 this->ecc.mode = NAND_ECC_SOFT;
         }
 
-        /* NAND bus width determines access funtions used by upper layer */
-        if (pdata->width == 2)
+        /* NAND bus width determines access functions used by upper layer */
+        if (host->pdata.width == 2)
                 this->options |= NAND_BUSWIDTH_16;
 
-        if (pdata->flash_bbt) {
+        if (host->pdata.flash_bbt) {
                 this->bbt_td = &bbt_main_descr;
                 this->bbt_md = &bbt_mirror_descr;
                 /* update flash based bbt */
@@ -1182,28 +1431,25 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         host->irq = platform_get_irq(pdev, 0);
 
         /*
-         * mask the interrupt. For i.MX21 explicitely call
-         * irq_control_v1_v2 to use the mask bit. We can't call
-         * disable_irq_nosync() for an interrupt we do not own yet.
+         * Use host->devtype_data->irq_control() here instead of irq_control()
+         * because we must not disable_irq_nosync without having requested the
+         * irq.
          */
-        if (cpu_is_mx21())
-                irq_control_v1_v2(host, 0);
-        else
-                host->irq_control(host, 0);
+        host->devtype_data->irq_control(host, 0);
 
         err = request_irq(host->irq, mxc_nfc_irq, IRQF_DISABLED, DRIVER_NAME, host);
         if (err)
                 goto eirq;
 
-        host->irq_control(host, 0);
-
         /*
-         * Now that the interrupt is disabled make sure the interrupt
-         * mask bit is cleared on i.MX21. Otherwise we can't read
-         * the interrupt status bit on this machine.
+         * Now that we "own" the interrupt make sure the interrupt mask bit is
+         * cleared on i.MX21. Otherwise we can't read the interrupt status bit
+         * on this machine.
          */
-        if (cpu_is_mx21())
-                irq_control_v1_v2(host, 1);
+        if (host->devtype_data->irqpending_quirk) {
+                disable_irq_nosync(host->irq);
+                host->devtype_data->irq_control(host, 1);
+        }
 
         /* first scan to find the device and get the page size */
         if (nand_scan_ident(mtd, nfc_is_v21() ? 4 : 1, NULL)) {
@@ -1212,18 +1458,12 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         }
 
         /* Call preset again, with correct writesize this time */
-        host->preset(mtd);
+        host->devtype_data->preset(mtd);
 
         if (mtd->writesize == 2048)
-                this->ecc.layout = oob_largepage;
-        if (nfc_is_v21() && mtd->writesize == 4096)
-                this->ecc.layout = &nandv2_hw_eccoob_4k;
-
-        /* second phase scan */
-        if (nand_scan_tail(mtd)) {
-                err = -ENXIO;
-                goto escan;
-        }
+                this->ecc.layout = host->devtype_data->ecclayout_2k;
+        else if (mtd->writesize == 4096)
+                this->ecc.layout = host->devtype_data->ecclayout_4k;
 
         if (this->ecc.mode == NAND_ECC_HW) {
                 if (nfc_is_v1())
@@ -1232,9 +1472,19 @@ static int __init mxcnd_probe(struct platform_device *pdev)
                         this->ecc.strength = (host->eccsize == 4) ? 4 : 8;
         }
 
+        /* second phase scan */
+        if (nand_scan_tail(mtd)) {
+                err = -ENXIO;
+                goto escan;
+        }
+
         /* Register the partitions */
-        mtd_device_parse_register(mtd, part_probes, NULL, pdata->parts,
-                                  pdata->nr_parts);
+        mtd_device_parse_register(mtd, part_probes,
+                        &(struct mtd_part_parser_data){
+                                .of_node = pdev->dev.of_node,
+                        },
+                        host->pdata.parts,
+                        host->pdata.nr_parts);
 
         platform_set_drvdata(pdev, host);
 
@@ -1275,6 +1525,8 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
 static struct platform_driver mxcnd_driver = {
         .driver = {
                    .name = DRIVER_NAME,
+                   .owner = THIS_MODULE,
+                   .of_match_table = of_match_ptr(mxcnd_dt_ids),
         },
         .remove = __devexit_p(mxcnd_remove),
 };
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 47b19c0bb070..d47586cf64ce 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1066,15 +1066,17 @@ EXPORT_SYMBOL(nand_lock);
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  *
  * Not for syndrome calculating ECC controllers, which use a special oob layout.
  */
 static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                              uint8_t *buf, int page)
+                              uint8_t *buf, int oob_required, int page)
 {
         chip->read_buf(mtd, buf, mtd->writesize);
-        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        if (oob_required)
+                chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
         return 0;
 }
 
@@ -1083,13 +1085,14 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  *
  * We need a special oob layout and handling even when OOB isn't used.
  */
 static int nand_read_page_raw_syndrome(struct mtd_info *mtd,
-                                        struct nand_chip *chip,
-                                        uint8_t *buf, int page)
+                                       struct nand_chip *chip, uint8_t *buf,
+                                       int oob_required, int page)
 {
         int eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1126,10 +1129,11 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  */
 static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf, int page)
+                                uint8_t *buf, int oob_required, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1138,8 +1142,9 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
         uint32_t *eccpos = chip->ecc.layout->eccpos;
+        unsigned int max_bitflips = 0;
 
-        chip->ecc.read_page_raw(mtd, chip, buf, page);
+        chip->ecc.read_page_raw(mtd, chip, buf, 1, page);
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
                 chip->ecc.calculate(mtd, p, &ecc_calc[i]);
@@ -1154,12 +1159,14 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
                 int stat;
 
                 stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
         }
-        return 0;
+        return max_bitflips;
 }
 
 /**
@@ -1180,6 +1187,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
         int datafrag_len, eccfrag_len, aligned_len, aligned_pos;
         int busw = (chip->options & NAND_BUSWIDTH_16) ? 2 : 1;
         int index = 0;
+        unsigned int max_bitflips = 0;
 
         /* Column address within the page aligned to ECC size (256bytes) */
         start_step = data_offs / chip->ecc.size;
@@ -1244,12 +1252,14 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
 
                 stat = chip->ecc.correct(mtd, p,
                         &chip->buffers->ecccode[i], &chip->buffers->ecccalc[i]);
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
         }
-        return 0;
+        return max_bitflips;
 }
 
 /**
@@ -1257,12 +1267,13 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  *
  * Not for syndrome calculating ECC controllers which need a special oob layout.
  */
 static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf, int page)
+                                uint8_t *buf, int oob_required, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1271,6 +1282,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
         uint32_t *eccpos = chip->ecc.layout->eccpos;
+        unsigned int max_bitflips = 0;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 chip->ecc.hwctl(mtd, NAND_ECC_READ);
@@ -1289,12 +1301,14 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
                 int stat;
 
                 stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
         }
-        return 0;
+        return max_bitflips;
 }
 
 /**
@@ -1302,6 +1316,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  *
  * Hardware ECC for large page chips, require OOB to be read first. For this
@@ -1311,7 +1326,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
  * the data area, by overwriting the NAND manufacturer bad block markings.
  */
 static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
-        struct nand_chip *chip, uint8_t *buf, int page)
+        struct nand_chip *chip, uint8_t *buf, int oob_required, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1320,6 +1335,7 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
         uint8_t *ecc_code = chip->buffers->ecccode;
         uint32_t *eccpos = chip->ecc.layout->eccpos;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
+        unsigned int max_bitflips = 0;
 
         /* Read the OOB area first */
         chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
@@ -1337,12 +1353,14 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
                 chip->ecc.calculate(mtd, p, &ecc_calc[i]);
 
                 stat = chip->ecc.correct(mtd, p, &ecc_code[i], NULL);
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
         }
-        return 0;
+        return max_bitflips;
 }
 
 /**
@@ -1350,19 +1368,21 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: buffer to store read data
+ * @oob_required: caller requires OOB data read to chip->oob_poi
  * @page: page number to read
  *
  * The hw generator calculates the error syndrome automatically. Therefore we
  * need a special oob layout and handling.
  */
 static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                                   uint8_t *buf, int page)
+                                   uint8_t *buf, int oob_required, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
         int eccsteps = chip->ecc.steps;
         uint8_t *p = buf;
         uint8_t *oob = chip->oob_poi;
+        unsigned int max_bitflips = 0;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 int stat;
@@ -1379,10 +1399,12 @@ static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
                 chip->read_buf(mtd, oob, eccbytes);
                 stat = chip->ecc.correct(mtd, p, oob, NULL);
 
-                if (stat < 0)
+                if (stat < 0) {
                         mtd->ecc_stats.failed++;
-                else
+                } else {
                         mtd->ecc_stats.corrected += stat;
+                        max_bitflips = max_t(unsigned int, max_bitflips, stat);
+                }
 
                 oob += eccbytes;
 
@@ -1397,7 +1419,7 @@ static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
         if (i)
                 chip->read_buf(mtd, oob, i);
 
-        return 0;
+        return max_bitflips;
 }
 
 /**
@@ -1459,11 +1481,9 @@ static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
 static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                             struct mtd_oob_ops *ops)
 {
-        int chipnr, page, realpage, col, bytes, aligned;
+        int chipnr, page, realpage, col, bytes, aligned, oob_required;
         struct nand_chip *chip = mtd->priv;
         struct mtd_ecc_stats stats;
-        int blkcheck = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
-        int sndcmd = 1;
         int ret = 0;
         uint32_t readlen = ops->len;
         uint32_t oobreadlen = ops->ooblen;
@@ -1471,6 +1491,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                 mtd->oobavail : mtd->oobsize;
 
         uint8_t *bufpoi, *oob, *buf;
+        unsigned int max_bitflips = 0;
 
         stats = mtd->ecc_stats;
 
@@ -1484,6 +1505,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
 
         buf = ops->datbuf;
         oob = ops->oobbuf;
+        oob_required = oob ? 1 : 0;
 
         while (1) {
                 bytes = min(mtd->writesize - col, readlen);
@@ -1493,21 +1515,22 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                 if (realpage != chip->pagebuf || oob) {
                         bufpoi = aligned ? buf : chip->buffers->databuf;
 
-                        if (likely(sndcmd)) {
-                                chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
-                                sndcmd = 0;
-                        }
+                        chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
 
-                        /* Now read the page into the buffer */
+                        /*
+                         * Now read the page into the buffer.  Absent an error,
+                         * the read methods return max bitflips per ecc step.
+                         */
                         if (unlikely(ops->mode == MTD_OPS_RAW))
-                                ret = chip->ecc.read_page_raw(mtd, chip,
-                                                              bufpoi, page);
+                                ret = chip->ecc.read_page_raw(mtd, chip, bufpoi,
+                                                              oob_required,
+                                                              page);
                         else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)
                                 ret = chip->ecc.read_subpage(mtd, chip,
                                                         col, bytes, bufpoi);
                         else
                                 ret = chip->ecc.read_page(mtd, chip, bufpoi,
-                                                          page);
+                                                          oob_required, page);
                         if (ret < 0) {
                                 if (!aligned)
                                         /* Invalidate page cache */
@@ -1515,22 +1538,25 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                                 break;
                         }
 
+                        max_bitflips = max_t(unsigned int, max_bitflips, ret);
+
                         /* Transfer not aligned data */
                         if (!aligned) {
                                 if (!NAND_SUBPAGE_READ(chip) && !oob &&
                                     !(mtd->ecc_stats.failed - stats.failed) &&
-                                    (ops->mode != MTD_OPS_RAW))
+                                    (ops->mode != MTD_OPS_RAW)) {
                                         chip->pagebuf = realpage;
-                                else
+                                        chip->pagebuf_bitflips = ret;
+                                } else {
                                         /* Invalidate page cache */
                                         chip->pagebuf = -1;
+                                }
                                 memcpy(buf, chip->buffers->databuf + col, bytes);
                         }
 
                         buf += bytes;
 
                         if (unlikely(oob)) {
-
                                 int toread = min(oobreadlen, max_oobsize);
 
                                 if (toread) {
@@ -1541,13 +1567,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                         }
 
                         if (!(chip->options & NAND_NO_READRDY)) {
-                                /*
-                                 * Apply delay or wait for ready/busy pin. Do
-                                 * this before the AUTOINCR check, so no
-                                 * problems arise if a chip which does auto
-                                 * increment is marked as NOAUTOINCR by the
-                                 * board driver.
-                                 */
+                                /* Apply delay or wait for ready/busy pin */
                                 if (!chip->dev_ready)
                                         udelay(chip->chip_delay);
                                 else
@@ -1556,6 +1576,8 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                 } else {
                         memcpy(buf, chip->buffers->databuf + col, bytes);
                         buf += bytes;
+                        max_bitflips = max_t(unsigned int, max_bitflips,
+                                             chip->pagebuf_bitflips);
                 }
 
                 readlen -= bytes;
@@ -1575,26 +1597,19 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                         chip->select_chip(mtd, -1);
                         chip->select_chip(mtd, chipnr);
                 }
-
-                /*
-                 * Check, if the chip supports auto page increment or if we
-                 * have hit a block boundary.
-                 */
-                if (!NAND_CANAUTOINCR(chip) || !(page & blkcheck))
-                        sndcmd = 1;
         }
 
         ops->retlen = ops->len - (size_t) readlen;
         if (oob)
                 ops->oobretlen = ops->ooblen - oobreadlen;
 
-        if (ret)
+        if (ret < 0)
                 return ret;
 
         if (mtd->ecc_stats.failed - stats.failed)
                 return -EBADMSG;
 
-        return  mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
+        return max_bitflips;
 }
 
 /**
@@ -1630,17 +1645,13 @@ static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @page: page number to read
- * @sndcmd: flag whether to issue read command or not
  */
 static int nand_read_oob_std(struct mtd_info *mtd, struct nand_chip *chip,
-                             int page, int sndcmd)
+                             int page)
 {
-        if (sndcmd) {
-                chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
-                sndcmd = 0;
-        }
+        chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
         chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
-        return sndcmd;
+        return 0;
 }
 
 /**
@@ -1649,10 +1660,9 @@ static int nand_read_oob_std(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @page: page number to read
- * @sndcmd: flag whether to issue read command or not
  */
 static int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
-                                  int page, int sndcmd)
+                                  int page)
 {
         uint8_t *buf = chip->oob_poi;
         int length = mtd->oobsize;
@@ -1679,7 +1689,7 @@ static int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
         if (length > 0)
                 chip->read_buf(mtd, bufpoi, length);
 
-        return 1;
+        return 0;
 }
 
 /**
@@ -1775,13 +1785,13 @@ static int nand_write_oob_syndrome(struct mtd_info *mtd,
 static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                             struct mtd_oob_ops *ops)
 {
-        int page, realpage, chipnr, sndcmd = 1;
+        int page, realpage, chipnr;
         struct nand_chip *chip = mtd->priv;
         struct mtd_ecc_stats stats;
-        int blkcheck = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
         int readlen = ops->ooblen;
         int len;
         uint8_t *buf = ops->oobbuf;
+        int ret = 0;
 
         pr_debug("%s: from = 0x%08Lx, len = %i\n",
                         __func__, (unsigned long long)from, readlen);
@@ -1817,20 +1827,18 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
 
         while (1) {
                 if (ops->mode == MTD_OPS_RAW)
-                        sndcmd = chip->ecc.read_oob_raw(mtd, chip, page, sndcmd);
+                        ret = chip->ecc.read_oob_raw(mtd, chip, page);
                 else
-                        sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
+                        ret = chip->ecc.read_oob(mtd, chip, page);
+
+                if (ret < 0)
+                        break;
 
                 len = min(len, readlen);
                 buf = nand_transfer_oob(chip, buf, ops, len);
 
                 if (!(chip->options & NAND_NO_READRDY)) {
-                        /*
-                         * Apply delay or wait for ready/busy pin. Do this
-                         * before the AUTOINCR check, so no problems arise if a
-                         * chip which does auto increment is marked as
-                         * NOAUTOINCR by the board driver.
-                         */
+                        /* Apply delay or wait for ready/busy pin */
                         if (!chip->dev_ready)
                                 udelay(chip->chip_delay);
                         else
@@ -1851,16 +1859,12 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                         chip->select_chip(mtd, -1);
                         chip->select_chip(mtd, chipnr);
                 }
-
-                /*
-                 * Check, if the chip supports auto page increment or if we
-                 * have hit a block boundary.
-                 */
-                if (!NAND_CANAUTOINCR(chip) || !(page & blkcheck))
-                        sndcmd = 1;
         }
 
-        ops->oobretlen = ops->ooblen;
+        ops->oobretlen = ops->ooblen - readlen;
+
+        if (ret < 0)
+                return ret;
 
         if (mtd->ecc_stats.failed - stats.failed)
                 return -EBADMSG;
@@ -1919,14 +1923,16 @@ out:
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: data buffer
+ * @oob_required: must write chip->oob_poi to OOB
  *
  * Not for syndrome calculating ECC controllers, which use a special oob layout.
  */
 static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                                const uint8_t *buf)
+                                const uint8_t *buf, int oob_required)
 {
         chip->write_buf(mtd, buf, mtd->writesize);
-        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
+        if (oob_required)
+                chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
 }
 
 /**
@@ -1934,12 +1940,13 @@ static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: data buffer
+ * @oob_required: must write chip->oob_poi to OOB
  *
  * We need a special oob layout and handling even when ECC isn't checked.
  */
 static void nand_write_page_raw_syndrome(struct mtd_info *mtd,
                                         struct nand_chip *chip,
-                                        const uint8_t *buf)
+                                        const uint8_t *buf, int oob_required)
 {
         int eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1973,9 +1980,10 @@ static void nand_write_page_raw_syndrome(struct mtd_info *mtd,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: data buffer
+ * @oob_required: must write chip->oob_poi to OOB
  */
 static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                  const uint8_t *buf)
+                                  const uint8_t *buf, int oob_required)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -1991,7 +1999,7 @@ static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         for (i = 0; i < chip->ecc.total; i++)
                 chip->oob_poi[eccpos[i]] = ecc_calc[i];
 
-        chip->ecc.write_page_raw(mtd, chip, buf);
+        chip->ecc.write_page_raw(mtd, chip, buf, 1);
 }
 
 /**
@@ -1999,9 +2007,10 @@ static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: data buffer
+ * @oob_required: must write chip->oob_poi to OOB
  */
 static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                  const uint8_t *buf)
+                                  const uint8_t *buf, int oob_required)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -2027,12 +2036,14 @@ static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
  * @mtd: mtd info structure
  * @chip: nand chip info structure
  * @buf: data buffer
+ * @oob_required: must write chip->oob_poi to OOB
  *
  * The hw generator calculates the error syndrome automatically. Therefore we
  * need a special oob layout and handling.
  */
 static void nand_write_page_syndrome(struct mtd_info *mtd,
-                                    struct nand_chip *chip, const uint8_t *buf)
+                                    struct nand_chip *chip,
+                                    const uint8_t *buf, int oob_required)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -2071,21 +2082,23 @@ static void nand_write_page_syndrome(struct mtd_info *mtd,
  * @mtd: MTD device structure
  * @chip: NAND chip descriptor
  * @buf: the data to write
+ * @oob_required: must write chip->oob_poi to OOB
  * @page: page number to write
  * @cached: cached programming
  * @raw: use _raw version of write_page
  */
 static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
-                           const uint8_t *buf, int page, int cached, int raw)
+                           const uint8_t *buf, int oob_required, int page,
+                           int cached, int raw)
 {
         int status;
 
         chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
 
         if (unlikely(raw))
-                chip->ecc.write_page_raw(mtd, chip, buf);
+                chip->ecc.write_page_raw(mtd, chip, buf, oob_required);
         else
-                chip->ecc.write_page(mtd, chip, buf);
+                chip->ecc.write_page(mtd, chip, buf, oob_required);
 
         /*
          * Cached progamming disabled for now. Not sure if it's worth the
@@ -2118,6 +2131,9 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
 
         if (chip->verify_buf(mtd, buf, mtd->writesize))
                 return -EIO;
+
+        /* Make sure the next page prog is preceded by a status read */
+        chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
 #endif
         return 0;
 }
@@ -2202,6 +2218,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
         uint8_t *oob = ops->oobbuf;
         uint8_t *buf = ops->datbuf;
         int ret, subpage;
+        int oob_required = oob ? 1 : 0;
 
         ops->retlen = 0;
         if (!writelen)
@@ -2264,8 +2281,8 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                         memset(chip->oob_poi, 0xff, mtd->oobsize);
                 }
 
-                ret = chip->write_page(mtd, chip, wbuf, page, cached,
-                                       (ops->mode == MTD_OPS_RAW));
+                ret = chip->write_page(mtd, chip, wbuf, oob_required, page,
+                                       cached, (ops->mode == MTD_OPS_RAW));
                 if (ret)
                         break;
 
@@ -2898,8 +2915,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
                 *busw = NAND_BUSWIDTH_16;
 
         chip->options &= ~NAND_CHIPOPTIONS_MSK;
-        chip->options |= (NAND_NO_READRDY |
-                        NAND_NO_AUTOINCR) & NAND_CHIPOPTIONS_MSK;
+        chip->options |= NAND_NO_READRDY & NAND_CHIPOPTIONS_MSK;
 
         pr_info("ONFI flash detected\n");
         return 1;
@@ -3076,11 +3092,6 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
                 chip->options &= ~NAND_SAMSUNG_LP_OPTIONS;
 ident_done:
 
-        /*
-         * Set chip as a default. Board drivers can override it, if necessary.
-         */
-        chip->options |= NAND_NO_AUTOINCR;
-
         /* Try to identify manufacturer */
         for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_idx++) {
                 if (nand_manuf_ids[maf_idx].id == *maf_id)
@@ -3154,10 +3165,11 @@ ident_done:
         if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
                 chip->cmdfunc = nand_command_lp;
 
-        pr_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 ? chip->onfi_params.model : type->name);
+        pr_info("NAND device: Manufacturer ID: 0x%02x, Chip ID: 0x%02x (%s %s),"
+                " page size: %d, OOB size: %d\n",
+                *maf_id, *dev_id, nand_manuf_ids[maf_idx].name,
+                chip->onfi_version ? chip->onfi_params.model : type->name,
+                mtd->writesize, mtd->oobsize);
 
         return type;
 }
@@ -3329,8 +3341,13 @@ int nand_scan_tail(struct mtd_info *mtd)
                 if (!chip->ecc.write_oob)
                         chip->ecc.write_oob = nand_write_oob_syndrome;
 
-                if (mtd->writesize >= chip->ecc.size)
+                if (mtd->writesize >= chip->ecc.size) {
+                        if (!chip->ecc.strength) {
+                                pr_warn("Driver must set ecc.strength when using hardware ECC\n");
+                                BUG();
+                        }
                         break;
+                }
                 pr_warn("%d byte HW ECC not possible on "
                            "%d byte page size, fallback to SW ECC\n",
                            chip->ecc.size, mtd->writesize);
@@ -3385,7 +3402,7 @@ int nand_scan_tail(struct mtd_info *mtd)
                         BUG();
                 }
                 chip->ecc.strength =
-                        chip->ecc.bytes*8 / fls(8*chip->ecc.size);
+                        chip->ecc.bytes * 8 / fls(8 * chip->ecc.size);
                 break;
 
         case NAND_ECC_NONE:
@@ -3483,7 +3500,7 @@ int nand_scan_tail(struct mtd_info *mtd)
 
         /* propagate ecc info to mtd_info */
         mtd->ecclayout = chip->ecc.layout;
-        mtd->ecc_strength = chip->ecc.strength * chip->ecc.steps;
+        mtd->ecc_strength = chip->ecc.strength;
 
         /* Check, if we should skip the bad block table scan */
         if (chip->options & NAND_SKIP_BBTSCAN)
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 20a112f591fe..30d1319ff065 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -324,6 +324,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
 
                 buf += mtd->oobsize + mtd->writesize;
                 len -= mtd->writesize;
+                offs += mtd->writesize;
         }
         return 0;
 }
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index af4fe8ca7b5e..621b70b7a159 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -70,7 +70,7 @@ struct nand_flash_dev nand_flash_ids[] = {
          * These are the new chips with large page size. The pagesize and the
          * erasesize is determined from the extended id bytes
          */
-#define LP_OPTIONS (NAND_SAMSUNG_LP_OPTIONS | NAND_NO_READRDY | NAND_NO_AUTOINCR)
+#define LP_OPTIONS (NAND_SAMSUNG_LP_OPTIONS | NAND_NO_READRDY)
 #define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)
 
         /* 512 Megabit */
@@ -157,9 +157,7 @@ struct nand_flash_dev nand_flash_ids[] = {
          * writes possible, but not implemented now
          */
         {"AND 128MiB 3,3V 8-bit",       0x01, 2048, 128, 0x4000,
-         NAND_IS_AND | NAND_NO_AUTOINCR |NAND_NO_READRDY | NAND_4PAGE_ARRAY |
-         BBT_AUTO_REFRESH
-        },
+         NAND_IS_AND | NAND_NO_READRDY | NAND_4PAGE_ARRAY | BBT_AUTO_REFRESH},
 
         {NULL,}
 };
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 261f478f8cc3..6cc8fbfabb8e 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -268,7 +268,6 @@ MODULE_PARM_DESC(bch,		 "Enable BCH ecc and set how many bits should "
 #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 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 */
@@ -594,7 +593,7 @@ static int init_nandsim(struct mtd_info *mtd)
                 ns->options |= OPT_PAGE256;
         }
         else if (ns->geom.pgsz == 512) {
-                ns->options |= (OPT_PAGE512 | OPT_AUTOINCR);
+                ns->options |= OPT_PAGE512;
                 if (ns->busw == 8)
                         ns->options |= OPT_PAGE512_8BIT;
         } else if (ns->geom.pgsz == 2048) {
@@ -663,8 +662,6 @@ static int init_nandsim(struct mtd_info *mtd)
         for (i = 0; nand_flash_ids[i].name != NULL; i++) {
                 if (second_id_byte != nand_flash_ids[i].id)
                         continue;
-                if (!(nand_flash_ids[i].options & NAND_NO_AUTOINCR))
-                        ns->options |= OPT_AUTOINCR;
         }
 
         if (ns->busw == 16)
@@ -1936,20 +1933,8 @@ static u_char ns_nand_read_byte(struct mtd_info *mtd)
         if (ns->regs.count == ns->regs.num) {
                 NS_DBG("read_byte: all bytes were read\n");
 
-                /*
-                 * 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) {
-                        ns->regs.count = 0;
-                        if (ns->regs.row + 1 < ns->geom.pgnum)
-                                ns->regs.row += 1;
-                        NS_DBG("read_byte: switch to the next page (%#x)\n", ns->regs.row);
-                        do_state_action(ns, ACTION_CPY);
-                }
-                else if (NS_STATE(ns->nxstate) == STATE_READY)
+                if (NS_STATE(ns->nxstate) == STATE_READY)
                         switch_state(ns);
-
         }
 
         return outb;
@@ -2203,14 +2188,7 @@ static void ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
         ns->regs.count += len;
 
         if (ns->regs.count == ns->regs.num) {
-                if ((ns->options & OPT_AUTOINCR) && NS_STATE(ns->state) == STATE_DATAOUT) {
-                        ns->regs.count = 0;
-                        if (ns->regs.row + 1 < ns->geom.pgnum)
-                                ns->regs.row += 1;
-                        NS_DBG("read_buf: switch to the next page (%#x)\n", ns->regs.row);
-                        do_state_action(ns, ACTION_CPY);
-                }
-                else if (NS_STATE(ns->nxstate) == STATE_READY)
+                if (NS_STATE(ns->nxstate) == STATE_READY)
                         switch_state(ns);
         }
 
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index c2b0bba9d8b3..d7f681d0c9b9 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -21,6 +21,10 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
+#ifdef CONFIG_MTD_NAND_OMAP_BCH
+#include <linux/bch.h>
+#endif
+
 #include <plat/dma.h>
 #include <plat/gpmc.h>
 #include <plat/nand.h>
@@ -127,6 +131,11 @@ struct omap_nand_info {
         } iomode;
         u_char                          *buf;
         int                                     buf_len;
+
+#ifdef CONFIG_MTD_NAND_OMAP_BCH
+        struct bch_control             *bch;
+        struct nand_ecclayout           ecclayout;
+#endif
 };
 
 /**
@@ -402,7 +411,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
                         PREFETCH_FIFOTHRESHOLD_MAX, 0x1, len, is_write);
         if (ret)
                 /* PFPW engine is busy, use cpu copy method */
-                goto out_copy;
+                goto out_copy_unmap;
 
         init_completion(&info->comp);
 
@@ -421,6 +430,8 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr,
         dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
         return 0;
 
+out_copy_unmap:
+        dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
 out_copy:
         if (info->nand.options & NAND_BUSWIDTH_16)
                 is_write == 0 ? omap_read_buf16(mtd, (u_char *) addr, len)
@@ -879,7 +890,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
         struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
                                                         mtd);
         unsigned long timeo = jiffies;
-        int status = NAND_STATUS_FAIL, state = this->state;
+        int status, state = this->state;
 
         if (state == FL_ERASING)
                 timeo += (HZ * 400) / 1000;
@@ -894,6 +905,8 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
                         break;
                 cond_resched();
         }
+
+        status = gpmc_nand_read(info->gpmc_cs, GPMC_NAND_DATA);
         return status;
 }
 
@@ -925,6 +938,226 @@ static int omap_dev_ready(struct mtd_info *mtd)
         return 1;
 }
 
+#ifdef CONFIG_MTD_NAND_OMAP_BCH
+
+/**
+ * omap3_enable_hwecc_bch - Program OMAP3 GPMC to perform BCH ECC correction
+ * @mtd: MTD device structure
+ * @mode: Read/Write mode
+ */
+static void omap3_enable_hwecc_bch(struct mtd_info *mtd, int mode)
+{
+        int nerrors;
+        unsigned int dev_width;
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+        struct nand_chip *chip = mtd->priv;
+
+        nerrors = (info->nand.ecc.bytes == 13) ? 8 : 4;
+        dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0;
+        /*
+         * Program GPMC to perform correction on one 512-byte sector at a time.
+         * Using 4 sectors at a time (i.e. ecc.size = 2048) is also possible and
+         * gives a slight (5%) performance gain (but requires additional code).
+         */
+        (void)gpmc_enable_hwecc_bch(info->gpmc_cs, mode, dev_width, 1, nerrors);
+}
+
+/**
+ * omap3_calculate_ecc_bch4 - Generate 7 bytes of ECC bytes
+ * @mtd: MTD device structure
+ * @dat: The pointer to data on which ecc is computed
+ * @ecc_code: The ecc_code buffer
+ */
+static int omap3_calculate_ecc_bch4(struct mtd_info *mtd, const u_char *dat,
+                                    u_char *ecc_code)
+{
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+        return gpmc_calculate_ecc_bch4(info->gpmc_cs, dat, ecc_code);
+}
+
+/**
+ * omap3_calculate_ecc_bch8 - Generate 13 bytes of ECC bytes
+ * @mtd: MTD device structure
+ * @dat: The pointer to data on which ecc is computed
+ * @ecc_code: The ecc_code buffer
+ */
+static int omap3_calculate_ecc_bch8(struct mtd_info *mtd, const u_char *dat,
+                                    u_char *ecc_code)
+{
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+        return gpmc_calculate_ecc_bch8(info->gpmc_cs, dat, ecc_code);
+}
+
+/**
+ * omap3_correct_data_bch - Decode received data and correct errors
+ * @mtd: MTD device structure
+ * @data: page data
+ * @read_ecc: ecc read from nand flash
+ * @calc_ecc: ecc read from HW ECC registers
+ */
+static int omap3_correct_data_bch(struct mtd_info *mtd, u_char *data,
+                                  u_char *read_ecc, u_char *calc_ecc)
+{
+        int i, count;
+        /* cannot correct more than 8 errors */
+        unsigned int errloc[8];
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+
+        count = decode_bch(info->bch, NULL, 512, read_ecc, calc_ecc, NULL,
+                           errloc);
+        if (count > 0) {
+                /* correct errors */
+                for (i = 0; i < count; i++) {
+                        /* correct data only, not ecc bytes */
+                        if (errloc[i] < 8*512)
+                                data[errloc[i]/8] ^= 1 << (errloc[i] & 7);
+                        pr_debug("corrected bitflip %u\n", errloc[i]);
+                }
+        } else if (count < 0) {
+                pr_err("ecc unrecoverable error\n");
+        }
+        return count;
+}
+
+/**
+ * omap3_free_bch - Release BCH ecc resources
+ * @mtd: MTD device structure
+ */
+static void omap3_free_bch(struct mtd_info *mtd)
+{
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+        if (info->bch) {
+                free_bch(info->bch);
+                info->bch = NULL;
+        }
+}
+
+/**
+ * omap3_init_bch - Initialize BCH ECC
+ * @mtd: MTD device structure
+ * @ecc_opt: OMAP ECC mode (OMAP_ECC_BCH4_CODE_HW or OMAP_ECC_BCH8_CODE_HW)
+ */
+static int omap3_init_bch(struct mtd_info *mtd, int ecc_opt)
+{
+        int ret, max_errors;
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+#ifdef CONFIG_MTD_NAND_OMAP_BCH8
+        const int hw_errors = 8;
+#else
+        const int hw_errors = 4;
+#endif
+        info->bch = NULL;
+
+        max_errors = (ecc_opt == OMAP_ECC_BCH8_CODE_HW) ? 8 : 4;
+        if (max_errors != hw_errors) {
+                pr_err("cannot configure %d-bit BCH ecc, only %d-bit supported",
+                       max_errors, hw_errors);
+                goto fail;
+        }
+
+        /* initialize GPMC BCH engine */
+        ret = gpmc_init_hwecc_bch(info->gpmc_cs, 1, max_errors);
+        if (ret)
+                goto fail;
+
+        /* software bch library is only used to detect and locate errors */
+        info->bch = init_bch(13, max_errors, 0x201b /* hw polynomial */);
+        if (!info->bch)
+                goto fail;
+
+        info->nand.ecc.size    = 512;
+        info->nand.ecc.hwctl   = omap3_enable_hwecc_bch;
+        info->nand.ecc.correct = omap3_correct_data_bch;
+        info->nand.ecc.mode    = NAND_ECC_HW;
+
+        /*
+         * The number of corrected errors in an ecc block that will trigger
+         * block scrubbing defaults to the ecc strength (4 or 8).
+         * Set mtd->bitflip_threshold here to define a custom threshold.
+         */
+
+        if (max_errors == 8) {
+                info->nand.ecc.strength  = 8;
+                info->nand.ecc.bytes     = 13;
+                info->nand.ecc.calculate = omap3_calculate_ecc_bch8;
+        } else {
+                info->nand.ecc.strength  = 4;
+                info->nand.ecc.bytes     = 7;
+                info->nand.ecc.calculate = omap3_calculate_ecc_bch4;
+        }
+
+        pr_info("enabling NAND BCH ecc with %d-bit correction\n", max_errors);
+        return 0;
+fail:
+        omap3_free_bch(mtd);
+        return -1;
+}
+
+/**
+ * omap3_init_bch_tail - Build an oob layout for BCH ECC correction.
+ * @mtd: MTD device structure
+ */
+static int omap3_init_bch_tail(struct mtd_info *mtd)
+{
+        int i, steps;
+        struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
+                                                   mtd);
+        struct nand_ecclayout *layout = &info->ecclayout;
+
+        /* build oob layout */
+        steps = mtd->writesize/info->nand.ecc.size;
+        layout->eccbytes = steps*info->nand.ecc.bytes;
+
+        /* do not bother creating special oob layouts for small page devices */
+        if (mtd->oobsize < 64) {
+                pr_err("BCH ecc is not supported on small page devices\n");
+                goto fail;
+        }
+
+        /* reserve 2 bytes for bad block marker */
+        if (layout->eccbytes+2 > mtd->oobsize) {
+                pr_err("no oob layout available for oobsize %d eccbytes %u\n",
+                       mtd->oobsize, layout->eccbytes);
+                goto fail;
+        }
+
+        /* put ecc bytes at oob tail */
+        for (i = 0; i < layout->eccbytes; i++)
+                layout->eccpos[i] = mtd->oobsize-layout->eccbytes+i;
+
+        layout->oobfree[0].offset = 2;
+        layout->oobfree[0].length = mtd->oobsize-2-layout->eccbytes;
+        info->nand.ecc.layout = layout;
+
+        if (!(info->nand.options & NAND_BUSWIDTH_16))
+                info->nand.badblock_pattern = &bb_descrip_flashbased;
+        return 0;
+fail:
+        omap3_free_bch(mtd);
+        return -1;
+}
+
+#else
+static int omap3_init_bch(struct mtd_info *mtd, int ecc_opt)
+{
+        pr_err("CONFIG_MTD_NAND_OMAP_BCH is not enabled\n");
+        return -1;
+}
+static int omap3_init_bch_tail(struct mtd_info *mtd)
+{
+        return -1;
+}
+static void omap3_free_bch(struct mtd_info *mtd)
+{
+}
+#endif /* CONFIG_MTD_NAND_OMAP_BCH */
+
 static int __devinit omap_nand_probe(struct platform_device *pdev)
 {
         struct omap_nand_info           *info;
@@ -1063,6 +1296,13 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                 info->nand.ecc.hwctl            = omap_enable_hwecc;
                 info->nand.ecc.correct          = omap_correct_data;
                 info->nand.ecc.mode             = NAND_ECC_HW;
+        } else if ((pdata->ecc_opt == OMAP_ECC_BCH4_CODE_HW) ||
+                   (pdata->ecc_opt == OMAP_ECC_BCH8_CODE_HW)) {
+                err = omap3_init_bch(&info->mtd, pdata->ecc_opt);
+                if (err) {
+                        err = -EINVAL;
+                        goto out_release_mem_region;
+                }
         }
 
         /* DIP switches on some boards change between 8 and 16 bit
@@ -1094,6 +1334,14 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
                                         (offset + omap_oobinfo.eccbytes);
 
                 info->nand.ecc.layout = &omap_oobinfo;
+        } else if ((pdata->ecc_opt == OMAP_ECC_BCH4_CODE_HW) ||
+                   (pdata->ecc_opt == OMAP_ECC_BCH8_CODE_HW)) {
+                /* build OOB layout for BCH ECC correction */
+                err = omap3_init_bch_tail(&info->mtd);
+                if (err) {
+                        err = -EINVAL;
+                        goto out_release_mem_region;
+                }
         }
 
         /* second phase scan */
@@ -1122,6 +1370,7 @@ static int omap_nand_remove(struct platform_device *pdev)
         struct mtd_info *mtd = platform_get_drvdata(pdev);
         struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
                                                         mtd);
+        omap3_free_bch(&info->mtd);
 
         platform_set_drvdata(pdev, NULL);
         if (info->dma_ch != -1)
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 974dbf8251c9..1440e51cedcc 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -155,7 +155,6 @@ static int __devinit pasemi_nand_probe(struct platform_device *ofdev)
         chip->ecc.mode = NAND_ECC_SOFT;
 
         /* Enable the following for a flash based bad block table */
-        chip->options = NAND_NO_AUTOINCR;
         chip->bbt_options = NAND_BBT_USE_FLASH;
 
         /* Scan to find existence of the device */
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 6404e6e81b10..1bcb52040422 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -23,14 +23,18 @@ struct plat_nand_data {
         void __iomem            *io_base;
 };
 
+static const char *part_probe_types[] = { "cmdlinepart", NULL };
+
 /*
  * Probe for the NAND device.
  */
 static int __devinit plat_nand_probe(struct platform_device *pdev)
 {
         struct platform_nand_data *pdata = pdev->dev.platform_data;
+        struct mtd_part_parser_data ppdata;
         struct plat_nand_data *data;
         struct resource *res;
+        const char **part_types;
         int err = 0;
 
         if (pdata->chip.nr_chips < 1) {
@@ -75,6 +79,7 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
         data->chip.select_chip = pdata->ctrl.select_chip;
         data->chip.write_buf = pdata->ctrl.write_buf;
         data->chip.read_buf = pdata->ctrl.read_buf;
+        data->chip.read_byte = pdata->ctrl.read_byte;
         data->chip.chip_delay = pdata->chip.chip_delay;
         data->chip.options |= pdata->chip.options;
         data->chip.bbt_options |= pdata->chip.bbt_options;
@@ -98,8 +103,10 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        err = mtd_device_parse_register(&data->mtd,
-                                        pdata->chip.part_probe_types, NULL,
+        part_types = pdata->chip.part_probe_types ? : part_probe_types;
+
+        ppdata.of_node = pdev->dev.of_node;
+        err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,
                                         pdata->chip.partitions,
                                         pdata->chip.nr_partitions);
 
@@ -140,12 +147,19 @@ static int __devexit plat_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id plat_nand_match[] = {
+        { .compatible = "gen_nand" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, plat_nand_match);
+
 static struct platform_driver plat_nand_driver = {
-        .probe          = plat_nand_probe,
-        .remove         = __devexit_p(plat_nand_remove),
-        .driver         = {
-                .name   = "gen_nand",
-                .owner  = THIS_MODULE,
+        .probe  = plat_nand_probe,
+        .remove = __devexit_p(plat_nand_remove),
+        .driver = {
+                .name           = "gen_nand",
+                .owner          = THIS_MODULE,
+                .of_match_table = plat_nand_match,
         },
 };
 
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index def50caa6f84..252aaefcacfa 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -682,14 +682,15 @@ static void pxa3xx_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
 }
 
 static void pxa3xx_nand_write_page_hwecc(struct mtd_info *mtd,
-                struct nand_chip *chip, const uint8_t *buf)
+                struct nand_chip *chip, const uint8_t *buf, int oob_required)
 {
         chip->write_buf(mtd, buf, mtd->writesize);
         chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
 }
 
 static int pxa3xx_nand_read_page_hwecc(struct mtd_info *mtd,
-                struct nand_chip *chip, uint8_t *buf, int page)
+                struct nand_chip *chip, uint8_t *buf, int oob_required,
+                int page)
 {
         struct pxa3xx_nand_host *host = mtd->priv;
         struct pxa3xx_nand_info *info = host->info_data;
@@ -1004,7 +1005,6 @@ KEEP_CONFIG:
         chip->ecc.size = host->page_size;
         chip->ecc.strength = 1;
 
-        chip->options = NAND_NO_AUTOINCR;
         chip->options |= NAND_NO_READRDY;
         if (host->reg_ndcr & NDCR_DWIDTH_M)
                 chip->options |= NAND_BUSWIDTH_16;
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index c2040187c813..8cb627751c9c 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -539,14 +539,11 @@ exit:
  * nand_read_oob_syndrome assumes we can send column address - we can't
  */
 static int r852_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
-                             int page, int sndcmd)
+                             int page)
 {
-        if (sndcmd) {
-                chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
-                sndcmd = 0;
-        }
+        chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
         chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
-        return sndcmd;
+        return 0;
 }
 
 /*
@@ -1104,18 +1101,7 @@ static struct pci_driver r852_pci_driver = {
         .driver.pm      = &r852_pm_ops,
 };
 
-static __init int r852_module_init(void)
-{
-        return pci_register_driver(&r852_pci_driver);
-}
-
-static void __exit r852_module_exit(void)
-{
-        pci_unregister_driver(&r852_pci_driver);
-}
-
-module_init(r852_module_init);
-module_exit(r852_module_exit);
+module_pci_driver(r852_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Maxim Levitsky <maximlevitsky@gmail.com>");
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index e9b2b260de3a..aa9b8a5e0b8f 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -344,7 +344,7 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va
 }
 
 static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                uint8_t *buf, int page)
+                                uint8_t *buf, int oob_required, int page)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -359,14 +359,14 @@ static int flctl_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
                 if (flctl->hwecc_cant_correct[i])
                         mtd->ecc_stats.failed++;
                 else
-                        mtd->ecc_stats.corrected += 0;
+                        mtd->ecc_stats.corrected += 0; /* FIXME */
         }
 
         return 0;
 }
 
 static void flctl_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
-                                   const uint8_t *buf)
+                                   const uint8_t *buf, int oob_required)
 {
         int i, eccsize = chip->ecc.size;
         int eccbytes = chip->ecc.bytes;
@@ -881,8 +881,6 @@ static int __devinit flctl_probe(struct platform_device *pdev)
         flctl->hwecc = pdata->has_hwecc;
         flctl->holden = pdata->use_holden;
 
-        nand->options = NAND_NO_AUTOINCR;
-
         /* Set address of hardware control function */
         /* 20 us command delay time */
         nand->chip_delay = 20;
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 774c3c266713..082bcdcd6bcf 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -94,17 +94,16 @@ static struct nand_flash_dev nand_smartmedia_flash_ids[] = {
         {NULL,}
 };
 
-#define XD_TYPEM       (NAND_NO_AUTOINCR | NAND_BROKEN_XD)
 static struct nand_flash_dev nand_xd_flash_ids[] = {
 
         {"xD 16MiB 3,3V",    0x73, 512, 16, 0x4000, 0},
         {"xD 32MiB 3,3V",    0x75, 512, 32, 0x4000, 0},
         {"xD 64MiB 3,3V",    0x76, 512, 64, 0x4000, 0},
         {"xD 128MiB 3,3V",   0x79, 512, 128, 0x4000, 0},
-        {"xD 256MiB 3,3V",   0x71, 512, 256, 0x4000, XD_TYPEM},
-        {"xD 512MiB 3,3V",   0xdc, 512, 512, 0x4000, XD_TYPEM},
-        {"xD 1GiB 3,3V",     0xd3, 512, 1024, 0x4000, XD_TYPEM},
-        {"xD 2GiB 3,3V",     0xd5, 512, 2048, 0x4000, XD_TYPEM},
+        {"xD 256MiB 3,3V",   0x71, 512, 256, 0x4000, NAND_BROKEN_XD},
+        {"xD 512MiB 3,3V",   0xdc, 512, 512, 0x4000, NAND_BROKEN_XD},
+        {"xD 1GiB 3,3V",     0xd3, 512, 1024, 0x4000, NAND_BROKEN_XD},
+        {"xD 2GiB 3,3V",     0xd5, 512, 2048, 0x4000, NAND_BROKEN_XD},
         {NULL,}
 };
 
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index b3ce12ef359e..7153e0d27101 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1201,7 +1201,8 @@ static int onenand_mlc_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         if (mtd->ecc_stats.failed - stats.failed)
                 return -EBADMSG;
 
-        return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
+        /* return max bitflips per ecc step; ONENANDs correct 1 bit only */
+        return mtd->ecc_stats.corrected != stats.corrected ? 1 : 0;
 }
 
 /**
@@ -1333,7 +1334,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from,
         if (mtd->ecc_stats.failed - stats.failed)
                 return -EBADMSG;
 
-        return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
+        /* return max bitflips per ecc step; ONENANDs correct 1 bit only */
+        return mtd->ecc_stats.corrected != stats.corrected ? 1 : 0;
 }
 
 /**
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 9f957c2d48e9..09d4f8d9d592 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -264,6 +264,9 @@ static struct dentry *dfs_rootdir;
  */
 int ubi_debugfs_init(void)
 {
+        if (!IS_ENABLED(DEBUG_FS))
+                return 0;
+
         dfs_rootdir = debugfs_create_dir("ubi", NULL);
         if (IS_ERR_OR_NULL(dfs_rootdir)) {
                 int err = dfs_rootdir ? -ENODEV : PTR_ERR(dfs_rootdir);
@@ -281,7 +284,8 @@ int ubi_debugfs_init(void)
  */
 void ubi_debugfs_exit(void)
 {
-        debugfs_remove(dfs_rootdir);
+        if (IS_ENABLED(DEBUG_FS))
+                debugfs_remove(dfs_rootdir);
 }
 
 /* Read an UBI debugfs file */
@@ -403,6 +407,9 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
         struct dentry *dent;
         struct ubi_debug_info *d = ubi->dbg;
 
+        if (!IS_ENABLED(DEBUG_FS))
+                return 0;
+
         n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,
                      ubi->ubi_num);
         if (n == UBI_DFS_DIR_LEN) {
@@ -470,5 +477,6 @@ out:
  */
 void ubi_debugfs_exit_dev(struct ubi_device *ubi)
 {
-        debugfs_remove_recursive(ubi->dbg->dfs_dir);
+        if (IS_ENABLED(DEBUG_FS))
+                debugfs_remove_recursive(ubi->dbg->dfs_dir);
 }
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 9df100a4ec38..b6be644e7b85 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1262,11 +1262,11 @@ int ubi_wl_flush(struct ubi_device *ubi, int vol_id, int lnum)
         dbg_wl("flush pending work for LEB %d:%d (%d pending works)",
                vol_id, lnum, ubi->works_count);
 
-        down_write(&ubi->work_sem);
         while (found) {
                 struct ubi_work *wrk;
                 found = 0;
 
+                down_read(&ubi->work_sem);
                 spin_lock(&ubi->wl_lock);
                 list_for_each_entry(wrk, &ubi->works, list) {
                         if ((vol_id == UBI_ALL || wrk->vol_id == vol_id) &&
@@ -1277,18 +1277,27 @@ int ubi_wl_flush(struct ubi_device *ubi, int vol_id, int lnum)
                                 spin_unlock(&ubi->wl_lock);
 
                                 err = wrk->func(ubi, wrk, 0);
-                                if (err)
-                                        goto out;
+                                if (err) {
+                                        up_read(&ubi->work_sem);
+                                        return err;
+                                }
+
                                 spin_lock(&ubi->wl_lock);
                                 found = 1;
                                 break;
                         }
                 }
                 spin_unlock(&ubi->wl_lock);
+                up_read(&ubi->work_sem);
         }
 
-out:
+        /*
+         * Make sure all the works which have been done in parallel are
+         * finished.
+         */
+        down_write(&ubi->work_sem);
         up_write(&ubi->work_sem);
+
         return err;
 }
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2ee8cf9e8a3b..b9c2ae62166d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -76,6 +76,7 @@
 #include <net/route.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
+#include <net/pkt_sched.h>
 #include "bonding.h"
 #include "bond_3ad.h"
 #include "bond_alb.h"
@@ -381,8 +382,6 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
         return next;
 }
 
-#define bond_queue_mapping(skb) (*(u16 *)((skb)->cb))
-
 /**
  * bond_dev_queue_xmit - Prepare skb for xmit.
  *
@@ -395,7 +394,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
 {
         skb->dev = slave_dev;
 
-        skb->queue_mapping = bond_queue_mapping(skb);
+        BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
+                     sizeof(qdisc_skb_cb(skb)->bond_queue_mapping));
+        skb->queue_mapping = qdisc_skb_cb(skb)->bond_queue_mapping;
 
         if (unlikely(netpoll_tx_running(slave_dev)))
                 bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
@@ -4171,7 +4172,7 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
         /*
          * Save the original txq to restore before passing to the driver
          */
-        bond_queue_mapping(skb) = skb->queue_mapping;
+        qdisc_skb_cb(skb)->bond_queue_mapping = skb->queue_mapping;
 
         if (unlikely(txq >= dev->real_num_tx_queues)) {
                 do {
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index aef42f045320..485bedb8278c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1082,8 +1082,12 @@ static ssize_t bonding_store_primary(struct device *d,
                 }
         }
 
-        pr_info("%s: Unable to set %.*s as primary slave.\n",
-                bond->dev->name, (int)strlen(buf) - 1, buf);
+        strncpy(bond->params.primary, ifname, IFNAMSIZ);
+        bond->params.primary[IFNAMSIZ - 1] = 0;
+
+        pr_info("%s: Recording %s as primary, "
+                "but it has not been enslaved to %s yet.\n",
+                bond->dev->name, ifname, bond->dev->name);
 out:
         write_unlock_bh(&bond->curr_slave_lock);
         read_unlock(&bond->lock);
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 536bda072a16..8dc84d66eea1 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -686,7 +686,7 @@ static int c_can_get_berr_counter(const struct net_device *dev,
  *
  * We iterate from priv->tx_echo to priv->tx_next and check if the
  * packet has been transmitted, echo it back to the CAN framework.
- * If we discover a not yet transmitted package, stop looking for more.
+ * If we discover a not yet transmitted packet, stop looking for more.
  */
 static void c_can_do_tx(struct net_device *dev)
 {
@@ -698,7 +698,7 @@ static void c_can_do_tx(struct net_device *dev)
         for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {
                 msg_obj_no = get_tx_echo_msg_obj(priv);
                 val = c_can_read_reg32(priv, &priv->regs->txrqst1);
-                if (!(val & (1 << msg_obj_no))) {
+                if (!(val & (1 << (msg_obj_no - 1)))) {
                         can_get_echo_skb(dev,
                                         msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
                         stats->tx_bytes += priv->read_reg(priv,
@@ -706,6 +706,8 @@ static void c_can_do_tx(struct net_device *dev)
                                         & IF_MCONT_DLC_MASK;
                         stats->tx_packets++;
                         c_can_inval_msg_object(dev, 0, msg_obj_no);
+                } else {
+                        break;
                 }
         }
 
@@ -950,7 +952,7 @@ static int c_can_poll(struct napi_struct *napi, int quota)
         struct net_device *dev = napi->dev;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        irqstatus = priv->irqstatus;
         if (!irqstatus)
                 goto end;
 
@@ -1028,12 +1030,11 @@ end:
 
 static irqreturn_t c_can_isr(int irq, void *dev_id)
 {
-        u16 irqstatus;
         struct net_device *dev = (struct net_device *)dev_id;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
-        if (!irqstatus)
+        priv->irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!priv->irqstatus)
                 return IRQ_NONE;
 
         /* disable all interrupts and schedule the NAPI */
@@ -1063,10 +1064,11 @@ static int c_can_open(struct net_device *dev)
                 goto exit_irq_fail;
         }
 
+        napi_enable(&priv->napi);
+
         /* start the c_can controller */
         c_can_start(dev);
 
-        napi_enable(&priv->napi);
         netif_start_queue(dev);
 
         return 0;
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 9b7fbef3d09a..5f32d34af507 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -76,6 +76,7 @@ struct c_can_priv {
         unsigned int tx_next;
         unsigned int tx_echo;
         void *priv;             /* for board-specific data */
+        u16 irqstatus;
 };
 
 struct net_device *alloc_c_can_dev(void);
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index 53115eee8075..688371cda37a 100644
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -154,7 +154,7 @@ static int __devinit cc770_get_platform_data(struct platform_device *pdev,
         struct cc770_platform_data *pdata = pdev->dev.platform_data;
 
         priv->can.clock.freq = pdata->osc_freq;
-        if (priv->cpu_interface | CPUIF_DSC)
+        if (priv->cpu_interface & CPUIF_DSC)
                 priv->can.clock.freq /= 2;
         priv->clkout = pdata->cor;
         priv->bus_config = pdata->bcr;
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 442d91a2747b..bab0158f1cc3 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -187,8 +187,10 @@ static int __init dummy_init_module(void)
         rtnl_lock();
         err = __rtnl_link_register(&dummy_link_ops);
 
-        for (i = 0; i < numdummies && !err; i++)
+        for (i = 0; i < numdummies && !err; i++) {
                 err = dummy_init_one();
+                cond_resched();
+        }
         if (err < 0)
                 __rtnl_link_unregister(&dummy_link_ops);
         rtnl_unlock();
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e30e2a2f354c..7de824184979 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -747,21 +747,6 @@ struct bnx2x_fastpath {
 
 #define ETH_RX_ERROR_FALGS              ETH_FAST_PATH_RX_CQE_PHY_DECODE_ERR_FLG
 
-#define BNX2X_IP_CSUM_ERR(cqe) \
-                        (!((cqe)->fast_path_cqe.status_flags & \
-                           ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG) && \
-                         ((cqe)->fast_path_cqe.type_error_flags & \
-                          ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG))
-
-#define BNX2X_L4_CSUM_ERR(cqe) \
-                        (!((cqe)->fast_path_cqe.status_flags & \
-                           ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG) && \
-                         ((cqe)->fast_path_cqe.type_error_flags & \
-                          ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))
-
-#define BNX2X_RX_CSUM_OK(cqe) \
-                        (!(BNX2X_L4_CSUM_ERR(cqe) || BNX2X_IP_CSUM_ERR(cqe)))
-
 #define BNX2X_PRS_FLAG_OVERETH_IPV4(flags) \
                                 (((le16_to_cpu(flags) & \
                                    PARSING_FLAGS_OVER_ETHERNET_PROTOCOL) >> \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index ad0743bf4bde..cbc56f274e0c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -617,6 +617,25 @@ static int bnx2x_alloc_rx_data(struct bnx2x *bp,
         return 0;
 }
 
+static void bnx2x_csum_validate(struct sk_buff *skb, union eth_rx_cqe *cqe,
+                                struct bnx2x_fastpath *fp)
+{
+        /* Do nothing if no IP/L4 csum validation was done */
+
+        if (cqe->fast_path_cqe.status_flags &
+            (ETH_FAST_PATH_RX_CQE_IP_XSUM_NO_VALIDATION_FLG |
+             ETH_FAST_PATH_RX_CQE_L4_XSUM_NO_VALIDATION_FLG))
+                return;
+
+        /* If both IP/L4 validation were done, check if an error was found. */
+
+        if (cqe->fast_path_cqe.type_error_flags &
+            (ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG |
+             ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG))
+                fp->eth_q_stats.hw_csum_err++;
+        else
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+}
 
 int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 {
@@ -806,13 +825,9 @@ reuse_rx:
 
                 skb_checksum_none_assert(skb);
 
-                if (bp->dev->features & NETIF_F_RXCSUM) {
+                if (bp->dev->features & NETIF_F_RXCSUM)
+                        bnx2x_csum_validate(skb, cqe, fp);
 
-                        if (likely(BNX2X_RX_CSUM_OK(cqe)))
-                                skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        else
-                                fp->eth_q_stats.hw_csum_err++;
-                }
 
                 skb_record_rx_queue(skb, fp->rx_queue);
 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index edeeb516807a..e47ff8be1d7b 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14275,7 +14275,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 }
         }
 
-        if (tg3_flag(tp, 5755_PLUS))
+        if (tg3_flag(tp, 5755_PLUS) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 tg3_flag_set(tp, SHORT_DMA_BUG);
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 08efd308d78a..fdb50cec6b51 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -736,6 +736,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 
         copied = make_tx_wrbs(adapter, txq, skb, wrb_cnt, dummy_wrb);
         if (copied) {
+                int gso_segs = skb_shinfo(skb)->gso_segs;
+
                 /* record the sent skb in the sent_skb table */
                 BUG_ON(txo->sent_skb_list[start]);
                 txo->sent_skb_list[start] = skb;
@@ -753,8 +755,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 
                 be_txq_notify(adapter, txq->id, wrb_cnt);
 
-                be_tx_stats_update(txo, wrb_cnt, copied,
-                                skb_shinfo(skb)->gso_segs, stopped);
+                be_tx_stats_update(txo, wrb_cnt, copied, gso_segs, stopped);
         } else {
                 txq->head = start;
                 dev_kfree_skb_any(skb);
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index 97f947b3d94a..2933d08b036e 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -437,7 +437,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
                 length = status & BCOM_FEC_RX_BD_LEN_MASK;
                 skb_put(rskb, length - 4);      /* length without CRC32 */
                 rskb->protocol = eth_type_trans(rskb, dev);
-                if (!skb_defer_rx_timestamp(skb))
+                if (!skb_defer_rx_timestamp(rskb))
                         netif_rx(rskb);
 
                 spin_lock(&priv->lock);
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 95731c841044..7483ca0a6282 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4080,7 +4080,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                                 spin_lock_irqsave(&adapter->stats_lock,
                                                   irq_flags);
                                 e1000_tbi_adjust_stats(hw, &adapter->stats,
-                                                       length, skb->data);
+                                                       length, mapped);
                                 spin_unlock_irqrestore(&adapter->stats_lock,
                                                        irq_flags);
                                 length--;
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index d863075df7a4..905e2147d918 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -258,7 +258,8 @@ static int e1000_set_settings(struct net_device *netdev,
          * When SoL/IDER sessions are active, autoneg/speed/duplex
          * cannot be changed
          */
-        if (hw->phy.ops.check_reset_block(hw)) {
+        if (hw->phy.ops.check_reset_block &&
+            hw->phy.ops.check_reset_block(hw)) {
                 e_err("Cannot change link characteristics when SoL/IDER is active.\n");
                 return -EINVAL;
         }
@@ -1615,7 +1616,8 @@ static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
          * PHY loopback cannot be performed if SoL/IDER
          * sessions are active
          */
-        if (hw->phy.ops.check_reset_block(hw)) {
+        if (hw->phy.ops.check_reset_block &&
+            hw->phy.ops.check_reset_block(hw)) {
                 e_err("Cannot do PHY loopback test when SoL/IDER is active.\n");
                 *data = 0;
                 goto out;
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index bbf70ba367da..238ab2f8a5e7 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -165,14 +165,14 @@
 #define I217_EEE_100_SUPPORTED  (1 << 1)        /* 100BaseTx EEE supported */
 
 /* Intel Rapid Start Technology Support */
-#define I217_PROXY_CTRL                 PHY_REG(BM_WUC_PAGE, 70)
+#define I217_PROXY_CTRL                 BM_PHY_REG(BM_WUC_PAGE, 70)
 #define I217_PROXY_CTRL_AUTO_DISABLE    0x0080
 #define I217_SxCTRL                     PHY_REG(BM_PORT_CTRL_PAGE, 28)
-#define I217_SxCTRL_MASK                0x1000
+#define I217_SxCTRL_ENABLE_LPI_RESET    0x1000
 #define I217_CGFREG                     PHY_REG(772, 29)
-#define I217_CGFREG_MASK                0x0002
+#define I217_CGFREG_ENABLE_MTA_RESET    0x0002
 #define I217_MEMPWR                     PHY_REG(772, 26)
-#define I217_MEMPWR_MASK                0x0010
+#define I217_MEMPWR_DISABLE_SMB_RELEASE 0x0010
 
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
@@ -4089,12 +4089,12 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
                          * power good.
                          */
                         e1e_rphy_locked(hw, I217_SxCTRL, &phy_reg);
-                        phy_reg |= I217_SxCTRL_MASK;
+                        phy_reg |= I217_SxCTRL_ENABLE_LPI_RESET;
                         e1e_wphy_locked(hw, I217_SxCTRL, phy_reg);
 
                         /* Disable the SMB release on LCD reset. */
                         e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
-                        phy_reg &= ~I217_MEMPWR;
+                        phy_reg &= ~I217_MEMPWR_DISABLE_SMB_RELEASE;
                         e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
                 }
 
@@ -4103,7 +4103,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
                  * Support
                  */
                 e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
-                phy_reg |= I217_CGFREG_MASK;
+                phy_reg |= I217_CGFREG_ENABLE_MTA_RESET;
                 e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
 
 release:
@@ -4176,7 +4176,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
                         ret_val = e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
                         if (ret_val)
                                 goto release;
-                        phy_reg |= I217_MEMPWR_MASK;
+                        phy_reg |= I217_MEMPWR_DISABLE_SMB_RELEASE;
                         e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
 
                         /* Disable Proxy */
@@ -4186,7 +4186,7 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
                 ret_val = e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
                 if (ret_val)
                         goto release;
-                phy_reg &= ~I217_CGFREG_MASK;
+                phy_reg &= ~I217_CGFREG_ENABLE_MTA_RESET;
                 e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
 release:
                 if (ret_val)
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 026e8b3ab52e..a13439928488 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -709,7 +709,7 @@ s32 e1000e_setup_link_generic(struct e1000_hw *hw)
          * In the case of the phy reset being blocked, we already have a link.
          * We do not need to set it up again.
          */
-        if (hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                 return 0;
 
         /*
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a4b0435b00dc..31d37a2b5ba8 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6237,7 +6237,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 adapter->hw.phy.ms_type = e1000_ms_hw_default;
         }
 
-        if (hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && hw->phy.ops.check_reset_block(hw))
                 e_info("PHY reset is blocked due to SOL/IDER session.\n");
 
         /* Set initial default active device features */
@@ -6404,7 +6404,7 @@ err_register:
         if (!(adapter->flags & FLAG_HAS_AMT))
                 e1000e_release_hw_control(adapter);
 err_eeprom:
-        if (!hw->phy.ops.check_reset_block(hw))
+        if (hw->phy.ops.check_reset_block && !hw->phy.ops.check_reset_block(hw))
                 e1000_phy_hw_reset(&adapter->hw);
 err_hw_init:
         kfree(adapter->tx_ring);
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 0334d013bc3c..b860d4f7ea2a 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -2155,9 +2155,11 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw)
         s32 ret_val;
         u32 ctrl;
 
-        ret_val = phy->ops.check_reset_block(hw);
-        if (ret_val)
-                return 0;
+        if (phy->ops.check_reset_block) {
+                ret_val = phy->ops.check_reset_block(hw);
+                if (ret_val)
+                        return 0;
+        }
 
         ret_val = phy->ops.acquire(hw);
         if (ret_val)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bf20457ea23a..17ad6a3c1be1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1390,6 +1390,8 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
                                      union ixgbe_adv_rx_desc *rx_desc,
                                      struct sk_buff *skb)
 {
+        struct net_device *dev = rx_ring->netdev;
+
         ixgbe_update_rsc_stats(rx_ring, skb);
 
         ixgbe_rx_hash(rx_ring, rx_desc, skb);
@@ -1401,14 +1403,15 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
                 ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, skb);
 #endif
 
-        if (ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
+        if ((dev->features & NETIF_F_HW_VLAN_RX) &&
+            ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
                 u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan);
                 __vlan_hwaccel_put_tag(skb, vid);
         }
 
         skb_record_rx_queue(skb, rx_ring->queue_index);
 
-        skb->protocol = eth_type_trans(skb, rx_ring->netdev);
+        skb->protocol = eth_type_trans(skb, dev);
 }
 
 static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,
@@ -3607,10 +3610,6 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
         if (hw->mac.type == ixgbe_mac_82598EB)
                 netif_set_gso_max_size(adapter->netdev, 32768);
 
-
-        /* Enable VLAN tag insert/strip */
-        adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
-
         hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
 
 #ifdef IXGBE_FCOE
@@ -6701,11 +6700,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-#ifdef CONFIG_DCB
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
-                features &= ~NETIF_F_HW_VLAN_RX;
-#endif
-
         /* return error if RXHASH is being enabled when RSS is not supported */
         if (!(adapter->flags & IXGBE_FLAG_RSS_ENABLED))
                 features &= ~NETIF_F_RXHASH;
@@ -6718,7 +6712,6 @@ static netdev_features_t ixgbe_fix_features(struct net_device *netdev,
         if (!(adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE))
                 features &= ~NETIF_F_LRO;
 
-
         return features;
 }
 
@@ -6766,6 +6759,11 @@ static int ixgbe_set_features(struct net_device *netdev,
                 need_reset = true;
         }
 
+        if (features & NETIF_F_HW_VLAN_RX)
+                ixgbe_vlan_strip_enable(adapter);
+        else
+                ixgbe_vlan_strip_disable(adapter);
+
         if (changed & NETIF_F_RXALL)
                 need_reset = true;
 
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 04d901d0ff63..f0f06b2bc28b 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -436,7 +436,9 @@ struct mv643xx_eth_private {
         /*
          * Hardware-specific parameters.
          */
+#if defined(CONFIG_HAVE_CLK)
         struct clk *clk;
+#endif
         unsigned int t_clk;
 };
 
@@ -2895,17 +2897,17 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         mp->dev = dev;
 
         /*
-         * Get the clk rate, if there is one, otherwise use the default.
+         * Start with a default rate, and if there is a clock, allow
+         * it to override the default.
          */
+        mp->t_clk = 133000000;
+#if defined(CONFIG_HAVE_CLK)
         mp->clk = clk_get(&pdev->dev, (pdev->id ? "1" : "0"));
         if (!IS_ERR(mp->clk)) {
                 clk_prepare_enable(mp->clk);
                 mp->t_clk = clk_get_rate(mp->clk);
-        } else {
-                mp->t_clk = 133000000;
-                printk(KERN_WARNING "Unable to get clock");
         }
-
+#endif
         set_params(mp, pd);
         netif_set_real_num_tx_queues(dev, mp->txq_count);
         netif_set_real_num_rx_queues(dev, mp->rxq_count);
@@ -2995,10 +2997,13 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
                 phy_detach(mp->phy);
         cancel_work_sync(&mp->tx_timeout_task);
 
+#if defined(CONFIG_HAVE_CLK)
         if (!IS_ERR(mp->clk)) {
                 clk_disable_unprepare(mp->clk);
                 clk_put(mp->clk);
         }
+#endif
+
         free_netdev(mp->dev);
 
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index cace36f2ab92..28a54451a3e5 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4381,10 +4381,12 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features)
         struct sky2_port *sky2 = netdev_priv(dev);
         netdev_features_t changed = dev->features ^ features;
 
-        if (changed & NETIF_F_RXCSUM) {
-                bool on = features & NETIF_F_RXCSUM;
-                sky2_write32(sky2->hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR),
-                             on ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
+        if ((changed & NETIF_F_RXCSUM) &&
+            !(sky2->hw->flags & SKY2_HW_NEW_LE)) {
+                sky2_write32(sky2->hw,
+                             Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                             (features & NETIF_F_RXCSUM)
+                             ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
         }
 
         if (changed & NETIF_F_RXHASH)
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 1bcead1fa2f6..842c8ce9494e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -617,7 +617,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = NULL
+                .wrapper = mlx4_QUERY_FW_wrapper
         },
         {
                 .opcode = MLX4_CMD_QUERY_HCA,
@@ -635,7 +635,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = NULL
+                .wrapper = mlx4_QUERY_DEV_CAP_wrapper
         },
         {
                 .opcode = MLX4_CMD_QUERY_FUNC_CAP,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 988b2424e1c6..69ba57270481 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -136,13 +136,12 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
         struct mlx4_en_dev *mdev = (struct mlx4_en_dev *) endev_ptr;
         struct mlx4_en_priv *priv;
 
-        if (!mdev->pndev[port])
-                return;
-
-        priv = netdev_priv(mdev->pndev[port]);
         switch (event) {
         case MLX4_DEV_EVENT_PORT_UP:
         case MLX4_DEV_EVENT_PORT_DOWN:
+                if (!mdev->pndev[port])
+                        return;
+                priv = netdev_priv(mdev->pndev[port]);
                 /* To prevent races, we poll the link state in a separate
                   task rather than changing it here */
                 priv->link_state = event;
@@ -154,7 +153,10 @@ static void mlx4_en_event(struct mlx4_dev *dev, void *endev_ptr,
                 break;
 
         default:
-                mlx4_warn(mdev, "Unhandled event: %d\n", event);
+                if (port < 1 || port > dev->caps.num_ports ||
+                    !mdev->pndev[port])
+                        return;
+                mlx4_warn(mdev, "Unhandled event %d for port %d\n", event, port);
         }
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 3b6f8efbf141..bce98d9c0039 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -426,7 +426,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
 
                         mlx4_dbg(dev, "FLR event for slave: %d\n", flr_slave);
 
-                        if (flr_slave > dev->num_slaves) {
+                        if (flr_slave >= dev->num_slaves) {
                                 mlx4_warn(dev,
                                           "Got FLR for unknown function: %d\n",
                                           flr_slave);
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 68f5cd6cb3c7..9c83bb8151ea 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -412,7 +412,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         outbox = mailbox->buf;
 
         err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,
-                           MLX4_CMD_TIME_CLASS_A, !mlx4_is_slave(dev));
+                           MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
         if (err)
                 goto out;
 
@@ -590,8 +590,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 
                 for (i = 1; i <= dev_cap->num_ports; ++i) {
                         err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
-                                           MLX4_CMD_TIME_CLASS_B,
-                                           !mlx4_is_slave(dev));
+                                           MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
                         if (err)
                                 goto out;
 
@@ -669,6 +668,28 @@ out:
         return err;
 }
 
+int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
+                               struct mlx4_vhcr *vhcr,
+                               struct mlx4_cmd_mailbox *inbox,
+                               struct mlx4_cmd_mailbox *outbox,
+                               struct mlx4_cmd_info *cmd)
+{
+        int     err = 0;
+        u8      field;
+
+        err = mlx4_cmd_box(dev, 0, outbox->dma, 0, 0, MLX4_CMD_QUERY_DEV_CAP,
+                           MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
+        if (err)
+                return err;
+
+        /* For guests, report Blueflame disabled */
+        MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_BF_OFFSET);
+        field &= 0x7f;
+        MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET);
+
+        return 0;
+}
+
 int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                             struct mlx4_vhcr *vhcr,
                             struct mlx4_cmd_mailbox *inbox,
@@ -860,6 +881,9 @@ int mlx4_QUERY_FW(struct mlx4_dev *dev)
                 ((fw_ver & 0xffff0000ull) >> 16) |
                 ((fw_ver & 0x0000ffffull) << 16);
 
+        if (mlx4_is_slave(dev))
+                goto out;
+
         MLX4_GET(lg, outbox, QUERY_FW_PPF_ID);
         dev->caps.function = lg;
 
@@ -927,6 +951,27 @@ out:
         return err;
 }
 
+int mlx4_QUERY_FW_wrapper(struct mlx4_dev *dev, int slave,
+                          struct mlx4_vhcr *vhcr,
+                          struct mlx4_cmd_mailbox *inbox,
+                          struct mlx4_cmd_mailbox *outbox,
+                          struct mlx4_cmd_info *cmd)
+{
+        u8 *outbuf;
+        int err;
+
+        outbuf = outbox->buf;
+        err = mlx4_cmd_box(dev, 0, outbox->dma, 0, 0, MLX4_CMD_QUERY_FW,
+                            MLX4_CMD_TIME_CLASS_A, MLX4_CMD_NATIVE);
+        if (err)
+                return err;
+
+        /* for slaves, zero out everything except FW version */
+        outbuf[0] = outbuf[1] = 0;
+        memset(&outbuf[8], 0, QUERY_FW_OUT_SIZE - 8);
+        return 0;
+}
+
 static void get_board_id(void *vsd, char *board_id)
 {
         int i;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 2e024a68fa81..ee6f4fe00837 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -142,12 +142,6 @@ struct mlx4_port_config {
         struct pci_dev *pdev;
 };
 
-static inline int mlx4_master_get_num_eqs(struct mlx4_dev *dev)
-{
-        return dev->caps.reserved_eqs +
-                MLX4_MFUNC_EQ_NUM * (dev->num_slaves + 1);
-}
-
 int mlx4_check_port_params(struct mlx4_dev *dev,
                            enum mlx4_port_type *port_type)
 {
@@ -217,6 +211,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         }
 
         dev->caps.num_ports          = dev_cap->num_ports;
+        dev->phys_caps.num_phys_eqs  = MLX4_MAX_EQ_NUM;
         for (i = 1; i <= dev->caps.num_ports; ++i) {
                 dev->caps.vl_cap[i]         = dev_cap->max_vl[i];
                 dev->caps.ib_mtu_cap[i]     = dev_cap->ib_mtu[i];
@@ -435,12 +430,17 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
         mlx4_log_num_mgm_entry_size = hca_param.log_mc_entry_sz;
 
         memset(&dev_cap, 0, sizeof(dev_cap));
+        dev->caps.max_qp_dest_rdma = 1 << hca_param.log_rd_per_qp;
         err = mlx4_dev_cap(dev, &dev_cap);
         if (err) {
                 mlx4_err(dev, "QUERY_DEV_CAP command failed, aborting.\n");
                 return err;
         }
 
+        err = mlx4_QUERY_FW(dev);
+        if (err)
+                mlx4_err(dev, "QUERY_FW command failed: could not get FW version.\n");
+
         page_size = ~dev->caps.page_size_cap + 1;
         mlx4_warn(dev, "HCA minimum page size:%d\n", page_size);
         if (page_size > PAGE_SIZE) {
@@ -485,15 +485,15 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
         dev->caps.num_mgms              = 0;
         dev->caps.num_amgms             = 0;
 
-        for (i = 1; i <= dev->caps.num_ports; ++i)
-                dev->caps.port_mask[i] = dev->caps.port_type[i];
-
         if (dev->caps.num_ports > MLX4_MAX_PORTS) {
                 mlx4_err(dev, "HCA has %d ports, but we only support %d, "
                          "aborting.\n", dev->caps.num_ports, MLX4_MAX_PORTS);
                 return -ENODEV;
         }
 
+        for (i = 1; i <= dev->caps.num_ports; ++i)
+                dev->caps.port_mask[i] = dev->caps.port_type[i];
+
         if (dev->caps.uar_page_size * (dev->caps.num_uars -
                                        dev->caps.reserved_uars) >
                                        pci_resource_len(dev->pdev, 2)) {
@@ -504,18 +504,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -ENODEV;
         }
 
-#if 0
-        mlx4_warn(dev, "sqp_demux:%d\n", dev->caps.sqp_demux);
-        mlx4_warn(dev, "num_uars:%d reserved_uars:%d uar region:0x%x bar2:0x%llx\n",
-                  dev->caps.num_uars, dev->caps.reserved_uars,
-                  dev->caps.uar_page_size * dev->caps.num_uars,
-                  pci_resource_len(dev->pdev, 2));
-        mlx4_warn(dev, "num_eqs:%d reserved_eqs:%d\n", dev->caps.num_eqs,
-                  dev->caps.reserved_eqs);
-        mlx4_warn(dev, "num_pds:%d reserved_pds:%d slave_pd_shift:%d pd_base:%d\n",
-                  dev->caps.num_pds, dev->caps.reserved_pds,
-                  dev->caps.slave_pd_shift, dev->caps.pd_base);
-#endif
         return 0;
 }
 
@@ -810,9 +798,8 @@ static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,
         if (err)
                 goto err_srq;
 
-        num_eqs = (mlx4_is_master(dev)) ?
-                roundup_pow_of_two(mlx4_master_get_num_eqs(dev)) :
-                dev->caps.num_eqs;
+        num_eqs = (mlx4_is_master(dev)) ? dev->phys_caps.num_phys_eqs :
+                  dev->caps.num_eqs;
         err = mlx4_init_icm_table(dev, &priv->eq_table.cmpt_table,
                                   cmpt_base +
                                   ((u64) (MLX4_CMPT_TYPE_EQ *
@@ -874,9 +861,8 @@ static int mlx4_init_icm(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap,
         }
 
 
-        num_eqs = (mlx4_is_master(dev)) ?
-                roundup_pow_of_two(mlx4_master_get_num_eqs(dev)) :
-                dev->caps.num_eqs;
+        num_eqs = (mlx4_is_master(dev)) ? dev->phys_caps.num_phys_eqs :
+                   dev->caps.num_eqs;
         err = mlx4_init_icm_table(dev, &priv->eq_table.table,
                                   init_hca->eqc_base, dev_cap->eqc_entry_sz,
                                   num_eqs, num_eqs, 0, 0);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index 86b6e5a2fabf..e5d20220762c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -1039,6 +1039,11 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev);
 void mlx4_free_resource_tracker(struct mlx4_dev *dev,
                                 enum mlx4_res_tracker_free_type type);
 
+int mlx4_QUERY_FW_wrapper(struct mlx4_dev *dev, int slave,
+                          struct mlx4_vhcr *vhcr,
+                          struct mlx4_cmd_mailbox *inbox,
+                          struct mlx4_cmd_mailbox *outbox,
+                          struct mlx4_cmd_info *cmd);
 int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,
                           struct mlx4_vhcr *vhcr,
                           struct mlx4_cmd_mailbox *inbox,
@@ -1054,6 +1059,11 @@ int mlx4_CLOSE_PORT_wrapper(struct mlx4_dev *dev, int slave,
                             struct mlx4_cmd_mailbox *inbox,
                             struct mlx4_cmd_mailbox *outbox,
                             struct mlx4_cmd_info *cmd);
+int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave,
+                               struct mlx4_vhcr *vhcr,
+                               struct mlx4_cmd_mailbox *inbox,
+                               struct mlx4_cmd_mailbox *outbox,
+                               struct mlx4_cmd_info *cmd);
 int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
                             struct mlx4_vhcr *vhcr,
                             struct mlx4_cmd_mailbox *inbox,
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 1fe2c7a8b40c..a8fb52992c64 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -697,10 +697,10 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
         if (slave != dev->caps.function)
                 memset(inbox->buf, 0, 256);
         if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {
-                *(u8 *) inbox->buf         = !!reset_qkey_viols << 6;
+                *(u8 *) inbox->buf         |= !!reset_qkey_viols << 6;
                 ((__be32 *) inbox->buf)[2] = agg_cap_mask;
         } else {
-                ((u8 *) inbox->buf)[3]     = !!reset_qkey_viols;
+                ((u8 *) inbox->buf)[3]     |= !!reset_qkey_viols;
                 ((__be32 *) inbox->buf)[1] = agg_cap_mask;
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
index 06e5adeb76f7..b83bc928d52a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/profile.c
+++ b/drivers/net/ethernet/mellanox/mlx4/profile.c
@@ -126,7 +126,9 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
         profile[MLX4_RES_AUXC].num    = request->num_qp;
         profile[MLX4_RES_SRQ].num     = request->num_srq;
         profile[MLX4_RES_CQ].num      = request->num_cq;
-        profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
+        profile[MLX4_RES_EQ].num      = mlx4_is_mfunc(dev) ?
+                                        dev->phys_caps.num_phys_eqs :
+                                        min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
         profile[MLX4_RES_DMPT].num    = request->num_mpt;
         profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
         profile[MLX4_RES_MTT].num     = request->num_mtt * (1 << log_mtts_per_seg);
@@ -215,9 +217,10 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
                         init_hca->log_num_cqs = profile[i].log_num;
                         break;
                 case MLX4_RES_EQ:
-                        dev->caps.num_eqs     = profile[i].num;
+                        dev->caps.num_eqs     = roundup_pow_of_two(min_t(unsigned, dev_cap->max_eqs,
+                                                                         MAX_MSIX));
                         init_hca->eqc_base    = profile[i].start;
-                        init_hca->log_num_eqs = profile[i].log_num;
+                        init_hca->log_num_eqs = ilog2(dev->caps.num_eqs);
                         break;
                 case MLX4_RES_DMPT:
                         dev->caps.num_mpts      = profile[i].num;
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 8d2666fcffd7..083d6715335c 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -946,16 +946,16 @@ static void __lpc_handle_xmit(struct net_device *ndev)
                         /* Update stats */
                         ndev->stats.tx_packets++;
                         ndev->stats.tx_bytes += skb->len;
-
-                        /* Free buffer */
-                        dev_kfree_skb_irq(skb);
                 }
+                dev_kfree_skb_irq(skb);
 
                 txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
         }
 
-        if (netif_queue_stopped(ndev))
-                netif_wake_queue(ndev);
+        if (pldat->num_used_tx_buffs <= ENET_TX_DESC/2) {
+                if (netif_queue_stopped(ndev))
+                        netif_wake_queue(ndev);
+        }
 }
 
 static int __lpc_handle_recv(struct net_device *ndev, int budget)
@@ -1320,6 +1320,7 @@ static const struct net_device_ops lpc_netdev_ops = {
         .ndo_set_rx_mode        = lpc_eth_set_multicast_list,
         .ndo_do_ioctl           = lpc_eth_ioctl,
         .ndo_set_mac_address    = lpc_set_mac_address,
+        .ndo_change_mtu         = eth_change_mtu,
 };
 
 static int lpc_eth_drv_probe(struct platform_device *pdev)
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 4de73643fec6..d1827e887f4e 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1096,20 +1096,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         if (err) {
                 dev_err(&pdev->dev, "32-bit PCI DMA addresses"
                                 "not supported by the card\n");
-                goto err_out;
+                goto err_out_disable_dev;
         }
         err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 dev_err(&pdev->dev, "32-bit PCI DMA addresses"
                                 "not supported by the card\n");
-                goto err_out;
+                goto err_out_disable_dev;
         }
 
         /* IO Size check */
         if (pci_resource_len(pdev, bar) < io_size) {
                 dev_err(&pdev->dev, "Insufficient PCI resources, aborting\n");
                 err = -EIO;
-                goto err_out;
+                goto err_out_disable_dev;
         }
 
         pci_set_master(pdev);
@@ -1117,7 +1117,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         dev = alloc_etherdev(sizeof(struct r6040_private));
         if (!dev) {
                 err = -ENOMEM;
-                goto err_out;
+                goto err_out_disable_dev;
         }
         SET_NETDEV_DEV(dev, &pdev->dev);
         lp = netdev_priv(dev);
@@ -1233,11 +1233,15 @@ err_out_mdio_irq:
 err_out_mdio:
         mdiobus_free(lp->mii_bus);
 err_out_unmap:
+        netif_napi_del(&lp->napi);
+        pci_set_drvdata(pdev, NULL);
         pci_iounmap(pdev, ioaddr);
 err_out_free_res:
         pci_release_regions(pdev);
 err_out_free_dev:
         free_netdev(dev);
+err_out_disable_dev:
+        pci_disable_device(pdev);
 err_out:
         return err;
 }
@@ -1251,6 +1255,9 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
         mdiobus_unregister(lp->mii_bus);
         kfree(lp->mii_bus->irq);
         mdiobus_free(lp->mii_bus);
+        netif_napi_del(&lp->napi);
+        pci_set_drvdata(pdev, NULL);
+        pci_iounmap(pdev, lp->base);
         pci_release_regions(pdev);
         free_netdev(dev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 5eef290997f9..995d0cfc4c06 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -979,6 +979,17 @@ static void cp_init_hw (struct cp_private *cp)
         cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
         cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
 
+        cpw32_f(HiTxRingAddr, 0);
+        cpw32_f(HiTxRingAddr + 4, 0);
+
+        ring_dma = cp->ring_dma;
+        cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
+        cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
+
+        ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
+        cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
+        cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
+
         cp_start_hw(cp);
         cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
 
@@ -992,17 +1003,6 @@ static void cp_init_hw (struct cp_private *cp)
 
         cpw8(Config5, cpr8(Config5) & PMEStatus);
 
-        cpw32_f(HiTxRingAddr, 0);
-        cpw32_f(HiTxRingAddr + 4, 0);
-
-        ring_dma = cp->ring_dma;
-        cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
-        cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
-
-        ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
-        cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
-        cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
-
         cpw16(MultiIntr, 0);
 
         cpw8_f(Cfg9346, Cfg9346_Lock);
@@ -1636,7 +1636,7 @@ static void eeprom_cmd(void __iomem *ee_addr, int cmd, int cmd_len)
 
 static void eeprom_cmd_end(void __iomem *ee_addr)
 {
-        writeb (~EE_CS, ee_addr);
+        writeb(0, ee_addr);
         eeprom_delay ();
 }
 
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 03df076ed596..1d83565cc6af 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -1173,7 +1173,7 @@ static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_l
         }
 
         /* Terminate the EEPROM access. */
-        RTL_W8 (Cfg9346, ~EE_CS);
+        RTL_W8(Cfg9346, 0);
         eeprom_delay ();
 
         return retval;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 00b4f56a671c..7260aa79466a 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5889,11 +5889,7 @@ static void rtl_slow_event_work(struct rtl8169_private *tp)
         if (status & LinkChg)
                 __rtl8169_check_link_status(dev, tp, tp->mmio_addr, true);
 
-        napi_disable(&tp->napi);
-        rtl_irq_disable(tp);
-
-        napi_enable(&tp->napi);
-        napi_schedule(&tp->napi);
+        rtl_irq_enable_all(tp);
 }
 
 static void rtl_task(struct work_struct *work)
@@ -6345,6 +6341,8 @@ static void __devexit rtl_remove_one(struct pci_dev *pdev)
 
         cancel_work_sync(&tp->wk.work);
 
+        netif_napi_del(&tp->napi);
+
         unregister_netdev(dev);
 
         rtl_release_firmware(tp);
@@ -6668,6 +6666,7 @@ out:
         return rc;
 
 err_out_msi_4:
+        netif_napi_del(&tp->napi);
         rtl_disable_msi(pdev, tp);
         iounmap(ioaddr);
 err_out_free_res_3:
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index be3c22179161..667169b82526 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1101,8 +1101,12 @@ static int sh_eth_rx(struct net_device *ndev)
 
         /* Restart Rx engine if stopped. */
         /* If we don't need to check status, don't. -KDU */
-        if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R))
+        if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {
+                /* fix the values for the next receiving */
+                mdp->cur_rx = mdp->dirty_rx = (sh_eth_read(ndev, RDFAR) -
+                                               sh_eth_read(ndev, RDLAR)) >> 4;
                 sh_eth_write(ndev, EDRRR_R, EDRRR);
+        }
 
         return 0;
 }
@@ -1199,8 +1203,6 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 /* Receive Descriptor Empty int */
                 ndev->stats.rx_over_errors++;
 
-                if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R)
-                        sh_eth_write(ndev, EDRRR_R, EDRRR);
                 if (netif_msg_rx_err(mdp))
                         dev_err(&ndev->dev, "Receive Descriptor Empty\n");
         }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index dab9c6f671ec..1466e5d2af44 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2390,11 +2390,11 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
 
         retval = smsc911x_request_resources(pdev);
         if (retval)
-                goto out_return_resources;
+                goto out_request_resources_fail;
 
         retval = smsc911x_enable_resources(pdev);
         if (retval)
-                goto out_disable_resources;
+                goto out_enable_resources_fail;
 
         if (pdata->ioaddr == NULL) {
                 SMSC_WARN(pdata, probe, "Error smsc911x base address invalid");
@@ -2501,8 +2501,9 @@ out_free_irq:
         free_irq(dev->irq, dev);
 out_disable_resources:
         (void)smsc911x_disable_resources(pdev);
-out_return_resources:
+out_enable_resources_fail:
         smsc911x_free_resources(pdev);
+out_request_resources_fail:
         platform_set_drvdata(pdev, NULL);
         iounmap(pdata->ioaddr);
         free_netdev(dev);
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 036428348faa..9f448279e12a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -13,7 +13,7 @@ config STMMAC_ETH
 if STMMAC_ETH
 
 config STMMAC_PLATFORM
-        tristate "STMMAC platform bus support"
+        bool "STMMAC Platform bus support"
         depends on STMMAC_ETH
         default y
         ---help---
@@ -26,7 +26,7 @@ config STMMAC_PLATFORM
           If unsure, say N.
 
 config STMMAC_PCI
-        tristate "STMMAC support on PCI bus (EXPERIMENTAL)"
+        bool "STMMAC PCI bus support (EXPERIMENTAL)"
         depends on STMMAC_ETH && PCI && EXPERIMENTAL
         ---help---
           This is to select the Synopsys DWMAC available on PCI devices,
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 6b5d060ee9de..dc20c56efc9d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -26,6 +26,7 @@
 #include <linux/clk.h>
 #include <linux/stmmac.h>
 #include <linux/phy.h>
+#include <linux/pci.h>
 #include "common.h"
 #ifdef CONFIG_STMMAC_TIMER
 #include "stmmac_timer.h"
@@ -95,7 +96,6 @@ extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
 extern const struct stmmac_desc_ops enh_desc_ops;
 extern const struct stmmac_desc_ops ndesc_ops;
-
 int stmmac_freeze(struct net_device *ndev);
 int stmmac_restore(struct net_device *ndev);
 int stmmac_resume(struct net_device *ndev);
@@ -109,7 +109,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 static inline int stmmac_clk_enable(struct stmmac_priv *priv)
 {
         if (!IS_ERR(priv->stmmac_clk))
-                return clk_enable(priv->stmmac_clk);
+                return clk_prepare_enable(priv->stmmac_clk);
 
         return 0;
 }
@@ -119,7 +119,7 @@ static inline void stmmac_clk_disable(struct stmmac_priv *priv)
         if (IS_ERR(priv->stmmac_clk))
                 return;
 
-        clk_disable(priv->stmmac_clk);
+        clk_disable_unprepare(priv->stmmac_clk);
 }
 static inline int stmmac_clk_get(struct stmmac_priv *priv)
 {
@@ -143,3 +143,60 @@ static inline int stmmac_clk_get(struct stmmac_priv *priv)
         return 0;
 }
 #endif /* CONFIG_HAVE_CLK */
+
+
+#ifdef CONFIG_STMMAC_PLATFORM
+extern struct platform_driver stmmac_pltfr_driver;
+static inline int stmmac_register_platform(void)
+{
+        int err;
+
+        err = platform_driver_register(&stmmac_pltfr_driver);
+        if (err)
+                pr_err("stmmac: failed to register the platform driver\n");
+
+        return err;
+}
+static inline void stmmac_unregister_platform(void)
+{
+        platform_driver_register(&stmmac_pltfr_driver);
+}
+#else
+static inline int stmmac_register_platform(void)
+{
+        pr_debug("stmmac: do not register the platf driver\n");
+
+        return -EINVAL;
+}
+static inline void stmmac_unregister_platform(void)
+{
+}
+#endif /* CONFIG_STMMAC_PLATFORM */
+
+#ifdef CONFIG_STMMAC_PCI
+extern struct pci_driver stmmac_pci_driver;
+static inline int stmmac_register_pci(void)
+{
+        int err;
+
+        err = pci_register_driver(&stmmac_pci_driver);
+        if (err)
+                pr_err("stmmac: failed to register the PCI driver\n");
+
+        return err;
+}
+static inline void stmmac_unregister_pci(void)
+{
+        pci_unregister_driver(&stmmac_pci_driver);
+}
+#else
+static inline int stmmac_register_pci(void)
+{
+        pr_debug("stmmac: do not register the PCI driver\n");
+
+        return -EINVAL;
+}
+static inline void stmmac_unregister_pci(void)
+{
+}
+#endif /* CONFIG_STMMAC_PCI */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 70966330f44e..51b3b68528ee 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -833,8 +833,9 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
 
 /**
  * stmmac_selec_desc_mode
- * @dev : device pointer
- * Description: select the Enhanced/Alternate or Normal descriptors */
+ * @priv : private structure
+ * Description: select the Enhanced/Alternate or Normal descriptors
+ */
 static void stmmac_selec_desc_mode(struct stmmac_priv *priv)
 {
         if (priv->plat->enh_desc) {
@@ -1861,6 +1862,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 /**
  * stmmac_dvr_probe
  * @device: device pointer
+ * @plat_dat: platform data pointer
+ * @addr: iobase memory address
  * Description: this is the main probe function used to
  * call the alloc_etherdev, allocate the priv structure.
  */
@@ -2090,6 +2093,34 @@ int stmmac_restore(struct net_device *ndev)
 }
 #endif /* CONFIG_PM */
 
+/* Driver can be configured w/ and w/ both PCI and Platf drivers
+ * depending on the configuration selected.
+ */
+static int __init stmmac_init(void)
+{
+        int err_plt = 0;
+        int err_pci = 0;
+
+        err_plt = stmmac_register_platform();
+        err_pci = stmmac_register_pci();
+
+        if ((err_pci) && (err_plt)) {
+                pr_err("stmmac: driver registration failed\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void __exit stmmac_exit(void)
+{
+        stmmac_unregister_platform();
+        stmmac_unregister_pci();
+}
+
+module_init(stmmac_init);
+module_exit(stmmac_exit);
+
 #ifndef MODULE
 static int __init stmmac_cmdline_opt(char *str)
 {
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 58fab5303e9c..cf826e6b6aa1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -179,7 +179,7 @@ static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {
 
 MODULE_DEVICE_TABLE(pci, stmmac_id_table);
 
-static struct pci_driver stmmac_driver = {
+struct pci_driver stmmac_pci_driver = {
         .name = STMMAC_RESOURCE_NAME,
         .id_table = stmmac_id_table,
         .probe = stmmac_pci_probe,
@@ -190,33 +190,6 @@ static struct pci_driver stmmac_driver = {
 #endif
 };
 
-/**
- * stmmac_init_module - Entry point for the driver
- * Description: This function is the entry point for the driver.
- */
-static int __init stmmac_init_module(void)
-{
-        int ret;
-
-        ret = pci_register_driver(&stmmac_driver);
-        if (ret < 0)
-                pr_err("%s: ERROR: driver registration failed\n", __func__);
-
-        return ret;
-}
-
-/**
- * stmmac_cleanup_module - Cleanup routine for the driver
- * Description: This function is the cleanup routine for the driver.
- */
-static void __exit stmmac_cleanup_module(void)
-{
-        pci_unregister_driver(&stmmac_driver);
-}
-
-module_init(stmmac_init_module);
-module_exit(stmmac_cleanup_module);
-
 MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PCI driver");
 MODULE_AUTHOR("Rayagond Kokatanur <rayagond.kokatanur@vayavyalabs.com>");
 MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3dd8f0803808..680d2b8dfe27 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -255,7 +255,7 @@ static const struct of_device_id stmmac_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, stmmac_dt_ids);
 
-static struct platform_driver stmmac_driver = {
+struct platform_driver stmmac_pltfr_driver = {
         .probe = stmmac_pltfr_probe,
         .remove = stmmac_pltfr_remove,
         .driver = {
@@ -266,8 +266,6 @@ static struct platform_driver stmmac_driver = {
                    },
 };
 
-module_platform_driver(stmmac_driver);
-
 MODULE_DESCRIPTION("STMMAC 10/100/1000 Ethernet PLATFORM driver");
 MODULE_AUTHOR("Giuseppe Cavallaro <peppe.cavallaro@st.com>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 703c8cce2a2c..8c726b7004d3 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -3598,7 +3598,6 @@ static int release_tx_packet(struct niu *np, struct tx_ring_info *rp, int idx)
 static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)
 {
         struct netdev_queue *txq;
-        unsigned int tx_bytes;
         u16 pkt_cnt, tmp;
         int cons, index;
         u64 cs;
@@ -3621,18 +3620,12 @@ static void niu_tx_work(struct niu *np, struct tx_ring_info *rp)
         netif_printk(np, tx_done, KERN_DEBUG, np->dev,
                      "%s() pkt_cnt[%u] cons[%d]\n", __func__, pkt_cnt, cons);
 
-        tx_bytes = 0;
-        tmp = pkt_cnt;
-        while (tmp--) {
-                tx_bytes += rp->tx_buffs[cons].skb->len;
+        while (pkt_cnt--)
                 cons = release_tx_packet(np, rp, cons);
-        }
 
         rp->cons = cons;
         smp_mb();
 
-        netdev_tx_completed_queue(txq, pkt_cnt, tx_bytes);
-
 out:
         if (unlikely(netif_tx_queue_stopped(txq) &&
                      (niu_tx_avail(rp) > NIU_TX_WAKEUP_THRESH(rp)))) {
@@ -4333,7 +4326,6 @@ static void niu_free_channels(struct niu *np)
                         struct tx_ring_info *rp = &np->tx_rings[i];
 
                         niu_free_tx_ring_info(np, rp);
-                        netdev_tx_reset_queue(netdev_get_tx_queue(np->dev, i));
                 }
                 kfree(np->tx_rings);
                 np->tx_rings = NULL;
@@ -6739,8 +6731,6 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb,
                 prod = NEXT_TX(rp, prod);
         }
 
-        netdev_tx_sent_queue(txq, skb->len);
-
         if (prod < rp->prod)
                 rp->wrap_bit ^= TX_RING_KICK_WRAP;
         rp->prod = prod;
diff --git a/drivers/net/ethernet/tile/Kconfig b/drivers/net/ethernet/tile/Kconfig
index 2d9218f86bca..098b1c42b393 100644
--- a/drivers/net/ethernet/tile/Kconfig
+++ b/drivers/net/ethernet/tile/Kconfig
@@ -7,6 +7,8 @@ config TILE_NET
         depends on TILE
         default y
         select CRC32
+        select TILE_GXIO_MPIPE if TILEGX
+        select HIGH_RES_TIMERS if TILEGX
         ---help---
           This is a standard Linux network device driver for the
           on-chip Tilera Gigabit Ethernet and XAUI interfaces.
diff --git a/drivers/net/ethernet/tile/Makefile b/drivers/net/ethernet/tile/Makefile
index f634f142cab4..0ef9eefd3211 100644
--- a/drivers/net/ethernet/tile/Makefile
+++ b/drivers/net/ethernet/tile/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_TILE_NET) += tile_net.o
 ifdef CONFIG_TILEGX
-tile_net-objs := tilegx.o mpipe.o iorpc_mpipe.o dma_queue.o
+tile_net-y := tilegx.o
 else
-tile_net-objs := tilepro.o
+tile_net-y := tilepro.o
 endif
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
new file mode 100644
index 000000000000..83b4b388ad49
--- /dev/null
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -0,0 +1,1898 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>      /* printk() */
+#include <linux/slab.h>        /* kmalloc() */
+#include <linux/errno.h>       /* error codes */
+#include <linux/types.h>       /* size_t */
+#include <linux/interrupt.h>
+#include <linux/in.h>
+#include <linux/irq.h>
+#include <linux/netdevice.h>   /* struct device, and other headers */
+#include <linux/etherdevice.h> /* eth_type_trans */
+#include <linux/skbuff.h>
+#include <linux/ioctl.h>
+#include <linux/cdev.h>
+#include <linux/hugetlb.h>
+#include <linux/in6.h>
+#include <linux/timer.h>
+#include <linux/hrtimer.h>
+#include <linux/ktime.h>
+#include <linux/io.h>
+#include <linux/ctype.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+
+#include <asm/checksum.h>
+#include <asm/homecache.h>
+#include <gxio/mpipe.h>
+#include <arch/sim.h>
+
+/* Default transmit lockup timeout period, in jiffies. */
+#define TILE_NET_TIMEOUT (5 * HZ)
+
+/* The maximum number of distinct channels (idesc.channel is 5 bits). */
+#define TILE_NET_CHANNELS 32
+
+/* Maximum number of idescs to handle per "poll". */
+#define TILE_NET_BATCH 128
+
+/* Maximum number of packets to handle per "poll". */
+#define TILE_NET_WEIGHT 64
+
+/* Number of entries in each iqueue. */
+#define IQUEUE_ENTRIES 512
+
+/* Number of entries in each equeue. */
+#define EQUEUE_ENTRIES 2048
+
+/* Total header bytes per equeue slot.  Must be big enough for 2 bytes
+ * of NET_IP_ALIGN alignment, plus 14 bytes (?) of L2 header, plus up to
+ * 60 bytes of actual TCP header.  We round up to align to cache lines.
+ */
+#define HEADER_BYTES 128
+
+/* Maximum completions per cpu per device (must be a power of two).
+ * ISSUE: What is the right number here?  If this is too small, then
+ * egress might block waiting for free space in a completions array.
+ * ISSUE: At the least, allocate these only for initialized echannels.
+ */
+#define TILE_NET_MAX_COMPS 64
+
+#define MAX_FRAGS (MAX_SKB_FRAGS + 1)
+
+/* Size of completions data to allocate.
+ * ISSUE: Probably more than needed since we don't use all the channels.
+ */
+#define COMPS_SIZE (TILE_NET_CHANNELS * sizeof(struct tile_net_comps))
+
+/* Size of NotifRing data to allocate. */
+#define NOTIF_RING_SIZE (IQUEUE_ENTRIES * sizeof(gxio_mpipe_idesc_t))
+
+/* Timeout to wake the per-device TX timer after we stop the queue.
+ * We don't want the timeout too short (adds overhead, and might end
+ * up causing stop/wake/stop/wake cycles) or too long (affects performance).
+ * For the 10 Gb NIC, 30 usec means roughly 30+ 1500-byte packets.
+ */
+#define TX_TIMER_DELAY_USEC 30
+
+/* Timeout to wake the per-cpu egress timer to free completions. */
+#define EGRESS_TIMER_DELAY_USEC 1000
+
+MODULE_AUTHOR("Tilera Corporation");
+MODULE_LICENSE("GPL");
+
+/* A "packet fragment" (a chunk of memory). */
+struct frag {
+        void *buf;
+        size_t length;
+};
+
+/* A single completion. */
+struct tile_net_comp {
+        /* The "complete_count" when the completion will be complete. */
+        s64 when;
+        /* The buffer to be freed when the completion is complete. */
+        struct sk_buff *skb;
+};
+
+/* The completions for a given cpu and echannel. */
+struct tile_net_comps {
+        /* The completions. */
+        struct tile_net_comp comp_queue[TILE_NET_MAX_COMPS];
+        /* The number of completions used. */
+        unsigned long comp_next;
+        /* The number of completions freed. */
+        unsigned long comp_last;
+};
+
+/* The transmit wake timer for a given cpu and echannel. */
+struct tile_net_tx_wake {
+        struct hrtimer timer;
+        struct net_device *dev;
+};
+
+/* Info for a specific cpu. */
+struct tile_net_info {
+        /* The NAPI struct. */
+        struct napi_struct napi;
+        /* Packet queue. */
+        gxio_mpipe_iqueue_t iqueue;
+        /* Our cpu. */
+        int my_cpu;
+        /* True if iqueue is valid. */
+        bool has_iqueue;
+        /* NAPI flags. */
+        bool napi_added;
+        bool napi_enabled;
+        /* Number of small sk_buffs which must still be provided. */
+        unsigned int num_needed_small_buffers;
+        /* Number of large sk_buffs which must still be provided. */
+        unsigned int num_needed_large_buffers;
+        /* A timer for handling egress completions. */
+        struct hrtimer egress_timer;
+        /* True if "egress_timer" is scheduled. */
+        bool egress_timer_scheduled;
+        /* Comps for each egress channel. */
+        struct tile_net_comps *comps_for_echannel[TILE_NET_CHANNELS];
+        /* Transmit wake timer for each egress channel. */
+        struct tile_net_tx_wake tx_wake[TILE_NET_CHANNELS];
+};
+
+/* Info for egress on a particular egress channel. */
+struct tile_net_egress {
+        /* The "equeue". */
+        gxio_mpipe_equeue_t *equeue;
+        /* The headers for TSO. */
+        unsigned char *headers;
+};
+
+/* Info for a specific device. */
+struct tile_net_priv {
+        /* Our network device. */
+        struct net_device *dev;
+        /* The primary link. */
+        gxio_mpipe_link_t link;
+        /* The primary channel, if open, else -1. */
+        int channel;
+        /* The "loopify" egress link, if needed. */
+        gxio_mpipe_link_t loopify_link;
+        /* The "loopify" egress channel, if open, else -1. */
+        int loopify_channel;
+        /* The egress channel (channel or loopify_channel). */
+        int echannel;
+        /* Total stats. */
+        struct net_device_stats stats;
+};
+
+/* Egress info, indexed by "priv->echannel" (lazily created as needed). */
+static struct tile_net_egress egress_for_echannel[TILE_NET_CHANNELS];
+
+/* Devices currently associated with each channel.
+ * NOTE: The array entry can become NULL after ifconfig down, but
+ * we do not free the underlying net_device structures, so it is
+ * safe to use a pointer after reading it from this array.
+ */
+static struct net_device *tile_net_devs_for_channel[TILE_NET_CHANNELS];
+
+/* A mutex for "tile_net_devs_for_channel". */
+static DEFINE_MUTEX(tile_net_devs_for_channel_mutex);
+
+/* The per-cpu info. */
+static DEFINE_PER_CPU(struct tile_net_info, per_cpu_info);
+
+/* The "context" for all devices. */
+static gxio_mpipe_context_t context;
+
+/* Buffer sizes and mpipe enum codes for buffer stacks.
+ * See arch/tile/include/gxio/mpipe.h for the set of possible values.
+ */
+#define BUFFER_SIZE_SMALL_ENUM GXIO_MPIPE_BUFFER_SIZE_128
+#define BUFFER_SIZE_SMALL 128
+#define BUFFER_SIZE_LARGE_ENUM GXIO_MPIPE_BUFFER_SIZE_1664
+#define BUFFER_SIZE_LARGE 1664
+
+/* The small/large "buffer stacks". */
+static int small_buffer_stack = -1;
+static int large_buffer_stack = -1;
+
+/* Amount of memory allocated for each buffer stack. */
+static size_t buffer_stack_size;
+
+/* The actual memory allocated for the buffer stacks. */
+static void *small_buffer_stack_va;
+static void *large_buffer_stack_va;
+
+/* The buckets. */
+static int first_bucket = -1;
+static int num_buckets = 1;
+
+/* The ingress irq. */
+static int ingress_irq = -1;
+
+/* Text value of tile_net.cpus if passed as a module parameter. */
+static char *network_cpus_string;
+
+/* The actual cpus in "network_cpus". */
+static struct cpumask network_cpus_map;
+
+/* If "loopify=LINK" was specified, this is "LINK". */
+static char *loopify_link_name;
+
+/* If "tile_net.custom" was specified, this is non-NULL. */
+static char *custom_str;
+
+/* The "tile_net.cpus" argument specifies the cpus that are dedicated
+ * to handle ingress packets.
+ *
+ * The parameter should be in the form "tile_net.cpus=m-n[,x-y]", where
+ * m, n, x, y are integer numbers that represent the cpus that can be
+ * neither a dedicated cpu nor a dataplane cpu.
+ */
+static bool network_cpus_init(void)
+{
+        char buf[1024];
+        int rc;
+
+        if (network_cpus_string == NULL)
+                return false;
+
+        rc = cpulist_parse_crop(network_cpus_string, &network_cpus_map);
+        if (rc != 0) {
+                pr_warn("tile_net.cpus=%s: malformed cpu list\n",
+                        network_cpus_string);
+                return false;
+        }
+
+        /* Remove dedicated cpus. */
+        cpumask_and(&network_cpus_map, &network_cpus_map, cpu_possible_mask);
+
+        if (cpumask_empty(&network_cpus_map)) {
+                pr_warn("Ignoring empty tile_net.cpus='%s'.\n",
+                        network_cpus_string);
+                return false;
+        }
+
+        cpulist_scnprintf(buf, sizeof(buf), &network_cpus_map);
+        pr_info("Linux network CPUs: %s\n", buf);
+        return true;
+}
+
+module_param_named(cpus, network_cpus_string, charp, 0444);
+MODULE_PARM_DESC(cpus, "cpulist of cores that handle network interrupts");
+
+/* The "tile_net.loopify=LINK" argument causes the named device to
+ * actually use "loop0" for ingress, and "loop1" for egress.  This
+ * allows an app to sit between the actual link and linux, passing
+ * (some) packets along to linux, and forwarding (some) packets sent
+ * out by linux.
+ */
+module_param_named(loopify, loopify_link_name, charp, 0444);
+MODULE_PARM_DESC(loopify, "name the device to use loop0/1 for ingress/egress");
+
+/* The "tile_net.custom" argument causes us to ignore the "conventional"
+ * classifier metadata, in particular, the "l2_offset".
+ */
+module_param_named(custom, custom_str, charp, 0444);
+MODULE_PARM_DESC(custom, "indicates a (heavily) customized classifier");
+
+/* Atomically update a statistics field.
+ * Note that on TILE-Gx, this operation is fire-and-forget on the
+ * issuing core (single-cycle dispatch) and takes only a few cycles
+ * longer than a regular store when the request reaches the home cache.
+ * No expensive bus management overhead is required.
+ */
+static void tile_net_stats_add(unsigned long value, unsigned long *field)
+{
+        BUILD_BUG_ON(sizeof(atomic_long_t) != sizeof(unsigned long));
+        atomic_long_add(value, (atomic_long_t *)field);
+}
+
+/* Allocate and push a buffer. */
+static bool tile_net_provide_buffer(bool small)
+{
+        int stack = small ? small_buffer_stack : large_buffer_stack;
+        const unsigned long buffer_alignment = 128;
+        struct sk_buff *skb;
+        int len;
+
+        len = sizeof(struct sk_buff **) + buffer_alignment;
+        len += (small ? BUFFER_SIZE_SMALL : BUFFER_SIZE_LARGE);
+        skb = dev_alloc_skb(len);
+        if (skb == NULL)
+                return false;
+
+        /* Make room for a back-pointer to 'skb' and guarantee alignment. */
+        skb_reserve(skb, sizeof(struct sk_buff **));
+        skb_reserve(skb, -(long)skb->data & (buffer_alignment - 1));
+
+        /* Save a back-pointer to 'skb'. */
+        *(struct sk_buff **)(skb->data - sizeof(struct sk_buff **)) = skb;
+
+        /* Make sure "skb" and the back-pointer have been flushed. */
+        wmb();
+
+        gxio_mpipe_push_buffer(&context, stack,
+                               (void *)va_to_tile_io_addr(skb->data));
+
+        return true;
+}
+
+/* Convert a raw mpipe buffer to its matching skb pointer. */
+static struct sk_buff *mpipe_buf_to_skb(void *va)
+{
+        /* Acquire the associated "skb". */
+        struct sk_buff **skb_ptr = va - sizeof(*skb_ptr);
+        struct sk_buff *skb = *skb_ptr;
+
+        /* Paranoia. */
+        if (skb->data != va) {
+                /* Panic here since there's a reasonable chance
+                 * that corrupt buffers means generic memory
+                 * corruption, with unpredictable system effects.
+                 */
+                panic("Corrupt linux buffer! va=%p, skb=%p, skb->data=%p",
+                      va, skb, skb->data);
+        }
+
+        return skb;
+}
+
+static void tile_net_pop_all_buffers(int stack)
+{
+        for (;;) {
+                tile_io_addr_t addr =
+                        (tile_io_addr_t)gxio_mpipe_pop_buffer(&context, stack);
+                if (addr == 0)
+                        break;
+                dev_kfree_skb_irq(mpipe_buf_to_skb(tile_io_addr_to_va(addr)));
+        }
+}
+
+/* Provide linux buffers to mPIPE. */
+static void tile_net_provide_needed_buffers(void)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+
+        while (info->num_needed_small_buffers != 0) {
+                if (!tile_net_provide_buffer(true))
+                        goto oops;
+                info->num_needed_small_buffers--;
+        }
+
+        while (info->num_needed_large_buffers != 0) {
+                if (!tile_net_provide_buffer(false))
+                        goto oops;
+                info->num_needed_large_buffers--;
+        }
+
+        return;
+
+oops:
+        /* Add a description to the page allocation failure dump. */
+        pr_notice("Tile %d still needs some buffers\n", info->my_cpu);
+}
+
+static inline bool filter_packet(struct net_device *dev, void *buf)
+{
+        /* Filter packets received before we're up. */
+        if (dev == NULL || !(dev->flags & IFF_UP))
+                return true;
+
+        /* Filter out packets that aren't for us. */
+        if (!(dev->flags & IFF_PROMISC) &&
+            !is_multicast_ether_addr(buf) &&
+            compare_ether_addr(dev->dev_addr, buf) != 0)
+                return true;
+
+        return false;
+}
+
+static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb,
+                                 gxio_mpipe_idesc_t *idesc, unsigned long len)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        /* Encode the actual packet length. */
+        skb_put(skb, len);
+
+        skb->protocol = eth_type_trans(skb, dev);
+
+        /* Acknowledge "good" hardware checksums. */
+        if (idesc->cs && idesc->csum_seed_val == 0xFFFF)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+        netif_receive_skb(skb);
+
+        /* Update stats. */
+        tile_net_stats_add(1, &priv->stats.rx_packets);
+        tile_net_stats_add(len, &priv->stats.rx_bytes);
+
+        /* Need a new buffer. */
+        if (idesc->size == BUFFER_SIZE_SMALL_ENUM)
+                info->num_needed_small_buffers++;
+        else
+                info->num_needed_large_buffers++;
+}
+
+/* Handle a packet.  Return true if "processed", false if "filtered". */
+static bool tile_net_handle_packet(gxio_mpipe_idesc_t *idesc)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct net_device *dev = tile_net_devs_for_channel[idesc->channel];
+        uint8_t l2_offset;
+        void *va;
+        void *buf;
+        unsigned long len;
+        bool filter;
+
+        /* Drop packets for which no buffer was available.
+         * NOTE: This happens under heavy load.
+         */
+        if (idesc->be) {
+                struct tile_net_priv *priv = netdev_priv(dev);
+                tile_net_stats_add(1, &priv->stats.rx_dropped);
+                gxio_mpipe_iqueue_consume(&info->iqueue, idesc);
+                if (net_ratelimit())
+                        pr_info("Dropping packet (insufficient buffers).\n");
+                return false;
+        }
+
+        /* Get the "l2_offset", if allowed. */
+        l2_offset = custom_str ? 0 : gxio_mpipe_idesc_get_l2_offset(idesc);
+
+        /* Get the raw buffer VA (includes "headroom"). */
+        va = tile_io_addr_to_va((unsigned long)(long)idesc->va);
+
+        /* Get the actual packet start/length. */
+        buf = va + l2_offset;
+        len = idesc->l2_size - l2_offset;
+
+        /* Point "va" at the raw buffer. */
+        va -= NET_IP_ALIGN;
+
+        filter = filter_packet(dev, buf);
+        if (filter) {
+                gxio_mpipe_iqueue_drop(&info->iqueue, idesc);
+        } else {
+                struct sk_buff *skb = mpipe_buf_to_skb(va);
+
+                /* Skip headroom, and any custom header. */
+                skb_reserve(skb, NET_IP_ALIGN + l2_offset);
+
+                tile_net_receive_skb(dev, skb, idesc, len);
+        }
+
+        gxio_mpipe_iqueue_consume(&info->iqueue, idesc);
+        return !filter;
+}
+
+/* Handle some packets for the current CPU.
+ *
+ * This function handles up to TILE_NET_BATCH idescs per call.
+ *
+ * ISSUE: Since we do not provide new buffers until this function is
+ * complete, we must initially provide enough buffers for each network
+ * cpu to fill its iqueue and also its batched idescs.
+ *
+ * ISSUE: The "rotting packet" race condition occurs if a packet
+ * arrives after the queue appears to be empty, and before the
+ * hypervisor interrupt is re-enabled.
+ */
+static int tile_net_poll(struct napi_struct *napi, int budget)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        unsigned int work = 0;
+        gxio_mpipe_idesc_t *idesc;
+        int i, n;
+
+        /* Process packets. */
+        while ((n = gxio_mpipe_iqueue_try_peek(&info->iqueue, &idesc)) > 0) {
+                for (i = 0; i < n; i++) {
+                        if (i == TILE_NET_BATCH)
+                                goto done;
+                        if (tile_net_handle_packet(idesc + i)) {
+                                if (++work >= budget)
+                                        goto done;
+                        }
+                }
+        }
+
+        /* There are no packets left. */
+        napi_complete(&info->napi);
+
+        /* Re-enable hypervisor interrupts. */
+        gxio_mpipe_enable_notif_ring_interrupt(&context, info->iqueue.ring);
+
+        /* HACK: Avoid the "rotting packet" problem. */
+        if (gxio_mpipe_iqueue_try_peek(&info->iqueue, &idesc) > 0)
+                napi_schedule(&info->napi);
+
+        /* ISSUE: Handle completions? */
+
+done:
+        tile_net_provide_needed_buffers();
+
+        return work;
+}
+
+/* Handle an ingress interrupt on the current cpu. */
+static irqreturn_t tile_net_handle_ingress_irq(int irq, void *unused)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        napi_schedule(&info->napi);
+        return IRQ_HANDLED;
+}
+
+/* Free some completions.  This must be called with interrupts blocked. */
+static int tile_net_free_comps(gxio_mpipe_equeue_t *equeue,
+                                struct tile_net_comps *comps,
+                                int limit, bool force_update)
+{
+        int n = 0;
+        while (comps->comp_last < comps->comp_next) {
+                unsigned int cid = comps->comp_last % TILE_NET_MAX_COMPS;
+                struct tile_net_comp *comp = &comps->comp_queue[cid];
+                if (!gxio_mpipe_equeue_is_complete(equeue, comp->when,
+                                                   force_update || n == 0))
+                        break;
+                dev_kfree_skb_irq(comp->skb);
+                comps->comp_last++;
+                if (++n == limit)
+                        break;
+        }
+        return n;
+}
+
+/* Add a completion.  This must be called with interrupts blocked.
+ * tile_net_equeue_try_reserve() will have ensured a free completion entry.
+ */
+static void add_comp(gxio_mpipe_equeue_t *equeue,
+                     struct tile_net_comps *comps,
+                     uint64_t when, struct sk_buff *skb)
+{
+        int cid = comps->comp_next % TILE_NET_MAX_COMPS;
+        comps->comp_queue[cid].when = when;
+        comps->comp_queue[cid].skb = skb;
+        comps->comp_next++;
+}
+
+static void tile_net_schedule_tx_wake_timer(struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        hrtimer_start(&info->tx_wake[priv->echannel].timer,
+                      ktime_set(0, TX_TIMER_DELAY_USEC * 1000UL),
+                      HRTIMER_MODE_REL_PINNED);
+}
+
+static enum hrtimer_restart tile_net_handle_tx_wake_timer(struct hrtimer *t)
+{
+        struct tile_net_tx_wake *tx_wake =
+                container_of(t, struct tile_net_tx_wake, timer);
+        netif_wake_subqueue(tx_wake->dev, smp_processor_id());
+        return HRTIMER_NORESTART;
+}
+
+/* Make sure the egress timer is scheduled. */
+static void tile_net_schedule_egress_timer(void)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+
+        if (!info->egress_timer_scheduled) {
+                hrtimer_start(&info->egress_timer,
+                              ktime_set(0, EGRESS_TIMER_DELAY_USEC * 1000UL),
+                              HRTIMER_MODE_REL_PINNED);
+                info->egress_timer_scheduled = true;
+        }
+}
+
+/* The "function" for "info->egress_timer".
+ *
+ * This timer will reschedule itself as long as there are any pending
+ * completions expected for this tile.
+ */
+static enum hrtimer_restart tile_net_handle_egress_timer(struct hrtimer *t)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        unsigned long irqflags;
+        bool pending = false;
+        int i;
+
+        local_irq_save(irqflags);
+
+        /* The timer is no longer scheduled. */
+        info->egress_timer_scheduled = false;
+
+        /* Free all possible comps for this tile. */
+        for (i = 0; i < TILE_NET_CHANNELS; i++) {
+                struct tile_net_egress *egress = &egress_for_echannel[i];
+                struct tile_net_comps *comps = info->comps_for_echannel[i];
+                if (comps->comp_last >= comps->comp_next)
+                        continue;
+                tile_net_free_comps(egress->equeue, comps, -1, true);
+                pending = pending || (comps->comp_last < comps->comp_next);
+        }
+
+        /* Reschedule timer if needed. */
+        if (pending)
+                tile_net_schedule_egress_timer();
+
+        local_irq_restore(irqflags);
+
+        return HRTIMER_NORESTART;
+}
+
+/* Helper function for "tile_net_update()".
+ * "dev" (i.e. arg) is the device being brought up or down,
+ * or NULL if all devices are now down.
+ */
+static void tile_net_update_cpu(void *arg)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct net_device *dev = arg;
+
+        if (!info->has_iqueue)
+                return;
+
+        if (dev != NULL) {
+                if (!info->napi_added) {
+                        netif_napi_add(dev, &info->napi,
+                                       tile_net_poll, TILE_NET_WEIGHT);
+                        info->napi_added = true;
+                }
+                if (!info->napi_enabled) {
+                        napi_enable(&info->napi);
+                        info->napi_enabled = true;
+                }
+                enable_percpu_irq(ingress_irq, 0);
+        } else {
+                disable_percpu_irq(ingress_irq);
+                if (info->napi_enabled) {
+                        napi_disable(&info->napi);
+                        info->napi_enabled = false;
+                }
+                /* FIXME: Drain the iqueue. */
+        }
+}
+
+/* Helper function for tile_net_open() and tile_net_stop().
+ * Always called under tile_net_devs_for_channel_mutex.
+ */
+static int tile_net_update(struct net_device *dev)
+{
+        static gxio_mpipe_rules_t rules;  /* too big to fit on the stack */
+        bool saw_channel = false;
+        int channel;
+        int rc;
+        int cpu;
+
+        gxio_mpipe_rules_init(&rules, &context);
+
+        for (channel = 0; channel < TILE_NET_CHANNELS; channel++) {
+                if (tile_net_devs_for_channel[channel] == NULL)
+                        continue;
+                if (!saw_channel) {
+                        saw_channel = true;
+                        gxio_mpipe_rules_begin(&rules, first_bucket,
+                                               num_buckets, NULL);
+                        gxio_mpipe_rules_set_headroom(&rules, NET_IP_ALIGN);
+                }
+                gxio_mpipe_rules_add_channel(&rules, channel);
+        }
+
+        /* NOTE: This can fail if there is no classifier.
+         * ISSUE: Can anything else cause it to fail?
+         */
+        rc = gxio_mpipe_rules_commit(&rules);
+        if (rc != 0) {
+                netdev_warn(dev, "gxio_mpipe_rules_commit failed: %d\n", rc);
+                return -EIO;
+        }
+
+        /* Update all cpus, sequentially (to protect "netif_napi_add()"). */
+        for_each_online_cpu(cpu)
+                smp_call_function_single(cpu, tile_net_update_cpu,
+                                         (saw_channel ? dev : NULL), 1);
+
+        /* HACK: Allow packets to flow in the simulator. */
+        if (saw_channel)
+                sim_enable_mpipe_links(0, -1);
+
+        return 0;
+}
+
+/* Allocate and initialize mpipe buffer stacks, and register them in
+ * the mPIPE TLBs, for both small and large packet sizes.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int init_buffer_stacks(struct net_device *dev, int num_buffers)
+{
+        pte_t hash_pte = pte_set_home((pte_t) { 0 }, PAGE_HOME_HASH);
+        int rc;
+
+        /* Compute stack bytes; we round up to 64KB and then use
+         * alloc_pages() so we get the required 64KB alignment as well.
+         */
+        buffer_stack_size =
+                ALIGN(gxio_mpipe_calc_buffer_stack_bytes(num_buffers),
+                      64 * 1024);
+
+        /* Allocate two buffer stack indices. */
+        rc = gxio_mpipe_alloc_buffer_stacks(&context, 2, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_buffer_stacks failed: %d\n",
+                           rc);
+                return rc;
+        }
+        small_buffer_stack = rc;
+        large_buffer_stack = rc + 1;
+
+        /* Allocate the small memory stack. */
+        small_buffer_stack_va =
+                alloc_pages_exact(buffer_stack_size, GFP_KERNEL);
+        if (small_buffer_stack_va == NULL) {
+                netdev_err(dev,
+                           "Could not alloc %zd bytes for buffer stacks\n",
+                           buffer_stack_size);
+                return -ENOMEM;
+        }
+        rc = gxio_mpipe_init_buffer_stack(&context, small_buffer_stack,
+                                          BUFFER_SIZE_SMALL_ENUM,
+                                          small_buffer_stack_va,
+                                          buffer_stack_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init_buffer_stack: %d\n", rc);
+                return rc;
+        }
+        rc = gxio_mpipe_register_client_memory(&context, small_buffer_stack,
+                                               hash_pte, 0);
+        if (rc != 0) {
+                netdev_err(dev,
+                           "gxio_mpipe_register_buffer_memory failed: %d\n",
+                           rc);
+                return rc;
+        }
+
+        /* Allocate the large buffer stack. */
+        large_buffer_stack_va =
+                alloc_pages_exact(buffer_stack_size, GFP_KERNEL);
+        if (large_buffer_stack_va == NULL) {
+                netdev_err(dev,
+                           "Could not alloc %zd bytes for buffer stacks\n",
+                           buffer_stack_size);
+                return -ENOMEM;
+        }
+        rc = gxio_mpipe_init_buffer_stack(&context, large_buffer_stack,
+                                          BUFFER_SIZE_LARGE_ENUM,
+                                          large_buffer_stack_va,
+                                          buffer_stack_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init_buffer_stack failed: %d\n",
+                           rc);
+                return rc;
+        }
+        rc = gxio_mpipe_register_client_memory(&context, large_buffer_stack,
+                                               hash_pte, 0);
+        if (rc != 0) {
+                netdev_err(dev,
+                           "gxio_mpipe_register_buffer_memory failed: %d\n",
+                           rc);
+                return rc;
+        }
+
+        return 0;
+}
+
+/* Allocate per-cpu resources (memory for completions and idescs).
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int alloc_percpu_mpipe_resources(struct net_device *dev,
+                                        int cpu, int ring)
+{
+        struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+        int order, i, rc;
+        struct page *page;
+        void *addr;
+
+        /* Allocate the "comps". */
+        order = get_order(COMPS_SIZE);
+        page = homecache_alloc_pages(GFP_KERNEL, order, cpu);
+        if (page == NULL) {
+                netdev_err(dev, "Failed to alloc %zd bytes comps memory\n",
+                           COMPS_SIZE);
+                return -ENOMEM;
+        }
+        addr = pfn_to_kaddr(page_to_pfn(page));
+        memset(addr, 0, COMPS_SIZE);
+        for (i = 0; i < TILE_NET_CHANNELS; i++)
+                info->comps_for_echannel[i] =
+                        addr + i * sizeof(struct tile_net_comps);
+
+        /* If this is a network cpu, create an iqueue. */
+        if (cpu_isset(cpu, network_cpus_map)) {
+                order = get_order(NOTIF_RING_SIZE);
+                page = homecache_alloc_pages(GFP_KERNEL, order, cpu);
+                if (page == NULL) {
+                        netdev_err(dev,
+                                   "Failed to alloc %zd bytes iqueue memory\n",
+                                   NOTIF_RING_SIZE);
+                        return -ENOMEM;
+                }
+                addr = pfn_to_kaddr(page_to_pfn(page));
+                rc = gxio_mpipe_iqueue_init(&info->iqueue, &context, ring++,
+                                            addr, NOTIF_RING_SIZE, 0);
+                if (rc < 0) {
+                        netdev_err(dev,
+                                   "gxio_mpipe_iqueue_init failed: %d\n", rc);
+                        return rc;
+                }
+                info->has_iqueue = true;
+        }
+
+        return ring;
+}
+
+/* Initialize NotifGroup and buckets.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int init_notif_group_and_buckets(struct net_device *dev,
+                                        int ring, int network_cpus_count)
+{
+        int group, rc;
+
+        /* Allocate one NotifGroup. */
+        rc = gxio_mpipe_alloc_notif_groups(&context, 1, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_notif_groups failed: %d\n",
+                           rc);
+                return rc;
+        }
+        group = rc;
+
+        /* Initialize global num_buckets value. */
+        if (network_cpus_count > 4)
+                num_buckets = 256;
+        else if (network_cpus_count > 1)
+                num_buckets = 16;
+
+        /* Allocate some buckets, and set global first_bucket value. */
+        rc = gxio_mpipe_alloc_buckets(&context, num_buckets, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_buckets failed: %d\n", rc);
+                return rc;
+        }
+        first_bucket = rc;
+
+        /* Init group and buckets. */
+        rc = gxio_mpipe_init_notif_group_and_buckets(
+                &context, group, ring, network_cpus_count,
+                first_bucket, num_buckets,
+                GXIO_MPIPE_BUCKET_STICKY_FLOW_LOCALITY);
+        if (rc != 0) {
+                netdev_err(
+                        dev,
+                        "gxio_mpipe_init_notif_group_and_buckets failed: %d\n",
+                        rc);
+                return rc;
+        }
+
+        return 0;
+}
+
+/* Create an irq and register it, then activate the irq and request
+ * interrupts on all cores.  Note that "ingress_irq" being initialized
+ * is how we know not to call tile_net_init_mpipe() again.
+ * This routine supports tile_net_init_mpipe(), below.
+ */
+static int tile_net_setup_interrupts(struct net_device *dev)
+{
+        int cpu, rc;
+
+        rc = create_irq();
+        if (rc < 0) {
+                netdev_err(dev, "create_irq failed: %d\n", rc);
+                return rc;
+        }
+        ingress_irq = rc;
+        tile_irq_activate(ingress_irq, TILE_IRQ_PERCPU);
+        rc = request_irq(ingress_irq, tile_net_handle_ingress_irq,
+                         0, NULL, NULL);
+        if (rc != 0) {
+                netdev_err(dev, "request_irq failed: %d\n", rc);
+                destroy_irq(ingress_irq);
+                ingress_irq = -1;
+                return rc;
+        }
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                if (info->has_iqueue) {
+                        gxio_mpipe_request_notif_ring_interrupt(
+                                &context, cpu_x(cpu), cpu_y(cpu),
+                                1, ingress_irq, info->iqueue.ring);
+                }
+        }
+
+        return 0;
+}
+
+/* Undo any state set up partially by a failed call to tile_net_init_mpipe. */
+static void tile_net_init_mpipe_fail(void)
+{
+        int cpu;
+
+        /* Do cleanups that require the mpipe context first. */
+        if (small_buffer_stack >= 0)
+                tile_net_pop_all_buffers(small_buffer_stack);
+        if (large_buffer_stack >= 0)
+                tile_net_pop_all_buffers(large_buffer_stack);
+
+        /* Destroy mpipe context so the hardware no longer owns any memory. */
+        gxio_mpipe_destroy(&context);
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                free_pages((unsigned long)(info->comps_for_echannel[0]),
+                           get_order(COMPS_SIZE));
+                info->comps_for_echannel[0] = NULL;
+                free_pages((unsigned long)(info->iqueue.idescs),
+                           get_order(NOTIF_RING_SIZE));
+                info->iqueue.idescs = NULL;
+        }
+
+        if (small_buffer_stack_va)
+                free_pages_exact(small_buffer_stack_va, buffer_stack_size);
+        if (large_buffer_stack_va)
+                free_pages_exact(large_buffer_stack_va, buffer_stack_size);
+
+        small_buffer_stack_va = NULL;
+        large_buffer_stack_va = NULL;
+        large_buffer_stack = -1;
+        small_buffer_stack = -1;
+        first_bucket = -1;
+}
+
+/* The first time any tilegx network device is opened, we initialize
+ * the global mpipe state.  If this step fails, we fail to open the
+ * device, but if it succeeds, we never need to do it again, and since
+ * tile_net can't be unloaded, we never undo it.
+ *
+ * Note that some resources in this path (buffer stack indices,
+ * bindings from init_buffer_stack, etc.) are hypervisor resources
+ * that are freed implicitly by gxio_mpipe_destroy().
+ */
+static int tile_net_init_mpipe(struct net_device *dev)
+{
+        int i, num_buffers, rc;
+        int cpu;
+        int first_ring, ring;
+        int network_cpus_count = cpus_weight(network_cpus_map);
+
+        if (!hash_default) {
+                netdev_err(dev, "Networking requires hash_default!\n");
+                return -EIO;
+        }
+
+        rc = gxio_mpipe_init(&context, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_init failed: %d\n", rc);
+                return -EIO;
+        }
+
+        /* Set up the buffer stacks. */
+        num_buffers =
+                network_cpus_count * (IQUEUE_ENTRIES + TILE_NET_BATCH);
+        rc = init_buffer_stacks(dev, num_buffers);
+        if (rc != 0)
+                goto fail;
+
+        /* Provide initial buffers. */
+        rc = -ENOMEM;
+        for (i = 0; i < num_buffers; i++) {
+                if (!tile_net_provide_buffer(true)) {
+                        netdev_err(dev, "Cannot allocate initial sk_bufs!\n");
+                        goto fail;
+                }
+        }
+        for (i = 0; i < num_buffers; i++) {
+                if (!tile_net_provide_buffer(false)) {
+                        netdev_err(dev, "Cannot allocate initial sk_bufs!\n");
+                        goto fail;
+                }
+        }
+
+        /* Allocate one NotifRing for each network cpu. */
+        rc = gxio_mpipe_alloc_notif_rings(&context, network_cpus_count, 0, 0);
+        if (rc < 0) {
+                netdev_err(dev, "gxio_mpipe_alloc_notif_rings failed %d\n",
+                           rc);
+                goto fail;
+        }
+
+        /* Init NotifRings per-cpu. */
+        first_ring = rc;
+        ring = first_ring;
+        for_each_online_cpu(cpu) {
+                rc = alloc_percpu_mpipe_resources(dev, cpu, ring);
+                if (rc < 0)
+                        goto fail;
+                ring = rc;
+        }
+
+        /* Initialize NotifGroup and buckets. */
+        rc = init_notif_group_and_buckets(dev, first_ring, network_cpus_count);
+        if (rc != 0)
+                goto fail;
+
+        /* Create and enable interrupts. */
+        rc = tile_net_setup_interrupts(dev);
+        if (rc != 0)
+                goto fail;
+
+        return 0;
+
+fail:
+        tile_net_init_mpipe_fail();
+        return rc;
+}
+
+/* Create persistent egress info for a given egress channel.
+ * Note that this may be shared between, say, "gbe0" and "xgbe0".
+ * ISSUE: Defer header allocation until TSO is actually needed?
+ */
+static int tile_net_init_egress(struct net_device *dev, int echannel)
+{
+        struct page *headers_page, *edescs_page, *equeue_page;
+        gxio_mpipe_edesc_t *edescs;
+        gxio_mpipe_equeue_t *equeue;
+        unsigned char *headers;
+        int headers_order, edescs_order, equeue_order;
+        size_t edescs_size;
+        int edma;
+        int rc = -ENOMEM;
+
+        /* Only initialize once. */
+        if (egress_for_echannel[echannel].equeue != NULL)
+                return 0;
+
+        /* Allocate memory for the "headers". */
+        headers_order = get_order(EQUEUE_ENTRIES * HEADER_BYTES);
+        headers_page = alloc_pages(GFP_KERNEL, headers_order);
+        if (headers_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for TSO headers.\n",
+                            PAGE_SIZE << headers_order);
+                goto fail;
+        }
+        headers = pfn_to_kaddr(page_to_pfn(headers_page));
+
+        /* Allocate memory for the "edescs". */
+        edescs_size = EQUEUE_ENTRIES * sizeof(*edescs);
+        edescs_order = get_order(edescs_size);
+        edescs_page = alloc_pages(GFP_KERNEL, edescs_order);
+        if (edescs_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for eDMA ring.\n",
+                            edescs_size);
+                goto fail_headers;
+        }
+        edescs = pfn_to_kaddr(page_to_pfn(edescs_page));
+
+        /* Allocate memory for the "equeue". */
+        equeue_order = get_order(sizeof(*equeue));
+        equeue_page = alloc_pages(GFP_KERNEL, equeue_order);
+        if (equeue_page == NULL) {
+                netdev_warn(dev,
+                            "Could not alloc %zd bytes for equeue info.\n",
+                            PAGE_SIZE << equeue_order);
+                goto fail_edescs;
+        }
+        equeue = pfn_to_kaddr(page_to_pfn(equeue_page));
+
+        /* Allocate an edma ring.  Note that in practice this can't
+         * fail, which is good, because we will leak an edma ring if so.
+         */
+        rc = gxio_mpipe_alloc_edma_rings(&context, 1, 0, 0);
+        if (rc < 0) {
+                netdev_warn(dev, "gxio_mpipe_alloc_edma_rings failed: %d\n",
+                            rc);
+                goto fail_equeue;
+        }
+        edma = rc;
+
+        /* Initialize the equeue. */
+        rc = gxio_mpipe_equeue_init(equeue, &context, edma, echannel,
+                                    edescs, edescs_size, 0);
+        if (rc != 0) {
+                netdev_err(dev, "gxio_mpipe_equeue_init failed: %d\n", rc);
+                goto fail_equeue;
+        }
+
+        /* Done. */
+        egress_for_echannel[echannel].equeue = equeue;
+        egress_for_echannel[echannel].headers = headers;
+        return 0;
+
+fail_equeue:
+        __free_pages(equeue_page, equeue_order);
+
+fail_edescs:
+        __free_pages(edescs_page, edescs_order);
+
+fail_headers:
+        __free_pages(headers_page, headers_order);
+
+fail:
+        return rc;
+}
+
+/* Return channel number for a newly-opened link. */
+static int tile_net_link_open(struct net_device *dev, gxio_mpipe_link_t *link,
+                              const char *link_name)
+{
+        int rc = gxio_mpipe_link_open(link, &context, link_name, 0);
+        if (rc < 0) {
+                netdev_err(dev, "Failed to open '%s'\n", link_name);
+                return rc;
+        }
+        rc = gxio_mpipe_link_channel(link);
+        if (rc < 0 || rc >= TILE_NET_CHANNELS) {
+                netdev_err(dev, "gxio_mpipe_link_channel bad value: %d\n", rc);
+                gxio_mpipe_link_close(link);
+                return -EINVAL;
+        }
+        return rc;
+}
+
+/* Help the kernel activate the given network interface. */
+static int tile_net_open(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int cpu, rc;
+
+        mutex_lock(&tile_net_devs_for_channel_mutex);
+
+        /* Do one-time initialization the first time any device is opened. */
+        if (ingress_irq < 0) {
+                rc = tile_net_init_mpipe(dev);
+                if (rc != 0)
+                        goto fail;
+        }
+
+        /* Determine if this is the "loopify" device. */
+        if (unlikely((loopify_link_name != NULL) &&
+                     !strcmp(dev->name, loopify_link_name))) {
+                rc = tile_net_link_open(dev, &priv->link, "loop0");
+                if (rc < 0)
+                        goto fail;
+                priv->channel = rc;
+                rc = tile_net_link_open(dev, &priv->loopify_link, "loop1");
+                if (rc < 0)
+                        goto fail;
+                priv->loopify_channel = rc;
+                priv->echannel = rc;
+        } else {
+                rc = tile_net_link_open(dev, &priv->link, dev->name);
+                if (rc < 0)
+                        goto fail;
+                priv->channel = rc;
+                priv->echannel = rc;
+        }
+
+        /* Initialize egress info (if needed).  Once ever, per echannel. */
+        rc = tile_net_init_egress(dev, priv->echannel);
+        if (rc != 0)
+                goto fail;
+
+        tile_net_devs_for_channel[priv->channel] = dev;
+
+        rc = tile_net_update(dev);
+        if (rc != 0)
+                goto fail;
+
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        /* Initialize the transmit wake timer for this device for each cpu. */
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                struct tile_net_tx_wake *tx_wake =
+                        &info->tx_wake[priv->echannel];
+
+                hrtimer_init(&tx_wake->timer, CLOCK_MONOTONIC,
+                             HRTIMER_MODE_REL);
+                tx_wake->timer.function = tile_net_handle_tx_wake_timer;
+                tx_wake->dev = dev;
+        }
+
+        for_each_online_cpu(cpu)
+                netif_start_subqueue(dev, cpu);
+        netif_carrier_on(dev);
+        return 0;
+
+fail:
+        if (priv->loopify_channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->loopify_link) != 0)
+                        netdev_warn(dev, "Failed to close loopify link!\n");
+                priv->loopify_channel = -1;
+        }
+        if (priv->channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->link) != 0)
+                        netdev_warn(dev, "Failed to close link!\n");
+                priv->channel = -1;
+        }
+        priv->echannel = -1;
+        tile_net_devs_for_channel[priv->channel] = NULL;
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        /* Don't return raw gxio error codes to generic Linux. */
+        return (rc > -512) ? rc : -EIO;
+}
+
+/* Help the kernel deactivate the given network interface. */
+static int tile_net_stop(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int cpu;
+
+        for_each_online_cpu(cpu) {
+                struct tile_net_info *info = &per_cpu(per_cpu_info, cpu);
+                struct tile_net_tx_wake *tx_wake =
+                        &info->tx_wake[priv->echannel];
+
+                hrtimer_cancel(&tx_wake->timer);
+                netif_stop_subqueue(dev, cpu);
+        }
+
+        mutex_lock(&tile_net_devs_for_channel_mutex);
+        tile_net_devs_for_channel[priv->channel] = NULL;
+        (void)tile_net_update(dev);
+        if (priv->loopify_channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->loopify_link) != 0)
+                        netdev_warn(dev, "Failed to close loopify link!\n");
+                priv->loopify_channel = -1;
+        }
+        if (priv->channel >= 0) {
+                if (gxio_mpipe_link_close(&priv->link) != 0)
+                        netdev_warn(dev, "Failed to close link!\n");
+                priv->channel = -1;
+        }
+        priv->echannel = -1;
+        mutex_unlock(&tile_net_devs_for_channel_mutex);
+
+        return 0;
+}
+
+/* Determine the VA for a fragment. */
+static inline void *tile_net_frag_buf(skb_frag_t *f)
+{
+        unsigned long pfn = page_to_pfn(skb_frag_page(f));
+        return pfn_to_kaddr(pfn) + f->page_offset;
+}
+
+/* Acquire a completion entry and an egress slot, or if we can't,
+ * stop the queue and schedule the tx_wake timer.
+ */
+static s64 tile_net_equeue_try_reserve(struct net_device *dev,
+                                       struct tile_net_comps *comps,
+                                       gxio_mpipe_equeue_t *equeue,
+                                       int num_edescs)
+{
+        /* Try to acquire a completion entry. */
+        if (comps->comp_next - comps->comp_last < TILE_NET_MAX_COMPS - 1 ||
+            tile_net_free_comps(equeue, comps, 32, false) != 0) {
+
+                /* Try to acquire an egress slot. */
+                s64 slot = gxio_mpipe_equeue_try_reserve(equeue, num_edescs);
+                if (slot >= 0)
+                        return slot;
+
+                /* Freeing some completions gives the equeue time to drain. */
+                tile_net_free_comps(equeue, comps, TILE_NET_MAX_COMPS, false);
+
+                slot = gxio_mpipe_equeue_try_reserve(equeue, num_edescs);
+                if (slot >= 0)
+                        return slot;
+        }
+
+        /* Still nothing; give up and stop the queue for a short while. */
+        netif_stop_subqueue(dev, smp_processor_id());
+        tile_net_schedule_tx_wake_timer(dev);
+        return -1;
+}
+
+/* Determine how many edesc's are needed for TSO.
+ *
+ * Sometimes, if "sendfile()" requires copying, we will be called with
+ * "data" containing the header and payload, with "frags" being empty.
+ * Sometimes, for example when using NFS over TCP, a single segment can
+ * span 3 fragments.  This requires special care.
+ */
+static int tso_count_edescs(struct sk_buff *skb)
+{
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        unsigned int data_len = skb->data_len;
+        unsigned int p_len = sh->gso_size;
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        int num_edescs = 0;
+        int segment;
+
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+
+                unsigned int p_used = 0;
+
+                /* One edesc for header and for each piece of the payload. */
+                for (num_edescs++; p_used < p_len; num_edescs++) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+                }
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        return num_edescs;
+}
+
+/* Prepare modified copies of the skbuff headers.
+ * FIXME: add support for IPv6.
+ */
+static void tso_headers_prepare(struct sk_buff *skb, unsigned char *headers,
+                                s64 slot)
+{
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        struct iphdr *ih;
+        struct tcphdr *th;
+        unsigned int data_len = skb->data_len;
+        unsigned char *data = skb->data;
+        unsigned int ih_off, th_off, sh_len, p_len;
+        unsigned int isum_seed, tsum_seed, id, seq;
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        int segment;
+
+        /* Locate original headers and compute various lengths. */
+        ih = ip_hdr(skb);
+        th = tcp_hdr(skb);
+        ih_off = skb_network_offset(skb);
+        th_off = skb_transport_offset(skb);
+        sh_len = th_off + tcp_hdrlen(skb);
+        p_len = sh->gso_size;
+
+        /* Set up seed values for IP and TCP csum and initialize id and seq. */
+        isum_seed = ((0xFFFF - ih->check) +
+                     (0xFFFF - ih->tot_len) +
+                     (0xFFFF - ih->id));
+        tsum_seed = th->check + (0xFFFF ^ htons(skb->len));
+        id = ntohs(ih->id);
+        seq = ntohl(th->seq);
+
+        /* Prepare all the headers. */
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+                unsigned char *buf;
+                unsigned int p_used = 0;
+
+                /* Copy to the header memory for this segment. */
+                buf = headers + (slot % EQUEUE_ENTRIES) * HEADER_BYTES +
+                        NET_IP_ALIGN;
+                memcpy(buf, data, sh_len);
+
+                /* Update copied ip header. */
+                ih = (struct iphdr *)(buf + ih_off);
+                ih->tot_len = htons(sh_len + p_len - ih_off);
+                ih->id = htons(id);
+                ih->check = csum_long(isum_seed + ih->tot_len +
+                                      ih->id) ^ 0xffff;
+
+                /* Update copied tcp header. */
+                th = (struct tcphdr *)(buf + th_off);
+                th->seq = htonl(seq);
+                th->check = csum_long(tsum_seed + htons(sh_len + p_len));
+                if (segment != sh->gso_segs - 1) {
+                        th->fin = 0;
+                        th->psh = 0;
+                }
+
+                /* Skip past the header. */
+                slot++;
+
+                /* Skip past the payload. */
+                while (p_used < p_len) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+
+                        slot++;
+                }
+
+                id++;
+                seq += p_len;
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        /* Flush the headers so they are ready for hardware DMA. */
+        wmb();
+}
+
+/* Pass all the data to mpipe for egress. */
+static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue,
+                       struct sk_buff *skb, unsigned char *headers, s64 slot)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        struct skb_shared_info *sh = skb_shinfo(skb);
+        unsigned int data_len = skb->data_len;
+        unsigned int p_len = sh->gso_size;
+        gxio_mpipe_edesc_t edesc_head = { { 0 } };
+        gxio_mpipe_edesc_t edesc_body = { { 0 } };
+        long f_id = -1;    /* id of the current fragment */
+        long f_size = -1;  /* size of the current fragment */
+        long f_used = -1;  /* bytes used from the current fragment */
+        long n;            /* size of the current piece of payload */
+        unsigned long tx_packets = 0, tx_bytes = 0;
+        unsigned int csum_start, sh_len;
+        int segment;
+
+        /* Prepare to egress the headers: set up header edesc. */
+        csum_start = skb_checksum_start_offset(skb);
+        sh_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+        edesc_head.csum = 1;
+        edesc_head.csum_start = csum_start;
+        edesc_head.csum_dest = csum_start + skb->csum_offset;
+        edesc_head.xfer_size = sh_len;
+
+        /* This is only used to specify the TLB. */
+        edesc_head.stack_idx = large_buffer_stack;
+        edesc_body.stack_idx = large_buffer_stack;
+
+        /* Egress all the edescs. */
+        for (segment = 0; segment < sh->gso_segs; segment++) {
+                void *va;
+                unsigned char *buf;
+                unsigned int p_used = 0;
+
+                /* Egress the header. */
+                buf = headers + (slot % EQUEUE_ENTRIES) * HEADER_BYTES +
+                        NET_IP_ALIGN;
+                edesc_head.va = va_to_tile_io_addr(buf);
+                gxio_mpipe_equeue_put_at(equeue, edesc_head, slot);
+                slot++;
+
+                /* Egress the payload. */
+                while (p_used < p_len) {
+
+                        /* Advance as needed. */
+                        while (f_used >= f_size) {
+                                f_id++;
+                                f_size = sh->frags[f_id].size;
+                                f_used = 0;
+                        }
+
+                        va = tile_net_frag_buf(&sh->frags[f_id]) + f_used;
+
+                        /* Use bytes from the current fragment. */
+                        n = p_len - p_used;
+                        if (n > f_size - f_used)
+                                n = f_size - f_used;
+                        f_used += n;
+                        p_used += n;
+
+                        /* Egress a piece of the payload. */
+                        edesc_body.va = va_to_tile_io_addr(va);
+                        edesc_body.xfer_size = n;
+                        edesc_body.bound = !(p_used < p_len);
+                        gxio_mpipe_equeue_put_at(equeue, edesc_body, slot);
+                        slot++;
+                }
+
+                tx_packets++;
+                tx_bytes += sh_len + p_len;
+
+                /* The last segment may be less than gso_size. */
+                data_len -= p_len;
+                if (data_len < p_len)
+                        p_len = data_len;
+        }
+
+        /* Update stats. */
+        tile_net_stats_add(tx_packets, &priv->stats.tx_packets);
+        tile_net_stats_add(tx_bytes, &priv->stats.tx_bytes);
+}
+
+/* Do "TSO" handling for egress.
+ *
+ * Normally drivers set NETIF_F_TSO only to support hardware TSO;
+ * otherwise the stack uses scatter-gather to implement GSO in software.
+ * On our testing, enabling GSO support (via NETIF_F_SG) drops network
+ * performance down to around 7.5 Gbps on the 10G interfaces, although
+ * also dropping cpu utilization way down, to under 8%.  But
+ * implementing "TSO" in the driver brings performance back up to line
+ * rate, while dropping cpu usage even further, to less than 4%.  In
+ * practice, profiling of GSO shows that skb_segment() is what causes
+ * the performance overheads; we benefit in the driver from using
+ * preallocated memory to duplicate the TCP/IP headers.
+ */
+static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int channel = priv->echannel;
+        struct tile_net_egress *egress = &egress_for_echannel[channel];
+        struct tile_net_comps *comps = info->comps_for_echannel[channel];
+        gxio_mpipe_equeue_t *equeue = egress->equeue;
+        unsigned long irqflags;
+        int num_edescs;
+        s64 slot;
+
+        /* Determine how many mpipe edesc's are needed. */
+        num_edescs = tso_count_edescs(skb);
+
+        local_irq_save(irqflags);
+
+        /* Try to acquire a completion entry and an egress slot. */
+        slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);
+        if (slot < 0) {
+                local_irq_restore(irqflags);
+                return NETDEV_TX_BUSY;
+        }
+
+        /* Set up copies of header data properly. */
+        tso_headers_prepare(skb, egress->headers, slot);
+
+        /* Actually pass the data to the network hardware. */
+        tso_egress(dev, equeue, skb, egress->headers, slot);
+
+        /* Add a completion record. */
+        add_comp(equeue, comps, slot + num_edescs - 1, skb);
+
+        local_irq_restore(irqflags);
+
+        /* Make sure the egress timer is scheduled. */
+        tile_net_schedule_egress_timer();
+
+        return NETDEV_TX_OK;
+}
+
+/* Analyze the body and frags for a transmit request. */
+static unsigned int tile_net_tx_frags(struct frag *frags,
+                                       struct sk_buff *skb,
+                                       void *b_data, unsigned int b_len)
+{
+        unsigned int i, n = 0;
+
+        struct skb_shared_info *sh = skb_shinfo(skb);
+
+        if (b_len != 0) {
+                frags[n].buf = b_data;
+                frags[n++].length = b_len;
+        }
+
+        for (i = 0; i < sh->nr_frags; i++) {
+                skb_frag_t *f = &sh->frags[i];
+                frags[n].buf = tile_net_frag_buf(f);
+                frags[n++].length = skb_frag_size(f);
+        }
+
+        return n;
+}
+
+/* Help the kernel transmit a packet. */
+static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        struct tile_net_priv *priv = netdev_priv(dev);
+        struct tile_net_egress *egress = &egress_for_echannel[priv->echannel];
+        gxio_mpipe_equeue_t *equeue = egress->equeue;
+        struct tile_net_comps *comps =
+                info->comps_for_echannel[priv->echannel];
+        unsigned int len = skb->len;
+        unsigned char *data = skb->data;
+        unsigned int num_edescs;
+        struct frag frags[MAX_FRAGS];
+        gxio_mpipe_edesc_t edescs[MAX_FRAGS];
+        unsigned long irqflags;
+        gxio_mpipe_edesc_t edesc = { { 0 } };
+        unsigned int i;
+        s64 slot;
+
+        if (skb_is_gso(skb))
+                return tile_net_tx_tso(skb, dev);
+
+        num_edescs = tile_net_tx_frags(frags, skb, data, skb_headlen(skb));
+
+        /* This is only used to specify the TLB. */
+        edesc.stack_idx = large_buffer_stack;
+
+        /* Prepare the edescs. */
+        for (i = 0; i < num_edescs; i++) {
+                edesc.xfer_size = frags[i].length;
+                edesc.va = va_to_tile_io_addr(frags[i].buf);
+                edescs[i] = edesc;
+        }
+
+        /* Mark the final edesc. */
+        edescs[num_edescs - 1].bound = 1;
+
+        /* Add checksum info to the initial edesc, if needed. */
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                unsigned int csum_start = skb_checksum_start_offset(skb);
+                edescs[0].csum = 1;
+                edescs[0].csum_start = csum_start;
+                edescs[0].csum_dest = csum_start + skb->csum_offset;
+        }
+
+        local_irq_save(irqflags);
+
+        /* Try to acquire a completion entry and an egress slot. */
+        slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);
+        if (slot < 0) {
+                local_irq_restore(irqflags);
+                return NETDEV_TX_BUSY;
+        }
+
+        for (i = 0; i < num_edescs; i++)
+                gxio_mpipe_equeue_put_at(equeue, edescs[i], slot++);
+
+        /* Add a completion record. */
+        add_comp(equeue, comps, slot - 1, skb);
+
+        /* NOTE: Use ETH_ZLEN for short packets (e.g. 42 < 60). */
+        tile_net_stats_add(1, &priv->stats.tx_packets);
+        tile_net_stats_add(max_t(unsigned int, len, ETH_ZLEN),
+                           &priv->stats.tx_bytes);
+
+        local_irq_restore(irqflags);
+
+        /* Make sure the egress timer is scheduled. */
+        tile_net_schedule_egress_timer();
+
+        return NETDEV_TX_OK;
+}
+
+/* Return subqueue id on this core (one per core). */
+static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        return smp_processor_id();
+}
+
+/* Deal with a transmit timeout. */
+static void tile_net_tx_timeout(struct net_device *dev)
+{
+        int cpu;
+
+        for_each_online_cpu(cpu)
+                netif_wake_subqueue(dev, cpu);
+}
+
+/* Ioctl commands. */
+static int tile_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+        return -EOPNOTSUPP;
+}
+
+/* Get system network statistics for device. */
+static struct net_device_stats *tile_net_get_stats(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        return &priv->stats;
+}
+
+/* Change the MTU. */
+static int tile_net_change_mtu(struct net_device *dev, int new_mtu)
+{
+        if ((new_mtu < 68) || (new_mtu > 1500))
+                return -EINVAL;
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+/* Change the Ethernet address of the NIC.
+ *
+ * The hypervisor driver does not support changing MAC address.  However,
+ * the hardware does not do anything with the MAC address, so the address
+ * which gets used on outgoing packets, and which is accepted on incoming
+ * packets, is completely up to us.
+ *
+ * Returns 0 on success, negative on failure.
+ */
+static int tile_net_set_mac_address(struct net_device *dev, void *p)
+{
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        return 0;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/* Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void tile_net_netpoll(struct net_device *dev)
+{
+        disable_percpu_irq(ingress_irq);
+        tile_net_handle_ingress_irq(ingress_irq, NULL);
+        enable_percpu_irq(ingress_irq, 0);
+}
+#endif
+
+static const struct net_device_ops tile_net_ops = {
+        .ndo_open = tile_net_open,
+        .ndo_stop = tile_net_stop,
+        .ndo_start_xmit = tile_net_tx,
+        .ndo_select_queue = tile_net_select_queue,
+        .ndo_do_ioctl = tile_net_ioctl,
+        .ndo_get_stats = tile_net_get_stats,
+        .ndo_change_mtu = tile_net_change_mtu,
+        .ndo_tx_timeout = tile_net_tx_timeout,
+        .ndo_set_mac_address = tile_net_set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = tile_net_netpoll,
+#endif
+};
+
+/* The setup function.
+ *
+ * This uses ether_setup() to assign various fields in dev, including
+ * setting IFF_BROADCAST and IFF_MULTICAST, then sets some extra fields.
+ */
+static void tile_net_setup(struct net_device *dev)
+{
+        ether_setup(dev);
+        dev->netdev_ops = &tile_net_ops;
+        dev->watchdog_timeo = TILE_NET_TIMEOUT;
+        dev->features |= NETIF_F_LLTX;
+        dev->features |= NETIF_F_HW_CSUM;
+        dev->features |= NETIF_F_SG;
+        dev->features |= NETIF_F_TSO;
+        dev->mtu = 1500;
+}
+
+/* Allocate the device structure, register the device, and obtain the
+ * MAC address from the hypervisor.
+ */
+static void tile_net_dev_init(const char *name, const uint8_t *mac)
+{
+        int ret;
+        int i;
+        int nz_addr = 0;
+        struct net_device *dev;
+        struct tile_net_priv *priv;
+
+        /* HACK: Ignore "loop" links. */
+        if (strncmp(name, "loop", 4) == 0)
+                return;
+
+        /* Allocate the device structure.  Normally, "name" is a
+         * template, instantiated by register_netdev(), but not for us.
+         */
+        dev = alloc_netdev_mqs(sizeof(*priv), name, tile_net_setup,
+                               NR_CPUS, 1);
+        if (!dev) {
+                pr_err("alloc_netdev_mqs(%s) failed\n", name);
+                return;
+        }
+
+        /* Initialize "priv". */
+        priv = netdev_priv(dev);
+        memset(priv, 0, sizeof(*priv));
+        priv->dev = dev;
+        priv->channel = -1;
+        priv->loopify_channel = -1;
+        priv->echannel = -1;
+
+        /* Get the MAC address and set it in the device struct; this must
+         * be done before the device is opened.  If the MAC is all zeroes,
+         * we use a random address, since we're probably on the simulator.
+         */
+        for (i = 0; i < 6; i++)
+                nz_addr |= mac[i];
+
+        if (nz_addr) {
+                memcpy(dev->dev_addr, mac, 6);
+                dev->addr_len = 6;
+        } else {
+                random_ether_addr(dev->dev_addr);
+        }
+
+        /* Register the network device. */
+        ret = register_netdev(dev);
+        if (ret) {
+                netdev_err(dev, "register_netdev failed %d\n", ret);
+                free_netdev(dev);
+                return;
+        }
+}
+
+/* Per-cpu module initialization. */
+static void tile_net_init_module_percpu(void *unused)
+{
+        struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
+        int my_cpu = smp_processor_id();
+
+        info->has_iqueue = false;
+
+        info->my_cpu = my_cpu;
+
+        /* Initialize the egress timer. */
+        hrtimer_init(&info->egress_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        info->egress_timer.function = tile_net_handle_egress_timer;
+}
+
+/* Module initialization. */
+static int __init tile_net_init_module(void)
+{
+        int i;
+        char name[GXIO_MPIPE_LINK_NAME_LEN];
+        uint8_t mac[6];
+
+        pr_info("Tilera Network Driver\n");
+
+        mutex_init(&tile_net_devs_for_channel_mutex);
+
+        /* Initialize each CPU. */
+        on_each_cpu(tile_net_init_module_percpu, NULL, 1);
+
+        /* Find out what devices we have, and initialize them. */
+        for (i = 0; gxio_mpipe_link_enumerate_mac(i, name, mac) >= 0; i++)
+                tile_net_dev_init(name, mac);
+
+        if (!network_cpus_init())
+                network_cpus_map = *cpu_online_mask;
+
+        return 0;
+}
+
+module_init(tile_net_init_module);
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 4ffcd57b011b..2857ab078aac 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -478,6 +478,7 @@ struct netvsc_device {
         u32 nvsp_version;
 
         atomic_t num_outstanding_sends;
+        wait_queue_head_t wait_drain;
         bool start_remove;
         bool destroy;
         /*
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 8b919471472f..0c569831db5a 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -42,6 +42,7 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
         if (!net_device)
                 return NULL;
 
+        init_waitqueue_head(&net_device->wait_drain);
         net_device->start_remove = false;
         net_device->destroy = false;
         net_device->dev = device;
@@ -387,12 +388,8 @@ int netvsc_device_remove(struct hv_device *device)
         spin_unlock_irqrestore(&device->channel->inbound_lock, flags);
 
         /* Wait for all send completions */
-        while (atomic_read(&net_device->num_outstanding_sends)) {
-                dev_info(&device->device,
-                        "waiting for %d requests to complete...\n",
-                        atomic_read(&net_device->num_outstanding_sends));
-                udelay(100);
-        }
+        wait_event(net_device->wait_drain,
+                   atomic_read(&net_device->num_outstanding_sends) == 0);
 
         netvsc_disconnect_vsp(net_device);
 
@@ -486,6 +483,9 @@ static void netvsc_send_completion(struct hv_device *device,
                 num_outstanding_sends =
                         atomic_dec_return(&net_device->num_outstanding_sends);
 
+                if (net_device->destroy && num_outstanding_sends == 0)
+                        wake_up(&net_device->wait_drain);
+
                 if (netif_queue_stopped(ndev) && !net_device->start_remove &&
                         (hv_ringbuf_avail_percent(&device->channel->outbound)
                         > RING_AVAIL_PERCENT_HIWATER ||
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 5ac46f5226f3..47f8e8939266 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -41,6 +41,8 @@ MODULE_LICENSE("GPL");
 #define IP1001_APS_ON                   11      /* IP1001 APS Mode  bit */
 #define IP101A_G_APS_ON                 2       /* IP101A/G APS Mode bit */
 #define IP101A_G_IRQ_CONF_STATUS        0x11    /* Conf Info IRQ & Status Reg */
+#define IP101A_G_IRQ_PIN_USED           (1<<15) /* INTR pin used */
+#define IP101A_G_IRQ_DEFAULT            IP101A_G_IRQ_PIN_USED
 
 static int ip175c_config_init(struct phy_device *phydev)
 {
@@ -136,6 +138,11 @@ static int ip1001_config_init(struct phy_device *phydev)
         if (c < 0)
                 return c;
 
+        /* INTR pin used: speed/link/duplex will cause an interrupt */
+        c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
+        if (c < 0)
+                return c;
+
         if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
                 /* Additional delay (2ns) used to adjust RX clock phase
                  * at RGMII interface */
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 683ef1ce5519..5061608f408c 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -96,7 +96,7 @@ static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np)
 }
 /**
  * of_mdio_find_bus - Given an mii_bus node, find the mii_bus.
- * @mdio_np: Pointer to the mii_bus.
+ * @mdio_bus_np: Pointer to the mii_bus.
  *
  * Returns a pointer to the mii_bus, or NULL if none found.
  *
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 71e2b0523bc2..3ae80eccd0ef 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -35,6 +35,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/if_vlan.h>
 
 #define DRIVER_VERSION "22-Dec-2011"
 #define DRIVER_NAME "asix"
@@ -321,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         return 0;
                 }
 
-                if ((size > dev->net->mtu + ETH_HLEN) ||
+                if ((size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) ||
                     (size + offset > skb->len)) {
                         netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
                                    size);
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index add1064f755d..03c2d8d653df 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -629,11 +629,31 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         return skb->len > 0;
 }
 
+static void mcs7830_status(struct usbnet *dev, struct urb *urb)
+{
+        u8 *buf = urb->transfer_buffer;
+        bool link;
+
+        if (urb->actual_length < 16)
+                return;
+
+        link = !(buf[1] & 0x20);
+        if (netif_carrier_ok(dev->net) != link) {
+                if (link) {
+                        netif_carrier_on(dev->net);
+                        usbnet_defer_kevent(dev, EVENT_LINK_RESET);
+                } else
+                        netif_carrier_off(dev->net);
+                netdev_dbg(dev->net, "Link Status is: %d\n", link);
+        }
+}
+
 static const struct driver_info moschip_info = {
         .description    = "MOSCHIP 7830/7832/7730 usb-NET adapter",
         .bind           = mcs7830_bind,
         .rx_fixup       = mcs7830_rx_fixup,
-        .flags          = FLAG_ETHER,
+        .flags          = FLAG_ETHER | FLAG_LINK_INTR,
+        .status         = mcs7830_status,
         .in             = 1,
         .out            = 2,
 };
@@ -642,7 +662,8 @@ static const struct driver_info sitecom_info = {
         .description    = "Sitecom LN-30 usb-NET adapter",
         .bind           = mcs7830_bind,
         .rx_fixup       = mcs7830_rx_fixup,
-        .flags          = FLAG_ETHER,
+        .flags          = FLAG_ETHER | FLAG_LINK_INTR,
+        .status         = mcs7830_status,
         .in             = 1,
         .out            = 2,
 };
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 380dbea6109d..3b206786b5e7 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -547,6 +547,8 @@ static const struct usb_device_id products[] = {
         {QMI_GOBI_DEVICE(0x16d8, 0x8002)},      /* CMDTech Gobi 2000 Modem device (VU922) */
         {QMI_GOBI_DEVICE(0x05c6, 0x9205)},      /* Gobi 2000 Modem device */
         {QMI_GOBI_DEVICE(0x1199, 0x9013)},      /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
+        {QMI_GOBI_DEVICE(0x1199, 0x9015)},      /* Sierra Wireless Gobi 3000 Modem device */
+        {QMI_GOBI_DEVICE(0x1199, 0x9019)},      /* Sierra Wireless Gobi 3000 Modem device */
         { }                                     /* END */
 };
 MODULE_DEVICE_TABLE(usb, products);
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 3faef5670d1f..d75d1f56becf 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -946,7 +946,7 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
 }
 
 static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
-static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
+static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
         .rx_urb_size = 8 * 1024,
         .whitelist = {
                 .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
@@ -954,7 +954,7 @@ static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
         }
 };
 
-static const struct driver_info sierra_net_info_68A3 = {
+static const struct driver_info sierra_net_info_direct_ip = {
         .description = "Sierra Wireless USB-to-WWAN Modem",
         .flags = FLAG_WWAN | FLAG_SEND_ZLP,
         .bind = sierra_net_bind,
@@ -962,12 +962,18 @@ static const struct driver_info sierra_net_info_68A3 = {
         .status = sierra_net_status,
         .rx_fixup = sierra_net_rx_fixup,
         .tx_fixup = sierra_net_tx_fixup,
-        .data = (unsigned long)&sierra_net_info_data_68A3,
+        .data = (unsigned long)&sierra_net_info_data_direct_ip,
 };
 
 static const struct usb_device_id products[] = {
         {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
-        .driver_info = (unsigned long) &sierra_net_info_68A3},
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
+        {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
+        .driver_info = (unsigned long) &sierra_net_info_direct_ip},
 
         {}, /* last item */
 };
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9ce6995e8d08..f18149ae2588 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -42,7 +42,8 @@ module_param(gso, bool, 0444);
 #define VIRTNET_DRIVER_VERSION "1.0.0"
 
 struct virtnet_stats {
-        struct u64_stats_sync syncp;
+        struct u64_stats_sync tx_syncp;
+        struct u64_stats_sync rx_syncp;
         u64 tx_bytes;
         u64 tx_packets;
 
@@ -300,10 +301,10 @@ static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 
         hdr = skb_vnet_hdr(skb);
 
-        u64_stats_update_begin(&stats->syncp);
+        u64_stats_update_begin(&stats->rx_syncp);
         stats->rx_bytes += skb->len;
         stats->rx_packets++;
-        u64_stats_update_end(&stats->syncp);
+        u64_stats_update_end(&stats->rx_syncp);
 
         if (hdr->hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
                 pr_debug("Needs csum!\n");
@@ -565,10 +566,10 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
         while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
                 pr_debug("Sent skb %p\n", skb);
 
-                u64_stats_update_begin(&stats->syncp);
+                u64_stats_update_begin(&stats->tx_syncp);
                 stats->tx_bytes += skb->len;
                 stats->tx_packets++;
-                u64_stats_update_end(&stats->syncp);
+                u64_stats_update_end(&stats->tx_syncp);
 
                 tot_sgs += skb_vnet_hdr(skb)->num_sg;
                 dev_kfree_skb_any(skb);
@@ -703,12 +704,16 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
                 u64 tpackets, tbytes, rpackets, rbytes;
 
                 do {
-                        start = u64_stats_fetch_begin(&stats->syncp);
+                        start = u64_stats_fetch_begin(&stats->tx_syncp);
                         tpackets = stats->tx_packets;
                         tbytes   = stats->tx_bytes;
+                } while (u64_stats_fetch_retry(&stats->tx_syncp, start));
+
+                do {
+                        start = u64_stats_fetch_begin(&stats->rx_syncp);
                         rpackets = stats->rx_packets;
                         rbytes   = stats->rx_bytes;
-                } while (u64_stats_fetch_retry(&stats->syncp, start));
+                } while (u64_stats_fetch_retry(&stats->rx_syncp, start));
 
                 tot->rx_packets += rpackets;
                 tot->tx_packets += tpackets;
@@ -1231,11 +1236,6 @@ static int virtnet_freeze(struct virtio_device *vdev)
         vi->config_enable = false;
         mutex_unlock(&vi->config_lock);
 
-        virtqueue_disable_cb(vi->rvq);
-        virtqueue_disable_cb(vi->svq);
-        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
-                virtqueue_disable_cb(vi->cvq);
-
         netif_device_detach(vi->dev);
         cancel_delayed_work_sync(&vi->refill);
 
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 0ba81a66061f..fbaa30930076 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2415,6 +2415,22 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
 * Initialization routines *
 \*************************/
 
+static const struct ieee80211_iface_limit if_limits[] = {
+        { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) },
+        { .max = 4,     .types =
+#ifdef CONFIG_MAC80211_MESH
+                                 BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                                 BIT(NL80211_IFTYPE_AP) },
+};
+
+static const struct ieee80211_iface_combination if_comb = {
+        .limits = if_limits,
+        .n_limits = ARRAY_SIZE(if_limits),
+        .max_interfaces = 2048,
+        .num_different_channels = 1,
+};
+
 int __devinit
 ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
 {
@@ -2436,6 +2452,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
+        hw->wiphy->iface_combinations = &if_comb;
+        hw->wiphy->n_iface_combinations = 1;
+
         /* SW support for IBSS_RSN is provided by mac80211 */
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index ac53d901801d..dfb0441f406c 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3809,7 +3809,7 @@ static bool is_pmu_set(struct ath_hw *ah, u32 pmu_reg, int pmu_set)
         return true;
 }
 
-static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
+void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 {
         int internal_regulator =
                 ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 2505ac44f0c1..8396d150ce01 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -334,4 +334,7 @@ u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz);
 
 unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
                                            struct ath9k_channel *chan);
+
+void ar9003_hw_internal_regulator_apply(struct ath_hw *ah);
+
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
index f11d9b2677fd..1bd3a3d22101 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +19,7 @@
 #define INITVALS_9330_1P1_H
 
 static const u32 ar9331_1p1_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
@@ -27,10 +28,10 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
         {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
         {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009e04, 0x00202020, 0x00202020, 0x00202020, 0x00202020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
         {0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e14, 0x31365d5e, 0x3136605e, 0x3136605e, 0x31365d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
@@ -55,7 +56,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
         {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},
+        {0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},
         {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
@@ -63,7 +64,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = {
 };
 
 static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -155,7 +156,7 @@ static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_modes_high_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52, 0xffaa9a52},
         {0x0000a2e0, 0xffb31c84, 0xffb31c84, 0xffb31c84, 0xffb31c84},
@@ -245,7 +246,7 @@ static const u32 ar9331_modes_high_ob_db_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -377,14 +378,14 @@ static const u32 ar9331_1p1_radio_core[][2] = {
         {0x000160b4, 0x92480040},
         {0x000160c0, 0x006db6db},
         {0x000160c4, 0x0186db60},
-        {0x000160c8, 0x6db6db6c},
+        {0x000160c8, 0x6db4db6c},
         {0x000160cc, 0x6de6c300},
         {0x000160d0, 0x14500820},
         {0x00016100, 0x04cb0001},
         {0x00016104, 0xfff80015},
         {0x00016108, 0x00080010},
         {0x0001610c, 0x00170000},
-        {0x00016140, 0x10804000},
+        {0x00016140, 0x10800000},
         {0x00016144, 0x01884080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x01000015},
@@ -417,7 +418,7 @@ static const u32 ar9331_1p1_radio_core[][2] = {
 };
 
 static const u32 ar9331_1p1_soc_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
 };
 
@@ -691,7 +692,7 @@ static const u32 ar9331_1p1_baseband_core[][2] = {
 };
 
 static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a2dc, 0xffff2a52, 0xffff2a52, 0xffff2a52, 0xffff2a52},
         {0x0000a2e0, 0xffffcc84, 0xffffcc84, 0xffffcc84, 0xffffcc84},
@@ -783,7 +784,7 @@ static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
 };
 
 static const u32 ar9331_1p1_mac_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
         {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
         {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
@@ -973,26 +974,27 @@ static const u32 ar9331_1p1_mac_core[][2] = {
 
 static const u32 ar9331_common_rx_gain_1p1[][2] = {
         /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x01910190},
-        {0x0000a030, 0x01930192},
-        {0x0000a034, 0x01950194},
-        {0x0000a038, 0x038a0196},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
+        {0x00009e18, 0x05000000},
+        {0x0000a000, 0x00060005},
+        {0x0000a004, 0x00810080},
+        {0x0000a008, 0x00830082},
+        {0x0000a00c, 0x00850084},
+        {0x0000a010, 0x01820181},
+        {0x0000a014, 0x01840183},
+        {0x0000a018, 0x01880185},
+        {0x0000a01c, 0x018a0189},
+        {0x0000a020, 0x02850284},
+        {0x0000a024, 0x02890288},
+        {0x0000a028, 0x028b028a},
+        {0x0000a02c, 0x03850384},
+        {0x0000a030, 0x03890388},
+        {0x0000a034, 0x038b038a},
+        {0x0000a038, 0x038d038c},
+        {0x0000a03c, 0x03910390},
+        {0x0000a040, 0x03930392},
+        {0x0000a044, 0x03950394},
+        {0x0000a048, 0x00000396},
+        {0x0000a04c, 0x00000000},
         {0x0000a050, 0x00000000},
         {0x0000a054, 0x00000000},
         {0x0000a058, 0x00000000},
@@ -1005,15 +1007,15 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a074, 0x00000000},
         {0x0000a078, 0x00000000},
         {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x22222229},
-        {0x0000a084, 0x1d1d1d1d},
-        {0x0000a088, 0x1d1d1d1d},
-        {0x0000a08c, 0x1d1d1d1d},
-        {0x0000a090, 0x171d1d1d},
-        {0x0000a094, 0x11111717},
-        {0x0000a098, 0x00030311},
-        {0x0000a09c, 0x00000000},
-        {0x0000a0a0, 0x00000000},
+        {0x0000a080, 0x28282828},
+        {0x0000a084, 0x28282828},
+        {0x0000a088, 0x28282828},
+        {0x0000a08c, 0x28282828},
+        {0x0000a090, 0x28282828},
+        {0x0000a094, 0x24242428},
+        {0x0000a098, 0x171e1e1e},
+        {0x0000a09c, 0x02020b0b},
+        {0x0000a0a0, 0x02020202},
         {0x0000a0a4, 0x00000000},
         {0x0000a0a8, 0x00000000},
         {0x0000a0ac, 0x00000000},
@@ -1021,27 +1023,27 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a0b4, 0x00000000},
         {0x0000a0b8, 0x00000000},
         {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
+        {0x0000a0c0, 0x22072208},
+        {0x0000a0c4, 0x22052206},
+        {0x0000a0c8, 0x22032204},
+        {0x0000a0cc, 0x22012202},
+        {0x0000a0d0, 0x221f2200},
+        {0x0000a0d4, 0x221d221e},
+        {0x0000a0d8, 0x33023303},
+        {0x0000a0dc, 0x33003301},
+        {0x0000a0e0, 0x331e331f},
+        {0x0000a0e4, 0x4402331d},
+        {0x0000a0e8, 0x44004401},
+        {0x0000a0ec, 0x441e441f},
+        {0x0000a0f0, 0x55025503},
+        {0x0000a0f4, 0x55005501},
+        {0x0000a0f8, 0x551e551f},
+        {0x0000a0fc, 0x6602551d},
+        {0x0000a100, 0x66006601},
+        {0x0000a104, 0x661e661f},
+        {0x0000a108, 0x7703661d},
+        {0x0000a10c, 0x77017702},
+        {0x0000a110, 0x00007700},
         {0x0000a114, 0x00000000},
         {0x0000a118, 0x00000000},
         {0x0000a11c, 0x00000000},
@@ -1054,26 +1056,26 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a138, 0x00000000},
         {0x0000a13c, 0x00000000},
         {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
+        {0x0000a144, 0x111f1100},
+        {0x0000a148, 0x111d111e},
+        {0x0000a14c, 0x111b111c},
+        {0x0000a150, 0x22032204},
+        {0x0000a154, 0x22012202},
+        {0x0000a158, 0x221f2200},
+        {0x0000a15c, 0x221d221e},
+        {0x0000a160, 0x33013302},
+        {0x0000a164, 0x331f3300},
+        {0x0000a168, 0x4402331e},
+        {0x0000a16c, 0x44004401},
+        {0x0000a170, 0x441e441f},
+        {0x0000a174, 0x55015502},
+        {0x0000a178, 0x551f5500},
+        {0x0000a17c, 0x6602551e},
+        {0x0000a180, 0x66006601},
+        {0x0000a184, 0x661e661f},
+        {0x0000a188, 0x7703661d},
+        {0x0000a18c, 0x77017702},
+        {0x0000a190, 0x00007700},
         {0x0000a194, 0x00000000},
         {0x0000a198, 0x00000000},
         {0x0000a19c, 0x00000000},
@@ -1100,14 +1102,14 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = {
         {0x0000a1f0, 0x00000396},
         {0x0000a1f4, 0x00000396},
         {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
+        {0x0000a1fc, 0x00000296},
 };
 
 static const u32 ar9331_common_tx_gain_offset1_1[][1] = {
-        {0},
-        {3},
-        {0},
-        {0},
+        {0x00000000},
+        {0x00000003},
+        {0x00000000},
+        {0x00000000},
 };
 
 static const u32 ar9331_1p1_chansel_xtal_25M[] = {
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index abe05ec85d50..7db1890448f2 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1468,6 +1468,9 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
                 return false;
 
         ah->chip_fullsleep = false;
+
+        if (AR_SREV_9330(ah))
+                ar9003_hw_internal_regulator_apply(ah);
         ath9k_hw_init_pll(ah, chan);
         ath9k_hw_set_rfmode(ah, chan);
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index dfa78e8b6470..4de4473776ac 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -239,7 +239,7 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool ret;
+        bool ret = true;
 
         ieee80211_stop_queues(sc->hw);
 
@@ -250,11 +250,12 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
         ath9k_debug_samp_bb_mac(sc);
         ath9k_hw_disable_interrupts(ah);
 
-        ret = ath_drain_all_txq(sc, retry_tx);
-
         if (!ath_stoprecv(sc))
                 ret = false;
 
+        if (!ath_drain_all_txq(sc, retry_tx))
+                ret = false;
+
         if (!flush) {
                 if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                         ath_rx_tasklet(sc, 1, true);
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 23eaa1b26ebe..d59dd01d6cde 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -64,7 +64,8 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
 static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                            struct ath_txq *txq,
                                            struct ath_atx_tid *tid,
-                                           struct sk_buff *skb);
+                                           struct sk_buff *skb,
+                                           bool dequeue);
 
 enum {
         MCS_HT20,
@@ -811,7 +812,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                 fi = get_frame_info(skb);
                 bf = fi->bf;
                 if (!fi->bf)
-                        bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+                        bf = ath_tx_setup_buffer(sc, txq, tid, skb, true);
 
                 if (!bf)
                         continue;
@@ -1726,7 +1727,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
                 return;
         }
 
-        bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+        bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb, false);
         if (!bf)
                 return;
 
@@ -1753,7 +1754,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
 
         bf = fi->bf;
         if (!bf)
-                bf = ath_tx_setup_buffer(sc, txq, tid, skb);
+                bf = ath_tx_setup_buffer(sc, txq, tid, skb, false);
 
         if (!bf)
                 return;
@@ -1814,7 +1815,8 @@ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)
 static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                            struct ath_txq *txq,
                                            struct ath_atx_tid *tid,
-                                           struct sk_buff *skb)
+                                           struct sk_buff *skb,
+                                           bool dequeue)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_frame_info *fi = get_frame_info(skb);
@@ -1863,6 +1865,8 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
         return bf;
 
 error:
+        if (dequeue)
+                __skb_unlink(skb, &tid->buf_q);
         dev_kfree_skb_any(skb);
         return NULL;
 }
@@ -1893,7 +1897,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,
                  */
                 ath_tx_send_ampdu(sc, tid, skb, txctl);
         } else {
-                bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb);
+                bf = ath_tx_setup_buffer(sc, txctl->txq, tid, skb, false);
                 if (!bf)
                         return;
 
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 67c13af6f206..c06b6cb5c91e 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -877,6 +877,10 @@ struct b43_wl {
          * from the mac80211 subsystem. */
         u16 mac80211_initially_registered_queues;
 
+        /* Set this if we call ieee80211_register_hw() and check if we call
+         * ieee80211_unregister_hw(). */
+        bool hw_registred;
+
         /* We can only have one operating interface (802.11 core)
          * at a time. General information about this interface follows.
          */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 5a39b226b2e3..1b988f26bdf1 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2437,6 +2437,7 @@ start_ieee80211:
         err = ieee80211_register_hw(wl->hw);
         if (err)
                 goto err_one_core_detach;
+        wl->hw_registred = true;
         b43_leds_register(wl->current_dev);
         goto out;
 
@@ -3766,7 +3767,7 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan)
         if (prev_status >= B43_STAT_STARTED) {
                 err = b43_wireless_core_start(up_dev);
                 if (err) {
-                        b43err(wl, "Fatal: Coult not start device for "
+                        b43err(wl, "Fatal: Could not start device for "
                                "selected %s-GHz band\n",
                                band_to_string(chan->band));
                         b43_wireless_core_exit(up_dev);
@@ -5299,6 +5300,7 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev)
 
         hw->queues = modparam_qos ? B43_QOS_QUEUE_NUM : 1;
         wl->mac80211_initially_registered_queues = hw->queues;
+        wl->hw_registred = false;
         hw->max_rates = 2;
         SET_IEEE80211_DEV(hw, dev->dev);
         if (is_valid_ether_addr(sprom->et1mac))
@@ -5370,12 +5372,15 @@ static void b43_bcma_remove(struct bcma_device *core)
          * as the ieee80211 unreg will destroy the workqueue. */
         cancel_work_sync(&wldev->restart_work);
 
-        /* Restore the queues count before unregistering, because firmware detect
-         * might have modified it. Restoring is important, so the networking
-         * stack can properly free resources. */
-        wl->hw->queues = wl->mac80211_initially_registered_queues;
-        b43_leds_stop(wldev);
-        ieee80211_unregister_hw(wl->hw);
+        B43_WARN_ON(!wl);
+        if (wl->current_dev == wldev && wl->hw_registred) {
+                /* Restore the queues count before unregistering, because firmware detect
+                 * might have modified it. Restoring is important, so the networking
+                 * stack can properly free resources. */
+                wl->hw->queues = wl->mac80211_initially_registered_queues;
+                b43_leds_stop(wldev);
+                ieee80211_unregister_hw(wl->hw);
+        }
 
         b43_one_core_detach(wldev->dev);
 
@@ -5446,7 +5451,7 @@ static void b43_ssb_remove(struct ssb_device *sdev)
         cancel_work_sync(&wldev->restart_work);
 
         B43_WARN_ON(!wl);
-        if (wl->current_dev == wldev) {
+        if (wl->current_dev == wldev && wl->hw_registred) {
                 /* Restore the queues count before unregistering, because firmware detect
                  * might have modified it. Restoring is important, so the networking
                  * stack can properly free resources. */
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index cd9c9bc186d9..eae691e2f7dd 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2633,7 +2633,7 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl,
         if (prev_status >= B43legacy_STAT_STARTED) {
                 err = b43legacy_wireless_core_start(up_dev);
                 if (err) {
-                        b43legacyerr(wl, "Fatal: Coult not start device for "
+                        b43legacyerr(wl, "Fatal: Could not start device for "
                                "newly selected %s-PHY mode\n",
                                phymode_to_string(new_mode));
                         b43legacy_wireless_core_exit(up_dev);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index e2480d196276..8e7e6928c936 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -89,9 +89,9 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
         data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1;
         brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
 
-        /* redirect, configure ane enable io for interrupt signal */
+        /* redirect, configure and enable io for interrupt signal */
         data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
-        if (sdiodev->irq_flags | IRQF_TRIGGER_HIGH)
+        if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH)
                 data |= SDIO_SEPINT_ACT_HI;
         brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index c5a34ffe6459..a299d42da8e7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -28,6 +28,7 @@
 #include <linux/uaccess.h>
 #include <linux/firmware.h>
 #include <linux/usb.h>
+#include <linux/vmalloc.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -1239,7 +1240,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
                 return -EINVAL;
         }
 
-        devinfo->image = kmalloc(fw->size, GFP_ATOMIC); /* plus nvram */
+        devinfo->image = vmalloc(fw->size); /* plus nvram */
         if (!devinfo->image)
                 return -ENOMEM;
 
@@ -1603,7 +1604,7 @@ static struct usb_driver brcmf_usbdrvr = {
 void brcmf_usb_exit(void)
 {
         usb_deregister(&brcmf_usbdrvr);
-        kfree(g_image.data);
+        vfree(g_image.data);
         g_image.data = NULL;
         g_image.len = 0;
 }
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 9cfae0c08707..95aa8e1683ec 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1903,14 +1903,6 @@ static void ipw2100_down(struct ipw2100_priv *priv)
         netif_stop_queue(priv->net_dev);
 }
 
-/* Called by register_netdev() */
-static int ipw2100_net_init(struct net_device *dev)
-{
-        struct ipw2100_priv *priv = libipw_priv(dev);
-
-        return ipw2100_up(priv, 1);
-}
-
 static int ipw2100_wdev_init(struct net_device *dev)
 {
         struct ipw2100_priv *priv = libipw_priv(dev);
@@ -6087,7 +6079,6 @@ static const struct net_device_ops ipw2100_netdev_ops = {
         .ndo_stop               = ipw2100_close,
         .ndo_start_xmit         = libipw_xmit,
         .ndo_change_mtu         = libipw_change_mtu,
-        .ndo_init               = ipw2100_net_init,
         .ndo_tx_timeout         = ipw2100_tx_timeout,
         .ndo_set_mac_address    = ipw2100_set_address,
         .ndo_validate_addr      = eth_validate_addr,
@@ -6329,6 +6320,10 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         printk(KERN_INFO DRV_NAME
                ": Detected Intel PRO/Wireless 2100 Network Connection\n");
 
+        err = ipw2100_up(priv, 1);
+        if (err)
+                goto fail;
+
         err = ipw2100_wdev_init(dev);
         if (err)
                 goto fail;
@@ -6338,12 +6333,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
          * network device we would call ipw2100_up.  This introduced a race
          * condition with newer hotplug configurations (network was coming
          * up and making calls before the device was initialized).
-         *
-         * If we called ipw2100_up before we registered the device, then the
-         * device name wasn't registered.  So, we instead use the net_dev->init
-         * member to call a function that then just turns and calls ipw2100_up.
-         * net_dev->init is called after name allocation but before the
-         * notifier chain is called */
+         */
         err = register_netdev(dev);
         if (err) {
                 printk(KERN_WARNING DRV_NAME
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index db6c6e528022..2463c0626438 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -137,11 +137,3 @@ config IWLWIFI_EXPERIMENTAL_MFP
           even if the microcode doesn't advertise it.
 
           Say Y only if you want to experiment with MFP.
-
-config IWLWIFI_UCODE16
-        bool "support uCode 16.0"
-        depends on IWLWIFI
-        help
-          This option enables support for uCode version 16.0.
-
-          Say Y if you want to use 16.0 microcode.
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 406f297a9a56..d615eacbf050 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -18,7 +18,6 @@ iwlwifi-objs		+= iwl-notif-wait.o
 iwlwifi-objs            += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
 
 
-iwlwifi-$(CONFIG_IWLWIFI_UCODE16) += iwl-phy-db.o
 iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 7f793417c787..8133105ac645 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -79,7 +79,7 @@ static const struct iwl_base_params iwl2000_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
         .hd_v2 = true,
 };
 
@@ -97,7 +97,7 @@ static const struct iwl_base_params iwl2030_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_LONG_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
         .hd_v2 = true,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 381b02cf339c..e5e8ada4aaf6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -35,17 +35,20 @@
 #define IWL6000_UCODE_API_MAX 6
 #define IWL6050_UCODE_API_MAX 5
 #define IWL6000G2_UCODE_API_MAX 6
+#define IWL6035_UCODE_API_MAX 6
 
 /* Oldest version we won't warn about */
 #define IWL6000_UCODE_API_OK 4
 #define IWL6000G2_UCODE_API_OK 5
 #define IWL6050_UCODE_API_OK 5
 #define IWL6000G2B_UCODE_API_OK 6
+#define IWL6035_UCODE_API_OK 6
 
 /* Lowest firmware API version supported */
 #define IWL6000_UCODE_API_MIN 4
 #define IWL6050_UCODE_API_MIN 4
-#define IWL6000G2_UCODE_API_MIN 4
+#define IWL6000G2_UCODE_API_MIN 5
+#define IWL6035_UCODE_API_MIN 6
 
 /* EEPROM versions */
 #define EEPROM_6000_TX_POWER_VERSION    (4)
@@ -86,7 +89,7 @@ static const struct iwl_base_params iwl6000_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_base_params iwl6050_base_params = {
@@ -102,7 +105,7 @@ static const struct iwl_base_params iwl6050_base_params = {
         .chain_noise_scale = 1500,
         .wd_timeout = IWL_DEF_WD_TIMEOUT,
         .max_event_log_size = 1024,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_base_params iwl6000_g2_base_params = {
@@ -118,7 +121,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
         .chain_noise_scale = 1000,
         .wd_timeout = IWL_LONG_WD_TIMEOUT,
         .max_event_log_size = 512,
-        .shadow_reg_enable = true,
+        .shadow_reg_enable = false, /* TODO: fix bugs using this feature */
 };
 
 static const struct iwl_ht_params iwl6000_ht_params = {
@@ -227,9 +230,25 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
         IWL_DEVICE_6030,
 };
 
+#define IWL_DEVICE_6035                                         \
+        .fw_name_pre = IWL6030_FW_PRE,                          \
+        .ucode_api_max = IWL6035_UCODE_API_MAX,                 \
+        .ucode_api_ok = IWL6035_UCODE_API_OK,                   \
+        .ucode_api_min = IWL6035_UCODE_API_MIN,                 \
+        .device_family = IWL_DEVICE_FAMILY_6030,                \
+        .max_inst_size = IWL60_RTC_INST_SIZE,                   \
+        .max_data_size = IWL60_RTC_DATA_SIZE,                   \
+        .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
+        .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
+        .base_params = &iwl6000_g2_base_params,                 \
+        .bt_params = &iwl6000_bt_params,                        \
+        .need_temp_offset_calib = true,                         \
+        .led_mode = IWL_LED_RF_STATE,                           \
+        .adv_pm = true
+
 const struct iwl_cfg iwl6035_2agn_cfg = {
         .name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
-        IWL_DEVICE_6030,
+        IWL_DEVICE_6035,
         .ht_params = &iwl6000_ht_params,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 51e1a69ffdda..8cebd7c363fc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -884,6 +884,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||
             (priv->bt_full_concurrent != full_concurrent)) {
                 priv->bt_full_concurrent = full_concurrent;
+                priv->last_bt_traffic_load = priv->bt_traffic_load;
 
                 /* Update uCode's rate table. */
                 tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index b31584e87bc7..eb6a8eaf42fc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -772,7 +772,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                                                 ~IWL_STA_DRIVER_ACTIVE;
                                 priv->stations[i].used &=
                                                 ~IWL_STA_UCODE_INPROGRESS;
-                                spin_unlock_bh(&priv->sta_lock);
+                                continue;
                         }
                         /*
                          * Rate scaling has already been initialized, send
@@ -1267,7 +1267,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
                 key_flags |= STA_KEY_MULTICAST_MSK;
 
         sta_cmd.key.key_flags = key_flags;
-        sta_cmd.key.key_offset = WEP_INVALID_OFFSET;
+        sta_cmd.key.key_offset = keyconf->hw_key_idx;
         sta_cmd.sta.modify_mask = STA_MODIFY_KEY_MASK;
         sta_cmd.mode = STA_CONTROL_MODIFY_MSK;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 3c72bad0ae56..fac67a526a30 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -657,17 +657,17 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
         return -EINVAL;
 }
 
-static int alloc_pci_desc(struct iwl_drv *drv,
-                          struct iwl_firmware_pieces *pieces,
-                          enum iwl_ucode_type type)
+static int iwl_alloc_ucode(struct iwl_drv *drv,
+                           struct iwl_firmware_pieces *pieces,
+                           enum iwl_ucode_type type)
 {
         int i;
         for (i = 0;
              i < IWL_UCODE_SECTION_MAX && get_sec_size(pieces, type, i);
              i++)
                 if (iwl_alloc_fw_desc(drv, &(drv->fw.img[type].sec[i]),
-                                                get_sec(pieces, type, i)))
-                        return -1;
+                                      get_sec(pieces, type, i)))
+                        return -ENOMEM;
         return 0;
 }
 
@@ -825,8 +825,8 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
          * 1) unmodified from disk
          * 2) backup cache for save/restore during power-downs */
         for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
-                if (alloc_pci_desc(drv, &pieces, i))
-                        goto err_pci_alloc;
+                if (iwl_alloc_ucode(drv, &pieces, i))
+                        goto out_free_fw;
 
         /* Now that we can no longer fail, copy information */
 
@@ -861,13 +861,18 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 
         /* We have our copies now, allow OS release its copies */
         release_firmware(ucode_raw);
-        complete(&drv->request_firmware_complete);
 
         drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
 
         if (!drv->op_mode)
                 goto out_unbind;
 
+        /*
+         * Complete the firmware request last so that
+         * a driver unbind (stop) doesn't run while we
+         * are doing the start() above.
+         */
+        complete(&drv->request_firmware_complete);
         return;
 
  try_again:
@@ -877,7 +882,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
                 goto out_unbind;
         return;
 
- err_pci_alloc:
+ out_free_fw:
         IWL_ERR(drv, "failed to allocate pci memory\n");
         iwl_dealloc_ucode(drv);
         release_firmware(ucode_raw);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 50c58911e718..b8e2b223ac36 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -568,28 +568,28 @@ static int iwl_find_otp_image(struct iwl_trans *trans,
  * iwl_get_max_txpower_avg - get the highest tx power from all chains.
  *     find the highest tx power from all chains for the channel
  */
-static s8 iwl_get_max_txpower_avg(const struct iwl_cfg *cfg,
+static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
                 struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,
                 int element, s8 *max_txpower_in_half_dbm)
 {
         s8 max_txpower_avg = 0; /* (dBm) */
 
         /* Take the highest tx power from any valid chains */
-        if ((cfg->valid_tx_ant & ANT_A) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_A) &&
             (enhanced_txpower[element].chain_a_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_a_max;
-        if ((cfg->valid_tx_ant & ANT_B) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_B) &&
             (enhanced_txpower[element].chain_b_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_b_max;
-        if ((cfg->valid_tx_ant & ANT_C) &&
+        if ((priv->hw_params.valid_tx_ant & ANT_C) &&
             (enhanced_txpower[element].chain_c_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].chain_c_max;
-        if (((cfg->valid_tx_ant == ANT_AB) |
-            (cfg->valid_tx_ant == ANT_BC) |
-            (cfg->valid_tx_ant == ANT_AC)) &&
+        if (((priv->hw_params.valid_tx_ant == ANT_AB) |
+            (priv->hw_params.valid_tx_ant == ANT_BC) |
+            (priv->hw_params.valid_tx_ant == ANT_AC)) &&
             (enhanced_txpower[element].mimo2_max > max_txpower_avg))
                 max_txpower_avg =  enhanced_txpower[element].mimo2_max;
-        if ((cfg->valid_tx_ant == ANT_ABC) &&
+        if ((priv->hw_params.valid_tx_ant == ANT_ABC) &&
             (enhanced_txpower[element].mimo3_max > max_txpower_avg))
                 max_txpower_avg = enhanced_txpower[element].mimo3_max;
 
@@ -691,7 +691,7 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
                                  ((txp->delta_20_in_40 & 0xf0) >> 4),
                                  (txp->delta_20_in_40 & 0x0f));
 
-                max_txp_avg = iwl_get_max_txpower_avg(priv->cfg, txp_array, idx,
+                max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,
                                                       &max_txp_avg_halfdbm);
 
                 /*
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index ab2f4d7500a4..3ee23134c02b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -199,6 +199,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                             WIPHY_FLAG_DISABLE_BEACON_HINTS |
                             WIPHY_FLAG_IBSS_RSN;
 
+#ifdef CONFIG_PM_SLEEP
         if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
             priv->trans->ops->wowlan_suspend &&
             device_can_wakeup(priv->trans->dev)) {
@@ -217,6 +218,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                 hw->wiphy->wowlan.pattern_max_len =
                                         IWLAGN_WOWLAN_MAX_PATTERN_LEN;
         }
+#endif
 
         if (iwlwifi_mod_params.power_save)
                 hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;
@@ -249,6 +251,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         ret = ieee80211_register_hw(priv->hw);
         if (ret) {
                 IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);
+                iwl_leds_exit(priv);
                 return ret;
         }
         priv->mac80211_registered = 1;
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/iwlwifi/iwl-phy-db.c
deleted file mode 100644
index f166955340fe..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * 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 MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * 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 DAMAGE.
- *
- *****************************************************************************/
-
-#include <linux/slab.h>
-#include <linux/string.h>
-
-#include "iwl-debug.h"
-#include "iwl-dev.h"
-
-#include "iwl-phy-db.h"
-
-#define CHANNEL_NUM_SIZE        4       /* num of channels in calib_ch size */
-
-struct iwl_phy_db *iwl_phy_db_init(struct device *dev)
-{
-        struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
-                                            GFP_KERNEL);
-
-        if (!phy_db)
-                return phy_db;
-
-        phy_db->dev = dev;
-
-        /* TODO: add default values of the phy db. */
-        return phy_db;
-}
-
-/*
- * get phy db section: returns a pointer to a phy db section specified by
- * type and channel group id.
- */
-static struct iwl_phy_db_entry *
-iwl_phy_db_get_section(struct iwl_phy_db *phy_db,
-                       enum iwl_phy_db_section_type type,
-                       u16 chg_id)
-{
-        if (!phy_db || type < 0 || type >= IWL_PHY_DB_MAX)
-                return NULL;
-
-        switch (type) {
-        case IWL_PHY_DB_CFG:
-                return &phy_db->cfg;
-        case IWL_PHY_DB_CALIB_NCH:
-                return &phy_db->calib_nch;
-        case IWL_PHY_DB_CALIB_CH:
-                return &phy_db->calib_ch;
-        case IWL_PHY_DB_CALIB_CHG_PAPD:
-                if (chg_id < 0 || chg_id >= IWL_NUM_PAPD_CH_GROUPS)
-                        return NULL;
-                return &phy_db->calib_ch_group_papd[chg_id];
-        case IWL_PHY_DB_CALIB_CHG_TXP:
-                if (chg_id < 0 || chg_id >= IWL_NUM_TXP_CH_GROUPS)
-                        return NULL;
-                return &phy_db->calib_ch_group_txp[chg_id];
-        default:
-                return NULL;
-        }
-        return NULL;
-}
-
-static void iwl_phy_db_free_section(struct iwl_phy_db *phy_db,
-                                    enum iwl_phy_db_section_type type,
-                                    u16 chg_id)
-{
-        struct iwl_phy_db_entry *entry =
-                                iwl_phy_db_get_section(phy_db, type, chg_id);
-        if (!entry)
-                return;
-
-        kfree(entry->data);
-        entry->data = NULL;
-        entry->size = 0;
-}
-
-void iwl_phy_db_free(struct iwl_phy_db *phy_db)
-{
-        int i;
-
-        if (!phy_db)
-                return;
-
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CFG, 0);
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_NCH, 0);
-        iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CH, 0);
-        for (i = 0; i < IWL_NUM_PAPD_CH_GROUPS; i++)
-                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_PAPD, i);
-        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++)
-                iwl_phy_db_free_section(phy_db, IWL_PHY_DB_CALIB_CHG_TXP, i);
-
-        kfree(phy_db);
-}
-
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
-                           enum iwl_phy_db_section_type type, u8 *data,
-                           u16 size, gfp_t alloc_ctx)
-{
-        struct iwl_phy_db_entry *entry;
-        u16 chg_id = 0;
-
-        if (!phy_db)
-                return -EINVAL;
-
-        if (type == IWL_PHY_DB_CALIB_CHG_PAPD ||
-            type == IWL_PHY_DB_CALIB_CHG_TXP)
-                chg_id = le16_to_cpup((__le16 *)data);
-
-        entry = iwl_phy_db_get_section(phy_db, type, chg_id);
-        if (!entry)
-                return -EINVAL;
-
-        kfree(entry->data);
-        entry->data = kmemdup(data, size, alloc_ctx);
-        if (!entry->data) {
-                entry->size = 0;
-                return -ENOMEM;
-        }
-
-        entry->size = size;
-
-        if (type == IWL_PHY_DB_CALIB_CH) {
-                phy_db->channel_num = le32_to_cpup((__le32 *)data);
-                phy_db->channel_size =
-                      (size - CHANNEL_NUM_SIZE) / phy_db->channel_num;
-        }
-
-        return 0;
-}
-
-static int is_valid_channel(u16 ch_id)
-{
-        if (ch_id <= 14 ||
-            (36 <= ch_id && ch_id <= 64 && ch_id % 4 == 0) ||
-            (100 <= ch_id && ch_id <= 140 && ch_id % 4 == 0) ||
-            (145 <= ch_id && ch_id <= 165 && ch_id % 4 == 1))
-                return 1;
-        return 0;
-}
-
-static u8 ch_id_to_ch_index(u16 ch_id)
-{
-        if (WARN_ON(!is_valid_channel(ch_id)))
-                return 0xff;
-
-        if (ch_id <= 14)
-                return ch_id - 1;
-        if (ch_id <= 64)
-                return (ch_id + 20) / 4;
-        if (ch_id <= 140)
-                return (ch_id - 12) / 4;
-        return (ch_id - 13) / 4;
-}
-
-
-static u16 channel_id_to_papd(u16 ch_id)
-{
-        if (WARN_ON(!is_valid_channel(ch_id)))
-                return 0xff;
-
-        if (1 <= ch_id && ch_id <= 14)
-                return 0;
-        if (36 <= ch_id && ch_id <= 64)
-                return 1;
-        if (100 <= ch_id && ch_id <= 140)
-                return 2;
-        return 3;
-}
-
-static u16 channel_id_to_txp(struct iwl_phy_db *phy_db, u16 ch_id)
-{
-        struct iwl_phy_db_chg_txp *txp_chg;
-        int i;
-        u8 ch_index = ch_id_to_ch_index(ch_id);
-        if (ch_index == 0xff)
-                return 0xff;
-
-        for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++) {
-                txp_chg = (void *)phy_db->calib_ch_group_txp[i].data;
-                if (!txp_chg)
-                        return 0xff;
-                /*
-                 * Looking for the first channel group that its max channel is
-                 * higher then wanted channel.
-                 */
-                if (le16_to_cpu(txp_chg->max_channel_idx) >= ch_index)
-                        return i;
-        }
-        return 0xff;
-}
-
-int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
-                                enum iwl_phy_db_section_type type, u8 **data,
-                                u16 *size, u16 ch_id)
-{
-        struct iwl_phy_db_entry *entry;
-        u32 channel_num;
-        u32 channel_size;
-        u16 ch_group_id = 0;
-        u16 index;
-
-        if (!phy_db)
-                return -EINVAL;
-
-        /* find wanted channel group */
-        if (type == IWL_PHY_DB_CALIB_CHG_PAPD)
-                ch_group_id = channel_id_to_papd(ch_id);
-        else if (type == IWL_PHY_DB_CALIB_CHG_TXP)
-                ch_group_id = channel_id_to_txp(phy_db, ch_id);
-
-        entry = iwl_phy_db_get_section(phy_db, type, ch_group_id);
-        if (!entry)
-                return -EINVAL;
-
-        if (type == IWL_PHY_DB_CALIB_CH) {
-                index = ch_id_to_ch_index(ch_id);
-                channel_num = phy_db->channel_num;
-                channel_size = phy_db->channel_size;
-                if (index >= channel_num) {
-                        IWL_ERR(phy_db, "Wrong channel number %d", ch_id);
-                        return -EINVAL;
-                }
-                *data = entry->data + CHANNEL_NUM_SIZE + index * channel_size;
-                *size = channel_size;
-        } else {
-                *data = entry->data;
-                *size = entry->size;
-        }
-        return 0;
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/iwlwifi/iwl-phy-db.h
deleted file mode 100644
index c34c6a9303ab..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-phy-db.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * 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 MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * 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 DAMAGE.
- *
- *****************************************************************************/
-
-#ifndef __IWL_PHYDB_H__
-#define __IWL_PHYDB_H__
-
-#include <linux/types.h>
-
-#define IWL_NUM_PAPD_CH_GROUPS  4
-#define IWL_NUM_TXP_CH_GROUPS   8
-
-struct iwl_phy_db_entry {
-        u16     size;
-        u8      *data;
-};
-
-struct iwl_shared;
-
-/**
- * struct iwl_phy_db - stores phy configuration and calibration data.
- *
- * @cfg: phy configuration.
- * @calib_nch: non channel specific calibration data.
- * @calib_ch: channel specific calibration data.
- * @calib_ch_group_papd: calibration data related to papd channel group.
- * @calib_ch_group_txp: calibration data related to tx power chanel group.
- */
-struct iwl_phy_db {
-        struct iwl_phy_db_entry cfg;
-        struct iwl_phy_db_entry calib_nch;
-        struct iwl_phy_db_entry calib_ch;
-        struct iwl_phy_db_entry calib_ch_group_papd[IWL_NUM_PAPD_CH_GROUPS];
-        struct iwl_phy_db_entry calib_ch_group_txp[IWL_NUM_TXP_CH_GROUPS];
-
-        u32 channel_num;
-        u32 channel_size;
-
-        /* for an access to the logger */
-        struct device *dev;
-};
-
-enum iwl_phy_db_section_type {
-        IWL_PHY_DB_CFG = 1,
-        IWL_PHY_DB_CALIB_NCH,
-        IWL_PHY_DB_CALIB_CH,
-        IWL_PHY_DB_CALIB_CHG_PAPD,
-        IWL_PHY_DB_CALIB_CHG_TXP,
-        IWL_PHY_DB_MAX
-};
-
-/* for parsing of tx power channel group data that comes from the firmware*/
-struct iwl_phy_db_chg_txp {
-        __le32 space;
-        __le16 max_channel_idx;
-} __packed;
-
-struct iwl_phy_db *iwl_phy_db_init(struct device *dev);
-
-void iwl_phy_db_free(struct iwl_phy_db *phy_db);
-
-int iwl_phy_db_set_section(struct iwl_phy_db *phy_db,
-                           enum iwl_phy_db_section_type type, u8 *data,
-                           u16 size, gfp_t alloc_ctx);
-
-int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
-                                enum iwl_phy_db_section_type type, u8 **data,
-                                u16 *size, u16 ch_id);
-
-#endif /* __IWL_PHYDB_H__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index 3b1069290fa9..dfd54662e3e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -224,6 +224,7 @@
 #define SCD_TXFACT              (SCD_BASE + 0x10)
 #define SCD_ACTIVE              (SCD_BASE + 0x14)
 #define SCD_QUEUECHAIN_SEL      (SCD_BASE + 0xe8)
+#define SCD_CHAINEXT_EN         (SCD_BASE + 0x244)
 #define SCD_AGGR_SEL            (SCD_BASE + 0x248)
 #define SCD_INTERRUPT_MASK      (SCD_BASE + 0x108)
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index 6213c05a4b52..e959207c630a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -347,7 +347,7 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
 void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,
                                  int sta_id, int tid, int frame_limit, u16 ssn);
 void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-        int index, enum dma_data_direction dma_dir);
+                         enum dma_data_direction dma_dir);
 int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                          struct sk_buff_head *skbs);
 int iwl_queue_space(const struct iwl_queue *q);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index 21a8a672fbb2..a8750238ee09 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -204,33 +204,39 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
         for (i = 1; i < num_tbs; i++)
                 dma_unmap_single(trans->dev, iwl_tfd_tb_get_addr(tfd, i),
                                 iwl_tfd_tb_get_len(tfd, i), dma_dir);
+
+        tfd->num_tbs = 0;
 }
 
 /**
  * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
  * @trans - transport private data
  * @txq - tx queue
- * @index - the index of the TFD to be freed
- *@dma_dir - the direction of the DMA mapping
+ * @dma_dir - the direction of the DMA mapping
  *
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
 void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-        int index, enum dma_data_direction dma_dir)
+                         enum dma_data_direction dma_dir)
 {
         struct iwl_tfd *tfd_tmp = txq->tfds;
 
+        /* rd_ptr is bounded by n_bd and idx is bounded by n_window */
+        int rd_ptr = txq->q.read_ptr;
+        int idx = get_cmd_index(&txq->q, rd_ptr);
+
         lockdep_assert_held(&txq->lock);
 
-        iwlagn_unmap_tfd(trans, &txq->entries[index].meta,
-                         &tfd_tmp[index], dma_dir);
+        /* We have only q->n_window txq->entries, but we use q->n_bd tfds */
+        iwlagn_unmap_tfd(trans, &txq->entries[idx].meta,
+                         &tfd_tmp[rd_ptr], dma_dir);
 
         /* free SKB */
         if (txq->entries) {
                 struct sk_buff *skb;
 
-                skb = txq->entries[index].skb;
+                skb = txq->entries[idx].skb;
 
                 /* Can be called from irqs-disabled context
                  * If skb is not NULL, it means that the whole queue is being
@@ -238,7 +244,7 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
                  */
                 if (skb) {
                         iwl_op_mode_free_skb(trans->op_mode, skb);
-                        txq->entries[index].skb = NULL;
+                        txq->entries[idx].skb = NULL;
                 }
         }
 }
@@ -973,7 +979,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
                 iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
-                iwlagn_txq_free_tfd(trans, txq, txq->q.read_ptr, DMA_TO_DEVICE);
+                iwlagn_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
                 freed++;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 2e57161854b9..79c6b91417f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -435,9 +435,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
 
         spin_lock_bh(&txq->lock);
         while (q->write_ptr != q->read_ptr) {
-                /* The read_ptr needs to bound by q->n_window */
-                iwlagn_txq_free_tfd(trans, txq, get_cmd_index(q, q->read_ptr),
-                                    dma_dir);
+                iwlagn_txq_free_tfd(trans, txq, dma_dir);
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
         }
         spin_unlock_bh(&txq->lock);
@@ -1060,6 +1058,11 @@ static void iwl_tx_start(struct iwl_trans *trans)
         iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                        trans_pcie->scd_bc_tbls.dma >> 10);
 
+        /* The chain extension of the SCD doesn't work well. This feature is
+         * enabled by default by the HW, so we need to disable it manually.
+         */
+        iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
+
         /* Enable DMA channel */
         for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
                 iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index fb787df01666..a0b7cfd34685 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1555,6 +1555,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
                         hdr = (struct ieee80211_hdr *) skb->data;
                         mac80211_hwsim_monitor_ack(data2->hw, hdr->addr2);
                 }
+                txi->flags |= IEEE80211_TX_STAT_ACK;
         }
         ieee80211_tx_status_irqsafe(data2->hw, skb);
         return 0;
@@ -1721,6 +1722,24 @@ static void hwsim_exit_netlink(void)
                        "unregister family %i\n", ret);
 }
 
+static const struct ieee80211_iface_limit hwsim_if_limits[] = {
+        { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
+        { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |
+                                 BIT(NL80211_IFTYPE_P2P_CLIENT) |
+#ifdef CONFIG_MAC80211_MESH
+                                 BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
+                                 BIT(NL80211_IFTYPE_AP) |
+                                 BIT(NL80211_IFTYPE_P2P_GO) },
+};
+
+static const struct ieee80211_iface_combination hwsim_if_comb = {
+        .limits = hwsim_if_limits,
+        .n_limits = ARRAY_SIZE(hwsim_if_limits),
+        .max_interfaces = 2048,
+        .num_different_channels = 1,
+};
+
 static int __init init_mac80211_hwsim(void)
 {
         int i, err = 0;
@@ -1782,6 +1801,9 @@ static int __init init_mac80211_hwsim(void)
                 hw->wiphy->n_addresses = 2;
                 hw->wiphy->addresses = data->addresses;
 
+                hw->wiphy->iface_combinations = &hwsim_if_comb;
+                hw->wiphy->n_iface_combinations = 1;
+
                 if (fake_hw_scan) {
                         hw->wiphy->max_scan_ssids = 255;
                         hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 87671446e24b..015fec3371a0 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -948,6 +948,19 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 bss_cfg->ssid.ssid_len = params->ssid_len;
         }
 
+        switch (params->hidden_ssid) {
+        case NL80211_HIDDEN_SSID_NOT_IN_USE:
+                bss_cfg->bcast_ssid_ctl = 1;
+                break;
+        case NL80211_HIDDEN_SSID_ZERO_LEN:
+                bss_cfg->bcast_ssid_ctl = 0;
+                break;
+        case NL80211_HIDDEN_SSID_ZERO_CONTENTS:
+                /* firmware doesn't support this type of hidden SSID */
+        default:
+                return -EINVAL;
+        }
+
         if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
                 kfree(bss_cfg);
                 wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 9f674bbebe65..561452a5c818 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -122,6 +122,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)
 #define TLV_TYPE_UAP_BEACON_PERIOD  (PROPRIETARY_TLV_BASE_ID + 44)
 #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)
+#define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)
 #define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)
 #define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)
 #define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
@@ -1209,6 +1210,11 @@ struct host_cmd_tlv_ssid {
         u8 ssid[0];
 } __packed;
 
+struct host_cmd_tlv_bcast_ssid {
+        struct host_cmd_tlv tlv;
+        u8 bcast_ctl;
+} __packed;
+
 struct host_cmd_tlv_beacon_period {
         struct host_cmd_tlv tlv;
         __le16 period;
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 76dfbc42a732..8173ab66066d 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -132,6 +132,7 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         struct host_cmd_tlv_dtim_period *dtim_period;
         struct host_cmd_tlv_beacon_period *beacon_period;
         struct host_cmd_tlv_ssid *ssid;
+        struct host_cmd_tlv_bcast_ssid *bcast_ssid;
         struct host_cmd_tlv_channel_band *chan_band;
         struct host_cmd_tlv_frag_threshold *frag_threshold;
         struct host_cmd_tlv_rts_threshold *rts_threshold;
@@ -153,6 +154,14 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
                 cmd_size += sizeof(struct host_cmd_tlv) +
                             bss_cfg->ssid.ssid_len;
                 tlv += sizeof(struct host_cmd_tlv) + bss_cfg->ssid.ssid_len;
+
+                bcast_ssid = (struct host_cmd_tlv_bcast_ssid *)tlv;
+                bcast_ssid->tlv.type = cpu_to_le16(TLV_TYPE_UAP_BCAST_SSID);
+                bcast_ssid->tlv.len =
+                                cpu_to_le16(sizeof(bcast_ssid->bcast_ctl));
+                bcast_ssid->bcast_ctl = bss_cfg->bcast_ssid_ctl;
+                cmd_size += sizeof(struct host_cmd_tlv_bcast_ssid);
+                tlv += sizeof(struct host_cmd_tlv_bcast_ssid);
         }
         if (bss_cfg->channel && bss_cfg->channel <= MAX_CHANNEL_BAND_BG) {
                 chan_band = (struct host_cmd_tlv_channel_band *)tlv;
@@ -416,6 +425,7 @@ int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel)
         if (!bss_cfg)
                 return -ENOMEM;
 
+        mwifiex_set_sys_config_invalid_data(bss_cfg);
         bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
         bss_cfg->channel = channel;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index ca36cccaba31..8f754025b06e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -396,8 +396,7 @@ struct rt2x00_intf {
          * for hardware which doesn't support hardware
          * sequence counting.
          */
-        spinlock_t seqlock;
-        u16 seqno;
+        atomic_t seqno;
 };
 
 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index b49773ef72f2..dd24b2663b5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -277,7 +277,6 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
         else
                 rt2x00dev->intf_sta_count++;
 
-        spin_lock_init(&intf->seqlock);
         mutex_init(&intf->beacon_skb_mutex);
         intf->beacon = entry;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 4c662eccf53c..2fd830103415 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -207,6 +207,7 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif);
+        u16 seqno;
 
         if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
                 return;
@@ -238,15 +239,13 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
          * sequence counting per-frame, since those will override the
          * sequence counter given by mac80211.
          */
-        spin_lock(&intf->seqlock);
-
         if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
-                intf->seqno += 0x10;
-        hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-        hdr->seq_ctrl |= cpu_to_le16(intf->seqno);
-
-        spin_unlock(&intf->seqlock);
+                seqno = atomic_add_return(0x10, &intf->seqno);
+        else
+                seqno = atomic_read(&intf->seqno);
 
+        hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+        hdr->seq_ctrl |= cpu_to_le16(seqno);
 }
 
 static void rt2x00queue_create_tx_descriptor_plcp(struct rt2x00_dev *rt2x00dev,
diff --git a/drivers/net/wireless/rtl818x/rtl8187/leds.c b/drivers/net/wireless/rtl818x/rtl8187/leds.c
index 2e0de2f5f0f9..c2d5b495c179 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/leds.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/leds.c
@@ -117,7 +117,7 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
                         radio_on = true;
                 } else if (radio_on) {
                         radio_on = false;
-                        cancel_delayed_work_sync(&priv->led_on);
+                        cancel_delayed_work(&priv->led_on);
                         ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
                 }
         } else if (radio_on) {
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index 1b851f650e07..e2750a12c6f1 100644
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -260,6 +260,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         }
 
         if (wl->irq) {
+                irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
                 ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);
                 if (ret < 0) {
                         wl1251_error("request_irq() failed: %d", ret);
@@ -267,7 +268,6 @@ static int wl1251_sdio_probe(struct sdio_func *func,
                 }
 
                 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
-                disable_irq(wl->irq);
 
                 wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
                 wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 6248c354fc5c..87f6305bda2c 100644
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -281,6 +281,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         wl->use_eeprom = pdata->use_eeprom;
 
+        irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
         ret = request_irq(wl->irq, wl1251_irq, 0, DRIVER_NAME, wl);
         if (ret < 0) {
                 wl1251_error("request_irq() failed: %d", ret);
@@ -289,8 +290,6 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
 
-        disable_irq(wl->irq);
-
         ret = wl1251_init_ieee80211(wl);
         if (ret)
                 goto out_irq;
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index 509aa881d790..f3d6fa508269 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -1715,6 +1715,7 @@ out:
 
 }
 
+#ifdef CONFIG_PM
 /* Set the global behaviour of RX filters - On/Off + default action */
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
                                         enum rx_filter_action action)
@@ -1794,3 +1795,4 @@ out:
         kfree(acx);
         return ret;
 }
+#endif /* CONFIG_PM */
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index 8106b2ebfe60..e6a74869a5ff 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -1330,9 +1330,11 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);
 int wl1271_acx_fm_coex(struct wl1271 *wl);
 int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);
 int wl12xx_acx_config_hangover(struct wl1271 *wl);
+
+#ifdef CONFIG_PM
 int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
                                         enum rx_filter_action action);
 int wl1271_acx_set_rx_filter(struct wl1271 *wl, u8 index, bool enable,
                              struct wl12xx_rx_filter *filter);
-
+#endif /* CONFIG_PM */
 #endif /* __WL1271_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index 1f1d9488dfb6..d6a3c6b07827 100644
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -279,6 +279,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
         wl12xx_rearm_rx_streaming(wl, active_hlids);
 }
 
+#ifdef CONFIG_PM
 int wl1271_rx_filter_enable(struct wl1271 *wl,
                             int index, bool enable,
                             struct wl12xx_rx_filter *filter)
@@ -314,3 +315,4 @@ void wl1271_rx_filter_clear_all(struct wl1271 *wl)
                 wl1271_rx_filter_enable(wl, i, 0, NULL);
         }
 }
+#endif /* CONFIG_PM */
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 2596401308a8..f4a6fcaeffb1 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -325,8 +325,7 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb)
         unsigned int count;
         int i, copy_off;
 
-        count = DIV_ROUND_UP(
-                        offset_in_page(skb->data)+skb_headlen(skb), PAGE_SIZE);
+        count = DIV_ROUND_UP(skb_headlen(skb), PAGE_SIZE);
 
         copy_off = skb_headlen(skb) % PAGE_SIZE;
 
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index 46f4a9f9f5e4..281f18c2fb82 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -232,7 +232,7 @@ static int pn544_hci_i2c_write(struct i2c_client *client, u8 *buf, int len)
 
 static int check_crc(u8 *buf, int buflen)
 {
-        u8 len;
+        int len;
         u16 crc;
 
         len = buf[0] + 1;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 447e83472c01..77cb54a65cde 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1744,6 +1744,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
         if (target_state == PCI_POWER_ERROR)
                 return -EIO;
 
+        /* Some devices mustn't be in D3 during system sleep */
+        if (target_state == PCI_D3hot &&
+                        (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
+                return 0;
+
         pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
 
         error = pci_set_power_state(dev, target_state);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 2a7521677541..194b243a2817 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2929,6 +2929,32 @@ static void __devinit disable_igfx_irq(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
 
+/*
+ * The Intel 6 Series/C200 Series chipset's EHCI controllers on many
+ * ASUS motherboards will cause memory corruption or a system crash
+ * if they are in D3 while the system is put into S3 sleep.
+ */
+static void __devinit asus_ehci_no_d3(struct pci_dev *dev)
+{
+        const char *sys_info;
+        static const char good_Asus_board[] = "P8Z68-V";
+
+        if (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)
+                return;
+        if (dev->subsystem_vendor != PCI_VENDOR_ID_ASUSTEK)
+                return;
+        sys_info = dmi_get_system_info(DMI_BOARD_NAME);
+        if (sys_info && memcmp(sys_info, good_Asus_board,
+                        sizeof(good_Asus_board) - 1) == 0)
+                return;
+
+        dev_info(&dev->dev, "broken D3 during system sleep on ASUS\n");
+        dev->dev_flags |= PCI_DEV_FLAGS_NO_D3_DURING_SLEEP;
+        device_set_wakeup_capable(&dev->dev, false);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c26, asus_ehci_no_d3);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x1c2d, asus_ehci_no_d3);
+
 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
                           struct pci_fixup *end)
 {
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index c3b331b74fa0..0cc053af70bd 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -61,7 +61,7 @@ static LIST_HEAD(pinctrl_maps);
         list_for_each_entry(_maps_node_, &pinctrl_maps, node) \
                 for (_i_ = 0, _map_ = &_maps_node_->maps[_i_]; \
                         _i_ < _maps_node_->num_maps; \
-                        i++, _map_ = &_maps_node_->maps[_i_])
+                        _i_++, _map_ = &_maps_node_->maps[_i_])
 
 /**
  * pinctrl_provide_dummies() - indicate if pinctrl provides dummy state support
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index f6e7c670906c..dd6d93aa5334 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -27,16 +27,16 @@
 #include "core.h"
 #include "pinctrl-imx.h"
 
-#define IMX_PMX_DUMP(info, p, m, c, n)          \
-{                                               \
-        int i, j;                               \
-        printk("Format: Pin Mux Config\n");     \
-        for (i = 0; i < n; i++) {               \
-                j = p[i];                       \
-                printk("%s %d 0x%lx\n",         \
-                        info->pins[j].name,     \
-                        m[i], c[i]);            \
-        }                                       \
+#define IMX_PMX_DUMP(info, p, m, c, n)                  \
+{                                                       \
+        int i, j;                                       \
+        printk(KERN_DEBUG "Format: Pin Mux Config\n");  \
+        for (i = 0; i < n; i++) {                       \
+                j = p[i];                               \
+                printk(KERN_DEBUG "%s %d 0x%lx\n",      \
+                        info->pins[j].name,             \
+                        m[i], c[i]);                    \
+        }                                               \
 }
 
 /* The bits in CONFIG cell defined in binding doc*/
@@ -173,8 +173,10 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 
         /* create mux map */
         parent = of_get_parent(np);
-        if (!parent)
+        if (!parent) {
+                kfree(new_map);
                 return -EINVAL;
+        }
         new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
         new_map[0].data.mux.function = parent->name;
         new_map[0].data.mux.group = np->name;
@@ -193,7 +195,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
         }
 
         dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
-                new_map->data.mux.function, new_map->data.mux.group, map_num);
+                (*map)->data.mux.function, (*map)->data.mux.group, map_num);
 
         return 0;
 }
@@ -201,10 +203,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 static void imx_dt_free_map(struct pinctrl_dev *pctldev,
                                 struct pinctrl_map *map, unsigned num_maps)
 {
-        int i;
-
-        for (i = 0; i < num_maps; i++)
-                kfree(map);
+        kfree(map);
 }
 
 static struct pinctrl_ops imx_pctrl_ops = {
@@ -475,9 +474,8 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
                 grp->configs[j] = config & ~IMX_PAD_SION;
         }
 
-#ifdef DEBUG
         IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins);
-#endif
+
         return 0;
 }
 
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index 556e45a213eb..4ba4636b6a4a 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -107,8 +107,10 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
 
                 /* Compose group name */
                 group = kzalloc(length, GFP_KERNEL);
-                if (!group)
-                        return -ENOMEM;
+                if (!group) {
+                        ret = -ENOMEM;
+                        goto free;
+                }
                 snprintf(group, length, "%s.%d", np->name, reg);
                 new_map[i].data.mux.group = group;
                 i++;
@@ -118,7 +120,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
                 pconfig = kmemdup(&config, sizeof(config), GFP_KERNEL);
                 if (!pconfig) {
                         ret = -ENOMEM;
-                        goto free;
+                        goto free_group;
                 }
 
                 new_map[i].type = PIN_MAP_TYPE_CONFIGS_GROUP;
@@ -133,6 +135,9 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
 
         return 0;
 
+free_group:
+        if (!purecfg)
+                kfree(group);
 free:
         kfree(new_map);
         return ret;
@@ -511,6 +516,7 @@ int __devinit mxs_pinctrl_probe(struct platform_device *pdev,
         return 0;
 
 err:
+        platform_set_drvdata(pdev, NULL);
         iounmap(d->base);
         return ret;
 }
@@ -520,6 +526,7 @@ int __devexit mxs_pinctrl_remove(struct platform_device *pdev)
 {
         struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);
 
+        platform_set_drvdata(pdev, NULL);
         pinctrl_unregister(d->pctl);
         iounmap(d->base);
 
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index b8e01c3eaa95..3e7e47d6b385 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/pinctrl/pinconf.h>
@@ -672,7 +673,7 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
          * wakeup is anyhow controlled by the RIMSC and FIMSC registers.
          */
         if (nmk_chip->sleepmode && on) {
-                __nmk_gpio_set_slpm(nmk_chip, gpio % nmk_chip->chip.base,
+                __nmk_gpio_set_slpm(nmk_chip, gpio % NMK_GPIO_PER_CHIP,
                                     NMK_GPIO_SLPM_WAKEUP_ENABLE);
         }
 
@@ -1245,6 +1246,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
                 ret = PTR_ERR(clk);
                 goto out_unmap;
         }
+        clk_prepare(clk);
 
         nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
         if (!nmk_chip) {
@@ -1436,7 +1438,27 @@ static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function,
 
         dev_dbg(npct->dev, "enable group %s, %u pins\n", g->name, g->npins);
 
-        /* Handle this special glitch on altfunction C */
+        /*
+         * If we're setting altfunc C by setting both AFSLA and AFSLB to 1,
+         * we may pass through an undesired state. In this case we take
+         * some extra care.
+         *
+         * Safe sequence used to switch IOs between GPIO and Alternate-C mode:
+         *  - Save SLPM registers (since we have a shadow register in the
+         *    nmk_chip we're using that as backup)
+         *  - Set SLPM=0 for the IOs you want to switch and others to 1
+         *  - Configure the GPIO registers for the IOs that are being switched
+         *  - Set IOFORCE=1
+         *  - Modify the AFLSA/B registers for the IOs that are being switched
+         *  - Set IOFORCE=0
+         *  - Restore SLPM registers
+         *  - Any spurious wake up event during switch sequence to be ignored
+         *    and cleared
+         *
+         * We REALLY need to save ALL slpm registers, because the external
+         * IOFORCE will switch *all* ports to their sleepmode setting to as
+         * to avoid glitches. (Not just one port!)
+         */
         glitch = (g->altsetting == NMK_GPIO_ALT_C);
 
         if (glitch) {
@@ -1688,18 +1710,34 @@ static struct pinctrl_desc nmk_pinctrl_desc = {
         .owner = THIS_MODULE,
 };
 
+static const struct of_device_id nmk_pinctrl_match[] = {
+        {
+                .compatible = "stericsson,nmk_pinctrl",
+                .data = (void *)PINCTRL_NMK_DB8500,
+        },
+        {},
+};
+
 static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
 {
         const struct platform_device_id *platid = platform_get_device_id(pdev);
+        struct device_node *np = pdev->dev.of_node;
         struct nmk_pinctrl *npct;
+        unsigned int version = 0;
         int i;
 
         npct = devm_kzalloc(&pdev->dev, sizeof(*npct), GFP_KERNEL);
         if (!npct)
                 return -ENOMEM;
 
+        if (platid)
+                version = platid->driver_data;
+        else if (np)
+                version = (unsigned int)
+                        of_match_device(nmk_pinctrl_match, &pdev->dev)->data;
+
         /* Poke in other ASIC variants here */
-        if (platid->driver_data == PINCTRL_NMK_DB8500)
+        if (version == PINCTRL_NMK_DB8500)
                 nmk_pinctrl_db8500_init(&npct->soc);
 
         /*
@@ -1758,6 +1796,7 @@ static struct platform_driver nmk_pinctrl_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "pinctrl-nomadik",
+                .of_match_table = nmk_pinctrl_match,
         },
         .probe = nmk_pinctrl_probe,
         .id_table = nmk_pinctrl_id,
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
index ba15b1a29e52..e9f8e7d11001 100644
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@ -1184,7 +1184,7 @@ out_no_gpio_remap:
         return ret;
 }
 
-static const struct of_device_id pinmux_ids[]  = {
+static const struct of_device_id pinmux_ids[] __devinitconst = {
         { .compatible = "sirf,prima2-gpio-pinmux" },
         {}
 };
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 5ae50aadf885..b3f6b2873fdd 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * Inspired from:
  * - U300 Pinctl drivers
diff --git a/drivers/pinctrl/spear/pinctrl-spear.h b/drivers/pinctrl/spear/pinctrl-spear.h
index 9155783bb47f..d950eb78d939 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.h
+++ b/drivers/pinctrl/spear/pinctrl-spear.h
@@ -2,7 +2,7 @@
  * Driver header file for the ST Microelectronics SPEAr pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c
index fff168be7f00..d6cca8c81b92 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1310.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr1310 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -2192,7 +2192,7 @@ static void __exit spear1310_pinctrl_exit(void)
 }
 module_exit(spear1310_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr1310 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear1310_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c
index a8ab2a6f51bf..a0eb057e55bd 100644
--- a/drivers/pinctrl/spear/pinctrl-spear1340.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1340.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr1340 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -1983,7 +1983,7 @@ static void __exit spear1340_pinctrl_exit(void)
 }
 module_exit(spear1340_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr1340 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear1340_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index 9c82a35e4e78..4dfc2849b172 100644
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr300 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -702,7 +702,7 @@ static void __exit spear300_pinctrl_exit(void)
 }
 module_exit(spear300_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr300 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear300_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index 1a9707605125..96883693fb7e 100644
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr310 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -425,7 +425,7 @@ static void __exit spear310_pinctrl_exit(void)
 }
 module_exit(spear310_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr310 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, SPEAr310_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c
index de726e6c283a..020b1e0bdb3e 100644
--- a/drivers/pinctrl/spear/pinctrl-spear320.c
+++ b/drivers/pinctrl/spear/pinctrl-spear320.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr320 pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -3462,7 +3462,7 @@ static void __exit spear320_pinctrl_exit(void)
 }
 module_exit(spear320_pinctrl_exit);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ST Microelectronics SPEAr320 pinctrl driver");
 MODULE_LICENSE("GPL v2");
 MODULE_DEVICE_TABLE(of, spear320_pinctrl_of_match);
diff --git a/drivers/pinctrl/spear/pinctrl-spear3xx.c b/drivers/pinctrl/spear/pinctrl-spear3xx.c
index 91c883bc46a6..0242378f7cb8 100644
--- a/drivers/pinctrl/spear/pinctrl-spear3xx.c
+++ b/drivers/pinctrl/spear/pinctrl-spear3xx.c
@@ -2,7 +2,7 @@
  * Driver for the ST Microelectronics SPEAr3xx pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/pinctrl/spear/pinctrl-spear3xx.h b/drivers/pinctrl/spear/pinctrl-spear3xx.h
index 5d5fdd8df7b8..31f44347f17c 100644
--- a/drivers/pinctrl/spear/pinctrl-spear3xx.h
+++ b/drivers/pinctrl/spear/pinctrl-spear3xx.h
@@ -2,7 +2,7 @@
  * Header file for the ST Microelectronics SPEAr3xx pinmux
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c1a3fd8e1243..ce875dc365e5 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -523,6 +523,30 @@ static const struct dmi_system_id video_vendor_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4750"),
                 },
         },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer Extensa 5235",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5235"),
+                },
+        },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer TravelMate 5760",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5760"),
+                },
+        },
+        {
+                .callback = video_set_backlight_video_vendor,
+                .ident = "Acer Aspire 5750",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"),
+                },
+        },
         {}
 };
 
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 639db4d0aa76..2fd9d36acd15 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -5,7 +5,7 @@
  *
  * (C) 2009 - Peter Feuerer     peter (a) piie.net
  *                              http://piie.net
- *     2009 Borislav Petkov <petkovbb@gmail.com>
+ *     2009 Borislav Petkov     bp (a) alien8.de
  *
  * Inspired by and many thanks to:
  *  o acerfand   - Rachel Greenham
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 8a582bdfdc76..694a15a56230 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -87,6 +87,9 @@ static int gmux_update_status(struct backlight_device *bd)
         struct apple_gmux_data *gmux_data = bl_get_data(bd);
         u32 brightness = bd->props.brightness;
 
+        if (bd->props.state & BL_CORE_SUSPENDED)
+                return 0;
+
         /*
          * Older gmux versions require writing out lower bytes first then
          * setting the upper byte to 0 to flush the values. Newer versions
@@ -102,6 +105,7 @@ static int gmux_update_status(struct backlight_device *bd)
 }
 
 static const struct backlight_ops gmux_bl_ops = {
+        .options = BL_CORE_SUSPENDRESUME,
         .get_brightness = gmux_get_brightness,
         .update_status = gmux_update_status,
 };
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index e6c08ee8d46c..5f78aac9b163 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -21,7 +21,6 @@
 #include <linux/err.h>
 #include <linux/dmi.h>
 #include <linux/io.h>
-#include <linux/rfkill.h>
 #include <linux/power_supply.h>
 #include <linux/acpi.h>
 #include <linux/mm.h>
@@ -90,11 +89,8 @@ static struct platform_driver platform_driver = {
 
 static struct platform_device *platform_device;
 static struct backlight_device *dell_backlight_device;
-static struct rfkill *wifi_rfkill;
-static struct rfkill *bluetooth_rfkill;
-static struct rfkill *wwan_rfkill;
 
-static const struct dmi_system_id __initdata dell_device_table[] = {
+static const struct dmi_system_id dell_device_table[] __initconst = {
         {
                 .ident = "Dell laptop",
                 .matches = {
@@ -119,96 +115,94 @@ static const struct dmi_system_id __initdata dell_device_table[] = {
 };
 MODULE_DEVICE_TABLE(dmi, dell_device_table);
 
-static struct dmi_system_id __devinitdata dell_blacklist[] = {
-        /* Supported by compal-laptop */
-        {
-                .ident = "Dell Mini 9",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 910"),
-                },
-        },
+static struct dmi_system_id __devinitdata dell_quirks[] = {
         {
-                .ident = "Dell Mini 10",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro V130",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1010"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V130"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 10v",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro V131",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 1012",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro 3350",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3350"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Inspiron 11z",
+                .callback = dmi_matched,
+                .ident = "Dell Vostro 3555",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1110"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3555"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
         {
-                .ident = "Dell Mini 12",
+                .callback = dmi_matched,
+                .ident = "Dell Inspiron N311z",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1210"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron N311z"),
                 },
+                .driver_data = &quirk_dell_vostro_v130,
         },
-        {}
-};
-
-static struct dmi_system_id __devinitdata dell_quirks[] = {
         {
                 .callback = dmi_matched,
-                .ident = "Dell Vostro V130",
+                .ident = "Dell Inspiron M5110",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V130"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron M5110"),
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
         {
                 .callback = dmi_matched,
-                .ident = "Dell Vostro V131",
+                .ident = "Dell Vostro 3360",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"),
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
         {
                 .callback = dmi_matched,
-                .ident = "Dell Vostro 3555",
+                .ident = "Dell Vostro 3460",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3555"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3460"),
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
         {
                 .callback = dmi_matched,
-                .ident = "Dell Inspiron N311z",
+                .ident = "Dell Vostro 3560",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron N311z"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3560"),
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
         {
                 .callback = dmi_matched,
-                .ident = "Dell Inspiron M5110",
+                .ident = "Dell Vostro 3450",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron M5110"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Dell System Vostro 3450"),
                 },
                 .driver_data = &quirk_dell_vostro_v130,
         },
@@ -305,94 +299,6 @@ dell_send_request(struct calling_interface_buffer *buffer, int class,
         return buffer;
 }
 
-/* Derived from information in DellWirelessCtl.cpp:
-   Class 17, select 11 is radio control. It returns an array of 32-bit values.
-
-   Input byte 0 = 0: Wireless information
-
-   result[0]: return code
-   result[1]:
-     Bit 0:      Hardware switch supported
-     Bit 1:      Wifi locator supported
-     Bit 2:      Wifi is supported
-     Bit 3:      Bluetooth is supported
-     Bit 4:      WWAN is supported
-     Bit 5:      Wireless keyboard supported
-     Bits 6-7:   Reserved
-     Bit 8:      Wifi is installed
-     Bit 9:      Bluetooth is installed
-     Bit 10:     WWAN is installed
-     Bits 11-15: Reserved
-     Bit 16:     Hardware switch is on
-     Bit 17:     Wifi is blocked
-     Bit 18:     Bluetooth is blocked
-     Bit 19:     WWAN is blocked
-     Bits 20-31: Reserved
-   result[2]: NVRAM size in bytes
-   result[3]: NVRAM format version number
-
-   Input byte 0 = 2: Wireless switch configuration
-   result[0]: return code
-   result[1]:
-     Bit 0:      Wifi controlled by switch
-     Bit 1:      Bluetooth controlled by switch
-     Bit 2:      WWAN controlled by switch
-     Bits 3-6:   Reserved
-     Bit 7:      Wireless switch config locked
-     Bit 8:      Wifi locator enabled
-     Bits 9-14:  Reserved
-     Bit 15:     Wifi locator setting locked
-     Bits 16-31: Reserved
-*/
-
-static int dell_rfkill_set(void *data, bool blocked)
-{
-        int disable = blocked ? 1 : 0;
-        unsigned long radio = (unsigned long)data;
-        int hwswitch_bit = (unsigned long)data - 1;
-        int ret = 0;
-
-        get_buffer();
-        dell_send_request(buffer, 17, 11);
-
-        /* If the hardware switch controls this radio, and the hardware
-           switch is disabled, don't allow changing the software state */
-        if ((hwswitch_state & BIT(hwswitch_bit)) &&
-            !(buffer->output[1] & BIT(16))) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        buffer->input[0] = (1 | (radio<<8) | (disable << 16));
-        dell_send_request(buffer, 17, 11);
-
-out:
-        release_buffer();
-        return ret;
-}
-
-static void dell_rfkill_query(struct rfkill *rfkill, void *data)
-{
-        int status;
-        int bit = (unsigned long)data + 16;
-        int hwswitch_bit = (unsigned long)data - 1;
-
-        get_buffer();
-        dell_send_request(buffer, 17, 11);
-        status = buffer->output[1];
-        release_buffer();
-
-        rfkill_set_sw_state(rfkill, !!(status & BIT(bit)));
-
-        if (hwswitch_state & (BIT(hwswitch_bit)))
-                rfkill_set_hw_state(rfkill, !(status & BIT(16)));
-}
-
-static const struct rfkill_ops dell_rfkill_ops = {
-        .set_block = dell_rfkill_set,
-        .query = dell_rfkill_query,
-};
-
 static struct dentry *dell_laptop_dir;
 
 static int dell_debugfs_show(struct seq_file *s, void *data)
@@ -462,108 +368,6 @@ static const struct file_operations dell_debugfs_fops = {
         .release = single_release,
 };
 
-static void dell_update_rfkill(struct work_struct *ignored)
-{
-        if (wifi_rfkill)
-                dell_rfkill_query(wifi_rfkill, (void *)1);
-        if (bluetooth_rfkill)
-                dell_rfkill_query(bluetooth_rfkill, (void *)2);
-        if (wwan_rfkill)
-                dell_rfkill_query(wwan_rfkill, (void *)3);
-}
-static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);
-
-
-static int __init dell_setup_rfkill(void)
-{
-        int status;
-        int ret;
-
-        if (dmi_check_system(dell_blacklist)) {
-                pr_info("Blacklisted hardware detected - not enabling rfkill\n");
-                return 0;
-        }
-
-        get_buffer();
-        dell_send_request(buffer, 17, 11);
-        status = buffer->output[1];
-        buffer->input[0] = 0x2;
-        dell_send_request(buffer, 17, 11);
-        hwswitch_state = buffer->output[1];
-        release_buffer();
-
-        if ((status & (1<<2|1<<8)) == (1<<2|1<<8)) {
-                wifi_rfkill = rfkill_alloc("dell-wifi", &platform_device->dev,
-                                           RFKILL_TYPE_WLAN,
-                                           &dell_rfkill_ops, (void *) 1);
-                if (!wifi_rfkill) {
-                        ret = -ENOMEM;
-                        goto err_wifi;
-                }
-                ret = rfkill_register(wifi_rfkill);
-                if (ret)
-                        goto err_wifi;
-        }
-
-        if ((status & (1<<3|1<<9)) == (1<<3|1<<9)) {
-                bluetooth_rfkill = rfkill_alloc("dell-bluetooth",
-                                                &platform_device->dev,
-                                                RFKILL_TYPE_BLUETOOTH,
-                                                &dell_rfkill_ops, (void *) 2);
-                if (!bluetooth_rfkill) {
-                        ret = -ENOMEM;
-                        goto err_bluetooth;
-                }
-                ret = rfkill_register(bluetooth_rfkill);
-                if (ret)
-                        goto err_bluetooth;
-        }
-
-        if ((status & (1<<4|1<<10)) == (1<<4|1<<10)) {
-                wwan_rfkill = rfkill_alloc("dell-wwan",
-                                           &platform_device->dev,
-                                           RFKILL_TYPE_WWAN,
-                                           &dell_rfkill_ops, (void *) 3);
-                if (!wwan_rfkill) {
-                        ret = -ENOMEM;
-                        goto err_wwan;
-                }
-                ret = rfkill_register(wwan_rfkill);
-                if (ret)
-                        goto err_wwan;
-        }
-
-        return 0;
-err_wwan:
-        rfkill_destroy(wwan_rfkill);
-        if (bluetooth_rfkill)
-                rfkill_unregister(bluetooth_rfkill);
-err_bluetooth:
-        rfkill_destroy(bluetooth_rfkill);
-        if (wifi_rfkill)
-                rfkill_unregister(wifi_rfkill);
-err_wifi:
-        rfkill_destroy(wifi_rfkill);
-
-        return ret;
-}
-
-static void dell_cleanup_rfkill(void)
-{
-        if (wifi_rfkill) {
-                rfkill_unregister(wifi_rfkill);
-                rfkill_destroy(wifi_rfkill);
-        }
-        if (bluetooth_rfkill) {
-                rfkill_unregister(bluetooth_rfkill);
-                rfkill_destroy(bluetooth_rfkill);
-        }
-        if (wwan_rfkill) {
-                rfkill_unregister(wwan_rfkill);
-                rfkill_destroy(wwan_rfkill);
-        }
-}
-
 static int dell_send_intensity(struct backlight_device *bd)
 {
         int ret = 0;
@@ -655,30 +459,6 @@ static void touchpad_led_exit(void)
         led_classdev_unregister(&touchpad_led);
 }
 
-static bool dell_laptop_i8042_filter(unsigned char data, unsigned char str,
-                              struct serio *port)
-{
-        static bool extended;
-
-        if (str & 0x20)
-                return false;
-
-        if (unlikely(data == 0xe0)) {
-                extended = true;
-                return false;
-        } else if (unlikely(extended)) {
-                switch (data) {
-                case 0x8:
-                        schedule_delayed_work(&dell_rfkill_work,
-                                              round_jiffies_relative(HZ));
-                        break;
-                }
-                extended = false;
-        }
-
-        return false;
-}
-
 static int __init dell_init(void)
 {
         int max_intensity = 0;
@@ -720,26 +500,10 @@ static int __init dell_init(void)
                 goto fail_buffer;
         buffer = page_address(bufferpage);
 
-        ret = dell_setup_rfkill();
-
-        if (ret) {
-                pr_warn("Unable to setup rfkill\n");
-                goto fail_rfkill;
-        }
-
-        ret = i8042_install_filter(dell_laptop_i8042_filter);
-        if (ret) {
-                pr_warn("Unable to install key filter\n");
-                goto fail_filter;
-        }
-
         if (quirks && quirks->touchpad_led)
                 touchpad_led_init(&platform_device->dev);
 
         dell_laptop_dir = debugfs_create_dir("dell_laptop", NULL);
-        if (dell_laptop_dir != NULL)
-                debugfs_create_file("rfkill", 0444, dell_laptop_dir, NULL,
-                                    &dell_debugfs_fops);
 
 #ifdef CONFIG_ACPI
         /* In the event of an ACPI backlight being available, don't
@@ -782,11 +546,6 @@ static int __init dell_init(void)
         return 0;
 
 fail_backlight:
-        i8042_remove_filter(dell_laptop_i8042_filter);
-        cancel_delayed_work_sync(&dell_rfkill_work);
-fail_filter:
-        dell_cleanup_rfkill();
-fail_rfkill:
         free_page((unsigned long)bufferpage);
 fail_buffer:
         platform_device_del(platform_device);
@@ -804,10 +563,7 @@ static void __exit dell_exit(void)
         debugfs_remove_recursive(dell_laptop_dir);
         if (quirks && quirks->touchpad_led)
                 touchpad_led_exit();
-        i8042_remove_filter(dell_laptop_i8042_filter);
-        cancel_delayed_work_sync(&dell_rfkill_work);
         backlight_device_unregister(dell_backlight_device);
-        dell_cleanup_rfkill();
         if (platform_device) {
                 platform_device_unregister(platform_device);
                 platform_driver_unregister(&platform_driver);
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c
index 580d80a73c3a..da267eae8ba8 100644
--- a/drivers/platform/x86/fujitsu-tablet.c
+++ b/drivers/platform/x86/fujitsu-tablet.c
@@ -16,6 +16,8 @@
  * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -34,7 +36,8 @@
 #define ACPI_FUJITSU_CLASS "fujitsu"
 
 #define INVERT_TABLET_MODE_BIT      0x01
-#define FORCE_TABLET_MODE_IF_UNDOCK 0x02
+#define INVERT_DOCK_STATE_BIT       0x02
+#define FORCE_TABLET_MODE_IF_UNDOCK 0x04
 
 #define KEYMAP_LEN 16
 
@@ -161,6 +164,8 @@ static void fujitsu_send_state(void)
         state = fujitsu_read_register(0xdd);
 
         dock = state & 0x02;
+        if (fujitsu.config.quirks & INVERT_DOCK_STATE_BIT)
+                dock = !dock;
 
         if ((fujitsu.config.quirks & FORCE_TABLET_MODE_IF_UNDOCK) && (!dock)) {
                 tablet_mode = 1;
@@ -221,9 +226,6 @@ static int __devinit input_fujitsu_setup(struct device *parent,
         input_set_capability(idev, EV_SW, SW_DOCK);
         input_set_capability(idev, EV_SW, SW_TABLET_MODE);
 
-        input_set_capability(idev, EV_SW, SW_DOCK);
-        input_set_capability(idev, EV_SW, SW_TABLET_MODE);
-
         error = input_register_device(idev);
         if (error) {
                 input_free_device(idev);
@@ -275,25 +277,31 @@ static irqreturn_t fujitsu_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int __devinit fujitsu_dmi_default(const struct dmi_system_id *dmi)
+static void __devinit fujitsu_dmi_common(const struct dmi_system_id *dmi)
 {
-        printk(KERN_INFO MODULENAME ": %s\n", dmi->ident);
+        pr_info("%s\n", dmi->ident);
         memcpy(fujitsu.config.keymap, dmi->driver_data,
                         sizeof(fujitsu.config.keymap));
+}
+
+static int __devinit fujitsu_dmi_lifebook(const struct dmi_system_id *dmi)
+{
+        fujitsu_dmi_common(dmi);
+        fujitsu.config.quirks |= INVERT_TABLET_MODE_BIT;
         return 1;
 }
 
 static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
 {
-        fujitsu_dmi_default(dmi);
+        fujitsu_dmi_common(dmi);
         fujitsu.config.quirks |= FORCE_TABLET_MODE_IF_UNDOCK;
-        fujitsu.config.quirks |= INVERT_TABLET_MODE_BIT;
+        fujitsu.config.quirks |= INVERT_DOCK_STATE_BIT;
         return 1;
 }
 
 static struct dmi_system_id dmi_ids[] __initconst = {
         {
-                .callback = fujitsu_dmi_default,
+                .callback = fujitsu_dmi_lifebook,
                 .ident = "Fujitsu Siemens P/T Series",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -302,7 +310,7 @@ static struct dmi_system_id dmi_ids[] __initconst = {
                 .driver_data = keymap_Lifebook_Tseries
         },
         {
-                .callback = fujitsu_dmi_default,
+                .callback = fujitsu_dmi_lifebook,
                 .ident = "Fujitsu Lifebook T Series",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -320,7 +328,7 @@ static struct dmi_system_id dmi_ids[] __initconst = {
                 .driver_data = keymap_Stylistic_Tseries
         },
         {
-                .callback = fujitsu_dmi_default,
+                .callback = fujitsu_dmi_lifebook,
                 .ident = "Fujitsu LifeBook U810",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -347,7 +355,7 @@ static struct dmi_system_id dmi_ids[] __initconst = {
                 .driver_data = keymap_Stylistic_ST5xxx
         },
         {
-                .callback = fujitsu_dmi_default,
+                .callback = fujitsu_dmi_lifebook,
                 .ident = "Unknown (using defaults)",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, ""),
@@ -473,6 +481,6 @@ module_exit(fujitsu_module_exit);
 MODULE_AUTHOR("Robert Gerlach <khnz@gmx.de>");
 MODULE_DESCRIPTION("Fujitsu tablet pc extras driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("2.4");
+MODULE_VERSION("2.5");
 
 MODULE_DEVICE_TABLE(acpi, fujitsu_ids);
diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
index 7387f97a2941..24a3ae065f1b 100644
--- a/drivers/platform/x86/hdaps.c
+++ b/drivers/platform/x86/hdaps.c
@@ -2,7 +2,7 @@
  * hdaps.c - driver for IBM's Hard Drive Active Protection System
  *
  * Copyright (C) 2005 Robert Love <rml@novell.com>
- * Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>
+ * Copyright (C) 2005 Jesper Juhl <jj@chaosbits.net>
  *
  * The HardDisk Active Protection System (hdaps) is present in IBM ThinkPads
  * starting with the R40, T41, and X40.  It provides a basic two-axis
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index e2faa3cbb792..387183a2d6dd 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -634,6 +634,8 @@ static int __devinit hp_wmi_rfkill_setup(struct platform_device *device)
                                            RFKILL_TYPE_WLAN,
                                            &hp_wmi_rfkill_ops,
                                            (void *) HPWMI_WIFI);
+                if (!wifi_rfkill)
+                        return -ENOMEM;
                 rfkill_init_sw_state(wifi_rfkill,
                                      hp_wmi_get_sw_state(HPWMI_WIFI));
                 rfkill_set_hw_state(wifi_rfkill,
@@ -648,6 +650,10 @@ static int __devinit hp_wmi_rfkill_setup(struct platform_device *device)
                                                 RFKILL_TYPE_BLUETOOTH,
                                                 &hp_wmi_rfkill_ops,
                                                 (void *) HPWMI_BLUETOOTH);
+                if (!bluetooth_rfkill) {
+                        err = -ENOMEM;
+                        goto register_wifi_error;
+                }
                 rfkill_init_sw_state(bluetooth_rfkill,
                                      hp_wmi_get_sw_state(HPWMI_BLUETOOTH));
                 rfkill_set_hw_state(bluetooth_rfkill,
@@ -662,6 +668,10 @@ static int __devinit hp_wmi_rfkill_setup(struct platform_device *device)
                                            RFKILL_TYPE_WWAN,
                                            &hp_wmi_rfkill_ops,
                                            (void *) HPWMI_WWAN);
+                if (!wwan_rfkill) {
+                        err = -ENOMEM;
+                        goto register_bluetooth_error;
+                }
                 rfkill_init_sw_state(wwan_rfkill,
                                      hp_wmi_get_sw_state(HPWMI_WWAN));
                 rfkill_set_hw_state(wwan_rfkill,
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index ac902f7a9baa..4f20f8dd3d7c 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -194,7 +194,6 @@ static int write_ec_cmd(acpi_handle handle, int cmd, unsigned long data)
 /*
  * debugfs
  */
-#define DEBUGFS_EVENT_LEN (4096)
 static int debugfs_status_show(struct seq_file *s, void *data)
 {
         unsigned long value;
@@ -315,7 +314,7 @@ static int __devinit ideapad_debugfs_init(struct ideapad_private *priv)
         node = debugfs_create_file("status", S_IRUGO, priv->debug, NULL,
                                    &debugfs_status_fops);
         if (!node) {
-                pr_err("failed to create event in debugfs");
+                pr_err("failed to create status in debugfs");
                 goto errout;
         }
 
@@ -785,6 +784,10 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
                         case 9:
                                 ideapad_sync_rfk_state(priv);
                                 break;
+                        case 13:
+                        case 6:
+                                ideapad_input_report(priv, vpc_bit);
+                                break;
                         case 4:
                                 ideapad_backlight_notify_brightness(priv);
                                 break;
@@ -795,7 +798,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
                                 ideapad_backlight_notify_power(priv);
                                 break;
                         default:
-                                ideapad_input_report(priv, vpc_bit);
+                                pr_info("Unknown event: %lu\n", vpc_bit);
                         }
                 }
         }
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 8a51795aa02a..210d4ae547c2 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -141,6 +141,27 @@ MODULE_PARM_DESC(kbd_backlight_timeout,
                  "(default: 0)");
 
 static void sony_nc_kbd_backlight_resume(void);
+static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
+                unsigned int handle);
+static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd);
+
+static int sony_nc_battery_care_setup(struct platform_device *pd,
+                unsigned int handle);
+static void sony_nc_battery_care_cleanup(struct platform_device *pd);
+
+static int sony_nc_thermal_setup(struct platform_device *pd);
+static void sony_nc_thermal_cleanup(struct platform_device *pd);
+static void sony_nc_thermal_resume(void);
+
+static int sony_nc_lid_resume_setup(struct platform_device *pd);
+static void sony_nc_lid_resume_cleanup(struct platform_device *pd);
+
+static int sony_nc_highspeed_charging_setup(struct platform_device *pd);
+static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd);
+
+static int sony_nc_touchpad_setup(struct platform_device *pd,
+                                  unsigned int handle);
+static void sony_nc_touchpad_cleanup(struct platform_device *pd);
 
 enum sony_nc_rfkill {
         SONY_WIFI,
@@ -153,6 +174,9 @@ enum sony_nc_rfkill {
 static int sony_rfkill_handle;
 static struct rfkill *sony_rfkill_devices[N_SONY_RFKILL];
 static int sony_rfkill_address[N_SONY_RFKILL] = {0x300, 0x500, 0x700, 0x900};
+static int sony_nc_rfkill_setup(struct acpi_device *device,
+                unsigned int handle);
+static void sony_nc_rfkill_cleanup(void);
 static void sony_nc_rfkill_update(void);
 
 /*********** Input Devices ***********/
@@ -691,59 +715,97 @@ static struct acpi_device *sony_nc_acpi_device = NULL;
 
 /*
  * acpi_evaluate_object wrappers
+ * all useful calls into SNC methods take one or zero parameters and return
+ * integers or arrays.
  */
-static int acpi_callgetfunc(acpi_handle handle, char *name, int *result)
+static union acpi_object *__call_snc_method(acpi_handle handle, char *method,
+                u64 *value)
 {
-        struct acpi_buffer output;
-        union acpi_object out_obj;
+        union acpi_object *result = NULL;
+        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
         acpi_status status;
 
-        output.length = sizeof(out_obj);
-        output.pointer = &out_obj;
+        if (value) {
+                struct acpi_object_list params;
+                union acpi_object in;
+                in.type = ACPI_TYPE_INTEGER;
+                in.integer.value = *value;
+                params.count = 1;
+                params.pointer = &in;
+                status = acpi_evaluate_object(handle, method, &params, &output);
+                dprintk("__call_snc_method: [%s:0x%.8x%.8x]\n", method,
+                                (unsigned int)(*value >> 32),
+                                (unsigned int)*value & 0xffffffff);
+        } else {
+                status = acpi_evaluate_object(handle, method, NULL, &output);
+                dprintk("__call_snc_method: [%s]\n", method);
+        }
 
-        status = acpi_evaluate_object(handle, name, NULL, &output);
-        if ((status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER)) {
-                *result = out_obj.integer.value;
-                return 0;
+        if (ACPI_FAILURE(status)) {
+                pr_err("Failed to evaluate [%s]\n", method);
+                return NULL;
         }
 
-        pr_warn("acpi_callreadfunc failed\n");
+        result = (union acpi_object *) output.pointer;
+        if (!result)
+                dprintk("No return object [%s]\n", method);
 
-        return -1;
+        return result;
 }
 
-static int acpi_callsetfunc(acpi_handle handle, char *name, int value,
-                            int *result)
+static int sony_nc_int_call(acpi_handle handle, char *name, int *value,
+                int *result)
 {
-        struct acpi_object_list params;
-        union acpi_object in_obj;
-        struct acpi_buffer output;
-        union acpi_object out_obj;
-        acpi_status status;
-
-        params.count = 1;
-        params.pointer = &in_obj;
-        in_obj.type = ACPI_TYPE_INTEGER;
-        in_obj.integer.value = value;
+        union acpi_object *object = NULL;
+        if (value) {
+                u64 v = *value;
+                object = __call_snc_method(handle, name, &v);
+        } else
+                object = __call_snc_method(handle, name, NULL);
 
-        output.length = sizeof(out_obj);
-        output.pointer = &out_obj;
+        if (!object)
+                return -EINVAL;
 
-        status = acpi_evaluate_object(handle, name, &params, &output);
-        if (status == AE_OK) {
-                if (result != NULL) {
-                        if (out_obj.type != ACPI_TYPE_INTEGER) {
-                                pr_warn("acpi_evaluate_object bad return type\n");
-                                return -1;
-                        }
-                        *result = out_obj.integer.value;
-                }
-                return 0;
+        if (object->type != ACPI_TYPE_INTEGER) {
+                pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
+                                ACPI_TYPE_INTEGER, object->type);
+                kfree(object);
+                return -EINVAL;
         }
 
-        pr_warn("acpi_evaluate_object failed\n");
+        if (result)
+                *result = object->integer.value;
+
+        kfree(object);
+        return 0;
+}
+
+#define MIN(a, b)       (a > b ? b : a)
+static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
+                void *buffer, size_t buflen)
+{
+        size_t len = len;
+        union acpi_object *object = __call_snc_method(handle, name, value);
+
+        if (!object)
+                return -EINVAL;
+
+        if (object->type == ACPI_TYPE_BUFFER)
+                len = MIN(buflen, object->buffer.length);
+
+        else if (object->type == ACPI_TYPE_INTEGER)
+                len = MIN(buflen, sizeof(object->integer.value));
+
+        else {
+                pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
+                                ACPI_TYPE_BUFFER, object->type);
+                kfree(object);
+                return -EINVAL;
+        }
 
-        return -1;
+        memcpy(buffer, object->buffer.pointer, len);
+        kfree(object);
+        return 0;
 }
 
 struct sony_nc_handles {
@@ -770,16 +832,17 @@ static ssize_t sony_nc_handles_show(struct device *dev,
 
 static int sony_nc_handles_setup(struct platform_device *pd)
 {
-        int i;
-        int result;
+        int i, r, result, arg;
 
         handles = kzalloc(sizeof(*handles), GFP_KERNEL);
         if (!handles)
                 return -ENOMEM;
 
         for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
-                if (!acpi_callsetfunc(sony_nc_acpi_handle,
-                                        "SN00", i + 0x20, &result)) {
+                arg = i + 0x20;
+                r = sony_nc_int_call(sony_nc_acpi_handle, "SN00", &arg,
+                                        &result);
+                if (!r) {
                         dprintk("caching handle 0x%.4x (offset: 0x%.2x)\n",
                                         result, i);
                         handles->cap[i] = result;
@@ -819,8 +882,8 @@ static int sony_find_snc_handle(int handle)
         int i;
 
         /* not initialized yet, return early */
-        if (!handles)
-                return -1;
+        if (!handles || !handle)
+                return -EINVAL;
 
         for (i = 0; i < 0x10; i++) {
                 if (handles->cap[i] == handle) {
@@ -830,21 +893,20 @@ static int sony_find_snc_handle(int handle)
                 }
         }
         dprintk("handle 0x%.4x not found\n", handle);
-        return -1;
+        return -EINVAL;
 }
 
 static int sony_call_snc_handle(int handle, int argument, int *result)
 {
-        int ret = 0;
+        int arg, ret = 0;
         int offset = sony_find_snc_handle(handle);
 
         if (offset < 0)
-                return -1;
+                return offset;
 
-        ret = acpi_callsetfunc(sony_nc_acpi_handle, "SN07", offset | argument,
-                        result);
-        dprintk("called SN07 with 0x%.4x (result: 0x%.4x)\n", offset | argument,
-                        *result);
+        arg = offset | argument;
+        ret = sony_nc_int_call(sony_nc_acpi_handle, "SN07", &arg, result);
+        dprintk("called SN07 with 0x%.4x (result: 0x%.4x)\n", arg, *result);
         return ret;
 }
 
@@ -889,14 +951,16 @@ static int boolean_validate(const int direction, const int value)
 static ssize_t sony_nc_sysfs_show(struct device *dev, struct device_attribute *attr,
                               char *buffer)
 {
-        int value;
+        int value, ret = 0;
         struct sony_nc_value *item =
             container_of(attr, struct sony_nc_value, devattr);
 
         if (!*item->acpiget)
                 return -EIO;
 
-        if (acpi_callgetfunc(sony_nc_acpi_handle, *item->acpiget, &value) < 0)
+        ret = sony_nc_int_call(sony_nc_acpi_handle, *item->acpiget, NULL,
+                                &value);
+        if (ret < 0)
                 return -EIO;
 
         if (item->validate)
@@ -909,7 +973,8 @@ static ssize_t sony_nc_sysfs_store(struct device *dev,
                                struct device_attribute *attr,
                                const char *buffer, size_t count)
 {
-        int value;
+        unsigned long value = 0;
+        int ret = 0;
         struct sony_nc_value *item =
             container_of(attr, struct sony_nc_value, devattr);
 
@@ -919,7 +984,8 @@ static ssize_t sony_nc_sysfs_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        value = simple_strtoul(buffer, NULL, 10);
+        if (kstrtoul(buffer, 10, &value))
+                return -EINVAL;
 
         if (item->validate)
                 value = item->validate(SNC_VALIDATE_IN, value);
@@ -927,8 +993,11 @@ static ssize_t sony_nc_sysfs_store(struct device *dev,
         if (value < 0)
                 return value;
 
-        if (acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset, value, NULL) < 0)
+        ret = sony_nc_int_call(sony_nc_acpi_handle, *item->acpiset,
+                        (int *)&value, NULL);
+        if (ret < 0)
                 return -EIO;
+
         item->value = value;
         item->valid = 1;
         return count;
@@ -948,15 +1017,15 @@ struct sony_backlight_props sony_bl_props;
 
 static int sony_backlight_update_status(struct backlight_device *bd)
 {
-        return acpi_callsetfunc(sony_nc_acpi_handle, "SBRT",
-                                bd->props.brightness + 1, NULL);
+        int arg = bd->props.brightness + 1;
+        return sony_nc_int_call(sony_nc_acpi_handle, "SBRT", &arg, NULL);
 }
 
 static int sony_backlight_get_brightness(struct backlight_device *bd)
 {
         int value;
 
-        if (acpi_callgetfunc(sony_nc_acpi_handle, "GBRT", &value))
+        if (sony_nc_int_call(sony_nc_acpi_handle, "GBRT", NULL, &value))
                 return 0;
         /* brightness levels are 1-based, while backlight ones are 0-based */
         return value - 1;
@@ -1024,10 +1093,14 @@ static struct sony_nc_event sony_100_events[] = {
         { 0x06, SONYPI_EVENT_FNKEY_RELEASED },
         { 0x87, SONYPI_EVENT_FNKEY_F7 },
         { 0x07, SONYPI_EVENT_FNKEY_RELEASED },
+        { 0x88, SONYPI_EVENT_FNKEY_F8 },
+        { 0x08, SONYPI_EVENT_FNKEY_RELEASED },
         { 0x89, SONYPI_EVENT_FNKEY_F9 },
         { 0x09, SONYPI_EVENT_FNKEY_RELEASED },
         { 0x8A, SONYPI_EVENT_FNKEY_F10 },
         { 0x0A, SONYPI_EVENT_FNKEY_RELEASED },
+        { 0x8B, SONYPI_EVENT_FNKEY_F11 },
+        { 0x0B, SONYPI_EVENT_FNKEY_RELEASED },
         { 0x8C, SONYPI_EVENT_FNKEY_F12 },
         { 0x0C, SONYPI_EVENT_FNKEY_RELEASED },
         { 0x9d, SONYPI_EVENT_ZOOM_PRESSED },
@@ -1063,63 +1136,116 @@ static struct sony_nc_event sony_127_events[] = {
         { 0, 0 },
 };
 
+static int sony_nc_hotkeys_decode(u32 event, unsigned int handle)
+{
+        int ret = -EINVAL;
+        unsigned int result = 0;
+        struct sony_nc_event *key_event;
+
+        if (sony_call_snc_handle(handle, 0x200, &result)) {
+                dprintk("Unable to decode event 0x%.2x 0x%.2x\n", handle,
+                                event);
+                return -EINVAL;
+        }
+
+        result &= 0xFF;
+
+        if (handle == 0x0100)
+                key_event = sony_100_events;
+        else
+                key_event = sony_127_events;
+
+        for (; key_event->data; key_event++) {
+                if (key_event->data == result) {
+                        ret = key_event->event;
+                        break;
+                }
+        }
+
+        if (!key_event->data)
+                pr_info("Unknown hotkey 0x%.2x/0x%.2x (handle 0x%.2x)\n",
+                                event, result, handle);
+
+        return ret;
+}
+
 /*
  * ACPI callbacks
  */
 static void sony_nc_notify(struct acpi_device *device, u32 event)
 {
-        u32 ev = event;
+        u32 real_ev = event;
+        u8 ev_type = 0;
+        dprintk("sony_nc_notify, event: 0x%.2x\n", event);
+
+        if (event >= 0x90) {
+                unsigned int result = 0;
+                unsigned int arg = 0;
+                unsigned int handle = 0;
+                unsigned int offset = event - 0x90;
+
+                if (offset >= ARRAY_SIZE(handles->cap)) {
+                        pr_err("Event 0x%x outside of capabilities list\n",
+                                        event);
+                        return;
+                }
+                handle = handles->cap[offset];
+
+                /* list of handles known for generating events */
+                switch (handle) {
+                /* hotkey event */
+                case 0x0100:
+                case 0x0127:
+                        ev_type = 1;
+                        real_ev = sony_nc_hotkeys_decode(event, handle);
+
+                        if (real_ev > 0)
+                                sony_laptop_report_input_event(real_ev);
+                        else
+                                /* restore the original event for reporting */
+                                real_ev = event;
 
-        if (ev >= 0x90) {
-                /* New-style event */
-                int result;
-                int key_handle = 0;
-                ev -= 0x90;
-
-                if (sony_find_snc_handle(0x100) == ev)
-                        key_handle = 0x100;
-                if (sony_find_snc_handle(0x127) == ev)
-                        key_handle = 0x127;
-
-                if (key_handle) {
-                        struct sony_nc_event *key_event;
-
-                        if (sony_call_snc_handle(key_handle, 0x200, &result)) {
-                                dprintk("sony_nc_notify, unable to decode"
-                                        " event 0x%.2x 0x%.2x\n", key_handle,
-                                        ev);
-                                /* restore the original event */
-                                ev = event;
-                        } else {
-                                ev = result & 0xFF;
-
-                                if (key_handle == 0x100)
-                                        key_event = sony_100_events;
-                                else
-                                        key_event = sony_127_events;
-
-                                for (; key_event->data; key_event++) {
-                                        if (key_event->data == ev) {
-                                                ev = key_event->event;
-                                                break;
-                                        }
-                                }
+                        break;
 
-                                if (!key_event->data)
-                                        pr_info("Unknown event: 0x%x 0x%x\n",
-                                                key_handle, ev);
-                                else
-                                        sony_laptop_report_input_event(ev);
-                        }
-                } else if (sony_find_snc_handle(sony_rfkill_handle) == ev) {
-                        sony_nc_rfkill_update();
-                        return;
+                /* wlan switch */
+                case 0x0124:
+                case 0x0135:
+                        /* events on this handle are reported when the
+                         * switch changes position or for battery
+                         * events. We'll notify both of them but only
+                         * update the rfkill device status when the
+                         * switch is moved.
+                         */
+                        ev_type = 2;
+                        sony_call_snc_handle(handle, 0x0100, &result);
+                        real_ev = result & 0x03;
+
+                        /* hw switch event */
+                        if (real_ev == 1)
+                                sony_nc_rfkill_update();
+
+                        break;
+
+                default:
+                        dprintk("Unknown event 0x%x for handle 0x%x\n",
+                                        event, handle);
+                        break;
                 }
-        } else
-                sony_laptop_report_input_event(ev);
 
-        dprintk("sony_nc_notify, event: 0x%.2x\n", ev);
-        acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
+                /* clear the event (and the event reason when present) */
+                arg = 1 << offset;
+                sony_nc_int_call(sony_nc_acpi_handle, "SN05", &arg, &result);
+
+        } else {
+                /* old style event */
+                ev_type = 1;
+                sony_laptop_report_input_event(real_ev);
+        }
+
+        acpi_bus_generate_proc_event(sony_nc_acpi_device, ev_type, real_ev);
+
+        acpi_bus_generate_netlink_event(sony_nc_acpi_device->pnp.device_class,
+                        dev_name(&sony_nc_acpi_device->dev), ev_type, real_ev);
 }
 
 static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@@ -1140,20 +1266,190 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
 /*
  * ACPI device
  */
-static int sony_nc_function_setup(struct acpi_device *device)
+static void sony_nc_function_setup(struct acpi_device *device,
+                struct platform_device *pf_device)
 {
-        int result;
+        unsigned int i, result, bitmask, arg;
+
+        if (!handles)
+                return;
+
+        /* setup found handles here */
+        for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
+                unsigned int handle = handles->cap[i];
+
+                if (!handle)
+                        continue;
+
+                dprintk("setting up handle 0x%.4x\n", handle);
+
+                switch (handle) {
+                case 0x0100:
+                case 0x0101:
+                case 0x0127:
+                        /* setup hotkeys */
+                        sony_call_snc_handle(handle, 0, &result);
+                        break;
+                case 0x0102:
+                        /* setup hotkeys */
+                        sony_call_snc_handle(handle, 0x100, &result);
+                        break;
+                case 0x0105:
+                case 0x0148:
+                        /* touchpad enable/disable */
+                        result = sony_nc_touchpad_setup(pf_device, handle);
+                        if (result)
+                                pr_err("couldn't set up touchpad control function (%d)\n",
+                                                result);
+                        break;
+                case 0x0115:
+                case 0x0136:
+                case 0x013f:
+                        result = sony_nc_battery_care_setup(pf_device, handle);
+                        if (result)
+                                pr_err("couldn't set up battery care function (%d)\n",
+                                                result);
+                        break;
+                case 0x0119:
+                        result = sony_nc_lid_resume_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up lid resume function (%d)\n",
+                                                result);
+                        break;
+                case 0x0122:
+                        result = sony_nc_thermal_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up thermal profile function (%d)\n",
+                                                result);
+                        break;
+                case 0x0131:
+                        result = sony_nc_highspeed_charging_setup(pf_device);
+                        if (result)
+                                pr_err("couldn't set up high speed charging function (%d)\n",
+                                       result);
+                        break;
+                case 0x0124:
+                case 0x0135:
+                        result = sony_nc_rfkill_setup(device, handle);
+                        if (result)
+                                pr_err("couldn't set up rfkill support (%d)\n",
+                                                result);
+                        break;
+                case 0x0137:
+                case 0x0143:
+                        result = sony_nc_kbd_backlight_setup(pf_device, handle);
+                        if (result)
+                                pr_err("couldn't set up keyboard backlight function (%d)\n",
+                                                result);
+                        break;
+                default:
+                        continue;
+                }
+        }
 
         /* Enable all events */
-        acpi_callsetfunc(sony_nc_acpi_handle, "SN02", 0xffff, &result);
+        arg = 0x10;
+        if (!sony_nc_int_call(sony_nc_acpi_handle, "SN00", &arg, &bitmask))
+                sony_nc_int_call(sony_nc_acpi_handle, "SN02", &bitmask,
+                                &result);
+}
+
+static void sony_nc_function_cleanup(struct platform_device *pd)
+{
+        unsigned int i, result, bitmask, handle;
 
-        /* Setup hotkeys */
-        sony_call_snc_handle(0x0100, 0, &result);
-        sony_call_snc_handle(0x0101, 0, &result);
-        sony_call_snc_handle(0x0102, 0x100, &result);
-        sony_call_snc_handle(0x0127, 0, &result);
+        /* get enabled events and disable them */
+        sony_nc_int_call(sony_nc_acpi_handle, "SN01", NULL, &bitmask);
+        sony_nc_int_call(sony_nc_acpi_handle, "SN03", &bitmask, &result);
 
-        return 0;
+        /* cleanup handles here */
+        for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
+
+                handle = handles->cap[i];
+
+                if (!handle)
+                        continue;
+
+                switch (handle) {
+                case 0x0105:
+                case 0x0148:
+                        sony_nc_touchpad_cleanup(pd);
+                        break;
+                case 0x0115:
+                case 0x0136:
+                case 0x013f:
+                        sony_nc_battery_care_cleanup(pd);
+                        break;
+                case 0x0119:
+                        sony_nc_lid_resume_cleanup(pd);
+                        break;
+                case 0x0122:
+                        sony_nc_thermal_cleanup(pd);
+                        break;
+                case 0x0131:
+                        sony_nc_highspeed_charging_cleanup(pd);
+                        break;
+                case 0x0124:
+                case 0x0135:
+                        sony_nc_rfkill_cleanup();
+                        break;
+                case 0x0137:
+                case 0x0143:
+                        sony_nc_kbd_backlight_cleanup(pd);
+                        break;
+                default:
+                        continue;
+                }
+        }
+
+        /* finally cleanup the handles list */
+        sony_nc_handles_cleanup(pd);
+}
+
+static void sony_nc_function_resume(void)
+{
+        unsigned int i, result, bitmask, arg;
+
+        dprintk("Resuming SNC device\n");
+
+        for (i = 0; i < ARRAY_SIZE(handles->cap); i++) {
+                unsigned int handle = handles->cap[i];
+
+                if (!handle)
+                        continue;
+
+                switch (handle) {
+                case 0x0100:
+                case 0x0101:
+                case 0x0127:
+                        /* re-enable hotkeys */
+                        sony_call_snc_handle(handle, 0, &result);
+                        break;
+                case 0x0102:
+                        /* re-enable hotkeys */
+                        sony_call_snc_handle(handle, 0x100, &result);
+                        break;
+                case 0x0122:
+                        sony_nc_thermal_resume();
+                        break;
+                case 0x0124:
+                case 0x0135:
+                        sony_nc_rfkill_update();
+                        break;
+                case 0x0137:
+                case 0x0143:
+                        sony_nc_kbd_backlight_resume();
+                        break;
+                default:
+                        continue;
+                }
+        }
+
+        /* Enable all events */
+        arg = 0x10;
+        if (!sony_nc_int_call(sony_nc_acpi_handle, "SN00", &arg, &bitmask))
+                sony_nc_int_call(sony_nc_acpi_handle, "SN02", &bitmask,
+                                &result);
 }
 
 static int sony_nc_resume(struct acpi_device *device)
@@ -1166,8 +1462,8 @@ static int sony_nc_resume(struct acpi_device *device)
 
                 if (!item->valid)
                         continue;
-                ret = acpi_callsetfunc(sony_nc_acpi_handle, *item->acpiset,
-                                       item->value, NULL);
+                ret = sony_nc_int_call(sony_nc_acpi_handle, *item->acpiset,
+                                       &item->value, NULL);
                 if (ret < 0) {
                         pr_err("%s: %d\n", __func__, ret);
                         break;
@@ -1176,21 +1472,14 @@ static int sony_nc_resume(struct acpi_device *device)
 
         if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",
                                          &handle))) {
-                if (acpi_callsetfunc(sony_nc_acpi_handle, "ECON", 1, NULL))
+                int arg = 1;
+                if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL))
                         dprintk("ECON Method failed\n");
         }
 
         if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
-                                         &handle))) {
-                dprintk("Doing SNC setup\n");
-                sony_nc_function_setup(device);
-        }
-
-        /* re-read rfkill state */
-        sony_nc_rfkill_update();
-
-        /* restore kbd backlight states */
-        sony_nc_kbd_backlight_resume();
+                                         &handle)))
+                sony_nc_function_resume();
 
         return 0;
 }
@@ -1213,7 +1502,7 @@ static int sony_nc_rfkill_set(void *data, bool blocked)
         int argument = sony_rfkill_address[(long) data] + 0x100;
 
         if (!blocked)
-                argument |= 0xff0000;
+                argument |= 0x030000;
 
         return sony_call_snc_handle(sony_rfkill_handle, argument, &result);
 }
@@ -1230,7 +1519,7 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
         enum rfkill_type type;
         const char *name;
         int result;
-        bool hwblock;
+        bool hwblock, swblock;
 
         switch (nc_type) {
         case SONY_WIFI:
@@ -1258,8 +1547,21 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
         if (!rfk)
                 return -ENOMEM;
 
-        sony_call_snc_handle(sony_rfkill_handle, 0x200, &result);
+        if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) {
+                rfkill_destroy(rfk);
+                return -1;
+        }
         hwblock = !(result & 0x1);
+
+        if (sony_call_snc_handle(sony_rfkill_handle,
+                                sony_rfkill_address[nc_type],
+                                &result) < 0) {
+                rfkill_destroy(rfk);
+                return -1;
+        }
+        swblock = !(result & 0x2);
+
+        rfkill_init_sw_state(rfk, swblock);
         rfkill_set_hw_state(rfk, hwblock);
 
         err = rfkill_register(rfk);
@@ -1295,101 +1597,79 @@ static void sony_nc_rfkill_update(void)
 
                 sony_call_snc_handle(sony_rfkill_handle, argument, &result);
                 rfkill_set_states(sony_rfkill_devices[i],
-                                  !(result & 0xf), false);
+                                  !(result & 0x2), false);
         }
 }
 
-static void sony_nc_rfkill_setup(struct acpi_device *device)
+static int sony_nc_rfkill_setup(struct acpi_device *device,
+                unsigned int handle)
 {
-        int offset;
-        u8 dev_code, i;
-        acpi_status status;
-        struct acpi_object_list params;
-        union acpi_object in_obj;
-        union acpi_object *device_enum;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-
-        offset = sony_find_snc_handle(0x124);
-        if (offset == -1) {
-                offset = sony_find_snc_handle(0x135);
-                if (offset == -1)
-                        return;
-                else
-                        sony_rfkill_handle = 0x135;
-        } else
-                sony_rfkill_handle = 0x124;
-        dprintk("Found rkfill handle: 0x%.4x\n", sony_rfkill_handle);
-
-        /* need to read the whole buffer returned by the acpi call to SN06
-         * here otherwise we may miss some features
-         */
-        params.count = 1;
-        params.pointer = &in_obj;
-        in_obj.type = ACPI_TYPE_INTEGER;
-        in_obj.integer.value = offset;
-        status = acpi_evaluate_object(sony_nc_acpi_handle, "SN06", &params,
-                        &buffer);
-        if (ACPI_FAILURE(status)) {
-                dprintk("Radio device enumeration failed\n");
-                return;
-        }
-
-        device_enum = (union acpi_object *) buffer.pointer;
-        if (!device_enum) {
-                pr_err("No SN06 return object\n");
-                goto out_no_enum;
-        }
-        if (device_enum->type != ACPI_TYPE_BUFFER) {
-                pr_err("Invalid SN06 return object 0x%.2x\n",
-                       device_enum->type);
-                goto out_no_enum;
-        }
+        u64 offset;
+        int i;
+        unsigned char buffer[32] = { 0 };
 
-        /* the buffer is filled with magic numbers describing the devices
-         * available, 0xff terminates the enumeration
+        offset = sony_find_snc_handle(handle);
+        sony_rfkill_handle = handle;
+
+        i = sony_nc_buffer_call(sony_nc_acpi_handle, "SN06", &offset, buffer,
+                        32);
+        if (i < 0)
+                return i;
+
+        /* The buffer is filled with magic numbers describing the devices
+         * available, 0xff terminates the enumeration.
+         * Known codes:
+         *      0x00 WLAN
+         *      0x10 BLUETOOTH
+         *      0x20 WWAN GPRS-EDGE
+         *      0x21 WWAN HSDPA
+         *      0x22 WWAN EV-DO
+         *      0x23 WWAN GPS
+         *      0x25 Gobi WWAN no GPS
+         *      0x26 Gobi WWAN + GPS
+         *      0x28 Gobi WWAN no GPS
+         *      0x29 Gobi WWAN + GPS
+         *      0x30 WIMAX
+         *      0x50 Gobi WWAN no GPS
+         *      0x51 Gobi WWAN + GPS
+         *      0x70 no SIM card slot
+         *      0x71 SIM card slot
          */
-        for (i = 0; i < device_enum->buffer.length; i++) {
+        for (i = 0; i < ARRAY_SIZE(buffer); i++) {
 
-                dev_code = *(device_enum->buffer.pointer + i);
-                if (dev_code == 0xff)
+                if (buffer[i] == 0xff)
                         break;
 
-                dprintk("Radio devices, looking at 0x%.2x\n", dev_code);
+                dprintk("Radio devices, found 0x%.2x\n", buffer[i]);
 
-                if (dev_code == 0 && !sony_rfkill_devices[SONY_WIFI])
+                if (buffer[i] == 0 && !sony_rfkill_devices[SONY_WIFI])
                         sony_nc_setup_rfkill(device, SONY_WIFI);
 
-                if (dev_code == 0x10 && !sony_rfkill_devices[SONY_BLUETOOTH])
+                if (buffer[i] == 0x10 && !sony_rfkill_devices[SONY_BLUETOOTH])
                         sony_nc_setup_rfkill(device, SONY_BLUETOOTH);
 
-                if ((0xf0 & dev_code) == 0x20 &&
+                if (((0xf0 & buffer[i]) == 0x20 ||
+                                        (0xf0 & buffer[i]) == 0x50) &&
                                 !sony_rfkill_devices[SONY_WWAN])
                         sony_nc_setup_rfkill(device, SONY_WWAN);
 
-                if (dev_code == 0x30 && !sony_rfkill_devices[SONY_WIMAX])
+                if (buffer[i] == 0x30 && !sony_rfkill_devices[SONY_WIMAX])
                         sony_nc_setup_rfkill(device, SONY_WIMAX);
         }
-
-out_no_enum:
-        kfree(buffer.pointer);
-        return;
+        return 0;
 }
 
 /* Keyboard backlight feature */
-#define KBDBL_HANDLER   0x137
-#define KBDBL_PRESENT   0xB00
-#define SET_MODE        0xC00
-#define SET_STATE       0xD00
-#define SET_TIMEOUT     0xE00
-
 struct kbd_backlight {
-        int mode;
-        int timeout;
+        unsigned int handle;
+        unsigned int base;
+        unsigned int mode;
+        unsigned int timeout;
         struct device_attribute mode_attr;
         struct device_attribute timeout_attr;
 };
 
-static struct kbd_backlight *kbdbl_handle;
+static struct kbd_backlight *kbdbl_ctl;
 
 static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
 {
@@ -1398,15 +1678,15 @@ static ssize_t __sony_nc_kbd_backlight_mode_set(u8 value)
         if (value > 1)
                 return -EINVAL;
 
-        if (sony_call_snc_handle(KBDBL_HANDLER,
-                                (value << 0x10) | SET_MODE, &result))
+        if (sony_call_snc_handle(kbdbl_ctl->handle,
+                                (value << 0x10) | (kbdbl_ctl->base), &result))
                 return -EIO;
 
         /* Try to turn the light on/off immediately */
-        sony_call_snc_handle(KBDBL_HANDLER, (value << 0x10) | SET_STATE,
-                        &result);
+        sony_call_snc_handle(kbdbl_ctl->handle,
+                        (value << 0x10) | (kbdbl_ctl->base + 0x100), &result);
 
-        kbdbl_handle->mode = value;
+        kbdbl_ctl->mode = value;
 
         return 0;
 }
@@ -1421,7 +1701,7 @@ static ssize_t sony_nc_kbd_backlight_mode_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        if (strict_strtoul(buffer, 10, &value))
+        if (kstrtoul(buffer, 10, &value))
                 return -EINVAL;
 
         ret = __sony_nc_kbd_backlight_mode_set(value);
@@ -1435,7 +1715,7 @@ static ssize_t sony_nc_kbd_backlight_mode_show(struct device *dev,
                 struct device_attribute *attr, char *buffer)
 {
         ssize_t count = 0;
-        count = snprintf(buffer, PAGE_SIZE, "%d\n", kbdbl_handle->mode);
+        count = snprintf(buffer, PAGE_SIZE, "%d\n", kbdbl_ctl->mode);
         return count;
 }
 
@@ -1446,11 +1726,11 @@ static int __sony_nc_kbd_backlight_timeout_set(u8 value)
         if (value > 3)
                 return -EINVAL;
 
-        if (sony_call_snc_handle(KBDBL_HANDLER,
-                                (value << 0x10) | SET_TIMEOUT, &result))
+        if (sony_call_snc_handle(kbdbl_ctl->handle, (value << 0x10) |
+                                (kbdbl_ctl->base + 0x200), &result))
                 return -EIO;
 
-        kbdbl_handle->timeout = value;
+        kbdbl_ctl->timeout = value;
 
         return 0;
 }
@@ -1465,7 +1745,7 @@ static ssize_t sony_nc_kbd_backlight_timeout_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        if (strict_strtoul(buffer, 10, &value))
+        if (kstrtoul(buffer, 10, &value))
                 return -EINVAL;
 
         ret = __sony_nc_kbd_backlight_timeout_set(value);
@@ -1479,39 +1759,58 @@ static ssize_t sony_nc_kbd_backlight_timeout_show(struct device *dev,
                 struct device_attribute *attr, char *buffer)
 {
         ssize_t count = 0;
-        count = snprintf(buffer, PAGE_SIZE, "%d\n", kbdbl_handle->timeout);
+        count = snprintf(buffer, PAGE_SIZE, "%d\n", kbdbl_ctl->timeout);
         return count;
 }
 
-static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
+static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
+                unsigned int handle)
 {
         int result;
+        int ret = 0;
 
-        if (sony_call_snc_handle(KBDBL_HANDLER, KBDBL_PRESENT, &result))
-                return 0;
-        if (!(result & 0x02))
+        /* verify the kbd backlight presence, these handles are not used for
+         * keyboard backlight only
+         */
+        ret = sony_call_snc_handle(handle, handle == 0x0137 ? 0x0B00 : 0x0100,
+                        &result);
+        if (ret)
+                return ret;
+
+        if ((handle == 0x0137 && !(result & 0x02)) ||
+                        !(result & 0x01)) {
+                dprintk("no backlight keyboard found\n");
                 return 0;
+        }
 
-        kbdbl_handle = kzalloc(sizeof(*kbdbl_handle), GFP_KERNEL);
-        if (!kbdbl_handle)
+        kbdbl_ctl = kzalloc(sizeof(*kbdbl_ctl), GFP_KERNEL);
+        if (!kbdbl_ctl)
                 return -ENOMEM;
 
-        sysfs_attr_init(&kbdbl_handle->mode_attr.attr);
-        kbdbl_handle->mode_attr.attr.name = "kbd_backlight";
-        kbdbl_handle->mode_attr.attr.mode = S_IRUGO | S_IWUSR;
-        kbdbl_handle->mode_attr.show = sony_nc_kbd_backlight_mode_show;
-        kbdbl_handle->mode_attr.store = sony_nc_kbd_backlight_mode_store;
+        kbdbl_ctl->handle = handle;
+        if (handle == 0x0137)
+                kbdbl_ctl->base = 0x0C00;
+        else
+                kbdbl_ctl->base = 0x4000;
+
+        sysfs_attr_init(&kbdbl_ctl->mode_attr.attr);
+        kbdbl_ctl->mode_attr.attr.name = "kbd_backlight";
+        kbdbl_ctl->mode_attr.attr.mode = S_IRUGO | S_IWUSR;
+        kbdbl_ctl->mode_attr.show = sony_nc_kbd_backlight_mode_show;
+        kbdbl_ctl->mode_attr.store = sony_nc_kbd_backlight_mode_store;
 
-        sysfs_attr_init(&kbdbl_handle->timeout_attr.attr);
-        kbdbl_handle->timeout_attr.attr.name = "kbd_backlight_timeout";
-        kbdbl_handle->timeout_attr.attr.mode = S_IRUGO | S_IWUSR;
-        kbdbl_handle->timeout_attr.show = sony_nc_kbd_backlight_timeout_show;
-        kbdbl_handle->timeout_attr.store = sony_nc_kbd_backlight_timeout_store;
+        sysfs_attr_init(&kbdbl_ctl->timeout_attr.attr);
+        kbdbl_ctl->timeout_attr.attr.name = "kbd_backlight_timeout";
+        kbdbl_ctl->timeout_attr.attr.mode = S_IRUGO | S_IWUSR;
+        kbdbl_ctl->timeout_attr.show = sony_nc_kbd_backlight_timeout_show;
+        kbdbl_ctl->timeout_attr.store = sony_nc_kbd_backlight_timeout_store;
 
-        if (device_create_file(&pd->dev, &kbdbl_handle->mode_attr))
+        ret = device_create_file(&pd->dev, &kbdbl_ctl->mode_attr);
+        if (ret)
                 goto outkzalloc;
 
-        if (device_create_file(&pd->dev, &kbdbl_handle->timeout_attr))
+        ret = device_create_file(&pd->dev, &kbdbl_ctl->timeout_attr);
+        if (ret)
                 goto outmode;
 
         __sony_nc_kbd_backlight_mode_set(kbd_backlight);
@@ -1520,57 +1819,661 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
         return 0;
 
 outmode:
-        device_remove_file(&pd->dev, &kbdbl_handle->mode_attr);
+        device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr);
 outkzalloc:
-        kfree(kbdbl_handle);
-        kbdbl_handle = NULL;
-        return -1;
+        kfree(kbdbl_ctl);
+        kbdbl_ctl = NULL;
+        return ret;
 }
 
-static int sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
+static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
 {
-        if (kbdbl_handle) {
+        if (kbdbl_ctl) {
                 int result;
 
-                device_remove_file(&pd->dev, &kbdbl_handle->mode_attr);
-                device_remove_file(&pd->dev, &kbdbl_handle->timeout_attr);
+                device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr);
+                device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr);
 
                 /* restore the default hw behaviour */
-                sony_call_snc_handle(KBDBL_HANDLER, 0x1000 | SET_MODE, &result);
-                sony_call_snc_handle(KBDBL_HANDLER, SET_TIMEOUT, &result);
+                sony_call_snc_handle(kbdbl_ctl->handle,
+                                kbdbl_ctl->base | 0x10000, &result);
+                sony_call_snc_handle(kbdbl_ctl->handle,
+                                kbdbl_ctl->base + 0x200, &result);
 
-                kfree(kbdbl_handle);
+                kfree(kbdbl_ctl);
+                kbdbl_ctl = NULL;
         }
-        return 0;
 }
 
 static void sony_nc_kbd_backlight_resume(void)
 {
         int ignore = 0;
 
-        if (!kbdbl_handle)
+        if (!kbdbl_ctl)
                 return;
 
-        if (kbdbl_handle->mode == 0)
-                sony_call_snc_handle(KBDBL_HANDLER, SET_MODE, &ignore);
-
-        if (kbdbl_handle->timeout != 0)
-                sony_call_snc_handle(KBDBL_HANDLER,
-                                (kbdbl_handle->timeout << 0x10) | SET_TIMEOUT,
+        if (kbdbl_ctl->mode == 0)
+                sony_call_snc_handle(kbdbl_ctl->handle, kbdbl_ctl->base,
                                 &ignore);
+
+        if (kbdbl_ctl->timeout != 0)
+                sony_call_snc_handle(kbdbl_ctl->handle,
+                                (kbdbl_ctl->base + 0x200) |
+                                (kbdbl_ctl->timeout << 0x10), &ignore);
+}
+
+struct battery_care_control {
+        struct device_attribute attrs[2];
+        unsigned int handle;
+};
+static struct battery_care_control *bcare_ctl;
+
+static ssize_t sony_nc_battery_care_limit_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result, cmd;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value))
+                return -EINVAL;
+
+        /*  limit values (2 bits):
+         *  00 - none
+         *  01 - 80%
+         *  10 - 50%
+         *  11 - 100%
+         *
+         *  bit 0: 0 disable BCL, 1 enable BCL
+         *  bit 1: 1 tell to store the battery limit (see bits 6,7) too
+         *  bits 2,3: reserved
+         *  bits 4,5: store the limit into the EC
+         *  bits 6,7: store the limit into the battery
+         */
+
+        /*
+         * handle 0x0115 should allow storing on battery too;
+         * handle 0x0136 same as 0x0115 + health status;
+         * handle 0x013f, same as 0x0136 but no storing on the battery
+         *
+         * Store only inside the EC for now, regardless the handle number
+         */
+        if (value == 0)
+                /* disable limits */
+                cmd = 0x0;
+
+        else if (value <= 50)
+                cmd = 0x21;
+
+        else if (value <= 80)
+                cmd = 0x11;
+
+        else if (value <= 100)
+                cmd = 0x31;
+
+        else
+                return -EINVAL;
+
+        if (sony_call_snc_handle(bcare_ctl->handle, (cmd << 0x10) | 0x0100,
+                                &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_battery_care_limit_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result, status;
+
+        if (sony_call_snc_handle(bcare_ctl->handle, 0x0000, &result))
+                return -EIO;
+
+        status = (result & 0x01) ? ((result & 0x30) >> 0x04) : 0;
+        switch (status) {
+        case 1:
+                status = 80;
+                break;
+        case 2:
+                status = 50;
+                break;
+        case 3:
+                status = 100;
+                break;
+        default:
+                status = 0;
+                break;
+        }
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", status);
+}
+
+static ssize_t sony_nc_battery_care_health_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        ssize_t count = 0;
+        unsigned int health;
+
+        if (sony_call_snc_handle(bcare_ctl->handle, 0x0200, &health))
+                return -EIO;
+
+        count = snprintf(buffer, PAGE_SIZE, "%d\n", health & 0xff);
+
+        return count;
+}
+
+static int sony_nc_battery_care_setup(struct platform_device *pd,
+                unsigned int handle)
+{
+        int ret = 0;
+
+        bcare_ctl = kzalloc(sizeof(struct battery_care_control), GFP_KERNEL);
+        if (!bcare_ctl)
+                return -ENOMEM;
+
+        bcare_ctl->handle = handle;
+
+        sysfs_attr_init(&bcare_ctl->attrs[0].attr);
+        bcare_ctl->attrs[0].attr.name = "battery_care_limiter";
+        bcare_ctl->attrs[0].attr.mode = S_IRUGO | S_IWUSR;
+        bcare_ctl->attrs[0].show = sony_nc_battery_care_limit_show;
+        bcare_ctl->attrs[0].store = sony_nc_battery_care_limit_store;
+
+        ret = device_create_file(&pd->dev, &bcare_ctl->attrs[0]);
+        if (ret)
+                goto outkzalloc;
+
+        /* 0x0115 is for models with no health reporting capability */
+        if (handle == 0x0115)
+                return 0;
+
+        sysfs_attr_init(&bcare_ctl->attrs[1].attr);
+        bcare_ctl->attrs[1].attr.name = "battery_care_health";
+        bcare_ctl->attrs[1].attr.mode = S_IRUGO;
+        bcare_ctl->attrs[1].show = sony_nc_battery_care_health_show;
+
+        ret = device_create_file(&pd->dev, &bcare_ctl->attrs[1]);
+        if (ret)
+                goto outlimiter;
+
+        return 0;
+
+outlimiter:
+        device_remove_file(&pd->dev, &bcare_ctl->attrs[0]);
+
+outkzalloc:
+        kfree(bcare_ctl);
+        bcare_ctl = NULL;
+
+        return ret;
+}
+
+static void sony_nc_battery_care_cleanup(struct platform_device *pd)
+{
+        if (bcare_ctl) {
+                device_remove_file(&pd->dev, &bcare_ctl->attrs[0]);
+                if (bcare_ctl->handle != 0x0115)
+                        device_remove_file(&pd->dev, &bcare_ctl->attrs[1]);
+
+                kfree(bcare_ctl);
+                bcare_ctl = NULL;
+        }
+}
+
+struct snc_thermal_ctrl {
+        unsigned int mode;
+        unsigned int profiles;
+        struct device_attribute mode_attr;
+        struct device_attribute profiles_attr;
+};
+static struct snc_thermal_ctrl *th_handle;
+
+#define THM_PROFILE_MAX 3
+static const char * const snc_thermal_profiles[] = {
+        "balanced",
+        "silent",
+        "performance"
+};
+
+static int sony_nc_thermal_mode_set(unsigned short mode)
+{
+        unsigned int result;
+
+        /* the thermal profile seems to be a two bit bitmask:
+         * lsb -> silent
+         * msb -> performance
+         * no bit set is the normal operation and is always valid
+         * Some vaio models only have "balanced" and "performance"
+         */
+        if ((mode && !(th_handle->profiles & mode)) || mode >= THM_PROFILE_MAX)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0122, mode << 0x10 | 0x0200, &result))
+                return -EIO;
+
+        th_handle->mode = mode;
+
+        return 0;
+}
+
+static int sony_nc_thermal_mode_get(void)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0122, 0x0100, &result))
+                return -EIO;
+
+        return result & 0xff;
+}
+
+static ssize_t sony_nc_thermal_profiles_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        short cnt;
+        size_t idx = 0;
+
+        for (cnt = 0; cnt < THM_PROFILE_MAX; cnt++) {
+                if (!cnt || (th_handle->profiles & cnt))
+                        idx += snprintf(buffer + idx, PAGE_SIZE - idx, "%s ",
+                                        snc_thermal_profiles[cnt]);
+        }
+        idx += snprintf(buffer + idx, PAGE_SIZE - idx, "\n");
+
+        return idx;
+}
+
+static ssize_t sony_nc_thermal_mode_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned short cmd;
+        size_t len = count;
+
+        if (count == 0)
+                return -EINVAL;
+
+        /* skip the newline if present */
+        if (buffer[len - 1] == '\n')
+                len--;
+
+        for (cmd = 0; cmd < THM_PROFILE_MAX; cmd++)
+                if (strncmp(buffer, snc_thermal_profiles[cmd], len) == 0)
+                        break;
+
+        if (sony_nc_thermal_mode_set(cmd))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_thermal_mode_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        ssize_t count = 0;
+        unsigned int mode = sony_nc_thermal_mode_get();
+
+        if (mode < 0)
+                return mode;
+
+        count = snprintf(buffer, PAGE_SIZE, "%s\n", snc_thermal_profiles[mode]);
+
+        return count;
+}
+
+static int sony_nc_thermal_setup(struct platform_device *pd)
+{
+        int ret = 0;
+        th_handle = kzalloc(sizeof(struct snc_thermal_ctrl), GFP_KERNEL);
+        if (!th_handle)
+                return -ENOMEM;
+
+        ret = sony_call_snc_handle(0x0122, 0x0000, &th_handle->profiles);
+        if (ret) {
+                pr_warn("couldn't to read the thermal profiles\n");
+                goto outkzalloc;
+        }
+
+        ret = sony_nc_thermal_mode_get();
+        if (ret < 0) {
+                pr_warn("couldn't to read the current thermal profile");
+                goto outkzalloc;
+        }
+        th_handle->mode = ret;
+
+        sysfs_attr_init(&th_handle->profiles_attr.attr);
+        th_handle->profiles_attr.attr.name = "thermal_profiles";
+        th_handle->profiles_attr.attr.mode = S_IRUGO;
+        th_handle->profiles_attr.show = sony_nc_thermal_profiles_show;
+
+        sysfs_attr_init(&th_handle->mode_attr.attr);
+        th_handle->mode_attr.attr.name = "thermal_control";
+        th_handle->mode_attr.attr.mode = S_IRUGO | S_IWUSR;
+        th_handle->mode_attr.show = sony_nc_thermal_mode_show;
+        th_handle->mode_attr.store = sony_nc_thermal_mode_store;
+
+        ret = device_create_file(&pd->dev, &th_handle->profiles_attr);
+        if (ret)
+                goto outkzalloc;
+
+        ret = device_create_file(&pd->dev, &th_handle->mode_attr);
+        if (ret)
+                goto outprofiles;
+
+        return 0;
+
+outprofiles:
+        device_remove_file(&pd->dev, &th_handle->profiles_attr);
+outkzalloc:
+        kfree(th_handle);
+        th_handle = NULL;
+        return ret;
+}
+
+static void sony_nc_thermal_cleanup(struct platform_device *pd)
+{
+        if (th_handle) {
+                device_remove_file(&pd->dev, &th_handle->profiles_attr);
+                device_remove_file(&pd->dev, &th_handle->mode_attr);
+                kfree(th_handle);
+                th_handle = NULL;
+        }
+}
+
+static void sony_nc_thermal_resume(void)
+{
+        unsigned int status = sony_nc_thermal_mode_get();
+
+        if (status != th_handle->mode)
+                sony_nc_thermal_mode_set(th_handle->mode);
+}
+
+/* resume on LID open */
+struct snc_lid_resume_control {
+        struct device_attribute attrs[3];
+        unsigned int status;
+};
+static struct snc_lid_resume_control *lid_ctl;
+
+static ssize_t sony_nc_lid_resume_store(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buffer, size_t count)
+{
+        unsigned int result, pos;
+        unsigned long value;
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        /* the value we have to write to SNC is a bitmask:
+         * +--------------+
+         * | S3 | S4 | S5 |
+         * +--------------+
+         *   2    1    0
+         */
+        if (strcmp(attr->attr.name, "lid_resume_S3") == 0)
+                pos = 2;
+        else if (strcmp(attr->attr.name, "lid_resume_S4") == 0)
+                pos = 1;
+        else if (strcmp(attr->attr.name, "lid_resume_S5") == 0)
+                pos = 0;
+        else
+               return -EINVAL;
+
+        if (value)
+                value = lid_ctl->status | (1 << pos);
+        else
+                value = lid_ctl->status & ~(1 << pos);
+
+        if (sony_call_snc_handle(0x0119, value << 0x10 | 0x0100, &result))
+                return -EIO;
+
+        lid_ctl->status = value;
+
+        return count;
+}
+
+static ssize_t sony_nc_lid_resume_show(struct device *dev,
+                                       struct device_attribute *attr, char *buffer)
+{
+        unsigned int pos;
+
+        if (strcmp(attr->attr.name, "lid_resume_S3") == 0)
+                pos = 2;
+        else if (strcmp(attr->attr.name, "lid_resume_S4") == 0)
+                pos = 1;
+        else if (strcmp(attr->attr.name, "lid_resume_S5") == 0)
+                pos = 0;
+        else
+                return -EINVAL;
+               
+        return snprintf(buffer, PAGE_SIZE, "%d\n",
+                        (lid_ctl->status >> pos) & 0x01);
+}
+
+static int sony_nc_lid_resume_setup(struct platform_device *pd)
+{
+        unsigned int result;
+        int i;
+
+        if (sony_call_snc_handle(0x0119, 0x0000, &result))
+                return -EIO;
+
+        lid_ctl = kzalloc(sizeof(struct snc_lid_resume_control), GFP_KERNEL);
+        if (!lid_ctl)
+                return -ENOMEM;
+
+        lid_ctl->status = result & 0x7;
+
+        sysfs_attr_init(&lid_ctl->attrs[0].attr);
+        lid_ctl->attrs[0].attr.name = "lid_resume_S3";
+        lid_ctl->attrs[0].attr.mode = S_IRUGO | S_IWUSR;
+        lid_ctl->attrs[0].show = sony_nc_lid_resume_show;
+        lid_ctl->attrs[0].store = sony_nc_lid_resume_store;
+
+        sysfs_attr_init(&lid_ctl->attrs[1].attr);
+        lid_ctl->attrs[1].attr.name = "lid_resume_S4";
+        lid_ctl->attrs[1].attr.mode = S_IRUGO | S_IWUSR;
+        lid_ctl->attrs[1].show = sony_nc_lid_resume_show;
+        lid_ctl->attrs[1].store = sony_nc_lid_resume_store;
+
+        sysfs_attr_init(&lid_ctl->attrs[2].attr);
+        lid_ctl->attrs[2].attr.name = "lid_resume_S5";
+        lid_ctl->attrs[2].attr.mode = S_IRUGO | S_IWUSR;
+        lid_ctl->attrs[2].show = sony_nc_lid_resume_show;
+        lid_ctl->attrs[2].store = sony_nc_lid_resume_store;
+
+        for (i = 0; i < 3; i++) {
+                result = device_create_file(&pd->dev, &lid_ctl->attrs[i]);
+                if (result)
+                        goto liderror;
+        }
+
+        return 0;
+
+liderror:
+        for (; i > 0; i--)
+                device_remove_file(&pd->dev, &lid_ctl->attrs[i]);
+
+        kfree(lid_ctl);
+        lid_ctl = NULL;
+
+        return result;
+}
+
+static void sony_nc_lid_resume_cleanup(struct platform_device *pd)
+{
+        int i;
+
+        if (lid_ctl) {
+                for (i = 0; i < 3; i++)
+                        device_remove_file(&pd->dev, &lid_ctl->attrs[i]);
+
+                kfree(lid_ctl);
+                lid_ctl = NULL;
+        }
+}
+
+/* High speed charging function */
+static struct device_attribute *hsc_handle;
+
+static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        if (sony_call_snc_handle(0x0131, value << 0x10 | 0x0200, &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_highspeed_charging_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0131, 0x0100, &result))
+                return -EIO;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", result & 0x01);
+}
+
+static int sony_nc_highspeed_charging_setup(struct platform_device *pd)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(0x0131, 0x0000, &result) || !(result & 0x01)) {
+                /* some models advertise the handle but have no implementation
+                 * for it
+                 */
+                pr_info("No High Speed Charging capability found\n");
+                return 0;
+        }
+
+        hsc_handle = kzalloc(sizeof(struct device_attribute), GFP_KERNEL);
+        if (!hsc_handle)
+                return -ENOMEM;
+
+        sysfs_attr_init(&hsc_handle->attr);
+        hsc_handle->attr.name = "battery_highspeed_charging";
+        hsc_handle->attr.mode = S_IRUGO | S_IWUSR;
+        hsc_handle->show = sony_nc_highspeed_charging_show;
+        hsc_handle->store = sony_nc_highspeed_charging_store;
+
+        result = device_create_file(&pd->dev, hsc_handle);
+        if (result) {
+                kfree(hsc_handle);
+                hsc_handle = NULL;
+                return result;
+        }
+
+        return 0;
+}
+
+static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
+{
+        if (hsc_handle) {
+                device_remove_file(&pd->dev, hsc_handle);
+                kfree(hsc_handle);
+                hsc_handle = NULL;
+        }
+}
+
+/* Touchpad enable/disable */
+struct touchpad_control {
+        struct device_attribute attr;
+        int handle;
+};
+static struct touchpad_control *tp_ctl;
+
+static ssize_t sony_nc_touchpad_store(struct device *dev,
+                struct device_attribute *attr, const char *buffer, size_t count)
+{
+        unsigned int result;
+        unsigned long value;
+
+        if (count > 31)
+                return -EINVAL;
+
+        if (kstrtoul(buffer, 10, &value) || value > 1)
+                return -EINVAL;
+
+        /* sysfs: 0 disabled, 1 enabled
+         * EC: 0 enabled, 1 disabled
+         */
+        if (sony_call_snc_handle(tp_ctl->handle,
+                                (!value << 0x10) | 0x100, &result))
+                return -EIO;
+
+        return count;
+}
+
+static ssize_t sony_nc_touchpad_show(struct device *dev,
+                struct device_attribute *attr, char *buffer)
+{
+        unsigned int result;
+
+        if (sony_call_snc_handle(tp_ctl->handle, 0x000, &result))
+                return -EINVAL;
+
+        return snprintf(buffer, PAGE_SIZE, "%d\n", !(result & 0x01));
+}
+
+static int sony_nc_touchpad_setup(struct platform_device *pd,
+                unsigned int handle)
+{
+        int ret = 0;
+
+        tp_ctl = kzalloc(sizeof(struct touchpad_control), GFP_KERNEL);
+        if (!tp_ctl)
+                return -ENOMEM;
+
+        tp_ctl->handle = handle;
+
+        sysfs_attr_init(&tp_ctl->attr.attr);
+        tp_ctl->attr.attr.name = "touchpad";
+        tp_ctl->attr.attr.mode = S_IRUGO | S_IWUSR;
+        tp_ctl->attr.show = sony_nc_touchpad_show;
+        tp_ctl->attr.store = sony_nc_touchpad_store;
+
+        ret = device_create_file(&pd->dev, &tp_ctl->attr);
+        if (ret) {
+                kfree(tp_ctl);
+                tp_ctl = NULL;
+        }
+
+        return ret;
+}
+
+static void sony_nc_touchpad_cleanup(struct platform_device *pd)
+{
+        if (tp_ctl) {
+                device_remove_file(&pd->dev, &tp_ctl->attr);
+                kfree(tp_ctl);
+                tp_ctl = NULL;
+        }
 }
 
 static void sony_nc_backlight_ng_read_limits(int handle,
                 struct sony_backlight_props *props)
 {
-        int offset;
-        acpi_status status;
-        u8 brlvl, i;
+        u64 offset;
+        int i;
         u8 min = 0xff, max = 0x00;
-        struct acpi_object_list params;
-        union acpi_object in_obj;
-        union acpi_object *lvl_enum;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        unsigned char buffer[32] = { 0 };
 
         props->handle = handle;
         props->offset = 0;
@@ -1583,50 +2486,31 @@ static void sony_nc_backlight_ng_read_limits(int handle,
         /* try to read the boundaries from ACPI tables, if we fail the above
          * defaults should be reasonable
          */
-        params.count = 1;
-        params.pointer = &in_obj;
-        in_obj.type = ACPI_TYPE_INTEGER;
-        in_obj.integer.value = offset;
-        status = acpi_evaluate_object(sony_nc_acpi_handle, "SN06", &params,
-                        &buffer);
-        if (ACPI_FAILURE(status))
+        i = sony_nc_buffer_call(sony_nc_acpi_handle, "SN06", &offset, buffer,
+                        32);
+        if (i < 0)
                 return;
 
-        lvl_enum = (union acpi_object *) buffer.pointer;
-        if (!lvl_enum) {
-                pr_err("No SN06 return object.");
-                return;
-        }
-        if (lvl_enum->type != ACPI_TYPE_BUFFER) {
-                pr_err("Invalid SN06 return object 0x%.2x\n",
-                       lvl_enum->type);
-                goto out_invalid;
-        }
-
         /* the buffer lists brightness levels available, brightness levels are
-         * from 0 to 8 in the array, other values are used by ALS control.
+         * from position 0 to 8 in the array, other values are used by ALS
+         * control.
          */
-        for (i = 0; i < 9 && i < lvl_enum->buffer.length; i++) {
+        for (i = 0; i < 9 && i < ARRAY_SIZE(buffer); i++) {
 
-                brlvl = *(lvl_enum->buffer.pointer + i);
-                dprintk("Brightness level: %d\n", brlvl);
+                dprintk("Brightness level: %d\n", buffer[i]);
 
-                if (!brlvl)
+                if (!buffer[i])
                         break;
 
-                if (brlvl > max)
-                        max = brlvl;
-                if (brlvl < min)
-                        min = brlvl;
+                if (buffer[i] > max)
+                        max = buffer[i];
+                if (buffer[i] < min)
+                        min = buffer[i];
         }
         props->offset = min;
         props->maxlvl = max;
         dprintk("Brightness levels: min=%d max=%d\n", props->offset,
                         props->maxlvl);
-
-out_invalid:
-        kfree(buffer.pointer);
-        return;
 }
 
 static void sony_nc_backlight_setup(void)
@@ -1715,28 +2599,25 @@ static int sony_nc_add(struct acpi_device *device)
 
         if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "ECON",
                                          &handle))) {
-                if (acpi_callsetfunc(sony_nc_acpi_handle, "ECON", 1, NULL))
+                int arg = 1;
+                if (sony_nc_int_call(sony_nc_acpi_handle, "ECON", &arg, NULL))
                         dprintk("ECON Method failed\n");
         }
 
         if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
                                          &handle))) {
                 dprintk("Doing SNC setup\n");
+                /* retrieve the available handles */
                 result = sony_nc_handles_setup(sony_pf_device);
-                if (result)
-                        goto outpresent;
-                result = sony_nc_kbd_backlight_setup(sony_pf_device);
-                if (result)
-                        goto outsnc;
-                sony_nc_function_setup(device);
-                sony_nc_rfkill_setup(device);
+                if (!result)
+                        sony_nc_function_setup(device, sony_pf_device);
         }
 
         /* setup input devices and helper fifo */
         result = sony_laptop_setup_input(device);
         if (result) {
                 pr_err("Unable to create input devices\n");
-                goto outkbdbacklight;
+                goto outsnc;
         }
 
         if (acpi_video_backlight_support()) {
@@ -1794,10 +2675,8 @@ static int sony_nc_add(struct acpi_device *device)
 
         sony_laptop_remove_input();
 
-      outkbdbacklight:
-        sony_nc_kbd_backlight_cleanup(sony_pf_device);
-
       outsnc:
+        sony_nc_function_cleanup(sony_pf_device);
         sony_nc_handles_cleanup(sony_pf_device);
 
       outpresent:
@@ -1820,11 +2699,10 @@ static int sony_nc_remove(struct acpi_device *device, int type)
                 device_remove_file(&sony_pf_device->dev, &item->devattr);
         }
 
-        sony_nc_kbd_backlight_cleanup(sony_pf_device);
+        sony_nc_function_cleanup(sony_pf_device);
         sony_nc_handles_cleanup(sony_pf_device);
         sony_pf_remove();
         sony_laptop_remove_input();
-        sony_nc_rfkill_cleanup();
         dprintk(SONY_NC_DRIVER_NAME " removed.\n");
 
         return 0;
@@ -2437,7 +3315,9 @@ static ssize_t sony_pic_wwanpower_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        value = simple_strtoul(buffer, NULL, 10);
+        if (kstrtoul(buffer, 10, &value))
+                return -EINVAL;
+
         mutex_lock(&spic_dev.lock);
         __sony_pic_set_wwanpower(value);
         mutex_unlock(&spic_dev.lock);
@@ -2474,7 +3354,9 @@ static ssize_t sony_pic_bluetoothpower_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        value = simple_strtoul(buffer, NULL, 10);
+        if (kstrtoul(buffer, 10, &value))
+                return -EINVAL;
+
         mutex_lock(&spic_dev.lock);
         __sony_pic_set_bluetoothpower(value);
         mutex_unlock(&spic_dev.lock);
@@ -2513,7 +3395,9 @@ static ssize_t sony_pic_fanspeed_store(struct device *dev,
         if (count > 31)
                 return -EINVAL;
 
-        value = simple_strtoul(buffer, NULL, 10);
+        if (kstrtoul(buffer, 10, &value))
+                return -EINVAL;
+
         if (sony_pic_set_fanspeed(value))
                 return -EIO;
 
@@ -2671,7 +3555,8 @@ static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd,
                         ret = -EIO;
                         break;
                 }
-                if (acpi_callgetfunc(sony_nc_acpi_handle, "GBRT", &value)) {
+                if (sony_nc_int_call(sony_nc_acpi_handle, "GBRT", NULL,
+                                        &value)) {
                         ret = -EIO;
                         break;
                 }
@@ -2688,8 +3573,9 @@ static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd,
                         ret = -EFAULT;
                         break;
                 }
-                if (acpi_callsetfunc(sony_nc_acpi_handle, "SBRT",
-                                (val8 >> 5) + 1, NULL)) {
+                value = (val8 >> 5) + 1;
+                if (sony_nc_int_call(sony_nc_acpi_handle, "SBRT", &value,
+                                        NULL)) {
                         ret = -EIO;
                         break;
                 }
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index d68c0002f4a2..8b5610d88418 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3402,7 +3402,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
         /* Do not issue duplicate brightness change events to
          * userspace. tpacpi_detect_brightness_capabilities() must have
          * been called before this point  */
-        if (tp_features.bright_acpimode && acpi_video_backlight_support()) {
+        if (acpi_video_backlight_support()) {
                 pr_info("This ThinkPad has standard ACPI backlight "
                         "brightness control, supported by the ACPI "
                         "video driver\n");
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 57787d87d9a4..dab10f6edcd4 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -95,6 +95,7 @@ MODULE_LICENSE("GPL");
 
 /* registers */
 #define HCI_FAN                         0x0004
+#define HCI_TR_BACKLIGHT                0x0005
 #define HCI_SYSTEM_EVENT                0x0016
 #define HCI_VIDEO_OUT                   0x001c
 #define HCI_HOTKEY_EVENT                0x001e
@@ -134,6 +135,7 @@ struct toshiba_acpi_dev {
         unsigned int system_event_supported:1;
         unsigned int ntfy_supported:1;
         unsigned int info_supported:1;
+        unsigned int tr_backlight_supported:1;
 
         struct mutex mutex;
 };
@@ -478,34 +480,70 @@ static const struct rfkill_ops toshiba_rfk_ops = {
         .poll = bt_rfkill_poll,
 };
 
+static int get_tr_backlight_status(struct toshiba_acpi_dev *dev, bool *enabled)
+{
+        u32 hci_result;
+        u32 status;
+
+        hci_read1(dev, HCI_TR_BACKLIGHT, &status, &hci_result);
+        *enabled = !status;
+        return hci_result == HCI_SUCCESS ? 0 : -EIO;
+}
+
+static int set_tr_backlight_status(struct toshiba_acpi_dev *dev, bool enable)
+{
+        u32 hci_result;
+        u32 value = !enable;
+
+        hci_write1(dev, HCI_TR_BACKLIGHT, value, &hci_result);
+        return hci_result == HCI_SUCCESS ? 0 : -EIO;
+}
+
 static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;
 
-static int get_lcd(struct backlight_device *bd)
+static int __get_lcd_brightness(struct toshiba_acpi_dev *dev)
 {
-        struct toshiba_acpi_dev *dev = bl_get_data(bd);
         u32 hci_result;
         u32 value;
+        int brightness = 0;
+
+        if (dev->tr_backlight_supported) {
+                bool enabled;
+                int ret = get_tr_backlight_status(dev, &enabled);
+                if (ret)
+                        return ret;
+                if (enabled)
+                        return 0;
+                brightness++;
+        }
 
         hci_read1(dev, HCI_LCD_BRIGHTNESS, &value, &hci_result);
         if (hci_result == HCI_SUCCESS)
-                return (value >> HCI_LCD_BRIGHTNESS_SHIFT);
+                return brightness + (value >> HCI_LCD_BRIGHTNESS_SHIFT);
 
         return -EIO;
 }
 
+static int get_lcd_brightness(struct backlight_device *bd)
+{
+        struct toshiba_acpi_dev *dev = bl_get_data(bd);
+        return __get_lcd_brightness(dev);
+}
+
 static int lcd_proc_show(struct seq_file *m, void *v)
 {
         struct toshiba_acpi_dev *dev = m->private;
         int value;
+        int levels;
 
         if (!dev->backlight_dev)
                 return -ENODEV;
 
-        value = get_lcd(dev->backlight_dev);
+        levels = dev->backlight_dev->props.max_brightness + 1;
+        value = get_lcd_brightness(dev->backlight_dev);
         if (value >= 0) {
                 seq_printf(m, "brightness:              %d\n", value);
-                seq_printf(m, "brightness_levels:       %d\n",
-                             HCI_LCD_BRIGHTNESS_LEVELS);
+                seq_printf(m, "brightness_levels:       %d\n", levels);
                 return 0;
         }
 
@@ -518,10 +556,19 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
         return single_open(file, lcd_proc_show, PDE(inode)->data);
 }
 
-static int set_lcd(struct toshiba_acpi_dev *dev, int value)
+static int set_lcd_brightness(struct toshiba_acpi_dev *dev, int value)
 {
         u32 hci_result;
 
+        if (dev->tr_backlight_supported) {
+                bool enable = !value;
+                int ret = set_tr_backlight_status(dev, enable);
+                if (ret)
+                        return ret;
+                if (value)
+                        value--;
+        }
+
         value = value << HCI_LCD_BRIGHTNESS_SHIFT;
         hci_write1(dev, HCI_LCD_BRIGHTNESS, value, &hci_result);
         return hci_result == HCI_SUCCESS ? 0 : -EIO;
@@ -530,7 +577,7 @@ static int set_lcd(struct toshiba_acpi_dev *dev, int value)
 static int set_lcd_status(struct backlight_device *bd)
 {
         struct toshiba_acpi_dev *dev = bl_get_data(bd);
-        return set_lcd(dev, bd->props.brightness);
+        return set_lcd_brightness(dev, bd->props.brightness);
 }
 
 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
@@ -541,6 +588,7 @@ static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
         size_t len;
         int value;
         int ret;
+        int levels = dev->backlight_dev->props.max_brightness + 1;
 
         len = min(count, sizeof(cmd) - 1);
         if (copy_from_user(cmd, buf, len))
@@ -548,8 +596,8 @@ static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
         cmd[len] = '\0';
 
         if (sscanf(cmd, " brightness : %i", &value) == 1 &&
-            value >= 0 && value < HCI_LCD_BRIGHTNESS_LEVELS) {
-                ret = set_lcd(dev, value);
+            value >= 0 && value < levels) {
+                ret = set_lcd_brightness(dev, value);
                 if (ret == 0)
                         ret = count;
         } else {
@@ -860,8 +908,9 @@ static void remove_toshiba_proc_entries(struct toshiba_acpi_dev *dev)
 }
 
 static const struct backlight_ops toshiba_backlight_data = {
-        .get_brightness = get_lcd,
-        .update_status  = set_lcd_status,
+        .options = BL_CORE_SUSPENDRESUME,
+        .get_brightness = get_lcd_brightness,
+        .update_status  = set_lcd_status,
 };
 
 static bool toshiba_acpi_i8042_filter(unsigned char data, unsigned char str,
@@ -1020,6 +1069,56 @@ static int __devinit toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
         return error;
 }
 
+static int __devinit toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
+{
+        struct backlight_properties props;
+        int brightness;
+        int ret;
+        bool enabled;
+
+        /*
+         * Some machines don't support the backlight methods at all, and
+         * others support it read-only. Either of these is pretty useless,
+         * so only register the backlight device if the backlight method
+         * supports both reads and writes.
+         */
+        brightness = __get_lcd_brightness(dev);
+        if (brightness < 0)
+                return 0;
+        ret = set_lcd_brightness(dev, brightness);
+        if (ret) {
+                pr_debug("Backlight method is read-only, disabling backlight support\n");
+                return 0;
+        }
+
+        /* Determine whether or not BIOS supports transflective backlight */
+        ret = get_tr_backlight_status(dev, &enabled);
+        dev->tr_backlight_supported = !ret;
+
+        memset(&props, 0, sizeof(props));
+        props.type = BACKLIGHT_PLATFORM;
+        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
+
+        /* adding an extra level and having 0 change to transflective mode */
+        if (dev->tr_backlight_supported)
+                props.max_brightness++;
+
+        dev->backlight_dev = backlight_device_register("toshiba",
+                                                       &dev->acpi_dev->dev,
+                                                       dev,
+                                                       &toshiba_backlight_data,
+                                                       &props);
+        if (IS_ERR(dev->backlight_dev)) {
+                ret = PTR_ERR(dev->backlight_dev);
+                pr_err("Could not register toshiba backlight device\n");
+                dev->backlight_dev = NULL;
+                return ret;
+        }
+
+        dev->backlight_dev->props.brightness = brightness;
+        return 0;
+}
+
 static int toshiba_acpi_remove(struct acpi_device *acpi_dev, int type)
 {
         struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
@@ -1078,7 +1177,6 @@ static int __devinit toshiba_acpi_add(struct acpi_device *acpi_dev)
         u32 dummy;
         bool bt_present;
         int ret = 0;
-        struct backlight_properties props;
 
         if (toshiba_acpi)
                 return -EBUSY;
@@ -1104,22 +1202,9 @@ static int __devinit toshiba_acpi_add(struct acpi_device *acpi_dev)
 
         mutex_init(&dev->mutex);
 
-        memset(&props, 0, sizeof(props));
-        props.type = BACKLIGHT_PLATFORM;
-        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
-        dev->backlight_dev = backlight_device_register("toshiba",
-                                                       &acpi_dev->dev,
-                                                       dev,
-                                                       &toshiba_backlight_data,
-                                                       &props);
-        if (IS_ERR(dev->backlight_dev)) {
-                ret = PTR_ERR(dev->backlight_dev);
-
-                pr_err("Could not register toshiba backlight device\n");
-                dev->backlight_dev = NULL;
+        ret = toshiba_acpi_setup_backlight(dev);
+        if (ret)
                 goto error;
-        }
-        dev->backlight_dev->props.brightness = get_lcd(dev->backlight_dev);
 
         /* Register rfkill switch for Bluetooth */
         if (hci_get_bt_present(dev, &bt_present) == HCI_SUCCESS && bt_present) {
diff --git a/drivers/platform/x86/xo1-rfkill.c b/drivers/platform/x86/xo1-rfkill.c
index 41781ed8301c..b57ad8641480 100644
--- a/drivers/platform/x86/xo1-rfkill.c
+++ b/drivers/platform/x86/xo1-rfkill.c
@@ -15,15 +15,26 @@
 
 #include <asm/olpc.h>
 
+static bool card_blocked;
+
 static int rfkill_set_block(void *data, bool blocked)
 {
         unsigned char cmd;
+        int r;
+
+        if (blocked == card_blocked)
+                return 0;
+
         if (blocked)
                 cmd = EC_WLAN_ENTER_RESET;
         else
                 cmd = EC_WLAN_LEAVE_RESET;
 
-        return olpc_ec_cmd(cmd, NULL, 0, NULL, 0);
+        r = olpc_ec_cmd(cmd, NULL, 0, NULL, 0);
+        if (r == 0)
+                card_blocked = blocked;
+
+        return r;
 }
 
 static const struct rfkill_ops rfkill_ops = {
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 99dc29f2f2f2..e3a3b4956f08 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -1,5 +1,5 @@
 menuconfig POWER_SUPPLY
-        tristate "Power supply class support"
+        bool "Power supply class support"
         help
           Say Y here to enable power supply class support. This allows
           power supply (batteries, AC, USB) monitoring by userspace
@@ -77,7 +77,7 @@ config BATTERY_DS2780
           Say Y here to enable support for batteries with ds2780 chip.
 
 config BATTERY_DS2781
-        tristate "2781 battery driver"
+        tristate "DS2781 battery driver"
         depends on HAS_IOMEM
         select W1
         select W1_SLAVE_DS2781
@@ -181,14 +181,15 @@ config BATTERY_MAX17040
           to operate with a single lithium cell
 
 config BATTERY_MAX17042
-        tristate "Maxim MAX17042/8997/8966 Fuel Gauge"
+        tristate "Maxim MAX17042/17047/17050/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.
+          with MAX17042. This driver also supports max17047/50 chips which are
+          improved version of max17042.
 
 config BATTERY_Z2
         tristate "Z2 battery driver"
@@ -291,6 +292,7 @@ config CHARGER_MAX8998
 config CHARGER_SMB347
         tristate "Summit Microelectronics SMB347 Battery Charger"
         depends on I2C
+        select REGMAP_I2C
         help
           Say Y to include support for Summit Microelectronics SMB347
           Battery Charger.
diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index d8bb99394ac0..bba3ccac72fe 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -964,10 +964,15 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
 {
         int irq, i, ret = 0;
         u8 val;
-        struct abx500_bm_plat_data *plat_data;
+        struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
+        struct ab8500_btemp *di;
+
+        if (!plat_data) {
+                dev_err(&pdev->dev, "No platform data\n");
+                return -EINVAL;
+        }
 
-        struct ab8500_btemp *di =
-                kzalloc(sizeof(struct ab8500_btemp), GFP_KERNEL);
+        di = kzalloc(sizeof(*di), GFP_KERNEL);
         if (!di)
                 return -ENOMEM;
 
@@ -977,7 +982,6 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
         di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
 
         /* get btemp specific platform data */
-        plat_data = pdev->dev.platform_data;
         di->pdata = plat_data->btemp;
         if (!di->pdata) {
                 dev_err(di->dev, "no btemp platform data supplied\n");
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index e2b4accbec88..d2303d0b7c75 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2534,10 +2534,15 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
 static int __devinit ab8500_charger_probe(struct platform_device *pdev)
 {
         int irq, i, charger_status, ret = 0;
-        struct abx500_bm_plat_data *plat_data;
+        struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
+        struct ab8500_charger *di;
 
-        struct ab8500_charger *di =
-                kzalloc(sizeof(struct ab8500_charger), GFP_KERNEL);
+        if (!plat_data) {
+                dev_err(&pdev->dev, "No platform data\n");
+                return -EINVAL;
+        }
+
+        di = kzalloc(sizeof(*di), GFP_KERNEL);
         if (!di)
                 return -ENOMEM;
 
@@ -2550,9 +2555,7 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
         spin_lock_init(&di->usb_state.usb_lock);
 
         /* get charger specific platform data */
-        plat_data = pdev->dev.platform_data;
         di->pdata = plat_data->charger;
-
         if (!di->pdata) {
                 dev_err(di->dev, "no charger platform data supplied\n");
                 ret = -EINVAL;
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index c22f2f05657e..bf022255994c 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2446,10 +2446,15 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
 {
         int i, irq;
         int ret = 0;
-        struct abx500_bm_plat_data *plat_data;
+        struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data;
+        struct ab8500_fg *di;
+
+        if (!plat_data) {
+                dev_err(&pdev->dev, "No platform data\n");
+                return -EINVAL;
+        }
 
-        struct ab8500_fg *di =
-                kzalloc(sizeof(struct ab8500_fg), GFP_KERNEL);
+        di = kzalloc(sizeof(*di), GFP_KERNEL);
         if (!di)
                 return -ENOMEM;
 
@@ -2461,7 +2466,6 @@ static int __devinit ab8500_fg_probe(struct platform_device *pdev)
         di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0");
 
         /* get fg specific platform data */
-        plat_data = pdev->dev.platform_data;
         di->pdata = plat_data->fg;
         if (!di->pdata) {
                 dev_err(di->dev, "no fg platform data supplied\n");
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 9eca9f1ff0ea..86935ec18954 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -23,6 +23,16 @@
 #include <linux/power/charger-manager.h>
 #include <linux/regulator/consumer.h>
 
+static const char * const default_event_names[] = {
+        [CM_EVENT_UNKNOWN] = "Unknown",
+        [CM_EVENT_BATT_FULL] = "Battery Full",
+        [CM_EVENT_BATT_IN] = "Battery Inserted",
+        [CM_EVENT_BATT_OUT] = "Battery Pulled Out",
+        [CM_EVENT_EXT_PWR_IN_OUT] = "External Power Attach/Detach",
+        [CM_EVENT_CHG_START_STOP] = "Charging Start/Stop",
+        [CM_EVENT_OTHERS] = "Other battery events"
+};
+
 /*
  * Regard CM_JIFFIES_SMALL jiffies is small enough to ignore for
  * delayed works so that we can run delayed works with CM_JIFFIES_SMALL
@@ -57,6 +67,12 @@ static bool cm_suspended;
 static bool cm_rtc_set;
 static unsigned long cm_suspend_duration_ms;
 
+/* About normal (not suspended) monitoring */
+static unsigned long polling_jiffy = ULONG_MAX; /* ULONG_MAX: no polling */
+static unsigned long next_polling; /* Next appointed polling time */
+static struct workqueue_struct *cm_wq; /* init at driver add */
+static struct delayed_work cm_monitor_work; /* init at driver add */
+
 /* Global charger-manager description */
 static struct charger_global_desc *g_desc; /* init with setup_charger_manager */
 
@@ -71,6 +87,11 @@ static bool is_batt_present(struct charger_manager *cm)
         int i, ret;
 
         switch (cm->desc->battery_present) {
+        case CM_BATTERY_PRESENT:
+                present = true;
+                break;
+        case CM_NO_BATTERY:
+                break;
         case CM_FUEL_GAUGE:
                 ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
                                 POWER_SUPPLY_PROP_PRESENT, &val);
@@ -279,6 +300,26 @@ static int try_charger_enable(struct charger_manager *cm, bool enable)
 }
 
 /**
+ * try_charger_restart - Restart charging.
+ * @cm: the Charger Manager representing the battery.
+ *
+ * Restart charging by turning off and on the charger.
+ */
+static int try_charger_restart(struct charger_manager *cm)
+{
+        int err;
+
+        if (cm->emergency_stop)
+                return -EAGAIN;
+
+        err = try_charger_enable(cm, false);
+        if (err)
+                return err;
+
+        return try_charger_enable(cm, true);
+}
+
+/**
  * uevent_notify - Let users know something has changed.
  * @cm: the Charger Manager representing the battery.
  * @event: the event string.
@@ -334,6 +375,46 @@ static void uevent_notify(struct charger_manager *cm, const char *event)
 }
 
 /**
+ * fullbatt_vchk - Check voltage drop some times after "FULL" event.
+ * @work: the work_struct appointing the function
+ *
+ * If a user has designated "fullbatt_vchkdrop_ms/uV" values with
+ * charger_desc, Charger Manager checks voltage drop after the battery
+ * "FULL" event. It checks whether the voltage has dropped more than
+ * fullbatt_vchkdrop_uV by calling this function after fullbatt_vchkrop_ms.
+ */
+static void fullbatt_vchk(struct work_struct *work)
+{
+        struct delayed_work *dwork = to_delayed_work(work);
+        struct charger_manager *cm = container_of(dwork,
+                        struct charger_manager, fullbatt_vchk_work);
+        struct charger_desc *desc = cm->desc;
+        int batt_uV, err, diff;
+
+        /* remove the appointment for fullbatt_vchk */
+        cm->fullbatt_vchk_jiffies_at = 0;
+
+        if (!desc->fullbatt_vchkdrop_uV || !desc->fullbatt_vchkdrop_ms)
+                return;
+
+        err = get_batt_uV(cm, &batt_uV);
+        if (err) {
+                dev_err(cm->dev, "%s: get_batt_uV error(%d).\n", __func__, err);
+                return;
+        }
+
+        diff = cm->fullbatt_vchk_uV;
+        diff -= batt_uV;
+
+        dev_dbg(cm->dev, "VBATT dropped %duV after full-batt.\n", diff);
+
+        if (diff > desc->fullbatt_vchkdrop_uV) {
+                try_charger_restart(cm);
+                uevent_notify(cm, "Recharge");
+        }
+}
+
+/**
  * _cm_monitor - Monitor the temperature and return true for exceptions.
  * @cm: the Charger Manager representing the battery.
  *
@@ -392,6 +473,131 @@ static bool cm_monitor(void)
         return stop;
 }
 
+/**
+ * _setup_polling - Setup the next instance of polling.
+ * @work: work_struct of the function _setup_polling.
+ */
+static void _setup_polling(struct work_struct *work)
+{
+        unsigned long min = ULONG_MAX;
+        struct charger_manager *cm;
+        bool keep_polling = false;
+        unsigned long _next_polling;
+
+        mutex_lock(&cm_list_mtx);
+
+        list_for_each_entry(cm, &cm_list, entry) {
+                if (is_polling_required(cm) && cm->desc->polling_interval_ms) {
+                        keep_polling = true;
+
+                        if (min > cm->desc->polling_interval_ms)
+                                min = cm->desc->polling_interval_ms;
+                }
+        }
+
+        polling_jiffy = msecs_to_jiffies(min);
+        if (polling_jiffy <= CM_JIFFIES_SMALL)
+                polling_jiffy = CM_JIFFIES_SMALL + 1;
+
+        if (!keep_polling)
+                polling_jiffy = ULONG_MAX;
+        if (polling_jiffy == ULONG_MAX)
+                goto out;
+
+        WARN(cm_wq == NULL, "charger-manager: workqueue not initialized"
+                            ". try it later. %s\n", __func__);
+
+        _next_polling = jiffies + polling_jiffy;
+
+        if (!delayed_work_pending(&cm_monitor_work) ||
+            (delayed_work_pending(&cm_monitor_work) &&
+             time_after(next_polling, _next_polling))) {
+                cancel_delayed_work_sync(&cm_monitor_work);
+                next_polling = jiffies + polling_jiffy;
+                queue_delayed_work(cm_wq, &cm_monitor_work, polling_jiffy);
+        }
+
+out:
+        mutex_unlock(&cm_list_mtx);
+}
+static DECLARE_WORK(setup_polling, _setup_polling);
+
+/**
+ * cm_monitor_poller - The Monitor / Poller.
+ * @work: work_struct of the function cm_monitor_poller
+ *
+ * During non-suspended state, cm_monitor_poller is used to poll and monitor
+ * the batteries.
+ */
+static void cm_monitor_poller(struct work_struct *work)
+{
+        cm_monitor();
+        schedule_work(&setup_polling);
+}
+
+/**
+ * fullbatt_handler - Event handler for CM_EVENT_BATT_FULL
+ * @cm: the Charger Manager representing the battery.
+ */
+static void fullbatt_handler(struct charger_manager *cm)
+{
+        struct charger_desc *desc = cm->desc;
+
+        if (!desc->fullbatt_vchkdrop_uV || !desc->fullbatt_vchkdrop_ms)
+                goto out;
+
+        if (cm_suspended)
+                device_set_wakeup_capable(cm->dev, true);
+
+        if (delayed_work_pending(&cm->fullbatt_vchk_work))
+                cancel_delayed_work(&cm->fullbatt_vchk_work);
+        queue_delayed_work(cm_wq, &cm->fullbatt_vchk_work,
+                           msecs_to_jiffies(desc->fullbatt_vchkdrop_ms));
+        cm->fullbatt_vchk_jiffies_at = jiffies + msecs_to_jiffies(
+                                       desc->fullbatt_vchkdrop_ms);
+
+        if (cm->fullbatt_vchk_jiffies_at == 0)
+                cm->fullbatt_vchk_jiffies_at = 1;
+
+out:
+        dev_info(cm->dev, "EVENT_HANDLE: Battery Fully Charged.\n");
+        uevent_notify(cm, default_event_names[CM_EVENT_BATT_FULL]);
+}
+
+/**
+ * battout_handler - Event handler for CM_EVENT_BATT_OUT
+ * @cm: the Charger Manager representing the battery.
+ */
+static void battout_handler(struct charger_manager *cm)
+{
+        if (cm_suspended)
+                device_set_wakeup_capable(cm->dev, true);
+
+        if (!is_batt_present(cm)) {
+                dev_emerg(cm->dev, "Battery Pulled Out!\n");
+                uevent_notify(cm, default_event_names[CM_EVENT_BATT_OUT]);
+        } else {
+                uevent_notify(cm, "Battery Reinserted?");
+        }
+}
+
+/**
+ * misc_event_handler - Handler for other evnets
+ * @cm: the Charger Manager representing the battery.
+ * @type: the Charger Manager representing the battery.
+ */
+static void misc_event_handler(struct charger_manager *cm,
+                        enum cm_event_types type)
+{
+        if (cm_suspended)
+                device_set_wakeup_capable(cm->dev, true);
+
+        if (!delayed_work_pending(&cm_monitor_work) &&
+            is_polling_required(cm) && cm->desc->polling_interval_ms)
+                schedule_work(&setup_polling);
+        uevent_notify(cm, default_event_names[type]);
+}
+
 static int charger_get_property(struct power_supply *psy,
                 enum power_supply_property psp,
                 union power_supply_propval *val)
@@ -613,6 +819,21 @@ static bool cm_setup_timer(void)
         mutex_lock(&cm_list_mtx);
 
         list_for_each_entry(cm, &cm_list, entry) {
+                unsigned int fbchk_ms = 0;
+
+                /* fullbatt_vchk is required. setup timer for that */
+                if (cm->fullbatt_vchk_jiffies_at) {
+                        fbchk_ms = jiffies_to_msecs(cm->fullbatt_vchk_jiffies_at
+                                                    - jiffies);
+                        if (time_is_before_eq_jiffies(
+                                cm->fullbatt_vchk_jiffies_at) ||
+                                msecs_to_jiffies(fbchk_ms) < CM_JIFFIES_SMALL) {
+                                fullbatt_vchk(&cm->fullbatt_vchk_work.work);
+                                fbchk_ms = 0;
+                        }
+                }
+                CM_MIN_VALID(wakeup_ms, fbchk_ms);
+
                 /* Skip if polling is not required for this CM */
                 if (!is_polling_required(cm) && !cm->emergency_stop)
                         continue;
@@ -672,6 +893,23 @@ static bool cm_setup_timer(void)
         return false;
 }
 
+static void _cm_fbchk_in_suspend(struct charger_manager *cm)
+{
+        unsigned long jiffy_now = jiffies;
+
+        if (!cm->fullbatt_vchk_jiffies_at)
+                return;
+
+        if (g_desc && g_desc->assume_timer_stops_in_suspend)
+                jiffy_now += msecs_to_jiffies(cm_suspend_duration_ms);
+
+        /* Execute now if it's going to be executed not too long after */
+        jiffy_now += CM_JIFFIES_SMALL;
+
+        if (time_after_eq(jiffy_now, cm->fullbatt_vchk_jiffies_at))
+                fullbatt_vchk(&cm->fullbatt_vchk_work.work);
+}
+
 /**
  * cm_suspend_again - Determine whether suspend again or not
  *
@@ -693,6 +931,8 @@ bool cm_suspend_again(void)
         ret = true;
         mutex_lock(&cm_list_mtx);
         list_for_each_entry(cm, &cm_list, entry) {
+                _cm_fbchk_in_suspend(cm);
+
                 if (cm->status_save_ext_pwr_inserted != is_ext_pwr_online(cm) ||
                     cm->status_save_batt != is_batt_present(cm)) {
                         ret = false;
@@ -796,6 +1036,21 @@ static int charger_manager_probe(struct platform_device *pdev)
         memcpy(cm->desc, desc, sizeof(struct charger_desc));
         cm->last_temp_mC = INT_MIN; /* denotes "unmeasured, yet" */
 
+        /*
+         * The following two do not need to be errors.
+         * Users may intentionally ignore those two features.
+         */
+        if (desc->fullbatt_uV == 0) {
+                dev_info(&pdev->dev, "Ignoring full-battery voltage threshold"
+                                        " as it is not supplied.");
+        }
+        if (!desc->fullbatt_vchkdrop_ms || !desc->fullbatt_vchkdrop_uV) {
+                dev_info(&pdev->dev, "Disabling full-battery voltage drop "
+                                "checking mechanism as it is not supplied.");
+                desc->fullbatt_vchkdrop_ms = 0;
+                desc->fullbatt_vchkdrop_uV = 0;
+        }
+
         if (!desc->charger_regulators || desc->num_charger_regulators < 1) {
                 ret = -EINVAL;
                 dev_err(&pdev->dev, "charger_regulators undefined.\n");
@@ -903,6 +1158,8 @@ static int charger_manager_probe(struct platform_device *pdev)
                 cm->charger_psy.num_properties++;
         }
 
+        INIT_DELAYED_WORK(&cm->fullbatt_vchk_work, fullbatt_vchk);
+
         ret = power_supply_register(NULL, &cm->charger_psy);
         if (ret) {
                 dev_err(&pdev->dev, "Cannot register charger-manager with"
@@ -928,6 +1185,15 @@ static int charger_manager_probe(struct platform_device *pdev)
         list_add(&cm->entry, &cm_list);
         mutex_unlock(&cm_list_mtx);
 
+        /*
+         * Charger-manager is capable of waking up the systme from sleep
+         * when event is happend through cm_notify_event()
+         */
+        device_init_wakeup(&pdev->dev, true);
+        device_set_wakeup_capable(&pdev->dev, false);
+
+        schedule_work(&setup_polling);
+
         return 0;
 
 err_chg_enable:
@@ -958,9 +1224,17 @@ static int __devexit charger_manager_remove(struct platform_device *pdev)
         list_del(&cm->entry);
         mutex_unlock(&cm_list_mtx);
 
+        if (work_pending(&setup_polling))
+                cancel_work_sync(&setup_polling);
+        if (delayed_work_pending(&cm_monitor_work))
+                cancel_delayed_work_sync(&cm_monitor_work);
+
         regulator_bulk_free(desc->num_charger_regulators,
                             desc->charger_regulators);
         power_supply_unregister(&cm->charger_psy);
+
+        try_charger_enable(cm, false);
+
         kfree(cm->charger_psy.properties);
         kfree(cm->charger_stat);
         kfree(cm->desc);
@@ -975,6 +1249,18 @@ static const struct platform_device_id charger_manager_id[] = {
 };
 MODULE_DEVICE_TABLE(platform, charger_manager_id);
 
+static int cm_suspend_noirq(struct device *dev)
+{
+        int ret = 0;
+
+        if (device_may_wakeup(dev)) {
+                device_set_wakeup_capable(dev, false);
+                ret = -EAGAIN;
+        }
+
+        return ret;
+}
+
 static int cm_suspend_prepare(struct device *dev)
 {
         struct charger_manager *cm = dev_get_drvdata(dev);
@@ -1000,6 +1286,8 @@ static int cm_suspend_prepare(struct device *dev)
                 cm_suspended = true;
         }
 
+        if (delayed_work_pending(&cm->fullbatt_vchk_work))
+                cancel_delayed_work(&cm->fullbatt_vchk_work);
         cm->status_save_ext_pwr_inserted = is_ext_pwr_online(cm);
         cm->status_save_batt = is_batt_present(cm);
 
@@ -1027,11 +1315,40 @@ static void cm_suspend_complete(struct device *dev)
                 cm_rtc_set = false;
         }
 
+        /* Re-enqueue delayed work (fullbatt_vchk_work) */
+        if (cm->fullbatt_vchk_jiffies_at) {
+                unsigned long delay = 0;
+                unsigned long now = jiffies + CM_JIFFIES_SMALL;
+
+                if (time_after_eq(now, cm->fullbatt_vchk_jiffies_at)) {
+                        delay = (unsigned long)((long)now
+                                - (long)(cm->fullbatt_vchk_jiffies_at));
+                        delay = jiffies_to_msecs(delay);
+                } else {
+                        delay = 0;
+                }
+
+                /*
+                 * Account for cm_suspend_duration_ms if
+                 * assume_timer_stops_in_suspend is active
+                 */
+                if (g_desc && g_desc->assume_timer_stops_in_suspend) {
+                        if (delay > cm_suspend_duration_ms)
+                                delay -= cm_suspend_duration_ms;
+                        else
+                                delay = 0;
+                }
+
+                queue_delayed_work(cm_wq, &cm->fullbatt_vchk_work,
+                                   msecs_to_jiffies(delay));
+        }
+        device_set_wakeup_capable(cm->dev, false);
         uevent_notify(cm, NULL);
 }
 
 static const struct dev_pm_ops charger_manager_pm = {
         .prepare        = cm_suspend_prepare,
+        .suspend_noirq  = cm_suspend_noirq,
         .complete       = cm_suspend_complete,
 };
 
@@ -1048,16 +1365,91 @@ static struct platform_driver charger_manager_driver = {
 
 static int __init charger_manager_init(void)
 {
+        cm_wq = create_freezable_workqueue("charger_manager");
+        INIT_DELAYED_WORK(&cm_monitor_work, cm_monitor_poller);
+
         return platform_driver_register(&charger_manager_driver);
 }
 late_initcall(charger_manager_init);
 
 static void __exit charger_manager_cleanup(void)
 {
+        destroy_workqueue(cm_wq);
+        cm_wq = NULL;
+
         platform_driver_unregister(&charger_manager_driver);
 }
 module_exit(charger_manager_cleanup);
 
+/**
+ * find_power_supply - find the associated power_supply of charger
+ * @cm: the Charger Manager representing the battery
+ * @psy: pointer to instance of charger's power_supply
+ */
+static bool find_power_supply(struct charger_manager *cm,
+                        struct power_supply *psy)
+{
+        int i;
+        bool found = false;
+
+        for (i = 0; cm->charger_stat[i]; i++) {
+                if (psy == cm->charger_stat[i]) {
+                        found = true;
+                        break;
+                }
+        }
+
+        return found;
+}
+
+/**
+ * cm_notify_event - charger driver notify Charger Manager of charger event
+ * @psy: pointer to instance of charger's power_supply
+ * @type: type of charger event
+ * @msg: optional message passed to uevent_notify fuction
+ */
+void cm_notify_event(struct power_supply *psy, enum cm_event_types type,
+                     char *msg)
+{
+        struct charger_manager *cm;
+        bool found_power_supply = false;
+
+        if (psy == NULL)
+                return;
+
+        mutex_lock(&cm_list_mtx);
+        list_for_each_entry(cm, &cm_list, entry) {
+                found_power_supply = find_power_supply(cm, psy);
+                if (found_power_supply)
+                        break;
+        }
+        mutex_unlock(&cm_list_mtx);
+
+        if (!found_power_supply)
+                return;
+
+        switch (type) {
+        case CM_EVENT_BATT_FULL:
+                fullbatt_handler(cm);
+                break;
+        case CM_EVENT_BATT_OUT:
+                battout_handler(cm);
+                break;
+        case CM_EVENT_BATT_IN:
+        case CM_EVENT_EXT_PWR_IN_OUT ... CM_EVENT_CHG_START_STOP:
+                misc_event_handler(cm, type);
+                break;
+        case CM_EVENT_UNKNOWN:
+        case CM_EVENT_OTHERS:
+                uevent_notify(cm, msg ? msg : default_event_names[type]);
+                break;
+        default:
+                dev_err(cm->dev, "%s type not specified.\n", __func__);
+                break;
+        }
+}
+EXPORT_SYMBOL_GPL(cm_notify_event);
+
 MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 MODULE_DESCRIPTION("Charger Manager");
 MODULE_LICENSE("GPL");
diff --git a/drivers/power/ds2781_battery.c b/drivers/power/ds2781_battery.c
index ca0d653d0a7a..975684a40f15 100644
--- a/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@ -643,9 +643,7 @@ static ssize_t ds2781_read_param_eeprom_bin(struct file *filp,
         struct power_supply *psy = to_power_supply(dev);
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK1_END -
-                DS2781_EEPROM_BLOCK1_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_PARAM_EEPROM_SIZE - off);
 
         return ds2781_read_block(dev_info, buf,
                                 DS2781_EEPROM_BLOCK1_START + off, count);
@@ -661,9 +659,7 @@ static ssize_t ds2781_write_param_eeprom_bin(struct file *filp,
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
         int ret;
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK1_END -
-                DS2781_EEPROM_BLOCK1_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_PARAM_EEPROM_SIZE - off);
 
         ret = ds2781_write(dev_info, buf,
                                 DS2781_EEPROM_BLOCK1_START + off, count);
@@ -682,7 +678,7 @@ static struct bin_attribute ds2781_param_eeprom_bin_attr = {
                 .name = "param_eeprom",
                 .mode = S_IRUGO | S_IWUSR,
         },
-        .size = DS2781_EEPROM_BLOCK1_END - DS2781_EEPROM_BLOCK1_START + 1,
+        .size = DS2781_PARAM_EEPROM_SIZE,
         .read = ds2781_read_param_eeprom_bin,
         .write = ds2781_write_param_eeprom_bin,
 };
@@ -696,9 +692,7 @@ static ssize_t ds2781_read_user_eeprom_bin(struct file *filp,
         struct power_supply *psy = to_power_supply(dev);
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK0_END -
-                DS2781_EEPROM_BLOCK0_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_USER_EEPROM_SIZE - off);
 
         return ds2781_read_block(dev_info, buf,
                                 DS2781_EEPROM_BLOCK0_START + off, count);
@@ -715,9 +709,7 @@ static ssize_t ds2781_write_user_eeprom_bin(struct file *filp,
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
         int ret;
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK0_END -
-                DS2781_EEPROM_BLOCK0_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_USER_EEPROM_SIZE - off);
 
         ret = ds2781_write(dev_info, buf,
                                 DS2781_EEPROM_BLOCK0_START + off, count);
@@ -736,7 +728,7 @@ static struct bin_attribute ds2781_user_eeprom_bin_attr = {
                 .name = "user_eeprom",
                 .mode = S_IRUGO | S_IWUSR,
         },
-        .size = DS2781_EEPROM_BLOCK0_END - DS2781_EEPROM_BLOCK0_START + 1,
+        .size = DS2781_USER_EEPROM_SIZE,
         .read = ds2781_read_user_eeprom_bin,
         .write = ds2781_write_user_eeprom_bin,
 };
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 39eb50f35f09..e5ccd2979773 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -474,13 +474,13 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 fail2:
         power_supply_unregister(&isp->psy);
 fail1:
+        isp1704_charger_set_power(isp, 0);
         usb_put_transceiver(isp->phy);
 fail0:
         kfree(isp);
 
         dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);
 
-        isp1704_charger_set_power(isp, 0);
         return ret;
 }
 
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 04620c2cb388..140788b309f8 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
 #include <linux/mod_devicetable.h>
 #include <linux/power_supply.h>
 #include <linux/power/max17042_battery.h>
@@ -61,9 +62,13 @@
 #define dP_ACC_100      0x1900
 #define dP_ACC_200      0x3200
 
+#define MAX17042_IC_VERSION     0x0092
+#define MAX17047_IC_VERSION     0x00AC  /* same for max17050 */
+
 struct max17042_chip {
         struct i2c_client *client;
         struct power_supply battery;
+        enum max170xx_chip_type chip_type;
         struct max17042_platform_data *pdata;
         struct work_struct work;
         int    init_complete;
@@ -105,6 +110,7 @@ static enum power_supply_property max17042_battery_props[] = {
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_NOW,
         POWER_SUPPLY_PROP_VOLTAGE_AVG,
+        POWER_SUPPLY_PROP_VOLTAGE_OCV,
         POWER_SUPPLY_PROP_CAPACITY,
         POWER_SUPPLY_PROP_CHARGE_FULL,
         POWER_SUPPLY_PROP_TEMP,
@@ -150,7 +156,10 @@ static int max17042_get_property(struct power_supply *psy,
                 val->intval *= 20000; /* Units of LSB = 20mV */
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
-                ret = max17042_read_reg(chip->client, MAX17042_V_empty);
+                if (chip->chip_type == MAX17042)
+                        ret = max17042_read_reg(chip->client, MAX17042_V_empty);
+                else
+                        ret = max17042_read_reg(chip->client, MAX17047_V_empty);
                 if (ret < 0)
                         return ret;
 
@@ -171,6 +180,13 @@ static int max17042_get_property(struct power_supply *psy,
 
                 val->intval = ret * 625 / 8;
                 break;
+        case POWER_SUPPLY_PROP_VOLTAGE_OCV:
+                ret = max17042_read_reg(chip->client, MAX17042_OCVInternal);
+                if (ret < 0)
+                        return ret;
+
+                val->intval = ret * 625 / 8;
+                break;
         case POWER_SUPPLY_PROP_CAPACITY:
                 ret = max17042_read_reg(chip->client, MAX17042_RepSOC);
                 if (ret < 0)
@@ -325,11 +341,10 @@ static inline int max17042_model_data_compare(struct max17042_chip *chip,
 static int max17042_init_model(struct max17042_chip *chip)
 {
         int ret;
-        int table_size =
-                sizeof(chip->pdata->config_data->cell_char_tbl)/sizeof(u16);
+        int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
         u16 *temp_data;
 
-        temp_data = kzalloc(table_size, GFP_KERNEL);
+        temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
         if (!temp_data)
                 return -ENOMEM;
 
@@ -354,12 +369,11 @@ static int max17042_init_model(struct max17042_chip *chip)
 static int max17042_verify_model_lock(struct max17042_chip *chip)
 {
         int i;
-        int table_size =
-                sizeof(chip->pdata->config_data->cell_char_tbl);
+        int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
         u16 *temp_data;
         int ret = 0;
 
-        temp_data = kzalloc(table_size, GFP_KERNEL);
+        temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
         if (!temp_data)
                 return -ENOMEM;
 
@@ -382,6 +396,9 @@ static void max17042_write_config_regs(struct max17042_chip *chip)
         max17042_write_reg(chip->client, MAX17042_FilterCFG,
                         config->filter_cfg);
         max17042_write_reg(chip->client, MAX17042_RelaxCFG, config->relax_cfg);
+        if (chip->chip_type == MAX17047)
+                max17042_write_reg(chip->client, MAX17047_FullSOCThr,
+                                                config->full_soc_thresh);
 }
 
 static void  max17042_write_custom_regs(struct max17042_chip *chip)
@@ -392,12 +409,23 @@ static void  max17042_write_custom_regs(struct max17042_chip *chip)
                                 config->rcomp0);
         max17042_write_verify_reg(chip->client, MAX17042_TempCo,
                                 config->tcompc0);
-        max17042_write_reg(chip->client, MAX17042_EmptyTempCo,
-                        config->empty_tempco);
-        max17042_write_verify_reg(chip->client, MAX17042_K_empty0,
-                                config->kempty0);
         max17042_write_verify_reg(chip->client, MAX17042_ICHGTerm,
                                 config->ichgt_term);
+        if (chip->chip_type == MAX17042) {
+                max17042_write_reg(chip->client, MAX17042_EmptyTempCo,
+                                        config->empty_tempco);
+                max17042_write_verify_reg(chip->client, MAX17042_K_empty0,
+                                        config->kempty0);
+        } else {
+                max17042_write_verify_reg(chip->client, MAX17047_QRTbl00,
+                                                config->qrtbl00);
+                max17042_write_verify_reg(chip->client, MAX17047_QRTbl10,
+                                                config->qrtbl10);
+                max17042_write_verify_reg(chip->client, MAX17047_QRTbl20,
+                                                config->qrtbl20);
+                max17042_write_verify_reg(chip->client, MAX17047_QRTbl30,
+                                                config->qrtbl30);
+        }
 }
 
 static void max17042_update_capacity_regs(struct max17042_chip *chip)
@@ -453,6 +481,8 @@ static void max17042_load_new_capacity_params(struct max17042_chip *chip)
                         config->design_cap);
         max17042_write_verify_reg(chip->client, MAX17042_FullCAPNom,
                         config->fullcapnom);
+        /* Update SOC register with new SOC */
+        max17042_write_reg(chip->client, MAX17042_RepSOC, vfSoc);
 }
 
 /*
@@ -489,20 +519,28 @@ static inline void max17042_override_por_values(struct max17042_chip *chip)
 
         max17042_override_por(client, MAX17042_FullCAP, config->fullcap);
         max17042_override_por(client, MAX17042_FullCAPNom, config->fullcapnom);
-        max17042_override_por(client, MAX17042_SOC_empty, config->socempty);
+        if (chip->chip_type == MAX17042)
+                max17042_override_por(client, MAX17042_SOC_empty,
+                                                config->socempty);
         max17042_override_por(client, MAX17042_LAvg_empty, config->lavg_empty);
         max17042_override_por(client, MAX17042_dQacc, config->dqacc);
         max17042_override_por(client, MAX17042_dPacc, config->dpacc);
 
-        max17042_override_por(client, MAX17042_V_empty, config->vempty);
+        if (chip->chip_type == MAX17042)
+                max17042_override_por(client, MAX17042_V_empty, config->vempty);
+        else
+                max17042_override_por(client, MAX17047_V_empty, config->vempty);
         max17042_override_por(client, MAX17042_TempNom, config->temp_nom);
         max17042_override_por(client, MAX17042_TempLim, config->temp_lim);
         max17042_override_por(client, MAX17042_FCTC, config->fctc);
         max17042_override_por(client, MAX17042_RCOMP0, config->rcomp0);
         max17042_override_por(client, MAX17042_TempCo, config->tcompc0);
-        max17042_override_por(client, MAX17042_EmptyTempCo,
-                        config->empty_tempco);
-        max17042_override_por(client, MAX17042_K_empty0, config->kempty0);
+        if (chip->chip_type) {
+                max17042_override_por(client, MAX17042_EmptyTempCo,
+                                        config->empty_tempco);
+                max17042_override_por(client, MAX17042_K_empty0,
+                                        config->kempty0);
+        }
 }
 
 static int max17042_init_chip(struct max17042_chip *chip)
@@ -659,7 +697,19 @@ static int __devinit max17042_probe(struct i2c_client *client,
 
         i2c_set_clientdata(client, chip);
 
-        chip->battery.name              = "max17042_battery";
+        ret = max17042_read_reg(chip->client, MAX17042_DevName);
+        if (ret == MAX17042_IC_VERSION) {
+                dev_dbg(&client->dev, "chip type max17042 detected\n");
+                chip->chip_type = MAX17042;
+        } else if (ret == MAX17047_IC_VERSION) {
+                dev_dbg(&client->dev, "chip type max17047/50 detected\n");
+                chip->chip_type = MAX17047;
+        } else {
+                dev_err(&client->dev, "device version mismatch: %x\n", ret);
+                return -EIO;
+        }
+
+        chip->battery.name              = "max170xx_battery";
         chip->battery.type              = POWER_SUPPLY_TYPE_BATTERY;
         chip->battery.get_property      = max17042_get_property;
         chip->battery.properties        = max17042_battery_props;
@@ -683,6 +733,12 @@ static int __devinit max17042_probe(struct i2c_client *client,
                 max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);
         }
 
+        ret = power_supply_register(&client->dev, &chip->battery);
+        if (ret) {
+                dev_err(&client->dev, "failed: power supply register\n");
+                return ret;
+        }
+
         if (client->irq) {
                 ret = request_threaded_irq(client->irq, NULL,
                                                 max17042_thread_handler,
@@ -693,13 +749,14 @@ static int __devinit max17042_probe(struct i2c_client *client,
                         reg |= CONFIG_ALRT_BIT_ENBL;
                         max17042_write_reg(client, MAX17042_CONFIG, reg);
                         max17042_set_soc_threshold(chip, 1);
-                } else
+                } else {
+                        client->irq = 0;
                         dev_err(&client->dev, "%s(): cannot get IRQ\n",
                                 __func__);
+                }
         }
 
         reg = max17042_read_reg(chip->client, MAX17042_STATUS);
-
         if (reg & STATUS_POR_BIT) {
                 INIT_WORK(&chip->work, max17042_init_worker);
                 schedule_work(&chip->work);
@@ -707,23 +764,65 @@ static int __devinit max17042_probe(struct i2c_client *client,
                 chip->init_complete = 1;
         }
 
-        ret = power_supply_register(&client->dev, &chip->battery);
-        if (ret)
-                dev_err(&client->dev, "failed: power supply register\n");
-        return ret;
+        return 0;
 }
 
 static int __devexit max17042_remove(struct i2c_client *client)
 {
         struct max17042_chip *chip = i2c_get_clientdata(client);
 
+        if (client->irq)
+                free_irq(client->irq, chip);
         power_supply_unregister(&chip->battery);
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int max17042_suspend(struct device *dev)
+{
+        struct max17042_chip *chip = dev_get_drvdata(dev);
+
+        /*
+         * disable the irq and enable irq_wake
+         * capability to the interrupt line.
+         */
+        if (chip->client->irq) {
+                disable_irq(chip->client->irq);
+                enable_irq_wake(chip->client->irq);
+        }
+
+        return 0;
+}
+
+static int max17042_resume(struct device *dev)
+{
+        struct max17042_chip *chip = dev_get_drvdata(dev);
+
+        if (chip->client->irq) {
+                disable_irq_wake(chip->client->irq);
+                enable_irq(chip->client->irq);
+                /* re-program the SOC thresholds to 1% change */
+                max17042_set_soc_threshold(chip, 1);
+        }
+
+        return 0;
+}
+
+static const struct dev_pm_ops max17042_pm_ops = {
+        .suspend        = max17042_suspend,
+        .resume         = max17042_resume,
+};
+
+#define MAX17042_PM_OPS (&max17042_pm_ops)
+#else
+#define MAX17042_PM_OPS NULL
+#endif
+
 #ifdef CONFIG_OF
 static const struct of_device_id max17042_dt_match[] = {
         { .compatible = "maxim,max17042" },
+        { .compatible = "maxim,max17047" },
+        { .compatible = "maxim,max17050" },
         { },
 };
 MODULE_DEVICE_TABLE(of, max17042_dt_match);
@@ -731,6 +830,8 @@ MODULE_DEVICE_TABLE(of, max17042_dt_match);
 
 static const struct i2c_device_id max17042_id[] = {
         { "max17042", 0 },
+        { "max17047", 1 },
+        { "max17050", 2 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, max17042_id);
@@ -739,6 +840,7 @@ static struct i2c_driver max17042_i2c_driver = {
         .driver = {
                 .name   = "max17042",
                 .of_match_table = of_match_ptr(max17042_dt_match),
+                .pm     = MAX17042_PM_OPS,
         },
         .probe          = max17042_probe,
         .remove         = __devexit_p(max17042_remove),
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 4368e7d61316..4150747f9186 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -146,6 +146,7 @@ static struct device_attribute power_supply_attrs[] = {
         POWER_SUPPLY_ATTR(voltage_min_design),
         POWER_SUPPLY_ATTR(voltage_now),
         POWER_SUPPLY_ATTR(voltage_avg),
+        POWER_SUPPLY_ATTR(voltage_ocv),
         POWER_SUPPLY_ATTR(current_max),
         POWER_SUPPLY_ATTR(current_now),
         POWER_SUPPLY_ATTR(current_avg),
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 06b659d91790..a5b6849d4123 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -89,7 +89,7 @@ static const struct chip_data {
         [REG_CURRENT] =
                 SBS_DATA(POWER_SUPPLY_PROP_CURRENT_NOW, 0x0A, -32768, 32767),
         [REG_CAPACITY] =
-                SBS_DATA(POWER_SUPPLY_PROP_CAPACITY, 0x0E, 0, 100),
+                SBS_DATA(POWER_SUPPLY_PROP_CAPACITY, 0x0D, 0, 100),
         [REG_REMAINING_CAPACITY] =
                 SBS_DATA(POWER_SUPPLY_PROP_ENERGY_NOW, 0x0F, 0, 65535),
         [REG_REMAINING_CAPACITY_CHARGE] =
diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index ce1694d1a365..f8eedd8a676f 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -11,7 +11,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/debugfs.h>
+#include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -21,7 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/power_supply.h>
 #include <linux/power/smb347-charger.h>
-#include <linux/seq_file.h>
+#include <linux/regmap.h>
 
 /*
  * Configuration registers. These are mirrored to volatile RAM and can be
@@ -39,6 +39,7 @@
 #define CFG_CURRENT_LIMIT_DC_SHIFT              4
 #define CFG_CURRENT_LIMIT_USB_MASK              0x0f
 #define CFG_FLOAT_VOLTAGE                       0x03
+#define CFG_FLOAT_VOLTAGE_FLOAT_MASK            0x3f
 #define CFG_FLOAT_VOLTAGE_THRESHOLD_MASK        0xc0
 #define CFG_FLOAT_VOLTAGE_THRESHOLD_SHIFT       6
 #define CFG_STAT                                0x05
@@ -113,29 +114,31 @@
 #define STAT_C_CHARGER_ERROR                    BIT(6)
 #define STAT_E                                  0x3f
 
+#define SMB347_MAX_REGISTER                     0x3f
+
 /**
  * struct smb347_charger - smb347 charger instance
  * @lock: protects concurrent access to online variables
- * @client: pointer to i2c client
+ * @dev: pointer to device
+ * @regmap: pointer to driver regmap
  * @mains: power_supply instance for AC/DC power
  * @usb: power_supply instance for USB power
  * @battery: power_supply instance for battery
  * @mains_online: is AC/DC input connected
  * @usb_online: is USB input connected
  * @charging_enabled: is charging enabled
- * @dentry: for debugfs
  * @pdata: pointer to platform data
  */
 struct smb347_charger {
         struct mutex            lock;
-        struct i2c_client       *client;
+        struct device           *dev;
+        struct regmap           *regmap;
         struct power_supply     mains;
         struct power_supply     usb;
         struct power_supply     battery;
         bool                    mains_online;
         bool                    usb_online;
         bool                    charging_enabled;
-        struct dentry           *dentry;
         const struct smb347_charger_platform_data *pdata;
 };
 
@@ -193,14 +196,6 @@ static const unsigned int ccc_tbl[] = {
         1200000,
 };
 
-/* Convert register value to current using lookup table */
-static int hw_to_current(const unsigned int *tbl, size_t size, unsigned int val)
-{
-        if (val >= size)
-                return -EINVAL;
-        return tbl[val];
-}
-
 /* Convert current to register value using lookup table */
 static int current_to_hw(const unsigned int *tbl, size_t size, unsigned int val)
 {
@@ -212,43 +207,22 @@ static int current_to_hw(const unsigned int *tbl, size_t size, unsigned int val)
         return i > 0 ? i - 1 : -EINVAL;
 }
 
-static int smb347_read(struct smb347_charger *smb, u8 reg)
-{
-        int ret;
-
-        ret = i2c_smbus_read_byte_data(smb->client, reg);
-        if (ret < 0)
-                dev_warn(&smb->client->dev, "failed to read reg 0x%x: %d\n",
-                         reg, ret);
-        return ret;
-}
-
-static int smb347_write(struct smb347_charger *smb, u8 reg, u8 val)
-{
-        int ret;
-
-        ret = i2c_smbus_write_byte_data(smb->client, reg, val);
-        if (ret < 0)
-                dev_warn(&smb->client->dev, "failed to write reg 0x%x: %d\n",
-                         reg, ret);
-        return ret;
-}
-
 /**
- * smb347_update_status - updates the charging status
+ * smb347_update_ps_status - refreshes the power source status
  * @smb: pointer to smb347 charger instance
  *
- * Function checks status of the charging and updates internal state
- * accordingly. Returns %0 if there is no change in status, %1 if the
- * status has changed and negative errno in case of failure.
+ * Function checks whether any power source is connected to the charger and
+ * updates internal state accordingly. If there is a change to previous state
+ * function returns %1, otherwise %0 and negative errno in case of errror.
  */
-static int smb347_update_status(struct smb347_charger *smb)
+static int smb347_update_ps_status(struct smb347_charger *smb)
 {
         bool usb = false;
         bool dc = false;
+        unsigned int val;
         int ret;
 
-        ret = smb347_read(smb, IRQSTAT_E);
+        ret = regmap_read(smb->regmap, IRQSTAT_E, &val);
         if (ret < 0)
                 return ret;
 
@@ -257,9 +231,9 @@ static int smb347_update_status(struct smb347_charger *smb)
          * platform data _and_ whether corresponding undervoltage is set.
          */
         if (smb->pdata->use_mains)
-                dc = !(ret & IRQSTAT_E_DCIN_UV_STAT);
+                dc = !(val & IRQSTAT_E_DCIN_UV_STAT);
         if (smb->pdata->use_usb)
-                usb = !(ret & IRQSTAT_E_USBIN_UV_STAT);
+                usb = !(val & IRQSTAT_E_USBIN_UV_STAT);
 
         mutex_lock(&smb->lock);
         ret = smb->mains_online != dc || smb->usb_online != usb;
@@ -271,15 +245,15 @@ static int smb347_update_status(struct smb347_charger *smb)
 }
 
 /*
- * smb347_is_online - returns whether input power source is connected
+ * smb347_is_ps_online - returns whether input power source is connected
  * @smb: pointer to smb347 charger instance
  *
  * Returns %true if input power source is connected. Note that this is
  * dependent on what platform has configured for usable power sources. For
- * example if USB is disabled, this will return %false even if the USB
- * cable is connected.
+ * example if USB is disabled, this will return %false even if the USB cable
+ * is connected.
  */
-static bool smb347_is_online(struct smb347_charger *smb)
+static bool smb347_is_ps_online(struct smb347_charger *smb)
 {
         bool ret;
 
@@ -299,16 +273,17 @@ static bool smb347_is_online(struct smb347_charger *smb)
  */
 static int smb347_charging_status(struct smb347_charger *smb)
 {
+        unsigned int val;
         int ret;
 
-        if (!smb347_is_online(smb))
+        if (!smb347_is_ps_online(smb))
                 return 0;
 
-        ret = smb347_read(smb, STAT_C);
+        ret = regmap_read(smb->regmap, STAT_C, &val);
         if (ret < 0)
                 return 0;
 
-        return (ret & STAT_C_CHG_MASK) >> STAT_C_CHG_SHIFT;
+        return (val & STAT_C_CHG_MASK) >> STAT_C_CHG_SHIFT;
 }
 
 static int smb347_charging_set(struct smb347_charger *smb, bool enable)
@@ -316,27 +291,17 @@ static int smb347_charging_set(struct smb347_charger *smb, bool enable)
         int ret = 0;
 
         if (smb->pdata->enable_control != SMB347_CHG_ENABLE_SW) {
-                dev_dbg(&smb->client->dev,
-                        "charging enable/disable in SW disabled\n");
+                dev_dbg(smb->dev, "charging enable/disable in SW disabled\n");
                 return 0;
         }
 
         mutex_lock(&smb->lock);
         if (smb->charging_enabled != enable) {
-                ret = smb347_read(smb, CMD_A);
-                if (ret < 0)
-                        goto out;
-
-                smb->charging_enabled = enable;
-
-                if (enable)
-                        ret |= CMD_A_CHG_ENABLED;
-                else
-                        ret &= ~CMD_A_CHG_ENABLED;
-
-                ret = smb347_write(smb, CMD_A, ret);
+                ret = regmap_update_bits(smb->regmap, CMD_A, CMD_A_CHG_ENABLED,
+                                         enable ? CMD_A_CHG_ENABLED : 0);
+                if (!ret)
+                        smb->charging_enabled = enable;
         }
-out:
         mutex_unlock(&smb->lock);
         return ret;
 }
@@ -351,7 +316,7 @@ static inline int smb347_charging_disable(struct smb347_charger *smb)
         return smb347_charging_set(smb, false);
 }
 
-static int smb347_update_online(struct smb347_charger *smb)
+static int smb347_start_stop_charging(struct smb347_charger *smb)
 {
         int ret;
 
@@ -360,16 +325,14 @@ static int smb347_update_online(struct smb347_charger *smb)
          * disable or enable the charging. We do it manually because it
          * depends on how the platform has configured the valid inputs.
          */
-        if (smb347_is_online(smb)) {
+        if (smb347_is_ps_online(smb)) {
                 ret = smb347_charging_enable(smb);
                 if (ret < 0)
-                        dev_err(&smb->client->dev,
-                                "failed to enable charging\n");
+                        dev_err(smb->dev, "failed to enable charging\n");
         } else {
                 ret = smb347_charging_disable(smb);
                 if (ret < 0)
-                        dev_err(&smb->client->dev,
-                                "failed to disable charging\n");
+                        dev_err(smb->dev, "failed to disable charging\n");
         }
 
         return ret;
@@ -377,112 +340,120 @@ static int smb347_update_online(struct smb347_charger *smb)
 
 static int smb347_set_charge_current(struct smb347_charger *smb)
 {
-        int ret, val;
-
-        ret = smb347_read(smb, CFG_CHARGE_CURRENT);
-        if (ret < 0)
-                return ret;
+        int ret;
 
         if (smb->pdata->max_charge_current) {
-                val = current_to_hw(fcc_tbl, ARRAY_SIZE(fcc_tbl),
+                ret = current_to_hw(fcc_tbl, ARRAY_SIZE(fcc_tbl),
                                     smb->pdata->max_charge_current);
-                if (val < 0)
-                        return val;
+                if (ret < 0)
+                        return ret;
 
-                ret &= ~CFG_CHARGE_CURRENT_FCC_MASK;
-                ret |= val << CFG_CHARGE_CURRENT_FCC_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_CHARGE_CURRENT,
+                                         CFG_CHARGE_CURRENT_FCC_MASK,
+                                         ret << CFG_CHARGE_CURRENT_FCC_SHIFT);
+                if (ret < 0)
+                        return ret;
         }
 
         if (smb->pdata->pre_charge_current) {
-                val = current_to_hw(pcc_tbl, ARRAY_SIZE(pcc_tbl),
+                ret = current_to_hw(pcc_tbl, ARRAY_SIZE(pcc_tbl),
                                     smb->pdata->pre_charge_current);
-                if (val < 0)
-                        return val;
+                if (ret < 0)
+                        return ret;
 
-                ret &= ~CFG_CHARGE_CURRENT_PCC_MASK;
-                ret |= val << CFG_CHARGE_CURRENT_PCC_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_CHARGE_CURRENT,
+                                         CFG_CHARGE_CURRENT_PCC_MASK,
+                                         ret << CFG_CHARGE_CURRENT_PCC_SHIFT);
+                if (ret < 0)
+                        return ret;
         }
 
         if (smb->pdata->termination_current) {
-                val = current_to_hw(tc_tbl, ARRAY_SIZE(tc_tbl),
+                ret = current_to_hw(tc_tbl, ARRAY_SIZE(tc_tbl),
                                     smb->pdata->termination_current);
-                if (val < 0)
-                        return val;
+                if (ret < 0)
+                        return ret;
 
-                ret &= ~CFG_CHARGE_CURRENT_TC_MASK;
-                ret |= val;
+                ret = regmap_update_bits(smb->regmap, CFG_CHARGE_CURRENT,
+                                         CFG_CHARGE_CURRENT_TC_MASK, ret);
+                if (ret < 0)
+                        return ret;
         }
 
-        return smb347_write(smb, CFG_CHARGE_CURRENT, ret);
+        return 0;
 }
 
 static int smb347_set_current_limits(struct smb347_charger *smb)
 {
-        int ret, val;
-
-        ret = smb347_read(smb, CFG_CURRENT_LIMIT);
-        if (ret < 0)
-                return ret;
+        int ret;
 
         if (smb->pdata->mains_current_limit) {
-                val = current_to_hw(icl_tbl, ARRAY_SIZE(icl_tbl),
+                ret = current_to_hw(icl_tbl, ARRAY_SIZE(icl_tbl),
                                     smb->pdata->mains_current_limit);
-                if (val < 0)
-                        return val;
+                if (ret < 0)
+                        return ret;
 
-                ret &= ~CFG_CURRENT_LIMIT_DC_MASK;
-                ret |= val << CFG_CURRENT_LIMIT_DC_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_CURRENT_LIMIT,
+                                         CFG_CURRENT_LIMIT_DC_MASK,
+                                         ret << CFG_CURRENT_LIMIT_DC_SHIFT);
+                if (ret < 0)
+                        return ret;
         }
 
         if (smb->pdata->usb_hc_current_limit) {
-                val = current_to_hw(icl_tbl, ARRAY_SIZE(icl_tbl),
+                ret = current_to_hw(icl_tbl, ARRAY_SIZE(icl_tbl),
                                     smb->pdata->usb_hc_current_limit);
-                if (val < 0)
-                        return val;
+                if (ret < 0)
+                        return ret;
 
-                ret &= ~CFG_CURRENT_LIMIT_USB_MASK;
-                ret |= val;
+                ret = regmap_update_bits(smb->regmap, CFG_CURRENT_LIMIT,
+                                         CFG_CURRENT_LIMIT_USB_MASK, ret);
+                if (ret < 0)
+                        return ret;
         }
 
-        return smb347_write(smb, CFG_CURRENT_LIMIT, ret);
+        return 0;
 }
 
 static int smb347_set_voltage_limits(struct smb347_charger *smb)
 {
-        int ret, val;
-
-        ret = smb347_read(smb, CFG_FLOAT_VOLTAGE);
-        if (ret < 0)
-                return ret;
+        int ret;
 
         if (smb->pdata->pre_to_fast_voltage) {
-                val = smb->pdata->pre_to_fast_voltage;
+                ret = smb->pdata->pre_to_fast_voltage;
 
                 /* uV */
-                val = clamp_val(val, 2400000, 3000000) - 2400000;
-                val /= 200000;
+                ret = clamp_val(ret, 2400000, 3000000) - 2400000;
+                ret /= 200000;
 
-                ret &= ~CFG_FLOAT_VOLTAGE_THRESHOLD_MASK;
-                ret |= val << CFG_FLOAT_VOLTAGE_THRESHOLD_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_FLOAT_VOLTAGE,
+                                CFG_FLOAT_VOLTAGE_THRESHOLD_MASK,
+                                ret << CFG_FLOAT_VOLTAGE_THRESHOLD_SHIFT);
+                if (ret < 0)
+                        return ret;
         }
 
         if (smb->pdata->max_charge_voltage) {
-                val = smb->pdata->max_charge_voltage;
+                ret = smb->pdata->max_charge_voltage;
 
                 /* uV */
-                val = clamp_val(val, 3500000, 4500000) - 3500000;
-                val /= 20000;
+                ret = clamp_val(ret, 3500000, 4500000) - 3500000;
+                ret /= 20000;
 
-                ret |= val;
+                ret = regmap_update_bits(smb->regmap, CFG_FLOAT_VOLTAGE,
+                                         CFG_FLOAT_VOLTAGE_FLOAT_MASK, ret);
+                if (ret < 0)
+                        return ret;
         }
 
-        return smb347_write(smb, CFG_FLOAT_VOLTAGE, ret);
+        return 0;
 }
 
 static int smb347_set_temp_limits(struct smb347_charger *smb)
 {
         bool enable_therm_monitor = false;
-        int ret, val;
+        int ret = 0;
+        int val;
 
         if (smb->pdata->chip_temp_threshold) {
                 val = smb->pdata->chip_temp_threshold;
@@ -491,22 +462,13 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 val = clamp_val(val, 100, 130) - 100;
                 val /= 10;
 
-                ret = smb347_read(smb, CFG_OTG);
-                if (ret < 0)
-                        return ret;
-
-                ret &= ~CFG_OTG_TEMP_THRESHOLD_MASK;
-                ret |= val << CFG_OTG_TEMP_THRESHOLD_SHIFT;
-
-                ret = smb347_write(smb, CFG_OTG, ret);
+                ret = regmap_update_bits(smb->regmap, CFG_OTG,
+                                         CFG_OTG_TEMP_THRESHOLD_MASK,
+                                         val << CFG_OTG_TEMP_THRESHOLD_SHIFT);
                 if (ret < 0)
                         return ret;
         }
 
-        ret = smb347_read(smb, CFG_TEMP_LIMIT);
-        if (ret < 0)
-                return ret;
-
         if (smb->pdata->soft_cold_temp_limit != SMB347_TEMP_USE_DEFAULT) {
                 val = smb->pdata->soft_cold_temp_limit;
 
@@ -515,8 +477,11 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 /* this goes from higher to lower so invert the value */
                 val = ~val & 0x3;
 
-                ret &= ~CFG_TEMP_LIMIT_SOFT_COLD_MASK;
-                ret |= val << CFG_TEMP_LIMIT_SOFT_COLD_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_TEMP_LIMIT,
+                                         CFG_TEMP_LIMIT_SOFT_COLD_MASK,
+                                         val << CFG_TEMP_LIMIT_SOFT_COLD_SHIFT);
+                if (ret < 0)
+                        return ret;
 
                 enable_therm_monitor = true;
         }
@@ -527,8 +492,11 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 val = clamp_val(val, 40, 55) - 40;
                 val /= 5;
 
-                ret &= ~CFG_TEMP_LIMIT_SOFT_HOT_MASK;
-                ret |= val << CFG_TEMP_LIMIT_SOFT_HOT_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_TEMP_LIMIT,
+                                         CFG_TEMP_LIMIT_SOFT_HOT_MASK,
+                                         val << CFG_TEMP_LIMIT_SOFT_HOT_SHIFT);
+                if (ret < 0)
+                        return ret;
 
                 enable_therm_monitor = true;
         }
@@ -541,8 +509,11 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 /* this goes from higher to lower so invert the value */
                 val = ~val & 0x3;
 
-                ret &= ~CFG_TEMP_LIMIT_HARD_COLD_MASK;
-                ret |= val << CFG_TEMP_LIMIT_HARD_COLD_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_TEMP_LIMIT,
+                                         CFG_TEMP_LIMIT_HARD_COLD_MASK,
+                                         val << CFG_TEMP_LIMIT_HARD_COLD_SHIFT);
+                if (ret < 0)
+                        return ret;
 
                 enable_therm_monitor = true;
         }
@@ -553,16 +524,15 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 val = clamp_val(val, 50, 65) - 50;
                 val /= 5;
 
-                ret &= ~CFG_TEMP_LIMIT_HARD_HOT_MASK;
-                ret |= val << CFG_TEMP_LIMIT_HARD_HOT_SHIFT;
+                ret = regmap_update_bits(smb->regmap, CFG_TEMP_LIMIT,
+                                         CFG_TEMP_LIMIT_HARD_HOT_MASK,
+                                         val << CFG_TEMP_LIMIT_HARD_HOT_SHIFT);
+                if (ret < 0)
+                        return ret;
 
                 enable_therm_monitor = true;
         }
 
-        ret = smb347_write(smb, CFG_TEMP_LIMIT, ret);
-        if (ret < 0)
-                return ret;
-
         /*
          * If any of the temperature limits are set, we also enable the
          * thermistor monitoring.
@@ -574,25 +544,15 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
          * depending on the configuration.
          */
         if (enable_therm_monitor) {
-                ret = smb347_read(smb, CFG_THERM);
-                if (ret < 0)
-                        return ret;
-
-                ret &= ~CFG_THERM_MONITOR_DISABLED;
-
-                ret = smb347_write(smb, CFG_THERM, ret);
+                ret = regmap_update_bits(smb->regmap, CFG_THERM,
+                                         CFG_THERM_MONITOR_DISABLED, 0);
                 if (ret < 0)
                         return ret;
         }
 
         if (smb->pdata->suspend_on_hard_temp_limit) {
-                ret = smb347_read(smb, CFG_SYSOK);
-                if (ret < 0)
-                        return ret;
-
-                ret &= ~CFG_SYSOK_SUSPEND_HARD_LIMIT_DISABLED;
-
-                ret = smb347_write(smb, CFG_SYSOK, ret);
+                ret = regmap_update_bits(smb->regmap, CFG_SYSOK,
+                                 CFG_SYSOK_SUSPEND_HARD_LIMIT_DISABLED, 0);
                 if (ret < 0)
                         return ret;
         }
@@ -601,17 +561,15 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
             SMB347_SOFT_TEMP_COMPENSATE_DEFAULT) {
                 val = smb->pdata->soft_temp_limit_compensation & 0x3;
 
-                ret = smb347_read(smb, CFG_THERM);
+                ret = regmap_update_bits(smb->regmap, CFG_THERM,
+                                 CFG_THERM_SOFT_HOT_COMPENSATION_MASK,
+                                 val << CFG_THERM_SOFT_HOT_COMPENSATION_SHIFT);
                 if (ret < 0)
                         return ret;
 
-                ret &= ~CFG_THERM_SOFT_HOT_COMPENSATION_MASK;
-                ret |= val << CFG_THERM_SOFT_HOT_COMPENSATION_SHIFT;
-
-                ret &= ~CFG_THERM_SOFT_COLD_COMPENSATION_MASK;
-                ret |= val << CFG_THERM_SOFT_COLD_COMPENSATION_SHIFT;
-
-                ret = smb347_write(smb, CFG_THERM, ret);
+                ret = regmap_update_bits(smb->regmap, CFG_THERM,
+                                 CFG_THERM_SOFT_COLD_COMPENSATION_MASK,
+                                 val << CFG_THERM_SOFT_COLD_COMPENSATION_SHIFT);
                 if (ret < 0)
                         return ret;
         }
@@ -622,14 +580,9 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
                 if (val < 0)
                         return val;
 
-                ret = smb347_read(smb, CFG_OTG);
-                if (ret < 0)
-                        return ret;
-
-                ret &= ~CFG_OTG_CC_COMPENSATION_MASK;
-                ret |= (val & 0x3) << CFG_OTG_CC_COMPENSATION_SHIFT;
-
-                ret = smb347_write(smb, CFG_OTG, ret);
+                ret = regmap_update_bits(smb->regmap, CFG_OTG,
+                                CFG_OTG_CC_COMPENSATION_MASK,
+                                (val & 0x3) << CFG_OTG_CC_COMPENSATION_SHIFT);
                 if (ret < 0)
                         return ret;
         }
@@ -648,22 +601,13 @@ static int smb347_set_temp_limits(struct smb347_charger *smb)
  */
 static int smb347_set_writable(struct smb347_charger *smb, bool writable)
 {
-        int ret;
-
-        ret = smb347_read(smb, CMD_A);
-        if (ret < 0)
-                return ret;
-
-        if (writable)
-                ret |= CMD_A_ALLOW_WRITE;
-        else
-                ret &= ~CMD_A_ALLOW_WRITE;
-
-        return smb347_write(smb, CMD_A, ret);
+        return regmap_update_bits(smb->regmap, CMD_A, CMD_A_ALLOW_WRITE,
+                                  writable ? CMD_A_ALLOW_WRITE : 0);
 }
 
 static int smb347_hw_init(struct smb347_charger *smb)
 {
+        unsigned int val;
         int ret;
 
         ret = smb347_set_writable(smb, true);
@@ -692,34 +636,19 @@ static int smb347_hw_init(struct smb347_charger *smb)
 
         /* If USB charging is disabled we put the USB in suspend mode */
         if (!smb->pdata->use_usb) {
-                ret = smb347_read(smb, CMD_A);
-                if (ret < 0)
-                        goto fail;
-
-                ret |= CMD_A_SUSPEND_ENABLED;
-
-                ret = smb347_write(smb, CMD_A, ret);
+                ret = regmap_update_bits(smb->regmap, CMD_A,
+                                         CMD_A_SUSPEND_ENABLED,
+                                         CMD_A_SUSPEND_ENABLED);
                 if (ret < 0)
                         goto fail;
         }
 
-        ret = smb347_read(smb, CFG_OTHER);
-        if (ret < 0)
-                goto fail;
-
         /*
          * If configured by platform data, we enable hardware Auto-OTG
          * support for driving VBUS. Otherwise we disable it.
          */
-        ret &= ~CFG_OTHER_RID_MASK;
-        if (smb->pdata->use_usb_otg)
-                ret |= CFG_OTHER_RID_ENABLED_AUTO_OTG;
-
-        ret = smb347_write(smb, CFG_OTHER, ret);
-        if (ret < 0)
-                goto fail;
-
-        ret = smb347_read(smb, CFG_PIN);
+        ret = regmap_update_bits(smb->regmap, CFG_OTHER, CFG_OTHER_RID_MASK,
+                smb->pdata->use_usb_otg ? CFG_OTHER_RID_ENABLED_AUTO_OTG : 0);
         if (ret < 0)
                 goto fail;
 
@@ -728,32 +657,33 @@ static int smb347_hw_init(struct smb347_charger *smb)
          * command register unless pin control is specified in the platform
          * data.
          */
-        ret &= ~CFG_PIN_EN_CTRL_MASK;
-
         switch (smb->pdata->enable_control) {
-        case SMB347_CHG_ENABLE_SW:
-                /* Do nothing, 0 means i2c control */
-                break;
         case SMB347_CHG_ENABLE_PIN_ACTIVE_LOW:
-                ret |= CFG_PIN_EN_CTRL_ACTIVE_LOW;
+                val = CFG_PIN_EN_CTRL_ACTIVE_LOW;
                 break;
         case SMB347_CHG_ENABLE_PIN_ACTIVE_HIGH:
-                ret |= CFG_PIN_EN_CTRL_ACTIVE_HIGH;
+                val = CFG_PIN_EN_CTRL_ACTIVE_HIGH;
+                break;
+        default:
+                val = 0;
                 break;
         }
 
-        /* Disable Automatic Power Source Detection (APSD) interrupt. */
-        ret &= ~CFG_PIN_EN_APSD_IRQ;
+        ret = regmap_update_bits(smb->regmap, CFG_PIN, CFG_PIN_EN_CTRL_MASK,
+                                 val);
+        if (ret < 0)
+                goto fail;
 
-        ret = smb347_write(smb, CFG_PIN, ret);
+        /* Disable Automatic Power Source Detection (APSD) interrupt. */
+        ret = regmap_update_bits(smb->regmap, CFG_PIN, CFG_PIN_EN_APSD_IRQ, 0);
         if (ret < 0)
                 goto fail;
 
-        ret = smb347_update_status(smb);
+        ret = smb347_update_ps_status(smb);
         if (ret < 0)
                 goto fail;
 
-        ret = smb347_update_online(smb);
+        ret = smb347_start_stop_charging(smb);
 
 fail:
         smb347_set_writable(smb, false);
@@ -763,24 +693,25 @@ fail:
 static irqreturn_t smb347_interrupt(int irq, void *data)
 {
         struct smb347_charger *smb = data;
-        int stat_c, irqstat_e, irqstat_c;
-        irqreturn_t ret = IRQ_NONE;
+        unsigned int stat_c, irqstat_e, irqstat_c;
+        bool handled = false;
+        int ret;
 
-        stat_c = smb347_read(smb, STAT_C);
-        if (stat_c < 0) {
-                dev_warn(&smb->client->dev, "reading STAT_C failed\n");
+        ret = regmap_read(smb->regmap, STAT_C, &stat_c);
+        if (ret < 0) {
+                dev_warn(smb->dev, "reading STAT_C failed\n");
                 return IRQ_NONE;
         }
 
-        irqstat_c = smb347_read(smb, IRQSTAT_C);
-        if (irqstat_c < 0) {
-                dev_warn(&smb->client->dev, "reading IRQSTAT_C failed\n");
+        ret = regmap_read(smb->regmap, IRQSTAT_C, &irqstat_c);
+        if (ret < 0) {
+                dev_warn(smb->dev, "reading IRQSTAT_C failed\n");
                 return IRQ_NONE;
         }
 
-        irqstat_e = smb347_read(smb, IRQSTAT_E);
-        if (irqstat_e < 0) {
-                dev_warn(&smb->client->dev, "reading IRQSTAT_E failed\n");
+        ret = regmap_read(smb->regmap, IRQSTAT_E, &irqstat_e);
+        if (ret < 0) {
+                dev_warn(smb->dev, "reading IRQSTAT_E failed\n");
                 return IRQ_NONE;
         }
 
@@ -789,13 +720,11 @@ static irqreturn_t smb347_interrupt(int irq, void *data)
          * disable charging.
          */
         if (stat_c & STAT_C_CHARGER_ERROR) {
-                dev_err(&smb->client->dev,
-                        "error in charger, disabling charging\n");
+                dev_err(smb->dev, "error in charger, disabling charging\n");
 
                 smb347_charging_disable(smb);
                 power_supply_changed(&smb->battery);
-
-                ret = IRQ_HANDLED;
+                handled = true;
         }
 
         /*
@@ -806,7 +735,7 @@ static irqreturn_t smb347_interrupt(int irq, void *data)
         if (irqstat_c & (IRQSTAT_C_TERMINATION_IRQ | IRQSTAT_C_TAPER_IRQ)) {
                 if (irqstat_c & IRQSTAT_C_TERMINATION_STAT)
                         power_supply_changed(&smb->battery);
-                ret = IRQ_HANDLED;
+                handled = true;
         }
 
         /*
@@ -814,15 +743,17 @@ static irqreturn_t smb347_interrupt(int irq, void *data)
          * was connected or disconnected.
          */
         if (irqstat_e & (IRQSTAT_E_USBIN_UV_IRQ | IRQSTAT_E_DCIN_UV_IRQ)) {
-                if (smb347_update_status(smb) > 0) {
-                        smb347_update_online(smb);
-                        power_supply_changed(&smb->mains);
-                        power_supply_changed(&smb->usb);
+                if (smb347_update_ps_status(smb) > 0) {
+                        smb347_start_stop_charging(smb);
+                        if (smb->pdata->use_mains)
+                                power_supply_changed(&smb->mains);
+                        if (smb->pdata->use_usb)
+                                power_supply_changed(&smb->usb);
                 }
-                ret = IRQ_HANDLED;
+                handled = true;
         }
 
-        return ret;
+        return handled ? IRQ_HANDLED : IRQ_NONE;
 }
 
 static int smb347_irq_set(struct smb347_charger *smb, bool enable)
@@ -839,41 +770,18 @@ static int smb347_irq_set(struct smb347_charger *smb, bool enable)
          *      - termination current reached
          *      - charger error
          */
-        if (enable) {
-                ret = smb347_write(smb, CFG_FAULT_IRQ, CFG_FAULT_IRQ_DCIN_UV);
-                if (ret < 0)
-                        goto fail;
-
-                ret = smb347_write(smb, CFG_STATUS_IRQ,
-                                   CFG_STATUS_IRQ_TERMINATION_OR_TAPER);
-                if (ret < 0)
-                        goto fail;
-
-                ret = smb347_read(smb, CFG_PIN);
-                if (ret < 0)
-                        goto fail;
-
-                ret |= CFG_PIN_EN_CHARGER_ERROR;
-
-                ret = smb347_write(smb, CFG_PIN, ret);
-        } else {
-                ret = smb347_write(smb, CFG_FAULT_IRQ, 0);
-                if (ret < 0)
-                        goto fail;
-
-                ret = smb347_write(smb, CFG_STATUS_IRQ, 0);
-                if (ret < 0)
-                        goto fail;
-
-                ret = smb347_read(smb, CFG_PIN);
-                if (ret < 0)
-                        goto fail;
-
-                ret &= ~CFG_PIN_EN_CHARGER_ERROR;
+        ret = regmap_update_bits(smb->regmap, CFG_FAULT_IRQ, 0xff,
+                                 enable ? CFG_FAULT_IRQ_DCIN_UV : 0);
+        if (ret < 0)
+                goto fail;
 
-                ret = smb347_write(smb, CFG_PIN, ret);
-        }
+        ret = regmap_update_bits(smb->regmap, CFG_STATUS_IRQ, 0xff,
+                        enable ? CFG_STATUS_IRQ_TERMINATION_OR_TAPER : 0);
+        if (ret < 0)
+                goto fail;
 
+        ret = regmap_update_bits(smb->regmap, CFG_PIN, CFG_PIN_EN_CHARGER_ERROR,
+                                 enable ? CFG_PIN_EN_CHARGER_ERROR : 0);
 fail:
         smb347_set_writable(smb, false);
         return ret;
@@ -889,18 +797,18 @@ static inline int smb347_irq_disable(struct smb347_charger *smb)
         return smb347_irq_set(smb, false);
 }
 
-static int smb347_irq_init(struct smb347_charger *smb)
+static int smb347_irq_init(struct smb347_charger *smb,
+                           struct i2c_client *client)
 {
         const struct smb347_charger_platform_data *pdata = smb->pdata;
         int ret, irq = gpio_to_irq(pdata->irq_gpio);
 
-        ret = gpio_request_one(pdata->irq_gpio, GPIOF_IN, smb->client->name);
+        ret = gpio_request_one(pdata->irq_gpio, GPIOF_IN, client->name);
         if (ret < 0)
                 goto fail;
 
         ret = request_threaded_irq(irq, NULL, smb347_interrupt,
-                                   IRQF_TRIGGER_FALLING, smb->client->name,
-                                   smb);
+                                   IRQF_TRIGGER_FALLING, client->name, smb);
         if (ret < 0)
                 goto fail_gpio;
 
@@ -912,23 +820,14 @@ static int smb347_irq_init(struct smb347_charger *smb)
          * Configure the STAT output to be suitable for interrupts: disable
          * all other output (except interrupts) and make it active low.
          */
-        ret = smb347_read(smb, CFG_STAT);
-        if (ret < 0)
-                goto fail_readonly;
-
-        ret &= ~CFG_STAT_ACTIVE_HIGH;
-        ret |= CFG_STAT_DISABLED;
-
-        ret = smb347_write(smb, CFG_STAT, ret);
-        if (ret < 0)
-                goto fail_readonly;
-
-        ret = smb347_irq_enable(smb);
+        ret = regmap_update_bits(smb->regmap, CFG_STAT,
+                                 CFG_STAT_ACTIVE_HIGH | CFG_STAT_DISABLED,
+                                 CFG_STAT_DISABLED);
         if (ret < 0)
                 goto fail_readonly;
 
         smb347_set_writable(smb, false);
-        smb->client->irq = irq;
+        client->irq = irq;
         return 0;
 
 fail_readonly:
@@ -938,7 +837,7 @@ fail_irq:
 fail_gpio:
         gpio_free(pdata->irq_gpio);
 fail:
-        smb->client->irq = 0;
+        client->irq = 0;
         return ret;
 }
 
@@ -987,13 +886,13 @@ static int smb347_battery_get_property(struct power_supply *psy,
         const struct smb347_charger_platform_data *pdata = smb->pdata;
         int ret;
 
-        ret = smb347_update_status(smb);
+        ret = smb347_update_ps_status(smb);
         if (ret < 0)
                 return ret;
 
         switch (prop) {
         case POWER_SUPPLY_PROP_STATUS:
-                if (!smb347_is_online(smb)) {
+                if (!smb347_is_ps_online(smb)) {
                         val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                         break;
                 }
@@ -1004,7 +903,7 @@ static int smb347_battery_get_property(struct power_supply *psy,
                 break;
 
         case POWER_SUPPLY_PROP_CHARGE_TYPE:
-                if (!smb347_is_online(smb))
+                if (!smb347_is_ps_online(smb))
                         return -ENODATA;
 
                 /*
@@ -1036,44 +935,6 @@ static int smb347_battery_get_property(struct power_supply *psy,
                 val->intval = pdata->battery_info.voltage_max_design;
                 break;
 
-        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-                if (!smb347_is_online(smb))
-                        return -ENODATA;
-                ret = smb347_read(smb, STAT_A);
-                if (ret < 0)
-                        return ret;
-
-                ret &= STAT_A_FLOAT_VOLTAGE_MASK;
-                if (ret > 0x3d)
-                        ret = 0x3d;
-
-                val->intval = 3500000 + ret * 20000;
-                break;
-
-        case POWER_SUPPLY_PROP_CURRENT_NOW:
-                if (!smb347_is_online(smb))
-                        return -ENODATA;
-
-                ret = smb347_read(smb, STAT_B);
-                if (ret < 0)
-                        return ret;
-
-                /*
-                 * The current value is composition of FCC and PCC values
-                 * and we can detect which table to use from bit 5.
-                 */
-                if (ret & 0x20) {
-                        val->intval = hw_to_current(fcc_tbl,
-                                                    ARRAY_SIZE(fcc_tbl),
-                                                    ret & 7);
-                } else {
-                        ret >>= 3;
-                        val->intval = hw_to_current(pcc_tbl,
-                                                    ARRAY_SIZE(pcc_tbl),
-                                                    ret & 7);
-                }
-                break;
-
         case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
                 val->intval = pdata->battery_info.charge_full_design;
                 break;
@@ -1095,64 +956,58 @@ static enum power_supply_property smb347_battery_properties[] = {
         POWER_SUPPLY_PROP_TECHNOLOGY,
         POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
         POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
-        POWER_SUPPLY_PROP_VOLTAGE_NOW,
-        POWER_SUPPLY_PROP_CURRENT_NOW,
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
         POWER_SUPPLY_PROP_MODEL_NAME,
 };
 
-static int smb347_debugfs_show(struct seq_file *s, void *data)
+static bool smb347_volatile_reg(struct device *dev, unsigned int reg)
 {
-        struct smb347_charger *smb = s->private;
-        int ret;
-        u8 reg;
-
-        seq_printf(s, "Control registers:\n");
-        seq_printf(s, "==================\n");
-        for (reg = CFG_CHARGE_CURRENT; reg <= CFG_ADDRESS; reg++) {
-                ret = smb347_read(smb, reg);
-                seq_printf(s, "0x%02x:\t0x%02x\n", reg, ret);
-        }
-        seq_printf(s, "\n");
-
-        seq_printf(s, "Command registers:\n");
-        seq_printf(s, "==================\n");
-        ret = smb347_read(smb, CMD_A);
-        seq_printf(s, "0x%02x:\t0x%02x\n", CMD_A, ret);
-        ret = smb347_read(smb, CMD_B);
-        seq_printf(s, "0x%02x:\t0x%02x\n", CMD_B, ret);
-        ret = smb347_read(smb, CMD_C);
-        seq_printf(s, "0x%02x:\t0x%02x\n", CMD_C, ret);
-        seq_printf(s, "\n");
-
-        seq_printf(s, "Interrupt status registers:\n");
-        seq_printf(s, "===========================\n");
-        for (reg = IRQSTAT_A; reg <= IRQSTAT_F; reg++) {
-                ret = smb347_read(smb, reg);
-                seq_printf(s, "0x%02x:\t0x%02x\n", reg, ret);
-        }
-        seq_printf(s, "\n");
-
-        seq_printf(s, "Status registers:\n");
-        seq_printf(s, "=================\n");
-        for (reg = STAT_A; reg <= STAT_E; reg++) {
-                ret = smb347_read(smb, reg);
-                seq_printf(s, "0x%02x:\t0x%02x\n", reg, ret);
+        switch (reg) {
+        case IRQSTAT_A:
+        case IRQSTAT_C:
+        case IRQSTAT_E:
+        case IRQSTAT_F:
+        case STAT_A:
+        case STAT_B:
+        case STAT_C:
+        case STAT_E:
+                return true;
         }
 
-        return 0;
+        return false;
 }
 
-static int smb347_debugfs_open(struct inode *inode, struct file *file)
+static bool smb347_readable_reg(struct device *dev, unsigned int reg)
 {
-        return single_open(file, smb347_debugfs_show, inode->i_private);
+        switch (reg) {
+        case CFG_CHARGE_CURRENT:
+        case CFG_CURRENT_LIMIT:
+        case CFG_FLOAT_VOLTAGE:
+        case CFG_STAT:
+        case CFG_PIN:
+        case CFG_THERM:
+        case CFG_SYSOK:
+        case CFG_OTHER:
+        case CFG_OTG:
+        case CFG_TEMP_LIMIT:
+        case CFG_FAULT_IRQ:
+        case CFG_STATUS_IRQ:
+        case CFG_ADDRESS:
+        case CMD_A:
+        case CMD_B:
+        case CMD_C:
+                return true;
+        }
+
+        return smb347_volatile_reg(dev, reg);
 }
 
-static const struct file_operations smb347_debugfs_fops = {
-        .open           = smb347_debugfs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
+static const struct regmap_config smb347_regmap = {
+        .reg_bits       = 8,
+        .val_bits       = 8,
+        .max_register   = SMB347_MAX_REGISTER,
+        .volatile_reg   = smb347_volatile_reg,
+        .readable_reg   = smb347_readable_reg,
 };
 
 static int smb347_probe(struct i2c_client *client,
@@ -1178,28 +1033,45 @@ static int smb347_probe(struct i2c_client *client,
         i2c_set_clientdata(client, smb);
 
         mutex_init(&smb->lock);
-        smb->client = client;
+        smb->dev = &client->dev;
         smb->pdata = pdata;
 
+        smb->regmap = devm_regmap_init_i2c(client, &smb347_regmap);
+        if (IS_ERR(smb->regmap))
+                return PTR_ERR(smb->regmap);
+
         ret = smb347_hw_init(smb);
         if (ret < 0)
                 return ret;
 
-        smb->mains.name = "smb347-mains";
-        smb->mains.type = POWER_SUPPLY_TYPE_MAINS;
-        smb->mains.get_property = smb347_mains_get_property;
-        smb->mains.properties = smb347_mains_properties;
-        smb->mains.num_properties = ARRAY_SIZE(smb347_mains_properties);
-        smb->mains.supplied_to = battery;
-        smb->mains.num_supplicants = ARRAY_SIZE(battery);
-
-        smb->usb.name = "smb347-usb";
-        smb->usb.type = POWER_SUPPLY_TYPE_USB;
-        smb->usb.get_property = smb347_usb_get_property;
-        smb->usb.properties = smb347_usb_properties;
-        smb->usb.num_properties = ARRAY_SIZE(smb347_usb_properties);
-        smb->usb.supplied_to = battery;
-        smb->usb.num_supplicants = ARRAY_SIZE(battery);
+        if (smb->pdata->use_mains) {
+                smb->mains.name = "smb347-mains";
+                smb->mains.type = POWER_SUPPLY_TYPE_MAINS;
+                smb->mains.get_property = smb347_mains_get_property;
+                smb->mains.properties = smb347_mains_properties;
+                smb->mains.num_properties = ARRAY_SIZE(smb347_mains_properties);
+                smb->mains.supplied_to = battery;
+                smb->mains.num_supplicants = ARRAY_SIZE(battery);
+                ret = power_supply_register(dev, &smb->mains);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (smb->pdata->use_usb) {
+                smb->usb.name = "smb347-usb";
+                smb->usb.type = POWER_SUPPLY_TYPE_USB;
+                smb->usb.get_property = smb347_usb_get_property;
+                smb->usb.properties = smb347_usb_properties;
+                smb->usb.num_properties = ARRAY_SIZE(smb347_usb_properties);
+                smb->usb.supplied_to = battery;
+                smb->usb.num_supplicants = ARRAY_SIZE(battery);
+                ret = power_supply_register(dev, &smb->usb);
+                if (ret < 0) {
+                        if (smb->pdata->use_mains)
+                                power_supply_unregister(&smb->mains);
+                        return ret;
+                }
+        }
 
         smb->battery.name = "smb347-battery";
         smb->battery.type = POWER_SUPPLY_TYPE_BATTERY;
@@ -1207,20 +1079,13 @@ static int smb347_probe(struct i2c_client *client,
         smb->battery.properties = smb347_battery_properties;
         smb->battery.num_properties = ARRAY_SIZE(smb347_battery_properties);
 
-        ret = power_supply_register(dev, &smb->mains);
-        if (ret < 0)
-                return ret;
-
-        ret = power_supply_register(dev, &smb->usb);
-        if (ret < 0) {
-                power_supply_unregister(&smb->mains);
-                return ret;
-        }
 
         ret = power_supply_register(dev, &smb->battery);
         if (ret < 0) {
-                power_supply_unregister(&smb->usb);
-                power_supply_unregister(&smb->mains);
+                if (smb->pdata->use_usb)
+                        power_supply_unregister(&smb->usb);
+                if (smb->pdata->use_mains)
+                        power_supply_unregister(&smb->mains);
                 return ret;
         }
 
@@ -1229,15 +1094,15 @@ static int smb347_probe(struct i2c_client *client,
          * interrupt support here.
          */
         if (pdata->irq_gpio >= 0) {
-                ret = smb347_irq_init(smb);
+                ret = smb347_irq_init(smb, client);
                 if (ret < 0) {
                         dev_warn(dev, "failed to initialize IRQ: %d\n", ret);
                         dev_warn(dev, "disabling IRQ support\n");
+                } else {
+                        smb347_irq_enable(smb);
                 }
         }
 
-        smb->dentry = debugfs_create_file("smb347-regs", S_IRUSR, NULL, smb,
-                                          &smb347_debugfs_fops);
         return 0;
 }
 
@@ -1245,9 +1110,6 @@ static int smb347_remove(struct i2c_client *client)
 {
         struct smb347_charger *smb = i2c_get_clientdata(client);
 
-        if (!IS_ERR_OR_NULL(smb->dentry))
-                debugfs_remove(smb->dentry);
-
         if (client->irq) {
                 smb347_irq_disable(smb);
                 free_irq(client->irq, smb);
@@ -1255,8 +1117,10 @@ static int smb347_remove(struct i2c_client *client)
         }
 
         power_supply_unregister(&smb->battery);
-        power_supply_unregister(&smb->usb);
-        power_supply_unregister(&smb->mains);
+        if (smb->pdata->use_usb)
+                power_supply_unregister(&smb->usb);
+        if (smb->pdata->use_mains)
+                power_supply_unregister(&smb->mains);
         return 0;
 }
 
@@ -1275,17 +1139,7 @@ static struct i2c_driver smb347_driver = {
         .id_table     = smb347_id,
 };
 
-static int __init smb347_init(void)
-{
-        return i2c_add_driver(&smb347_driver);
-}
-module_init(smb347_init);
-
-static void __exit smb347_exit(void)
-{
-        i2c_del_driver(&smb347_driver);
-}
-module_exit(smb347_exit);
+module_i2c_driver(smb347_driver);
 
 MODULE_AUTHOR("Bruce E. Robertson <bruce.e.robertson@intel.com>");
 MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index bc8719238793..6194d35ebb97 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -22,6 +22,20 @@ config RAPIDIO_ENABLE_RX_TX_PORTS
           ports for Input/Output direction to allow other traffic
           than Maintenance transfers.
 
+config RAPIDIO_DMA_ENGINE
+        bool "DMA Engine support for RapidIO"
+        depends on RAPIDIO
+        select DMADEVICES
+        select DMA_ENGINE
+        help
+          Say Y here if you want to use DMA Engine frameork for RapidIO data
+          transfers to/from target RIO devices. RapidIO uses NREAD and
+          NWRITE (NWRITE_R, SWRITE) requests to transfer data between local
+          memory and memory on remote target device. You need a DMA controller
+          capable to perform data transfers to/from RapidIO.
+
+          If you are unsure about this, say Y here.
+
 config RAPIDIO_DEBUG
         bool "RapidIO subsystem debug messages"
         depends on RAPIDIO
diff --git a/drivers/rapidio/devices/Makefile b/drivers/rapidio/devices/Makefile
index 3b7b4e2dff7c..7b62860f34f8 100644
--- a/drivers/rapidio/devices/Makefile
+++ b/drivers/rapidio/devices/Makefile
@@ -3,3 +3,6 @@
 #
 
 obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721.o
+ifeq ($(CONFIG_RAPIDIO_DMA_ENGINE),y)
+obj-$(CONFIG_RAPIDIO_TSI721)    += tsi721_dma.o
+endif
diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 30d2072f480b..722246cf20ab 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -108,6 +108,7 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
                         u16 destid, u8 hopcount, u32 offset, int len,
                         u32 *data, int do_wr)
 {
+        void __iomem *regs = priv->regs + TSI721_DMAC_BASE(priv->mdma.ch_id);
         struct tsi721_dma_desc *bd_ptr;
         u32 rd_count, swr_ptr, ch_stat;
         int i, err = 0;
@@ -116,10 +117,9 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
         if (offset > (RIO_MAINT_SPACE_SZ - len) || (len != sizeof(u32)))
                 return -EINVAL;
 
-        bd_ptr = priv->bdma[TSI721_DMACH_MAINT].bd_base;
+        bd_ptr = priv->mdma.bd_base;
 
-        rd_count = ioread32(
-                        priv->regs + TSI721_DMAC_DRDCNT(TSI721_DMACH_MAINT));
+        rd_count = ioread32(regs + TSI721_DMAC_DRDCNT);
 
         /* Initialize DMA descriptor */
         bd_ptr[0].type_id = cpu_to_le32((DTYPE2 << 29) | (op << 19) | destid);
@@ -134,19 +134,18 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
         mb();
 
         /* Start DMA operation */
-        iowrite32(rd_count + 2,
-                priv->regs + TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
-        ioread32(priv->regs + TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
+        iowrite32(rd_count + 2, regs + TSI721_DMAC_DWRCNT);
+        ioread32(regs + TSI721_DMAC_DWRCNT);
         i = 0;
 
         /* Wait until DMA transfer is finished */
-        while ((ch_stat = ioread32(priv->regs +
-                TSI721_DMAC_STS(TSI721_DMACH_MAINT))) & TSI721_DMAC_STS_RUN) {
+        while ((ch_stat = ioread32(regs + TSI721_DMAC_STS))
+                                                        & TSI721_DMAC_STS_RUN) {
                 udelay(1);
                 if (++i >= 5000000) {
                         dev_dbg(&priv->pdev->dev,
                                 "%s : DMA[%d] read timeout ch_status=%x\n",
-                                __func__, TSI721_DMACH_MAINT, ch_stat);
+                                __func__, priv->mdma.ch_id, ch_stat);
                         if (!do_wr)
                                 *data = 0xffffffff;
                         err = -EIO;
@@ -162,13 +161,10 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
                         __func__, ch_stat);
                 dev_dbg(&priv->pdev->dev, "OP=%d : destid=%x hc=%x off=%x\n",
                         do_wr ? MAINT_WR : MAINT_RD, destid, hopcount, offset);
-                iowrite32(TSI721_DMAC_INT_ALL,
-                        priv->regs + TSI721_DMAC_INT(TSI721_DMACH_MAINT));
-                iowrite32(TSI721_DMAC_CTL_INIT,
-                        priv->regs + TSI721_DMAC_CTL(TSI721_DMACH_MAINT));
+                iowrite32(TSI721_DMAC_INT_ALL, regs + TSI721_DMAC_INT);
+                iowrite32(TSI721_DMAC_CTL_INIT, regs + TSI721_DMAC_CTL);
                 udelay(10);
-                iowrite32(0, priv->regs +
-                                TSI721_DMAC_DWRCNT(TSI721_DMACH_MAINT));
+                iowrite32(0, regs + TSI721_DMAC_DWRCNT);
                 udelay(1);
                 if (!do_wr)
                         *data = 0xffffffff;
@@ -184,8 +180,8 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
          * NOTE: Skipping check and clear FIFO entries because we are waiting
          * for transfer to be completed.
          */
-        swr_ptr = ioread32(priv->regs + TSI721_DMAC_DSWP(TSI721_DMACH_MAINT));
-        iowrite32(swr_ptr, priv->regs + TSI721_DMAC_DSRP(TSI721_DMACH_MAINT));
+        swr_ptr = ioread32(regs + TSI721_DMAC_DSWP);
+        iowrite32(swr_ptr, regs + TSI721_DMAC_DSRP);
 err_out:
 
         return err;
@@ -541,6 +537,22 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr)
                         tsi721_pw_handler(mport);
         }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        if (dev_int & TSI721_DEV_INT_BDMA_CH) {
+                int ch;
+
+                if (dev_ch_int & TSI721_INT_BDMA_CHAN_M) {
+                        dev_dbg(&priv->pdev->dev,
+                                "IRQ from DMA channel 0x%08x\n", dev_ch_int);
+
+                        for (ch = 0; ch < TSI721_DMA_MAXCH; ch++) {
+                                if (!(dev_ch_int & TSI721_INT_BDMA_CHAN(ch)))
+                                        continue;
+                                tsi721_bdma_handler(&priv->bdma[ch]);
+                        }
+                }
+        }
+#endif
         return IRQ_HANDLED;
 }
 
@@ -553,18 +565,26 @@ static void tsi721_interrupts_init(struct tsi721_device *priv)
                 priv->regs + TSI721_SR_CHINT(IDB_QUEUE));
         iowrite32(TSI721_SR_CHINT_IDBQRCV,
                 priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
-        iowrite32(TSI721_INT_SR2PC_CHAN(IDB_QUEUE),
-                priv->regs + TSI721_DEV_CHAN_INTE);
 
         /* Enable SRIO MAC interrupts */
         iowrite32(TSI721_RIO_EM_DEV_INT_EN_INT,
                 priv->regs + TSI721_RIO_EM_DEV_INT_EN);
 
+        /* Enable interrupts from channels in use */
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        intr = TSI721_INT_SR2PC_CHAN(IDB_QUEUE) |
+                (TSI721_INT_BDMA_CHAN_M &
+                 ~TSI721_INT_BDMA_CHAN(TSI721_DMACH_MAINT));
+#else
+        intr = TSI721_INT_SR2PC_CHAN(IDB_QUEUE);
+#endif
+        iowrite32(intr, priv->regs + TSI721_DEV_CHAN_INTE);
+
         if (priv->flags & TSI721_USING_MSIX)
                 intr = TSI721_DEV_INT_SRIO;
         else
                 intr = TSI721_DEV_INT_SR2PC_CH | TSI721_DEV_INT_SRIO |
-                        TSI721_DEV_INT_SMSG_CH;
+                        TSI721_DEV_INT_SMSG_CH | TSI721_DEV_INT_BDMA_CH;
 
         iowrite32(intr, priv->regs + TSI721_DEV_INTE);
         ioread32(priv->regs + TSI721_DEV_INTE);
@@ -715,12 +735,29 @@ static int tsi721_enable_msix(struct tsi721_device *priv)
                                         TSI721_MSIX_OMSG_INT(i);
         }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        /*
+         * Initialize MSI-X entries for Block DMA Engine:
+         * this driver supports XXX DMA channels
+         * (one is reserved for SRIO maintenance transactions)
+         */
+        for (i = 0; i < TSI721_DMA_CHNUM; i++) {
+                entries[TSI721_VECT_DMA0_DONE + i].entry =
+                                        TSI721_MSIX_DMACH_DONE(i);
+                entries[TSI721_VECT_DMA0_INT + i].entry =
+                                        TSI721_MSIX_DMACH_INT(i);
+        }
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
+
         err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries));
         if (err) {
                 if (err > 0)
                         dev_info(&priv->pdev->dev,
                                  "Only %d MSI-X vectors available, "
                                  "not using MSI-X\n", err);
+                else
+                        dev_err(&priv->pdev->dev,
+                                "Failed to enable MSI-X (err=%d)\n", err);
                 return err;
         }
 
@@ -760,6 +797,22 @@ static int tsi721_enable_msix(struct tsi721_device *priv)
                          i, pci_name(priv->pdev));
         }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        for (i = 0; i < TSI721_DMA_CHNUM; i++) {
+                priv->msix[TSI721_VECT_DMA0_DONE + i].vector =
+                                entries[TSI721_VECT_DMA0_DONE + i].vector;
+                snprintf(priv->msix[TSI721_VECT_DMA0_DONE + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-dmad%d@pci:%s",
+                         i, pci_name(priv->pdev));
+
+                priv->msix[TSI721_VECT_DMA0_INT + i].vector =
+                                entries[TSI721_VECT_DMA0_INT + i].vector;
+                snprintf(priv->msix[TSI721_VECT_DMA0_INT + i].irq_name,
+                         IRQ_DEVICE_NAME_MAX, DRV_NAME "-dmai%d@pci:%s",
+                         i, pci_name(priv->pdev));
+        }
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
+
         return 0;
 }
 #endif /* CONFIG_PCI_MSI */
@@ -888,20 +941,34 @@ static void tsi721_doorbell_free(struct tsi721_device *priv)
         priv->idb_base = NULL;
 }
 
-static int tsi721_bdma_ch_init(struct tsi721_device *priv, int chnum)
+/**
+ * tsi721_bdma_maint_init - Initialize maintenance request BDMA channel.
+ * @priv: pointer to tsi721 private data
+ *
+ * Initialize BDMA channel allocated for RapidIO maintenance read/write
+ * request generation
+ * Returns %0 on success or %-ENOMEM on failure.
+ */
+static int tsi721_bdma_maint_init(struct tsi721_device *priv)
 {
         struct tsi721_dma_desc *bd_ptr;
         u64             *sts_ptr;
         dma_addr_t      bd_phys, sts_phys;
         int             sts_size;
-        int             bd_num = priv->bdma[chnum].bd_num;
+        int             bd_num = 2;
+        void __iomem    *regs;
 
-        dev_dbg(&priv->pdev->dev, "Init Block DMA Engine, CH%d\n", chnum);
+        dev_dbg(&priv->pdev->dev,
+                "Init Block DMA Engine for Maintenance requests, CH%d\n",
+                TSI721_DMACH_MAINT);
 
         /*
          * Initialize DMA channel for maintenance requests
          */
 
+        priv->mdma.ch_id = TSI721_DMACH_MAINT;
+        regs = priv->regs + TSI721_DMAC_BASE(TSI721_DMACH_MAINT);
+
         /* Allocate space for DMA descriptors */
         bd_ptr = dma_zalloc_coherent(&priv->pdev->dev,
                                         bd_num * sizeof(struct tsi721_dma_desc),
@@ -909,8 +976,9 @@ static int tsi721_bdma_ch_init(struct tsi721_device *priv, int chnum)
         if (!bd_ptr)
                 return -ENOMEM;
 
-        priv->bdma[chnum].bd_phys = bd_phys;
-        priv->bdma[chnum].bd_base = bd_ptr;
+        priv->mdma.bd_num = bd_num;
+        priv->mdma.bd_phys = bd_phys;
+        priv->mdma.bd_base = bd_ptr;
 
         dev_dbg(&priv->pdev->dev, "DMA descriptors @ %p (phys = %llx)\n",
                 bd_ptr, (unsigned long long)bd_phys);
@@ -927,13 +995,13 @@ static int tsi721_bdma_ch_init(struct tsi721_device *priv, int chnum)
                 dma_free_coherent(&priv->pdev->dev,
                                   bd_num * sizeof(struct tsi721_dma_desc),
                                   bd_ptr, bd_phys);
-                priv->bdma[chnum].bd_base = NULL;
+                priv->mdma.bd_base = NULL;
                 return -ENOMEM;
         }
 
-        priv->bdma[chnum].sts_phys = sts_phys;
-        priv->bdma[chnum].sts_base = sts_ptr;
-        priv->bdma[chnum].sts_size = sts_size;
+        priv->mdma.sts_phys = sts_phys;
+        priv->mdma.sts_base = sts_ptr;
+        priv->mdma.sts_size = sts_size;
 
         dev_dbg(&priv->pdev->dev,
                 "desc status FIFO @ %p (phys = %llx) size=0x%x\n",
@@ -946,83 +1014,61 @@ static int tsi721_bdma_ch_init(struct tsi721_device *priv, int chnum)
         bd_ptr[bd_num - 1].next_hi = cpu_to_le32((u64)bd_phys >> 32);
 
         /* Setup DMA descriptor pointers */
-        iowrite32(((u64)bd_phys >> 32),
-                priv->regs + TSI721_DMAC_DPTRH(chnum));
+        iowrite32(((u64)bd_phys >> 32), regs + TSI721_DMAC_DPTRH);
         iowrite32(((u64)bd_phys & TSI721_DMAC_DPTRL_MASK),
-                priv->regs + TSI721_DMAC_DPTRL(chnum));
+                regs + TSI721_DMAC_DPTRL);
 
         /* Setup descriptor status FIFO */
-        iowrite32(((u64)sts_phys >> 32),
-                priv->regs + TSI721_DMAC_DSBH(chnum));
+        iowrite32(((u64)sts_phys >> 32), regs + TSI721_DMAC_DSBH);
         iowrite32(((u64)sts_phys & TSI721_DMAC_DSBL_MASK),
-                priv->regs + TSI721_DMAC_DSBL(chnum));
+                regs + TSI721_DMAC_DSBL);
         iowrite32(TSI721_DMAC_DSSZ_SIZE(sts_size),
-                priv->regs + TSI721_DMAC_DSSZ(chnum));
+                regs + TSI721_DMAC_DSSZ);
 
         /* Clear interrupt bits */
-        iowrite32(TSI721_DMAC_INT_ALL,
-                priv->regs + TSI721_DMAC_INT(chnum));
+        iowrite32(TSI721_DMAC_INT_ALL, regs + TSI721_DMAC_INT);
 
-        ioread32(priv->regs + TSI721_DMAC_INT(chnum));
+        ioread32(regs + TSI721_DMAC_INT);
 
         /* Toggle DMA channel initialization */
-        iowrite32(TSI721_DMAC_CTL_INIT, priv->regs + TSI721_DMAC_CTL(chnum));
-        ioread32(priv->regs + TSI721_DMAC_CTL(chnum));
+        iowrite32(TSI721_DMAC_CTL_INIT, regs + TSI721_DMAC_CTL);
+        ioread32(regs + TSI721_DMAC_CTL);
         udelay(10);
 
         return 0;
 }
 
-static int tsi721_bdma_ch_free(struct tsi721_device *priv, int chnum)
+static int tsi721_bdma_maint_free(struct tsi721_device *priv)
 {
         u32 ch_stat;
+        struct tsi721_bdma_maint *mdma = &priv->mdma;
+        void __iomem *regs = priv->regs + TSI721_DMAC_BASE(mdma->ch_id);
 
-        if (priv->bdma[chnum].bd_base == NULL)
+        if (mdma->bd_base == NULL)
                 return 0;
 
         /* Check if DMA channel still running */
-        ch_stat = ioread32(priv->regs + TSI721_DMAC_STS(chnum));
+        ch_stat = ioread32(regs + TSI721_DMAC_STS);
         if (ch_stat & TSI721_DMAC_STS_RUN)
                 return -EFAULT;
 
         /* Put DMA channel into init state */
-        iowrite32(TSI721_DMAC_CTL_INIT,
-                priv->regs + TSI721_DMAC_CTL(chnum));
+        iowrite32(TSI721_DMAC_CTL_INIT, regs + TSI721_DMAC_CTL);
 
         /* Free space allocated for DMA descriptors */
         dma_free_coherent(&priv->pdev->dev,
-                priv->bdma[chnum].bd_num * sizeof(struct tsi721_dma_desc),
-                priv->bdma[chnum].bd_base, priv->bdma[chnum].bd_phys);
-        priv->bdma[chnum].bd_base = NULL;
+                mdma->bd_num * sizeof(struct tsi721_dma_desc),
+                mdma->bd_base, mdma->bd_phys);
+        mdma->bd_base = NULL;
 
         /* Free space allocated for status FIFO */
         dma_free_coherent(&priv->pdev->dev,
-                priv->bdma[chnum].sts_size * sizeof(struct tsi721_dma_sts),
-                priv->bdma[chnum].sts_base, priv->bdma[chnum].sts_phys);
-        priv->bdma[chnum].sts_base = NULL;
-        return 0;
-}
-
-static int tsi721_bdma_init(struct tsi721_device *priv)
-{
-        /* Initialize BDMA channel allocated for RapidIO maintenance read/write
-         * request generation
-         */
-        priv->bdma[TSI721_DMACH_MAINT].bd_num = 2;
-        if (tsi721_bdma_ch_init(priv, TSI721_DMACH_MAINT)) {
-                dev_err(&priv->pdev->dev, "Unable to initialize maintenance DMA"
-                        " channel %d, aborting\n", TSI721_DMACH_MAINT);
-                return -ENOMEM;
-        }
-
+                mdma->sts_size * sizeof(struct tsi721_dma_sts),
+                mdma->sts_base, mdma->sts_phys);
+        mdma->sts_base = NULL;
         return 0;
 }
 
-static void tsi721_bdma_free(struct tsi721_device *priv)
-{
-        tsi721_bdma_ch_free(priv, TSI721_DMACH_MAINT);
-}
-
 /* Enable Inbound Messaging Interrupts */
 static void
 tsi721_imsg_interrupt_enable(struct tsi721_device *priv, int ch,
@@ -2035,7 +2081,8 @@ static void tsi721_disable_ints(struct tsi721_device *priv)
 
         /* Disable all BDMA Channel interrupts */
         for (ch = 0; ch < TSI721_DMA_MAXCH; ch++)
-                iowrite32(0, priv->regs + TSI721_DMAC_INTE(ch));
+                iowrite32(0,
+                        priv->regs + TSI721_DMAC_BASE(ch) + TSI721_DMAC_INTE);
 
         /* Disable all general BDMA interrupts */
         iowrite32(0, priv->regs + TSI721_BDMA_INTE);
@@ -2104,6 +2151,7 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
         mport->phy_type = RIO_PHY_SERIAL;
         mport->priv = (void *)priv;
         mport->phys_efptr = 0x100;
+        priv->mport = mport;
 
         INIT_LIST_HEAD(&mport->dbells);
 
@@ -2129,17 +2177,21 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
         if (!err) {
                 tsi721_interrupts_init(priv);
                 ops->pwenable = tsi721_pw_enable;
-        } else
+        } else {
                 dev_err(&pdev->dev, "Unable to get assigned PCI IRQ "
                         "vector %02X err=0x%x\n", pdev->irq, err);
+                goto err_exit;
+        }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        tsi721_register_dma(priv);
+#endif
         /* Enable SRIO link */
         iowrite32(ioread32(priv->regs + TSI721_DEVCTL) |
                   TSI721_DEVCTL_SRBOOT_CMPL,
                   priv->regs + TSI721_DEVCTL);
 
         rio_register_mport(mport);
-        priv->mport = mport;
 
         if (mport->host_deviceid >= 0)
                 iowrite32(RIO_PORT_GEN_HOST | RIO_PORT_GEN_MASTER |
@@ -2149,6 +2201,11 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv)
                 iowrite32(0, priv->regs + (0x100 + RIO_PORT_GEN_CTL_CSR));
 
         return 0;
+
+err_exit:
+        kfree(mport);
+        kfree(ops);
+        return err;
 }
 
 static int __devinit tsi721_probe(struct pci_dev *pdev,
@@ -2294,7 +2351,7 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
         tsi721_init_pc2sr_mapping(priv);
         tsi721_init_sr2pc_mapping(priv);
 
-        if (tsi721_bdma_init(priv)) {
+        if (tsi721_bdma_maint_init(priv)) {
                 dev_err(&pdev->dev, "BDMA initialization failed, aborting\n");
                 err = -ENOMEM;
                 goto err_unmap_bars;
@@ -2319,7 +2376,7 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
 err_free_consistent:
         tsi721_doorbell_free(priv);
 err_free_bdma:
-        tsi721_bdma_free(priv);
+        tsi721_bdma_maint_free(priv);
 err_unmap_bars:
         if (priv->regs)
                 iounmap(priv->regs);
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h
index 1c226b31af13..59de9d7be346 100644
--- a/drivers/rapidio/devices/tsi721.h
+++ b/drivers/rapidio/devices/tsi721.h
@@ -167,6 +167,8 @@
 #define TSI721_DEV_INTE         0x29840
 #define TSI721_DEV_INT          0x29844
 #define TSI721_DEV_INTSET       0x29848
+#define TSI721_DEV_INT_BDMA_CH  0x00002000
+#define TSI721_DEV_INT_BDMA_NCH 0x00001000
 #define TSI721_DEV_INT_SMSG_CH  0x00000800
 #define TSI721_DEV_INT_SMSG_NCH 0x00000400
 #define TSI721_DEV_INT_SR2PC_CH 0x00000200
@@ -181,6 +183,8 @@
 #define TSI721_INT_IMSG_CHAN(x) (1 << (16 + (x)))
 #define TSI721_INT_OMSG_CHAN_M  0x0000ff00
 #define TSI721_INT_OMSG_CHAN(x) (1 << (8 + (x)))
+#define TSI721_INT_BDMA_CHAN_M  0x000000ff
+#define TSI721_INT_BDMA_CHAN(x) (1 << (x))
 
 /*
  * PC2SR block registers
@@ -235,14 +239,16 @@
  *   x = 0..7
  */
 
-#define TSI721_DMAC_DWRCNT(x)   (0x51000 + (x) * 0x1000)
-#define TSI721_DMAC_DRDCNT(x)   (0x51004 + (x) * 0x1000)
+#define TSI721_DMAC_BASE(x)     (0x51000 + (x) * 0x1000)
 
-#define TSI721_DMAC_CTL(x)      (0x51008 + (x) * 0x1000)
+#define TSI721_DMAC_DWRCNT      0x000
+#define TSI721_DMAC_DRDCNT      0x004
+
+#define TSI721_DMAC_CTL         0x008
 #define TSI721_DMAC_CTL_SUSP    0x00000002
 #define TSI721_DMAC_CTL_INIT    0x00000001
 
-#define TSI721_DMAC_INT(x)      (0x5100c + (x) * 0x1000)
+#define TSI721_DMAC_INT         0x00c
 #define TSI721_DMAC_INT_STFULL  0x00000010
 #define TSI721_DMAC_INT_DONE    0x00000008
 #define TSI721_DMAC_INT_SUSP    0x00000004
@@ -250,34 +256,33 @@
 #define TSI721_DMAC_INT_IOFDONE 0x00000001
 #define TSI721_DMAC_INT_ALL     0x0000001f
 
-#define TSI721_DMAC_INTSET(x)   (0x51010 + (x) * 0x1000)
+#define TSI721_DMAC_INTSET      0x010
 
-#define TSI721_DMAC_STS(x)      (0x51014 + (x) * 0x1000)
+#define TSI721_DMAC_STS         0x014
 #define TSI721_DMAC_STS_ABORT   0x00400000
 #define TSI721_DMAC_STS_RUN     0x00200000
 #define TSI721_DMAC_STS_CS      0x001f0000
 
-#define TSI721_DMAC_INTE(x)     (0x51018 + (x) * 0x1000)
+#define TSI721_DMAC_INTE        0x018
 
-#define TSI721_DMAC_DPTRL(x)    (0x51024 + (x) * 0x1000)
+#define TSI721_DMAC_DPTRL       0x024
 #define TSI721_DMAC_DPTRL_MASK  0xffffffe0
 
-#define TSI721_DMAC_DPTRH(x)    (0x51028 + (x) * 0x1000)
+#define TSI721_DMAC_DPTRH       0x028
 
-#define TSI721_DMAC_DSBL(x)     (0x5102c + (x) * 0x1000)
+#define TSI721_DMAC_DSBL        0x02c
 #define TSI721_DMAC_DSBL_MASK   0xffffffc0
 
-#define TSI721_DMAC_DSBH(x)     (0x51030 + (x) * 0x1000)
+#define TSI721_DMAC_DSBH        0x030
 
-#define TSI721_DMAC_DSSZ(x)     (0x51034 + (x) * 0x1000)
+#define TSI721_DMAC_DSSZ        0x034
 #define TSI721_DMAC_DSSZ_SIZE_M 0x0000000f
 #define TSI721_DMAC_DSSZ_SIZE(size)     (__fls(size) - 4)
 
-
-#define TSI721_DMAC_DSRP(x)     (0x51038 + (x) * 0x1000)
+#define TSI721_DMAC_DSRP        0x038
 #define TSI721_DMAC_DSRP_MASK   0x0007ffff
 
-#define TSI721_DMAC_DSWP(x)     (0x5103c + (x) * 0x1000)
+#define TSI721_DMAC_DSWP        0x03c
 #define TSI721_DMAC_DSWP_MASK   0x0007ffff
 
 #define TSI721_BDMA_INTE        0x5f000
@@ -612,6 +617,8 @@ enum dma_rtype {
 #define TSI721_DMACH_MAINT      0       /* DMA channel for maint requests */
 #define TSI721_DMACH_MAINT_NBD  32      /* Number of BDs for maint requests */
 
+#define TSI721_DMACH_DMA        1       /* DMA channel for data transfers */
+
 #define MSG_DMA_ENTRY_INX_TO_SIZE(x)    ((0x10 << (x)) & 0xFFFF0)
 
 enum tsi721_smsg_int_flag {
@@ -626,7 +633,48 @@ enum tsi721_smsg_int_flag {
 
 /* Structures */
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+
+struct tsi721_tx_desc {
+        struct dma_async_tx_descriptor  txd;
+        struct tsi721_dma_desc          *hw_desc;
+        u16                             destid;
+        /* low 64-bits of 66-bit RIO address */
+        u64                             rio_addr;
+        /* upper 2-bits of 66-bit RIO address */
+        u8                              rio_addr_u;
+        bool                            interrupt;
+        struct list_head                desc_node;
+        struct list_head                tx_list;
+};
+
 struct tsi721_bdma_chan {
+        int             id;
+        void __iomem    *regs;
+        int             bd_num;         /* number of buffer descriptors */
+        void            *bd_base;       /* start of DMA descriptors */
+        dma_addr_t      bd_phys;
+        void            *sts_base;      /* start of DMA BD status FIFO */
+        dma_addr_t      sts_phys;
+        int             sts_size;
+        u32             sts_rdptr;
+        u32             wr_count;
+        u32             wr_count_next;
+
+        struct dma_chan         dchan;
+        struct tsi721_tx_desc   *tx_desc;
+        spinlock_t              lock;
+        struct list_head        active_list;
+        struct list_head        queue;
+        struct list_head        free_list;
+        dma_cookie_t            completed_cookie;
+        struct tasklet_struct   tasklet;
+};
+
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
+
+struct tsi721_bdma_maint {
+        int             ch_id;          /* BDMA channel number */
         int             bd_num;         /* number of buffer descriptors */
         void            *bd_base;       /* start of DMA descriptors */
         dma_addr_t      bd_phys;
@@ -721,6 +769,24 @@ enum tsi721_msix_vect {
         TSI721_VECT_IMB1_INT,
         TSI721_VECT_IMB2_INT,
         TSI721_VECT_IMB3_INT,
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+        TSI721_VECT_DMA0_DONE,
+        TSI721_VECT_DMA1_DONE,
+        TSI721_VECT_DMA2_DONE,
+        TSI721_VECT_DMA3_DONE,
+        TSI721_VECT_DMA4_DONE,
+        TSI721_VECT_DMA5_DONE,
+        TSI721_VECT_DMA6_DONE,
+        TSI721_VECT_DMA7_DONE,
+        TSI721_VECT_DMA0_INT,
+        TSI721_VECT_DMA1_INT,
+        TSI721_VECT_DMA2_INT,
+        TSI721_VECT_DMA3_INT,
+        TSI721_VECT_DMA4_INT,
+        TSI721_VECT_DMA5_INT,
+        TSI721_VECT_DMA6_INT,
+        TSI721_VECT_DMA7_INT,
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
         TSI721_VECT_MAX
 };
 
@@ -754,7 +820,11 @@ struct tsi721_device {
         u32             pw_discard_count;
 
         /* BDMA Engine */
+        struct tsi721_bdma_maint mdma; /* Maintenance rd/wr request channel */
+
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
         struct tsi721_bdma_chan bdma[TSI721_DMA_CHNUM];
+#endif
 
         /* Inbound Messaging */
         int             imsg_init[TSI721_IMSG_CHNUM];
@@ -765,4 +835,9 @@ struct tsi721_device {
         struct tsi721_omsg_ring omsg_ring[TSI721_OMSG_CHNUM];
 };
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+extern void tsi721_bdma_handler(struct tsi721_bdma_chan *bdma_chan);
+extern int __devinit tsi721_register_dma(struct tsi721_device *priv);
+#endif
+
 #endif
diff --git a/drivers/rapidio/devices/tsi721_dma.c b/drivers/rapidio/devices/tsi721_dma.c
new file mode 100644
index 000000000000..92e06a5c62ec
--- /dev/null
+++ b/drivers/rapidio/devices/tsi721_dma.c
@@ -0,0 +1,823 @@
+/*
+ * DMA Engine support for Tsi721 PCIExpress-to-SRIO bridge
+ *
+ * Copyright 2011 Integrated Device Technology, Inc.
+ * Alexandre Bounine <alexandre.bounine@idt.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/io.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/rio.h>
+#include <linux/rio_drv.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/kfifo.h>
+#include <linux/delay.h>
+
+#include "tsi721.h"
+
+static inline struct tsi721_bdma_chan *to_tsi721_chan(struct dma_chan *chan)
+{
+        return container_of(chan, struct tsi721_bdma_chan, dchan);
+}
+
+static inline struct tsi721_device *to_tsi721(struct dma_device *ddev)
+{
+        return container_of(ddev, struct rio_mport, dma)->priv;
+}
+
+static inline
+struct tsi721_tx_desc *to_tsi721_desc(struct dma_async_tx_descriptor *txd)
+{
+        return container_of(txd, struct tsi721_tx_desc, txd);
+}
+
+static inline
+struct tsi721_tx_desc *tsi721_dma_first_active(
+                                struct tsi721_bdma_chan *bdma_chan)
+{
+        return list_first_entry(&bdma_chan->active_list,
+                                struct tsi721_tx_desc, desc_node);
+}
+
+static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan)
+{
+        struct tsi721_dma_desc *bd_ptr;
+        struct device *dev = bdma_chan->dchan.device->dev;
+        u64             *sts_ptr;
+        dma_addr_t      bd_phys;
+        dma_addr_t      sts_phys;
+        int             sts_size;
+        int             bd_num = bdma_chan->bd_num;
+
+        dev_dbg(dev, "Init Block DMA Engine, CH%d\n", bdma_chan->id);
+
+        /* Allocate space for DMA descriptors */
+        bd_ptr = dma_zalloc_coherent(dev,
+                                bd_num * sizeof(struct tsi721_dma_desc),
+                                &bd_phys, GFP_KERNEL);
+        if (!bd_ptr)
+                return -ENOMEM;
+
+        bdma_chan->bd_phys = bd_phys;
+        bdma_chan->bd_base = bd_ptr;
+
+        dev_dbg(dev, "DMA descriptors @ %p (phys = %llx)\n",
+                bd_ptr, (unsigned long long)bd_phys);
+
+        /* Allocate space for descriptor status FIFO */
+        sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ?
+                                        bd_num : TSI721_DMA_MINSTSSZ;
+        sts_size = roundup_pow_of_two(sts_size);
+        sts_ptr = dma_zalloc_coherent(dev,
+                                     sts_size * sizeof(struct tsi721_dma_sts),
+                                     &sts_phys, GFP_KERNEL);
+        if (!sts_ptr) {
+                /* Free space allocated for DMA descriptors */
+                dma_free_coherent(dev,
+                                  bd_num * sizeof(struct tsi721_dma_desc),
+                                  bd_ptr, bd_phys);
+                bdma_chan->bd_base = NULL;
+                return -ENOMEM;
+        }
+
+        bdma_chan->sts_phys = sts_phys;
+        bdma_chan->sts_base = sts_ptr;
+        bdma_chan->sts_size = sts_size;
+
+        dev_dbg(dev,
+                "desc status FIFO @ %p (phys = %llx) size=0x%x\n",
+                sts_ptr, (unsigned long long)sts_phys, sts_size);
+
+        /* Initialize DMA descriptors ring */
+        bd_ptr[bd_num - 1].type_id = cpu_to_le32(DTYPE3 << 29);
+        bd_ptr[bd_num - 1].next_lo = cpu_to_le32((u64)bd_phys &
+                                                 TSI721_DMAC_DPTRL_MASK);
+        bd_ptr[bd_num - 1].next_hi = cpu_to_le32((u64)bd_phys >> 32);
+
+        /* Setup DMA descriptor pointers */
+        iowrite32(((u64)bd_phys >> 32),
+                bdma_chan->regs + TSI721_DMAC_DPTRH);
+        iowrite32(((u64)bd_phys & TSI721_DMAC_DPTRL_MASK),
+                bdma_chan->regs + TSI721_DMAC_DPTRL);
+
+        /* Setup descriptor status FIFO */
+        iowrite32(((u64)sts_phys >> 32),
+                bdma_chan->regs + TSI721_DMAC_DSBH);
+        iowrite32(((u64)sts_phys & TSI721_DMAC_DSBL_MASK),
+                bdma_chan->regs + TSI721_DMAC_DSBL);
+        iowrite32(TSI721_DMAC_DSSZ_SIZE(sts_size),
+                bdma_chan->regs + TSI721_DMAC_DSSZ);
+
+        /* Clear interrupt bits */
+        iowrite32(TSI721_DMAC_INT_ALL,
+                bdma_chan->regs + TSI721_DMAC_INT);
+
+        ioread32(bdma_chan->regs + TSI721_DMAC_INT);
+
+        /* Toggle DMA channel initialization */
+        iowrite32(TSI721_DMAC_CTL_INIT, bdma_chan->regs + TSI721_DMAC_CTL);
+        ioread32(bdma_chan->regs + TSI721_DMAC_CTL);
+        bdma_chan->wr_count = bdma_chan->wr_count_next = 0;
+        bdma_chan->sts_rdptr = 0;
+        udelay(10);
+
+        return 0;
+}
+
+static int tsi721_bdma_ch_free(struct tsi721_bdma_chan *bdma_chan)
+{
+        u32 ch_stat;
+
+        if (bdma_chan->bd_base == NULL)
+                return 0;
+
+        /* Check if DMA channel still running */
+        ch_stat = ioread32(bdma_chan->regs + TSI721_DMAC_STS);
+        if (ch_stat & TSI721_DMAC_STS_RUN)
+                return -EFAULT;
+
+        /* Put DMA channel into init state */
+        iowrite32(TSI721_DMAC_CTL_INIT, bdma_chan->regs + TSI721_DMAC_CTL);
+
+        /* Free space allocated for DMA descriptors */
+        dma_free_coherent(bdma_chan->dchan.device->dev,
+                bdma_chan->bd_num * sizeof(struct tsi721_dma_desc),
+                bdma_chan->bd_base, bdma_chan->bd_phys);
+        bdma_chan->bd_base = NULL;
+
+        /* Free space allocated for status FIFO */
+        dma_free_coherent(bdma_chan->dchan.device->dev,
+                bdma_chan->sts_size * sizeof(struct tsi721_dma_sts),
+                bdma_chan->sts_base, bdma_chan->sts_phys);
+        bdma_chan->sts_base = NULL;
+        return 0;
+}
+
+static void
+tsi721_bdma_interrupt_enable(struct tsi721_bdma_chan *bdma_chan, int enable)
+{
+        if (enable) {
+                /* Clear pending BDMA channel interrupts */
+                iowrite32(TSI721_DMAC_INT_ALL,
+                        bdma_chan->regs + TSI721_DMAC_INT);
+                ioread32(bdma_chan->regs + TSI721_DMAC_INT);
+                /* Enable BDMA channel interrupts */
+                iowrite32(TSI721_DMAC_INT_ALL,
+                        bdma_chan->regs + TSI721_DMAC_INTE);
+        } else {
+                /* Disable BDMA channel interrupts */
+                iowrite32(0, bdma_chan->regs + TSI721_DMAC_INTE);
+                /* Clear pending BDMA channel interrupts */
+                iowrite32(TSI721_DMAC_INT_ALL,
+                        bdma_chan->regs + TSI721_DMAC_INT);
+        }
+
+}
+
+static bool tsi721_dma_is_idle(struct tsi721_bdma_chan *bdma_chan)
+{
+        u32 sts;
+
+        sts = ioread32(bdma_chan->regs + TSI721_DMAC_STS);
+        return ((sts & TSI721_DMAC_STS_RUN) == 0);
+}
+
+void tsi721_bdma_handler(struct tsi721_bdma_chan *bdma_chan)
+{
+        /* Disable BDMA channel interrupts */
+        iowrite32(0, bdma_chan->regs + TSI721_DMAC_INTE);
+
+        tasklet_schedule(&bdma_chan->tasklet);
+}
+
+#ifdef CONFIG_PCI_MSI
+/**
+ * tsi721_omsg_msix - MSI-X interrupt handler for BDMA channels
+ * @irq: Linux interrupt number
+ * @ptr: Pointer to interrupt-specific data (BDMA channel structure)
+ *
+ * Handles BDMA channel interrupts signaled using MSI-X.
+ */
+static irqreturn_t tsi721_bdma_msix(int irq, void *ptr)
+{
+        struct tsi721_bdma_chan *bdma_chan = ptr;
+
+        tsi721_bdma_handler(bdma_chan);
+        return IRQ_HANDLED;
+}
+#endif /* CONFIG_PCI_MSI */
+
+/* Must be called with the spinlock held */
+static void tsi721_start_dma(struct tsi721_bdma_chan *bdma_chan)
+{
+        if (!tsi721_dma_is_idle(bdma_chan)) {
+                dev_err(bdma_chan->dchan.device->dev,
+                        "BUG: Attempt to start non-idle channel\n");
+                return;
+        }
+
+        if (bdma_chan->wr_count == bdma_chan->wr_count_next) {
+                dev_err(bdma_chan->dchan.device->dev,
+                        "BUG: Attempt to start DMA with no BDs ready\n");
+                return;
+        }
+
+        dev_dbg(bdma_chan->dchan.device->dev,
+                "tx_chan: %p, chan: %d, regs: %p\n",
+                bdma_chan, bdma_chan->dchan.chan_id, bdma_chan->regs);
+
+        iowrite32(bdma_chan->wr_count_next,
+                bdma_chan->regs + TSI721_DMAC_DWRCNT);
+        ioread32(bdma_chan->regs + TSI721_DMAC_DWRCNT);
+
+        bdma_chan->wr_count = bdma_chan->wr_count_next;
+}
+
+static void tsi721_desc_put(struct tsi721_bdma_chan *bdma_chan,
+                            struct tsi721_tx_desc *desc)
+{
+        dev_dbg(bdma_chan->dchan.device->dev,
+                "Put desc: %p into free list\n", desc);
+
+        if (desc) {
+                spin_lock_bh(&bdma_chan->lock);
+                list_splice_init(&desc->tx_list, &bdma_chan->free_list);
+                list_add(&desc->desc_node, &bdma_chan->free_list);
+                bdma_chan->wr_count_next = bdma_chan->wr_count;
+                spin_unlock_bh(&bdma_chan->lock);
+        }
+}
+
+static
+struct tsi721_tx_desc *tsi721_desc_get(struct tsi721_bdma_chan *bdma_chan)
+{
+        struct tsi721_tx_desc *tx_desc, *_tx_desc;
+        struct tsi721_tx_desc *ret = NULL;
+        int i;
+
+        spin_lock_bh(&bdma_chan->lock);
+        list_for_each_entry_safe(tx_desc, _tx_desc,
+                                 &bdma_chan->free_list, desc_node) {
+                if (async_tx_test_ack(&tx_desc->txd)) {
+                        list_del(&tx_desc->desc_node);
+                        ret = tx_desc;
+                        break;
+                }
+                dev_dbg(bdma_chan->dchan.device->dev,
+                        "desc %p not ACKed\n", tx_desc);
+        }
+
+        i = bdma_chan->wr_count_next % bdma_chan->bd_num;
+        if (i == bdma_chan->bd_num - 1) {
+                i = 0;
+                bdma_chan->wr_count_next++; /* skip link descriptor */
+        }
+
+        bdma_chan->wr_count_next++;
+        tx_desc->txd.phys = bdma_chan->bd_phys +
+                                i * sizeof(struct tsi721_dma_desc);
+        tx_desc->hw_desc = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[i];
+
+        spin_unlock_bh(&bdma_chan->lock);
+
+        return ret;
+}
+
+static int
+tsi721_fill_desc(struct tsi721_bdma_chan *bdma_chan,
+        struct tsi721_tx_desc *desc, struct scatterlist *sg,
+        enum dma_rtype rtype, u32 sys_size)
+{
+        struct tsi721_dma_desc *bd_ptr = desc->hw_desc;
+        u64 rio_addr;
+
+        if (sg_dma_len(sg) > TSI721_DMAD_BCOUNT1 + 1) {
+                dev_err(bdma_chan->dchan.device->dev,
+                        "SG element is too large\n");
+                return -EINVAL;
+        }
+
+        dev_dbg(bdma_chan->dchan.device->dev,
+                "desc: 0x%llx, addr: 0x%llx len: 0x%x\n",
+                (u64)desc->txd.phys, (unsigned long long)sg_dma_address(sg),
+                sg_dma_len(sg));
+
+        dev_dbg(bdma_chan->dchan.device->dev,
+                "bd_ptr = %p did=%d raddr=0x%llx\n",
+                bd_ptr, desc->destid, desc->rio_addr);
+
+        /* Initialize DMA descriptor */
+        bd_ptr->type_id = cpu_to_le32((DTYPE1 << 29) |
+                                        (rtype << 19) | desc->destid);
+        if (desc->interrupt)
+                bd_ptr->type_id |= cpu_to_le32(TSI721_DMAD_IOF);
+        bd_ptr->bcount = cpu_to_le32(((desc->rio_addr & 0x3) << 30) |
+                                        (sys_size << 26) | sg_dma_len(sg));
+        rio_addr = (desc->rio_addr >> 2) |
+                                ((u64)(desc->rio_addr_u & 0x3) << 62);
+        bd_ptr->raddr_lo = cpu_to_le32(rio_addr & 0xffffffff);
+        bd_ptr->raddr_hi = cpu_to_le32(rio_addr >> 32);
+        bd_ptr->t1.bufptr_lo = cpu_to_le32(
+                                        (u64)sg_dma_address(sg) & 0xffffffff);
+        bd_ptr->t1.bufptr_hi = cpu_to_le32((u64)sg_dma_address(sg) >> 32);
+        bd_ptr->t1.s_dist = 0;
+        bd_ptr->t1.s_size = 0;
+
+        return 0;
+}
+
+static void tsi721_dma_chain_complete(struct tsi721_bdma_chan *bdma_chan,
+                                      struct tsi721_tx_desc *desc)
+{
+        struct dma_async_tx_descriptor *txd = &desc->txd;
+        dma_async_tx_callback callback = txd->callback;
+        void *param = txd->callback_param;
+
+        list_splice_init(&desc->tx_list, &bdma_chan->free_list);
+        list_move(&desc->desc_node, &bdma_chan->free_list);
+        bdma_chan->completed_cookie = txd->cookie;
+
+        if (callback)
+                callback(param);
+}
+
+static void tsi721_dma_complete_all(struct tsi721_bdma_chan *bdma_chan)
+{
+        struct tsi721_tx_desc *desc, *_d;
+        LIST_HEAD(list);
+
+        BUG_ON(!tsi721_dma_is_idle(bdma_chan));
+
+        if (!list_empty(&bdma_chan->queue))
+                tsi721_start_dma(bdma_chan);
+
+        list_splice_init(&bdma_chan->active_list, &list);
+        list_splice_init(&bdma_chan->queue, &bdma_chan->active_list);
+
+        list_for_each_entry_safe(desc, _d, &list, desc_node)
+                tsi721_dma_chain_complete(bdma_chan, desc);
+}
+
+static void tsi721_clr_stat(struct tsi721_bdma_chan *bdma_chan)
+{
+        u32 srd_ptr;
+        u64 *sts_ptr;
+        int i, j;
+
+        /* Check and clear descriptor status FIFO entries */
+        srd_ptr = bdma_chan->sts_rdptr;
+        sts_ptr = bdma_chan->sts_base;
+        j = srd_ptr * 8;
+        while (sts_ptr[j]) {
+                for (i = 0; i < 8 && sts_ptr[j]; i++, j++)
+                        sts_ptr[j] = 0;
+
+                ++srd_ptr;
+                srd_ptr %= bdma_chan->sts_size;
+                j = srd_ptr * 8;
+        }
+
+        iowrite32(srd_ptr, bdma_chan->regs + TSI721_DMAC_DSRP);
+        bdma_chan->sts_rdptr = srd_ptr;
+}
+
+static void tsi721_advance_work(struct tsi721_bdma_chan *bdma_chan)
+{
+        if (list_empty(&bdma_chan->active_list) ||
+                list_is_singular(&bdma_chan->active_list)) {
+                dev_dbg(bdma_chan->dchan.device->dev,
+                        "%s: Active_list empty\n", __func__);
+                tsi721_dma_complete_all(bdma_chan);
+        } else {
+                dev_dbg(bdma_chan->dchan.device->dev,
+                        "%s: Active_list NOT empty\n", __func__);
+                tsi721_dma_chain_complete(bdma_chan,
+                                        tsi721_dma_first_active(bdma_chan));
+                tsi721_start_dma(bdma_chan);
+        }
+}
+
+static void tsi721_dma_tasklet(unsigned long data)
+{
+        struct tsi721_bdma_chan *bdma_chan = (struct tsi721_bdma_chan *)data;
+        u32 dmac_int, dmac_sts;
+
+        dmac_int = ioread32(bdma_chan->regs + TSI721_DMAC_INT);
+        dev_dbg(bdma_chan->dchan.device->dev, "%s: DMAC%d_INT = 0x%x\n",
+                __func__, bdma_chan->id, dmac_int);
+        /* Clear channel interrupts */
+        iowrite32(dmac_int, bdma_chan->regs + TSI721_DMAC_INT);
+
+        if (dmac_int & TSI721_DMAC_INT_ERR) {
+                dmac_sts = ioread32(bdma_chan->regs + TSI721_DMAC_STS);
+                dev_err(bdma_chan->dchan.device->dev,
+                        "%s: DMA ERROR - DMAC%d_STS = 0x%x\n",
+                        __func__, bdma_chan->id, dmac_sts);
+        }
+
+        if (dmac_int & TSI721_DMAC_INT_STFULL) {
+                dev_err(bdma_chan->dchan.device->dev,
+                        "%s: DMAC%d descriptor status FIFO is full\n",
+                        __func__, bdma_chan->id);
+        }
+
+        if (dmac_int & (TSI721_DMAC_INT_DONE | TSI721_DMAC_INT_IOFDONE)) {
+                tsi721_clr_stat(bdma_chan);
+                spin_lock(&bdma_chan->lock);
+                tsi721_advance_work(bdma_chan);
+                spin_unlock(&bdma_chan->lock);
+        }
+
+        /* Re-Enable BDMA channel interrupts */
+        iowrite32(TSI721_DMAC_INT_ALL, bdma_chan->regs + TSI721_DMAC_INTE);
+}
+
+static dma_cookie_t tsi721_tx_submit(struct dma_async_tx_descriptor *txd)
+{
+        struct tsi721_tx_desc *desc = to_tsi721_desc(txd);
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(txd->chan);
+        dma_cookie_t cookie;
+
+        spin_lock_bh(&bdma_chan->lock);
+
+        cookie = txd->chan->cookie;
+        if (++cookie < 0)
+                cookie = 1;
+        txd->chan->cookie = cookie;
+        txd->cookie = cookie;
+
+        if (list_empty(&bdma_chan->active_list)) {
+                list_add_tail(&desc->desc_node, &bdma_chan->active_list);
+                tsi721_start_dma(bdma_chan);
+        } else {
+                list_add_tail(&desc->desc_node, &bdma_chan->queue);
+        }
+
+        spin_unlock_bh(&bdma_chan->lock);
+        return cookie;
+}
+
+static int tsi721_alloc_chan_resources(struct dma_chan *dchan)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+#ifdef CONFIG_PCI_MSI
+        struct tsi721_device *priv = to_tsi721(dchan->device);
+#endif
+        struct tsi721_tx_desc *desc = NULL;
+        LIST_HEAD(tmp_list);
+        int i;
+        int rc;
+
+        if (bdma_chan->bd_base)
+                return bdma_chan->bd_num - 1;
+
+        /* Initialize BDMA channel */
+        if (tsi721_bdma_ch_init(bdma_chan)) {
+                dev_err(dchan->device->dev, "Unable to initialize data DMA"
+                        " channel %d, aborting\n", bdma_chan->id);
+                return -ENOMEM;
+        }
+
+        /* Alocate matching number of logical descriptors */
+        desc = kcalloc((bdma_chan->bd_num - 1), sizeof(struct tsi721_tx_desc),
+                        GFP_KERNEL);
+        if (!desc) {
+                dev_err(dchan->device->dev,
+                        "Failed to allocate logical descriptors\n");
+                rc = -ENOMEM;
+                goto err_out;
+        }
+
+        bdma_chan->tx_desc = desc;
+
+        for (i = 0; i < bdma_chan->bd_num - 1; i++) {
+                dma_async_tx_descriptor_init(&desc[i].txd, dchan);
+                desc[i].txd.tx_submit = tsi721_tx_submit;
+                desc[i].txd.flags = DMA_CTRL_ACK;
+                INIT_LIST_HEAD(&desc[i].tx_list);
+                list_add_tail(&desc[i].desc_node, &tmp_list);
+        }
+
+        spin_lock_bh(&bdma_chan->lock);
+        list_splice(&tmp_list, &bdma_chan->free_list);
+        bdma_chan->completed_cookie = dchan->cookie = 1;
+        spin_unlock_bh(&bdma_chan->lock);
+
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                /* Request interrupt service if we are in MSI-X mode */
+                rc = request_irq(
+                        priv->msix[TSI721_VECT_DMA0_DONE +
+                                   bdma_chan->id].vector,
+                        tsi721_bdma_msix, 0,
+                        priv->msix[TSI721_VECT_DMA0_DONE +
+                                   bdma_chan->id].irq_name,
+                        (void *)bdma_chan);
+
+                if (rc) {
+                        dev_dbg(dchan->device->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "BDMA%d-DONE\n", bdma_chan->id);
+                        goto err_out;
+                }
+
+                rc = request_irq(priv->msix[TSI721_VECT_DMA0_INT +
+                                            bdma_chan->id].vector,
+                                tsi721_bdma_msix, 0,
+                                priv->msix[TSI721_VECT_DMA0_INT +
+                                           bdma_chan->id].irq_name,
+                                (void *)bdma_chan);
+
+                if (rc) {
+                        dev_dbg(dchan->device->dev,
+                                "Unable to allocate MSI-X interrupt for "
+                                "BDMA%d-INT\n", bdma_chan->id);
+                        free_irq(
+                                priv->msix[TSI721_VECT_DMA0_DONE +
+                                           bdma_chan->id].vector,
+                                (void *)bdma_chan);
+                        rc = -EIO;
+                        goto err_out;
+                }
+        }
+#endif /* CONFIG_PCI_MSI */
+
+        tasklet_enable(&bdma_chan->tasklet);
+        tsi721_bdma_interrupt_enable(bdma_chan, 1);
+
+        return bdma_chan->bd_num - 1;
+
+err_out:
+        kfree(desc);
+        tsi721_bdma_ch_free(bdma_chan);
+        return rc;
+}
+
+static void tsi721_free_chan_resources(struct dma_chan *dchan)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+#ifdef CONFIG_PCI_MSI
+        struct tsi721_device *priv = to_tsi721(dchan->device);
+#endif
+        LIST_HEAD(list);
+
+        dev_dbg(dchan->device->dev, "%s: Entry\n", __func__);
+
+        if (bdma_chan->bd_base == NULL)
+                return;
+
+        BUG_ON(!list_empty(&bdma_chan->active_list));
+        BUG_ON(!list_empty(&bdma_chan->queue));
+
+        tasklet_disable(&bdma_chan->tasklet);
+
+        spin_lock_bh(&bdma_chan->lock);
+        list_splice_init(&bdma_chan->free_list, &list);
+        spin_unlock_bh(&bdma_chan->lock);
+
+        tsi721_bdma_interrupt_enable(bdma_chan, 0);
+
+#ifdef CONFIG_PCI_MSI
+        if (priv->flags & TSI721_USING_MSIX) {
+                free_irq(priv->msix[TSI721_VECT_DMA0_DONE +
+                                    bdma_chan->id].vector, (void *)bdma_chan);
+                free_irq(priv->msix[TSI721_VECT_DMA0_INT +
+                                    bdma_chan->id].vector, (void *)bdma_chan);
+        }
+#endif /* CONFIG_PCI_MSI */
+
+        tsi721_bdma_ch_free(bdma_chan);
+        kfree(bdma_chan->tx_desc);
+}
+
+static
+enum dma_status tsi721_tx_status(struct dma_chan *dchan, dma_cookie_t cookie,
+                                 struct dma_tx_state *txstate)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+        dma_cookie_t            last_used;
+        dma_cookie_t            last_completed;
+        int                     ret;
+
+        spin_lock_bh(&bdma_chan->lock);
+        last_completed = bdma_chan->completed_cookie;
+        last_used = dchan->cookie;
+        spin_unlock_bh(&bdma_chan->lock);
+
+        ret = dma_async_is_complete(cookie, last_completed, last_used);
+
+        dma_set_tx_state(txstate, last_completed, last_used, 0);
+
+        dev_dbg(dchan->device->dev,
+                "%s: exit, ret: %d, last_completed: %d, last_used: %d\n",
+                __func__, ret, last_completed, last_used);
+
+        return ret;
+}
+
+static void tsi721_issue_pending(struct dma_chan *dchan)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+
+        dev_dbg(dchan->device->dev, "%s: Entry\n", __func__);
+
+        if (tsi721_dma_is_idle(bdma_chan)) {
+                spin_lock_bh(&bdma_chan->lock);
+                tsi721_advance_work(bdma_chan);
+                spin_unlock_bh(&bdma_chan->lock);
+        } else
+                dev_dbg(dchan->device->dev,
+                        "%s: DMA channel still busy\n", __func__);
+}
+
+static
+struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan,
+                        struct scatterlist *sgl, unsigned int sg_len,
+                        enum dma_transfer_direction dir, unsigned long flags,
+                        void *tinfo)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+        struct tsi721_tx_desc *desc = NULL;
+        struct tsi721_tx_desc *first = NULL;
+        struct scatterlist *sg;
+        struct rio_dma_ext *rext = tinfo;
+        u64 rio_addr = rext->rio_addr; /* limited to 64-bit rio_addr for now */
+        unsigned int i;
+        u32 sys_size = dma_to_mport(dchan->device)->sys_size;
+        enum dma_rtype rtype;
+
+        if (!sgl || !sg_len) {
+                dev_err(dchan->device->dev, "%s: No SG list\n", __func__);
+                return NULL;
+        }
+
+        if (dir == DMA_DEV_TO_MEM)
+                rtype = NREAD;
+        else if (dir == DMA_MEM_TO_DEV) {
+                switch (rext->wr_type) {
+                case RDW_ALL_NWRITE:
+                        rtype = ALL_NWRITE;
+                        break;
+                case RDW_ALL_NWRITE_R:
+                        rtype = ALL_NWRITE_R;
+                        break;
+                case RDW_LAST_NWRITE_R:
+                default:
+                        rtype = LAST_NWRITE_R;
+                        break;
+                }
+        } else {
+                dev_err(dchan->device->dev,
+                        "%s: Unsupported DMA direction option\n", __func__);
+                return NULL;
+        }
+
+        for_each_sg(sgl, sg, sg_len, i) {
+                int err;
+
+                dev_dbg(dchan->device->dev, "%s: sg #%d\n", __func__, i);
+                desc = tsi721_desc_get(bdma_chan);
+                if (!desc) {
+                        dev_err(dchan->device->dev,
+                                "Not enough descriptors available\n");
+                        goto err_desc_get;
+                }
+
+                if (sg_is_last(sg))
+                        desc->interrupt = (flags & DMA_PREP_INTERRUPT) != 0;
+                else
+                        desc->interrupt = false;
+
+                desc->destid = rext->destid;
+                desc->rio_addr = rio_addr;
+                desc->rio_addr_u = 0;
+
+                err = tsi721_fill_desc(bdma_chan, desc, sg, rtype, sys_size);
+                if (err) {
+                        dev_err(dchan->device->dev,
+                                "Failed to build desc: %d\n", err);
+                        goto err_desc_get;
+                }
+
+                rio_addr += sg_dma_len(sg);
+
+                if (!first)
+                        first = desc;
+                else
+                        list_add_tail(&desc->desc_node, &first->tx_list);
+        }
+
+        first->txd.cookie = -EBUSY;
+        desc->txd.flags = flags;
+
+        return &first->txd;
+
+err_desc_get:
+        tsi721_desc_put(bdma_chan, first);
+        return NULL;
+}
+
+static int tsi721_device_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd,
+                             unsigned long arg)
+{
+        struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
+        struct tsi721_tx_desc *desc, *_d;
+        LIST_HEAD(list);
+
+        dev_dbg(dchan->device->dev, "%s: Entry\n", __func__);
+
+        if (cmd != DMA_TERMINATE_ALL)
+                return -ENXIO;
+
+        spin_lock_bh(&bdma_chan->lock);
+
+        /* make sure to stop the transfer */
+        iowrite32(TSI721_DMAC_CTL_SUSP, bdma_chan->regs + TSI721_DMAC_CTL);
+
+        list_splice_init(&bdma_chan->active_list, &list);
+        list_splice_init(&bdma_chan->queue, &list);
+
+        list_for_each_entry_safe(desc, _d, &list, desc_node)
+                tsi721_dma_chain_complete(bdma_chan, desc);
+
+        spin_unlock_bh(&bdma_chan->lock);
+
+        return 0;
+}
+
+int __devinit tsi721_register_dma(struct tsi721_device *priv)
+{
+        int i;
+        int nr_channels = TSI721_DMA_MAXCH;
+        int err;
+        struct rio_mport *mport = priv->mport;
+
+        mport->dma.dev = &priv->pdev->dev;
+        mport->dma.chancnt = nr_channels;
+
+        INIT_LIST_HEAD(&mport->dma.channels);
+
+        for (i = 0; i < nr_channels; i++) {
+                struct tsi721_bdma_chan *bdma_chan = &priv->bdma[i];
+
+                if (i == TSI721_DMACH_MAINT)
+                        continue;
+
+                bdma_chan->bd_num = 64;
+                bdma_chan->regs = priv->regs + TSI721_DMAC_BASE(i);
+
+                bdma_chan->dchan.device = &mport->dma;
+                bdma_chan->dchan.cookie = 1;
+                bdma_chan->dchan.chan_id = i;
+                bdma_chan->id = i;
+
+                spin_lock_init(&bdma_chan->lock);
+
+                INIT_LIST_HEAD(&bdma_chan->active_list);
+                INIT_LIST_HEAD(&bdma_chan->queue);
+                INIT_LIST_HEAD(&bdma_chan->free_list);
+
+                tasklet_init(&bdma_chan->tasklet, tsi721_dma_tasklet,
+                             (unsigned long)bdma_chan);
+                tasklet_disable(&bdma_chan->tasklet);
+                list_add_tail(&bdma_chan->dchan.device_node,
+                              &mport->dma.channels);
+        }
+
+        dma_cap_zero(mport->dma.cap_mask);
+        dma_cap_set(DMA_PRIVATE, mport->dma.cap_mask);
+        dma_cap_set(DMA_SLAVE, mport->dma.cap_mask);
+
+        mport->dma.device_alloc_chan_resources = tsi721_alloc_chan_resources;
+        mport->dma.device_free_chan_resources = tsi721_free_chan_resources;
+        mport->dma.device_tx_status = tsi721_tx_status;
+        mport->dma.device_issue_pending = tsi721_issue_pending;
+        mport->dma.device_prep_slave_sg = tsi721_prep_rio_sg;
+        mport->dma.device_control = tsi721_device_control;
+
+        err = dma_async_device_register(&mport->dma);
+        if (err)
+                dev_err(&priv->pdev->dev, "Failed to register DMA device\n");
+
+        return err;
+}
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 86c9a091a2ff..c40665a4fa33 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1121,6 +1121,87 @@ int rio_std_route_clr_table(struct rio_mport *mport, u16 destid, u8 hopcount,
         return 0;
 }
 
+#ifdef CONFIG_RAPIDIO_DMA_ENGINE
+
+static bool rio_chan_filter(struct dma_chan *chan, void *arg)
+{
+        struct rio_dev *rdev = arg;
+
+        /* Check that DMA device belongs to the right MPORT */
+        return (rdev->net->hport ==
+                container_of(chan->device, struct rio_mport, dma));
+}
+
+/**
+ * rio_request_dma - request RapidIO capable DMA channel that supports
+ *   specified target RapidIO device.
+ * @rdev: RIO device control structure
+ *
+ * Returns pointer to allocated DMA channel or NULL if failed.
+ */
+struct dma_chan *rio_request_dma(struct rio_dev *rdev)
+{
+        dma_cap_mask_t mask;
+        struct dma_chan *dchan;
+
+        dma_cap_zero(mask);
+        dma_cap_set(DMA_SLAVE, mask);
+        dchan = dma_request_channel(mask, rio_chan_filter, rdev);
+
+        return dchan;
+}
+EXPORT_SYMBOL_GPL(rio_request_dma);
+
+/**
+ * rio_release_dma - release specified DMA channel
+ * @dchan: DMA channel to release
+ */
+void rio_release_dma(struct dma_chan *dchan)
+{
+        dma_release_channel(dchan);
+}
+EXPORT_SYMBOL_GPL(rio_release_dma);
+
+/**
+ * rio_dma_prep_slave_sg - RapidIO specific wrapper
+ *   for device_prep_slave_sg callback defined by DMAENGINE.
+ * @rdev: RIO device control structure
+ * @dchan: DMA channel to configure
+ * @data: RIO specific data descriptor
+ * @direction: DMA data transfer direction (TO or FROM the device)
+ * @flags: dmaengine defined flags
+ *
+ * Initializes RapidIO capable DMA channel for the specified data transfer.
+ * Uses DMA channel private extension to pass information related to remote
+ * target RIO device.
+ * Returns pointer to DMA transaction descriptor or NULL if failed.
+ */
+struct dma_async_tx_descriptor *rio_dma_prep_slave_sg(struct rio_dev *rdev,
+        struct dma_chan *dchan, struct rio_dma_data *data,
+        enum dma_transfer_direction direction, unsigned long flags)
+{
+        struct dma_async_tx_descriptor *txd = NULL;
+        struct rio_dma_ext rio_ext;
+
+        if (dchan->device->device_prep_slave_sg == NULL) {
+                pr_err("%s: prep_rio_sg == NULL\n", __func__);
+                return NULL;
+        }
+
+        rio_ext.destid = rdev->destid;
+        rio_ext.rio_addr_u = data->rio_addr_u;
+        rio_ext.rio_addr = data->rio_addr;
+        rio_ext.wr_type = data->wr_type;
+
+        txd = dmaengine_prep_rio_sg(dchan, data->sg, data->sg_len,
+                                        direction, flags, &rio_ext);
+
+        return txd;
+}
+EXPORT_SYMBOL_GPL(rio_dma_prep_slave_sg);
+
+#endif /* CONFIG_RAPIDIO_DMA_ENGINE */
+
 static void rio_fixup_device(struct rio_dev *dev)
 {
 }
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index e1b8c54ace5a..a739f5ca936a 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -794,17 +794,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match ab8500_regulator_matches[] = {
-        { .name = "LDO-AUX1",    .driver_data = (void *) AB8500_LDO_AUX1, },
-        { .name = "LDO-AUX2",    .driver_data = (void *) AB8500_LDO_AUX2, },
-        { .name = "LDO-AUX3",    .driver_data = (void *) AB8500_LDO_AUX3, },
-        { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, },
-        { .name = "LDO-TVOUT",   .driver_data = (void *) AB8500_LDO_TVOUT, },
-        { .name = "LDO-USB",     .driver_data = (void *) AB8500_LDO_USB, },
-        { .name = "LDO-AUDIO",   .driver_data = (void *) AB8500_LDO_AUDIO, },
-        { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
-        { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
-        { .name = "LDO-DMIC",    .driver_data = (void *) AB8500_LDO_DMIC, },
-        { .name = "LDO-ANA",     .driver_data = (void *) AB8500_LDO_ANA, },
+        { .name = "ab8500_ldo_aux1",    .driver_data = (void *) AB8500_LDO_AUX1, },
+        { .name = "ab8500_ldo_aux2",    .driver_data = (void *) AB8500_LDO_AUX2, },
+        { .name = "ab8500_ldo_aux3",    .driver_data = (void *) AB8500_LDO_AUX3, },
+        { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
+        { .name = "ab8500_ldo_tvout",   .driver_data = (void *) AB8500_LDO_TVOUT, },
+        { .name = "ab8500_ldo_usb",     .driver_data = (void *) AB8500_LDO_USB, },
+        { .name = "ab8500_ldo_audio",   .driver_data = (void *) AB8500_LDO_AUDIO, },
+        { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
+        { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
+        { .name = "ab8500_ldo_dmic",    .driver_data = (void *) AB8500_LDO_DMIC, },
+        { .name = "ab8500_ldo_ana",     .driver_data = (void *) AB8500_LDO_ANA, },
 };
 
 static __devinit int
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 3660bace123c..e82e7eaac0f1 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -224,7 +224,7 @@ static struct platform_driver anatop_regulator_driver = {
                 .of_match_table = of_anatop_regulator_match_tbl,
         },
         .probe  = anatop_regulator_probe,
-        .remove = anatop_regulator_remove,
+        .remove = __devexit_p(anatop_regulator_remove),
 };
 
 static int __init anatop_regulator_init(void)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7584a74eec8a..09a737c868b5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2050,6 +2050,9 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
                 return -EINVAL;
         }
 
+        if (min_uV < rdev->desc->min_uV)
+                min_uV = rdev->desc->min_uV;
+
         ret = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
         if (ret < 0)
                 return ret;
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 968f97f3cb3d..9dbb491b6efa 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -452,26 +452,26 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match db8500_regulator_matches[] = {
-        { .name = "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
-        { .name = "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
-        { .name = "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
-        { .name = "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
-        { .name = "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
-        { .name = "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
-        { .name = "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
-        { .name = "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
-        { .name = "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
-        { .name = "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
-        { .name = "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
-        { .name = "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
-        { .name = "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
-        { .name = "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
-        { .name = "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
-        { .name = "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
-        { .name = "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
-        { .name = "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
-        { .name = "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
-        { .name = "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
+        { .name = "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
+        { .name = "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
+        { .name = "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
+        { .name = "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
+        { .name = "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
+        { .name = "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
+        { .name = "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
+        { .name = "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
+        { .name = "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
+        { .name = "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
+        { .name = "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
+        { .name = "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
+        { .name = "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
+        { .name = "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
+        { .name = "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
+        { .name = "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
+        { .name = "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
+        { .name = "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
+        { .name = "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
+        { .name = "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
 };
 
 static __devinit int
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 9997d7aaca84..242851a4c1a6 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -101,16 +101,20 @@ static int gpio_regulator_get_value(struct regulator_dev *dev)
 }
 
 static int gpio_regulator_set_value(struct regulator_dev *dev,
-                                        int min, int max)
+                                        int min, int max, unsigned *selector)
 {
         struct gpio_regulator_data *data = rdev_get_drvdata(dev);
-        int ptr, target, state, best_val = INT_MAX;
+        int ptr, target = 0, state, best_val = INT_MAX;
 
         for (ptr = 0; ptr < data->nr_states; ptr++)
                 if (data->states[ptr].value < best_val &&
                     data->states[ptr].value >= min &&
-                    data->states[ptr].value <= max)
+                    data->states[ptr].value <= max) {
                         target = data->states[ptr].gpios;
+                        best_val = data->states[ptr].value;
+                        if (selector)
+                                *selector = ptr;
+                }
 
         if (best_val == INT_MAX)
                 return -EINVAL;
@@ -128,7 +132,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev,
                                         int min_uV, int max_uV,
                                         unsigned *selector)
 {
-        return gpio_regulator_set_value(dev, min_uV, max_uV);
+        return gpio_regulator_set_value(dev, min_uV, max_uV, selector);
 }
 
 static int gpio_regulator_list_voltage(struct regulator_dev *dev,
@@ -145,7 +149,7 @@ static int gpio_regulator_list_voltage(struct regulator_dev *dev,
 static int gpio_regulator_set_current_limit(struct regulator_dev *dev,
                                         int min_uA, int max_uA)
 {
-        return gpio_regulator_set_value(dev, min_uA, max_uA);
+        return gpio_regulator_set_value(dev, min_uA, max_uA, NULL);
 }
 
 static struct regulator_ops gpio_regulator_voltage_ops = {
@@ -286,7 +290,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
 
         cfg.dev = &pdev->dev;
         cfg.init_data = config->init_data;
-        cfg.driver_data = &drvdata;
+        cfg.driver_data = drvdata;
 
         drvdata->dev = regulator_register(&drvdata->desc, &cfg);
         if (IS_ERR(drvdata->dev)) {
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 1f4bb80457b3..9d540cd02dab 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -259,6 +259,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
         config.dev = &client->dev;
         config.init_data = pdata->regulator;
         config.driver_data = info;
+        config.regmap = info->regmap;
 
         info->regulator = regulator_register(&dcdc_desc, &config);
         if (IS_ERR(info->regulator)) {
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index c4435f608df7..9b7ca90057d5 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -775,9 +775,6 @@ static __devinit int palmas_probe(struct platform_device *pdev)
 err_unregister_regulator:
         while (--id >= 0)
                 regulator_unregister(pmic->rdev[id]);
-        kfree(pmic->rdev);
-        kfree(pmic->desc);
-        kfree(pmic);
         return ret;
 }
 
@@ -788,10 +785,6 @@ static int __devexit palmas_remove(struct platform_device *pdev)
 
         for (id = 0; id < PALMAS_NUM_REGS; id++)
                 regulator_unregister(pmic->rdev[id]);
-
-        kfree(pmic->rdev);
-        kfree(pmic->desc);
-        kfree(pmic);
         return 0;
 }
 
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 290d6fc01029..9caadb482178 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -451,7 +451,7 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev,
 
         desc = reg_voltage_map[reg_id];
 
-        if (old_sel < new_sel)
+        if ((old_sel < new_sel) && s5m8767->ramp_delay)
                 return DIV_ROUND_UP(desc->step * (new_sel - old_sel),
                                         s5m8767->ramp_delay * 1000);
         return 0;
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index 69425c4e86f3..de138e30d3e6 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -182,7 +182,7 @@ static int __devinit omap_rproc_probe(struct platform_device *pdev)
 
         ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
         if (ret) {
-                dev_err(pdev->dev.parent, "dma_set_coherent_mask: %d\n", ret);
+                dev_err(&pdev->dev, "dma_set_coherent_mask: %d\n", ret);
                 return ret;
         }
 
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8ea7bccc7100..66324ee4678f 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -247,7 +247,7 @@ rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len)
                 }
 
                 if (offset + filesz > len) {
-                        dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n",
+                        dev_err(dev, "truncated fw: need 0x%x avail 0x%zx\n",
                                         offset + filesz, len);
                         ret = -EINVAL;
                         break;
@@ -934,7 +934,7 @@ static void rproc_resource_cleanup(struct rproc *rproc)
                 unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
                 if (unmapped != entry->len) {
                         /* nothing much to do besides complaining */
-                        dev_err(dev, "failed to unmap %u/%u\n", entry->len,
+                        dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
                                                                 unmapped);
                 }
 
@@ -1020,7 +1020,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
         ehdr = (struct elf32_hdr *)fw->data;
 
-        dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);
+        dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size);
 
         /*
          * if enabling an IOMMU isn't relevant for this rproc, this is
@@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
         /* look for the resource table */
         table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
-        if (!table)
+        if (!table) {
+                ret = -EINVAL;
                 goto clean_up;
+        }
 
         /* handle fw resources which are required to boot rproc */
         ret = rproc_handle_boot_rsc(rproc, table, tablesz);
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 7d5f56edb8ef..4267789ca995 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -910,14 +910,17 @@ static inline int cmos_poweroff(struct device *dev)
 
 static u32 rtc_handler(void *context)
 {
+        struct device *dev = context;
+
+        pm_wakeup_event(dev, 0);
         acpi_clear_event(ACPI_EVENT_RTC);
         acpi_disable_event(ACPI_EVENT_RTC, 0);
         return ACPI_INTERRUPT_HANDLED;
 }
 
-static inline void rtc_wake_setup(void)
+static inline void rtc_wake_setup(struct device *dev)
 {
-        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
+        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev);
         /*
          * After the RTC handler is installed, the Fixed_RTC event should
          * be disabled. Only when the RTC alarm is set will it be enabled.
@@ -950,7 +953,7 @@ cmos_wake_setup(struct device *dev)
         if (acpi_disabled)
                 return;
 
-        rtc_wake_setup();
+        rtc_wake_setup(dev);
         acpi_rtc_info.wake_on = rtc_wake_on;
         acpi_rtc_info.wake_off = rtc_wake_off;
 
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 33a6743ddc55..c05da00583f0 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -10,8 +10,6 @@
 #ifndef DASD_INT_H
 #define DASD_INT_H
 
-#ifdef __KERNEL__
-
 /* we keep old device allocation scheme; IOW, minors are still in 0..255 */
 #define DASD_PER_MAJOR (1U << (MINORBITS - DASD_PARTN_BITS))
 #define DASD_PARTN_MASK ((1 << DASD_PARTN_BITS) - 1)
@@ -791,6 +789,4 @@ static inline int dasd_eer_enabled(struct dasd_device *device)
 #define dasd_eer_enabled(d)     (0)
 #endif  /* CONFIG_DASD_ERR */
 
-#endif                          /* __KERNEL__ */
-
 #endif                          /* DASD_H */
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 69e6c50d4cfb..50f7115990ff 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -211,7 +211,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
         sccb.evbuf.event_qual = EQ_STORE_DATA;
         sccb.evbuf.data_id = DI_FCP_DUMP;
         sccb.evbuf.event_id = 4712;
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
         sccb.evbuf.asa_size = ASA_SIZE_64;
 #else
         sccb.evbuf.asa_size = ASA_SIZE_32;
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 01bb04cd9e75..2a096795b9aa 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -571,13 +571,12 @@ free_cmd:
 static int mgmt_alloc_cmd_data(struct beiscsi_hba *phba, struct be_dma_mem *cmd,
                                int iscsi_cmd, int size)
 {
-        cmd->va = pci_alloc_consistent(phba->ctrl.pdev, sizeof(size),
-                                       &cmd->dma);
+        cmd->va = pci_alloc_consistent(phba->ctrl.pdev, size, &cmd->dma);
         if (!cmd->va) {
                 SE_DEBUG(DBG_LVL_1, "Failed to allocate memory for if info\n");
                 return -ENOMEM;
         }
-        memset(cmd->va, 0, sizeof(size));
+        memset(cmd->va, 0, size);
         cmd->size = size;
         be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size);
         return 0;
diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c
index 8b6c6bf7837e..b83927440171 100644
--- a/drivers/scsi/bfa/bfad_attr.c
+++ b/drivers/scsi/bfa/bfad_attr.c
@@ -426,6 +426,23 @@ bfad_im_vport_create(struct fc_vport *fc_vport, bool disable)
                 vshost = vport->drv_port.im_port->shost;
                 fc_host_node_name(vshost) = wwn_to_u64((u8 *)&port_cfg.nwwn);
                 fc_host_port_name(vshost) = wwn_to_u64((u8 *)&port_cfg.pwwn);
+                fc_host_supported_classes(vshost) = FC_COS_CLASS3;
+
+                memset(fc_host_supported_fc4s(vshost), 0,
+                        sizeof(fc_host_supported_fc4s(vshost)));
+
+                /* For FCP type 0x08 */
+                if (supported_fc4s & BFA_LPORT_ROLE_FCP_IM)
+                        fc_host_supported_fc4s(vshost)[2] = 1;
+
+                /* For fibre channel services type 0x20 */
+                fc_host_supported_fc4s(vshost)[7] = 1;
+
+                fc_host_supported_speeds(vshost) =
+                                bfad_im_supported_speeds(&bfad->bfa);
+                fc_host_maxframe_size(vshost) =
+                                bfa_fcport_get_maxfrsize(&bfad->bfa);
+
                 fc_vport->dd_data = vport;
                 vport->drv_port.im_port->fc_vport = fc_vport;
         } else if (rc == BFA_STATUS_INVALID_WWN)
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 3153923f5b60..1ac09afe35ee 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -987,7 +987,7 @@ done:
         return 0;
 }
 
-static u32
+u32
 bfad_im_supported_speeds(struct bfa_s *bfa)
 {
         struct bfa_ioc_attr_s *ioc_attr;
diff --git a/drivers/scsi/bfa/bfad_im.h b/drivers/scsi/bfa/bfad_im.h
index 0814367ef101..f6c1023e502a 100644
--- a/drivers/scsi/bfa/bfad_im.h
+++ b/drivers/scsi/bfa/bfad_im.h
@@ -37,6 +37,7 @@ int  bfad_im_scsi_host_alloc(struct bfad_s *bfad,
                 struct bfad_im_port_s *im_port, struct device *dev);
 void bfad_im_scsi_host_free(struct bfad_s *bfad,
                                 struct bfad_im_port_s *im_port);
+u32 bfad_im_supported_speeds(struct bfa_s *bfa);
 
 #define MAX_FCP_TARGET 1024
 #define MAX_FCP_LUN 16384
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index a4953ef9e53a..0578fa0dc14b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -62,7 +62,7 @@
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
-#define BNX2FC_VERSION          "1.0.10"
+#define BNX2FC_VERSION          "1.0.11"
 
 #define PFX                     "bnx2fc: "
 
@@ -228,13 +228,16 @@ struct bnx2fc_interface {
         struct packet_type fip_packet_type;
         struct workqueue_struct *timer_work_queue;
         struct kref kref;
-        struct fcoe_ctlr ctlr;
         u8 vlan_enabled;
         int vlan_id;
         bool enabled;
 };
 
-#define bnx2fc_from_ctlr(fip) container_of(fip, struct bnx2fc_interface, ctlr)
+#define bnx2fc_from_ctlr(x)                     \
+        ((struct bnx2fc_interface *)((x) + 1))
+
+#define bnx2fc_to_ctlr(x)                                       \
+        ((struct fcoe_ctlr *)(((struct fcoe_ctlr *)(x)) - 1))
 
 struct bnx2fc_lport {
         struct list_head list;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index ce0ce3e32f33..bdbbb13b8534 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -854,7 +854,6 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
         struct fc_exch *exch = fc_seq_exch(seq);
         struct fc_lport *lport = exch->lp;
         u8 *mac;
-        struct fc_frame_header *fh;
         u8 op;
 
         if (IS_ERR(fp))
@@ -862,13 +861,6 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
 
         mac = fr_cb(fp)->granted_mac;
         if (is_zero_ether_addr(mac)) {
-                fh = fc_frame_header_get(fp);
-                if (fh->fh_type != FC_TYPE_ELS) {
-                        printk(KERN_ERR PFX "bnx2fc_flogi_resp:"
-                                "fh_type != FC_TYPE_ELS\n");
-                        fc_frame_free(fp);
-                        return;
-                }
                 op = fc_frame_payload_op(fp);
                 if (lport->vport) {
                         if (op == ELS_LS_RJT) {
@@ -878,12 +870,10 @@ static void bnx2fc_flogi_resp(struct fc_seq *seq, struct fc_frame *fp,
                                 return;
                         }
                 }
-                if (fcoe_ctlr_recv_flogi(fip, lport, fp)) {
-                        fc_frame_free(fp);
-                        return;
-                }
+                fcoe_ctlr_recv_flogi(fip, lport, fp);
         }
-        fip->update_mac(lport, mac);
+        if (!is_zero_ether_addr(mac))
+                fip->update_mac(lport, mac);
 done:
         fc_lport_flogi_resp(seq, fp, lport);
 }
@@ -910,7 +900,7 @@ struct fc_seq *bnx2fc_elsct_send(struct fc_lport *lport, u32 did,
 {
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_interface *interface = port->priv;
-        struct fcoe_ctlr *fip = &interface->ctlr;
+        struct fcoe_ctlr *fip = bnx2fc_to_ctlr(interface);
         struct fc_frame_header *fh = fc_frame_header_get(fp);
 
         switch (op) {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index c1c6a92a0b98..f52f668fd247 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
 
 #define DRV_MODULE_NAME         "bnx2fc"
 #define DRV_MODULE_VERSION      BNX2FC_VERSION
-#define DRV_MODULE_RELDATE      "Jan 22, 2011"
+#define DRV_MODULE_RELDATE      "Apr 24, 2012"
 
 
 static char version[] __devinitdata =
@@ -54,6 +54,7 @@ static struct cnic_ulp_ops bnx2fc_cnic_cb;
 static struct libfc_function_template bnx2fc_libfc_fcn_templ;
 static struct scsi_host_template bnx2fc_shost_template;
 static struct fc_function_template bnx2fc_transport_function;
+static struct fcoe_sysfs_function_template bnx2fc_fcoe_sysfs_templ;
 static struct fc_function_template bnx2fc_vport_xport_function;
 static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode);
 static void __bnx2fc_destroy(struct bnx2fc_interface *interface);
@@ -88,6 +89,7 @@ static void bnx2fc_port_shutdown(struct fc_lport *lport);
 static void bnx2fc_stop(struct bnx2fc_interface *interface);
 static int __init bnx2fc_mod_init(void);
 static void __exit bnx2fc_mod_exit(void);
+static void bnx2fc_ctlr_get_lesb(struct fcoe_ctlr_device *ctlr_dev);
 
 unsigned int bnx2fc_debug_level;
 module_param_named(debug_logging, bnx2fc_debug_level, int, S_IRUGO|S_IWUSR);
@@ -118,6 +120,41 @@ static void bnx2fc_get_lesb(struct fc_lport *lport,
         __fcoe_get_lesb(lport, fc_lesb, netdev);
 }
 
+static void bnx2fc_ctlr_get_lesb(struct fcoe_ctlr_device *ctlr_dev)
+{
+        struct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr_dev);
+        struct net_device *netdev = bnx2fc_netdev(fip->lp);
+        struct fcoe_fc_els_lesb *fcoe_lesb;
+        struct fc_els_lesb fc_lesb;
+
+        __fcoe_get_lesb(fip->lp, &fc_lesb, netdev);
+        fcoe_lesb = (struct fcoe_fc_els_lesb *)(&fc_lesb);
+
+        ctlr_dev->lesb.lesb_link_fail =
+                ntohl(fcoe_lesb->lesb_link_fail);
+        ctlr_dev->lesb.lesb_vlink_fail =
+                ntohl(fcoe_lesb->lesb_vlink_fail);
+        ctlr_dev->lesb.lesb_miss_fka =
+                ntohl(fcoe_lesb->lesb_miss_fka);
+        ctlr_dev->lesb.lesb_symb_err =
+                ntohl(fcoe_lesb->lesb_symb_err);
+        ctlr_dev->lesb.lesb_err_block =
+                ntohl(fcoe_lesb->lesb_err_block);
+        ctlr_dev->lesb.lesb_fcs_error =
+                ntohl(fcoe_lesb->lesb_fcs_error);
+}
+EXPORT_SYMBOL(bnx2fc_ctlr_get_lesb);
+
+static void bnx2fc_fcf_get_vlan_id(struct fcoe_fcf_device *fcf_dev)
+{
+        struct fcoe_ctlr_device *ctlr_dev =
+                fcoe_fcf_dev_to_ctlr_dev(fcf_dev);
+        struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+        struct bnx2fc_interface *fcoe = fcoe_ctlr_priv(ctlr);
+
+        fcf_dev->vlan_id = fcoe->vlan_id;
+}
+
 static void bnx2fc_clean_rx_queue(struct fc_lport *lp)
 {
         struct fcoe_percpu_s *bg;
@@ -244,6 +281,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
         struct sk_buff          *skb;
         struct fc_frame_header  *fh;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr        *ctlr;
         struct bnx2fc_hba *hba;
         struct fcoe_port        *port;
         struct fcoe_hdr         *hp;
@@ -256,6 +294,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
 
         port = (struct fcoe_port *)lport_priv(lport);
         interface = port->priv;
+        ctlr = bnx2fc_to_ctlr(interface);
         hba = interface->hba;
 
         fh = fc_frame_header_get(fp);
@@ -268,12 +307,12 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
         }
 
         if (unlikely(fh->fh_r_ctl == FC_RCTL_ELS_REQ)) {
-                if (!interface->ctlr.sel_fcf) {
+                if (!ctlr->sel_fcf) {
                         BNX2FC_HBA_DBG(lport, "FCF not selected yet!\n");
                         kfree_skb(skb);
                         return -EINVAL;
                 }
-                if (fcoe_ctlr_els_send(&interface->ctlr, lport, skb))
+                if (fcoe_ctlr_els_send(ctlr, lport, skb))
                         return 0;
         }
 
@@ -346,14 +385,14 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp)
         /* fill up mac and fcoe headers */
         eh = eth_hdr(skb);
         eh->h_proto = htons(ETH_P_FCOE);
-        if (interface->ctlr.map_dest)
+        if (ctlr->map_dest)
                 fc_fcoe_set_mac(eh->h_dest, fh->fh_d_id);
         else
                 /* insert GW address */
-                memcpy(eh->h_dest, interface->ctlr.dest_addr, ETH_ALEN);
+                memcpy(eh->h_dest, ctlr->dest_addr, ETH_ALEN);
 
-        if (unlikely(interface->ctlr.flogi_oxid != FC_XID_UNKNOWN))
-                memcpy(eh->h_source, interface->ctlr.ctl_src_addr, ETH_ALEN);
+        if (unlikely(ctlr->flogi_oxid != FC_XID_UNKNOWN))
+                memcpy(eh->h_source, ctlr->ctl_src_addr, ETH_ALEN);
         else
                 memcpy(eh->h_source, port->data_src_addr, ETH_ALEN);
 
@@ -403,6 +442,7 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev,
 {
         struct fc_lport *lport;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         struct fc_frame_header *fh;
         struct fcoe_rcv_info *fr;
         struct fcoe_percpu_s *bg;
@@ -410,7 +450,8 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev,
 
         interface = container_of(ptype, struct bnx2fc_interface,
                                  fcoe_packet_type);
-        lport = interface->ctlr.lp;
+        ctlr = bnx2fc_to_ctlr(interface);
+        lport = ctlr->lp;
 
         if (unlikely(lport == NULL)) {
                 printk(KERN_ERR PFX "bnx2fc_rcv: lport is NULL\n");
@@ -758,11 +799,13 @@ static int bnx2fc_net_config(struct fc_lport *lport, struct net_device *netdev)
 {
         struct bnx2fc_hba *hba;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_port *port;
         u64 wwnn, wwpn;
 
         port = lport_priv(lport);
         interface = port->priv;
+        ctlr = bnx2fc_to_ctlr(interface);
         hba = interface->hba;
 
         /* require support for get_pauseparam ethtool op. */
@@ -781,13 +824,13 @@ static int bnx2fc_net_config(struct fc_lport *lport, struct net_device *netdev)
 
         if (!lport->vport) {
                 if (fcoe_get_wwn(netdev, &wwnn, NETDEV_FCOE_WWNN))
-                        wwnn = fcoe_wwn_from_mac(interface->ctlr.ctl_src_addr,
+                        wwnn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
                                                  1, 0);
                 BNX2FC_HBA_DBG(lport, "WWNN = 0x%llx\n", wwnn);
                 fc_set_wwnn(lport, wwnn);
 
                 if (fcoe_get_wwn(netdev, &wwpn, NETDEV_FCOE_WWPN))
-                        wwpn = fcoe_wwn_from_mac(interface->ctlr.ctl_src_addr,
+                        wwpn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
                                                  2, 0);
 
                 BNX2FC_HBA_DBG(lport, "WWPN = 0x%llx\n", wwpn);
@@ -824,6 +867,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
         struct fc_lport *lport;
         struct fc_lport *vport;
         struct bnx2fc_interface *interface, *tmp;
+        struct fcoe_ctlr *ctlr;
         int wait_for_upload = 0;
         u32 link_possible = 1;
 
@@ -874,7 +918,8 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
                 if (interface->hba != hba)
                         continue;
 
-                lport = interface->ctlr.lp;
+                ctlr = bnx2fc_to_ctlr(interface);
+                lport = ctlr->lp;
                 BNX2FC_HBA_DBG(lport, "netevent handler - event=%s %ld\n",
                                 interface->netdev->name, event);
 
@@ -889,8 +934,8 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
                          * on a stale vlan
                          */
                         if (interface->enabled)
-                                fcoe_ctlr_link_up(&interface->ctlr);
-                } else if (fcoe_ctlr_link_down(&interface->ctlr)) {
+                                fcoe_ctlr_link_up(ctlr);
+                } else if (fcoe_ctlr_link_down(ctlr)) {
                         mutex_lock(&lport->lp_mutex);
                         list_for_each_entry(vport, &lport->vports, list)
                                 fc_host_port_type(vport->host) =
@@ -995,9 +1040,11 @@ static int bnx2fc_fip_recv(struct sk_buff *skb, struct net_device *dev,
                            struct net_device *orig_dev)
 {
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         interface = container_of(ptype, struct bnx2fc_interface,
                                  fip_packet_type);
-        fcoe_ctlr_recv(&interface->ctlr, skb);
+        ctlr = bnx2fc_to_ctlr(interface);
+        fcoe_ctlr_recv(ctlr, skb);
         return 0;
 }
 
@@ -1155,6 +1202,7 @@ static int bnx2fc_interface_setup(struct bnx2fc_interface *interface)
 {
         struct net_device *netdev = interface->netdev;
         struct net_device *physdev = interface->hba->phys_dev;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct netdev_hw_addr *ha;
         int sel_san_mac = 0;
 
@@ -1169,7 +1217,7 @@ static int bnx2fc_interface_setup(struct bnx2fc_interface *interface)
 
                 if ((ha->type == NETDEV_HW_ADDR_T_SAN) &&
                     (is_valid_ether_addr(ha->addr))) {
-                        memcpy(interface->ctlr.ctl_src_addr, ha->addr,
+                        memcpy(ctlr->ctl_src_addr, ha->addr,
                                ETH_ALEN);
                         sel_san_mac = 1;
                         BNX2FC_MISC_DBG("Found SAN MAC\n");
@@ -1224,19 +1272,23 @@ static void bnx2fc_release_transport(void)
 
 static void bnx2fc_interface_release(struct kref *kref)
 {
+        struct fcoe_ctlr_device *ctlr_dev;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         struct net_device *netdev;
 
         interface = container_of(kref, struct bnx2fc_interface, kref);
         BNX2FC_MISC_DBG("Interface is being released\n");
 
+        ctlr = bnx2fc_to_ctlr(interface);
+        ctlr_dev = fcoe_ctlr_to_ctlr_dev(ctlr);
         netdev = interface->netdev;
 
         /* tear-down FIP controller */
         if (test_and_clear_bit(BNX2FC_CTLR_INIT_DONE, &interface->if_flags))
-                fcoe_ctlr_destroy(&interface->ctlr);
+                fcoe_ctlr_destroy(ctlr);
 
-        kfree(interface);
+        fcoe_ctlr_device_delete(ctlr_dev);
 
         dev_put(netdev);
         module_put(THIS_MODULE);
@@ -1329,33 +1381,40 @@ struct bnx2fc_interface *bnx2fc_interface_create(struct bnx2fc_hba *hba,
                                       struct net_device *netdev,
                                       enum fip_state fip_mode)
 {
+        struct fcoe_ctlr_device *ctlr_dev;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
+        int size;
         int rc = 0;
 
-        interface = kzalloc(sizeof(*interface), GFP_KERNEL);
-        if (!interface) {
+        size = (sizeof(*interface) + sizeof(struct fcoe_ctlr));
+        ctlr_dev = fcoe_ctlr_device_add(&netdev->dev, &bnx2fc_fcoe_sysfs_templ,
+                                         size);
+        if (!ctlr_dev) {
                 printk(KERN_ERR PFX "Unable to allocate interface structure\n");
                 return NULL;
         }
+        ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+        interface = fcoe_ctlr_priv(ctlr);
         dev_hold(netdev);
         kref_init(&interface->kref);
         interface->hba = hba;
         interface->netdev = netdev;
 
         /* Initialize FIP */
-        fcoe_ctlr_init(&interface->ctlr, fip_mode);
-        interface->ctlr.send = bnx2fc_fip_send;
-        interface->ctlr.update_mac = bnx2fc_update_src_mac;
-        interface->ctlr.get_src_addr = bnx2fc_get_src_mac;
+        fcoe_ctlr_init(ctlr, fip_mode);
+        ctlr->send = bnx2fc_fip_send;
+        ctlr->update_mac = bnx2fc_update_src_mac;
+        ctlr->get_src_addr = bnx2fc_get_src_mac;
         set_bit(BNX2FC_CTLR_INIT_DONE, &interface->if_flags);
 
         rc = bnx2fc_interface_setup(interface);
         if (!rc)
                 return interface;
 
-        fcoe_ctlr_destroy(&interface->ctlr);
+        fcoe_ctlr_destroy(ctlr);
         dev_put(netdev);
-        kfree(interface);
+        fcoe_ctlr_device_delete(ctlr_dev);
         return NULL;
 }
 
@@ -1373,6 +1432,7 @@ struct bnx2fc_interface *bnx2fc_interface_create(struct bnx2fc_hba *hba,
 static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
                                   struct device *parent, int npiv)
 {
+        struct fcoe_ctlr        *ctlr = bnx2fc_to_ctlr(interface);
         struct fc_lport         *lport, *n_port;
         struct fcoe_port        *port;
         struct Scsi_Host        *shost;
@@ -1383,7 +1443,7 @@ static struct fc_lport *bnx2fc_if_create(struct bnx2fc_interface *interface,
 
         blport = kzalloc(sizeof(struct bnx2fc_lport), GFP_KERNEL);
         if (!blport) {
-                BNX2FC_HBA_DBG(interface->ctlr.lp, "Unable to alloc blport\n");
+                BNX2FC_HBA_DBG(ctlr->lp, "Unable to alloc blport\n");
                 return NULL;
         }
 
@@ -1479,7 +1539,8 @@ static void bnx2fc_net_cleanup(struct bnx2fc_interface *interface)
 
 static void bnx2fc_interface_cleanup(struct bnx2fc_interface *interface)
 {
-        struct fc_lport *lport = interface->ctlr.lp;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
+        struct fc_lport *lport = ctlr->lp;
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_hba *hba = interface->hba;
 
@@ -1519,7 +1580,8 @@ static void bnx2fc_if_destroy(struct fc_lport *lport)
 
 static void __bnx2fc_destroy(struct bnx2fc_interface *interface)
 {
-        struct fc_lport *lport = interface->ctlr.lp;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
+        struct fc_lport *lport = ctlr->lp;
         struct fcoe_port *port = lport_priv(lport);
 
         bnx2fc_interface_cleanup(interface);
@@ -1543,13 +1605,15 @@ static int bnx2fc_destroy(struct net_device *netdev)
 {
         struct bnx2fc_interface *interface = NULL;
         struct workqueue_struct *timer_work_queue;
+        struct fcoe_ctlr *ctlr;
         int rc = 0;
 
         rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
 
         interface = bnx2fc_interface_lookup(netdev);
-        if (!interface || !interface->ctlr.lp) {
+        ctlr = bnx2fc_to_ctlr(interface);
+        if (!interface || !ctlr->lp) {
                 rc = -ENODEV;
                 printk(KERN_ERR PFX "bnx2fc_destroy: interface or lport not found\n");
                 goto netdev_err;
@@ -1646,6 +1710,7 @@ static void bnx2fc_ulp_start(void *handle)
 {
         struct bnx2fc_hba *hba = handle;
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         struct fc_lport *lport;
 
         mutex_lock(&bnx2fc_dev_lock);
@@ -1657,7 +1722,8 @@ static void bnx2fc_ulp_start(void *handle)
 
         list_for_each_entry(interface, &if_list, list) {
                 if (interface->hba == hba) {
-                        lport = interface->ctlr.lp;
+                        ctlr = bnx2fc_to_ctlr(interface);
+                        lport = ctlr->lp;
                         /* Kick off Fabric discovery*/
                         printk(KERN_ERR PFX "ulp_init: start discovery\n");
                         lport->tt.frame_send = bnx2fc_xmit;
@@ -1677,13 +1743,14 @@ static void bnx2fc_port_shutdown(struct fc_lport *lport)
 
 static void bnx2fc_stop(struct bnx2fc_interface *interface)
 {
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct fc_lport *lport;
         struct fc_lport *vport;
 
         if (!test_bit(BNX2FC_FLAG_FW_INIT_DONE, &interface->hba->flags))
                 return;
 
-        lport = interface->ctlr.lp;
+        lport = ctlr->lp;
         bnx2fc_port_shutdown(lport);
 
         mutex_lock(&lport->lp_mutex);
@@ -1692,7 +1759,7 @@ static void bnx2fc_stop(struct bnx2fc_interface *interface)
                                         FC_PORTTYPE_UNKNOWN;
         mutex_unlock(&lport->lp_mutex);
         fc_host_port_type(lport->host) = FC_PORTTYPE_UNKNOWN;
-        fcoe_ctlr_link_down(&interface->ctlr);
+        fcoe_ctlr_link_down(ctlr);
         fcoe_clean_pending_queue(lport);
 }
 
@@ -1804,6 +1871,7 @@ exit:
 
 static void bnx2fc_start_disc(struct bnx2fc_interface *interface)
 {
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct fc_lport *lport;
         int wait_cnt = 0;
 
@@ -1814,18 +1882,18 @@ static void bnx2fc_start_disc(struct bnx2fc_interface *interface)
                 return;
         }
 
-        lport = interface->ctlr.lp;
+        lport = ctlr->lp;
         BNX2FC_HBA_DBG(lport, "calling fc_fabric_login\n");
 
         if (!bnx2fc_link_ok(lport) && interface->enabled) {
                 BNX2FC_HBA_DBG(lport, "ctlr_link_up\n");
-                fcoe_ctlr_link_up(&interface->ctlr);
+                fcoe_ctlr_link_up(ctlr);
                 fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
                 set_bit(ADAPTER_STATE_READY, &interface->hba->adapter_state);
         }
 
         /* wait for the FCF to be selected before issuing FLOGI */
-        while (!interface->ctlr.sel_fcf) {
+        while (!ctlr->sel_fcf) {
                 msleep(250);
                 /* give up after 3 secs */
                 if (++wait_cnt > 12)
@@ -1889,19 +1957,21 @@ static void bnx2fc_ulp_init(struct cnic_dev *dev)
 static int bnx2fc_disable(struct net_device *netdev)
 {
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         int rc = 0;
 
         rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
 
         interface = bnx2fc_interface_lookup(netdev);
-        if (!interface || !interface->ctlr.lp) {
+        ctlr = bnx2fc_to_ctlr(interface);
+        if (!interface || !ctlr->lp) {
                 rc = -ENODEV;
                 printk(KERN_ERR PFX "bnx2fc_disable: interface or lport not found\n");
         } else {
                 interface->enabled = false;
-                fcoe_ctlr_link_down(&interface->ctlr);
-                fcoe_clean_pending_queue(interface->ctlr.lp);
+                fcoe_ctlr_link_down(ctlr);
+                fcoe_clean_pending_queue(ctlr->lp);
         }
 
         mutex_unlock(&bnx2fc_dev_lock);
@@ -1913,17 +1983,19 @@ static int bnx2fc_disable(struct net_device *netdev)
 static int bnx2fc_enable(struct net_device *netdev)
 {
         struct bnx2fc_interface *interface;
+        struct fcoe_ctlr *ctlr;
         int rc = 0;
 
         rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
 
         interface = bnx2fc_interface_lookup(netdev);
-        if (!interface || !interface->ctlr.lp) {
+        ctlr = bnx2fc_to_ctlr(interface);
+        if (!interface || !ctlr->lp) {
                 rc = -ENODEV;
                 printk(KERN_ERR PFX "bnx2fc_enable: interface or lport not found\n");
-        } else if (!bnx2fc_link_ok(interface->ctlr.lp)) {
-                fcoe_ctlr_link_up(&interface->ctlr);
+        } else if (!bnx2fc_link_ok(ctlr->lp)) {
+                fcoe_ctlr_link_up(ctlr);
                 interface->enabled = true;
         }
 
@@ -1944,6 +2016,7 @@ static int bnx2fc_enable(struct net_device *netdev)
  */
 static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
 {
+        struct fcoe_ctlr *ctlr;
         struct bnx2fc_interface *interface;
         struct bnx2fc_hba *hba;
         struct net_device *phys_dev;
@@ -2010,6 +2083,7 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
                 goto ifput_err;
         }
 
+        ctlr = bnx2fc_to_ctlr(interface);
         interface->vlan_id = vlan_id;
         interface->vlan_enabled = 1;
 
@@ -2035,10 +2109,10 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
         lport->boot_time = jiffies;
 
         /* Make this master N_port */
-        interface->ctlr.lp = lport;
+        ctlr->lp = lport;
 
         if (!bnx2fc_link_ok(lport)) {
-                fcoe_ctlr_link_up(&interface->ctlr);
+                fcoe_ctlr_link_up(ctlr);
                 fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
                 set_bit(ADAPTER_STATE_READY, &interface->hba->adapter_state);
         }
@@ -2439,6 +2513,19 @@ static void __exit bnx2fc_mod_exit(void)
 module_init(bnx2fc_mod_init);
 module_exit(bnx2fc_mod_exit);
 
+static struct fcoe_sysfs_function_template bnx2fc_fcoe_sysfs_templ = {
+        .get_fcoe_ctlr_mode = fcoe_ctlr_get_fip_mode,
+        .get_fcoe_ctlr_link_fail = bnx2fc_ctlr_get_lesb,
+        .get_fcoe_ctlr_vlink_fail = bnx2fc_ctlr_get_lesb,
+        .get_fcoe_ctlr_miss_fka = bnx2fc_ctlr_get_lesb,
+        .get_fcoe_ctlr_symb_err = bnx2fc_ctlr_get_lesb,
+        .get_fcoe_ctlr_err_block = bnx2fc_ctlr_get_lesb,
+        .get_fcoe_ctlr_fcs_error = bnx2fc_ctlr_get_lesb,
+
+        .get_fcoe_fcf_selected = fcoe_fcf_get_selected,
+        .get_fcoe_fcf_vlan_id = bnx2fc_fcf_get_vlan_id,
+};
+
 static struct fc_function_template bnx2fc_transport_function = {
         .show_host_node_name = 1,
         .show_host_port_name = 1,
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index afd570962b8c..2ca6bfe4ce5e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -167,6 +167,7 @@ int bnx2fc_send_session_ofld_req(struct fcoe_port *port,
 {
         struct fc_lport *lport = port->lport;
         struct bnx2fc_interface *interface = port->priv;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct bnx2fc_hba *hba = interface->hba;
         struct kwqe *kwqe_arr[4];
         struct fcoe_kwqe_conn_offload1 ofld_req1;
@@ -314,13 +315,13 @@ int bnx2fc_send_session_ofld_req(struct fcoe_port *port,
         ofld_req4.src_mac_addr_mid[1] =  port->data_src_addr[2];
         ofld_req4.src_mac_addr_hi[0] =  port->data_src_addr[1];
         ofld_req4.src_mac_addr_hi[1] =  port->data_src_addr[0];
-        ofld_req4.dst_mac_addr_lo[0] =  interface->ctlr.dest_addr[5];
+        ofld_req4.dst_mac_addr_lo[0] =  ctlr->dest_addr[5];
                                                         /* fcf mac */
-        ofld_req4.dst_mac_addr_lo[1] =  interface->ctlr.dest_addr[4];
-        ofld_req4.dst_mac_addr_mid[0] =  interface->ctlr.dest_addr[3];
-        ofld_req4.dst_mac_addr_mid[1] =  interface->ctlr.dest_addr[2];
-        ofld_req4.dst_mac_addr_hi[0] =  interface->ctlr.dest_addr[1];
-        ofld_req4.dst_mac_addr_hi[1] =  interface->ctlr.dest_addr[0];
+        ofld_req4.dst_mac_addr_lo[1] = ctlr->dest_addr[4];
+        ofld_req4.dst_mac_addr_mid[0] = ctlr->dest_addr[3];
+        ofld_req4.dst_mac_addr_mid[1] = ctlr->dest_addr[2];
+        ofld_req4.dst_mac_addr_hi[0] = ctlr->dest_addr[1];
+        ofld_req4.dst_mac_addr_hi[1] = ctlr->dest_addr[0];
 
         ofld_req4.lcq_addr_lo = (u32) tgt->lcq_dma;
         ofld_req4.lcq_addr_hi = (u32)((u64) tgt->lcq_dma >> 32);
@@ -351,6 +352,7 @@ static int bnx2fc_send_session_enable_req(struct fcoe_port *port,
 {
         struct kwqe *kwqe_arr[2];
         struct bnx2fc_interface *interface = port->priv;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct bnx2fc_hba *hba = interface->hba;
         struct fcoe_kwqe_conn_enable_disable enbl_req;
         struct fc_lport *lport = port->lport;
@@ -374,12 +376,12 @@ static int bnx2fc_send_session_enable_req(struct fcoe_port *port,
         enbl_req.src_mac_addr_hi[1] =  port->data_src_addr[0];
         memcpy(tgt->src_addr, port->data_src_addr, ETH_ALEN);
 
-        enbl_req.dst_mac_addr_lo[0] =  interface->ctlr.dest_addr[5];
-        enbl_req.dst_mac_addr_lo[1] =  interface->ctlr.dest_addr[4];
-        enbl_req.dst_mac_addr_mid[0] =  interface->ctlr.dest_addr[3];
-        enbl_req.dst_mac_addr_mid[1] =  interface->ctlr.dest_addr[2];
-        enbl_req.dst_mac_addr_hi[0] =  interface->ctlr.dest_addr[1];
-        enbl_req.dst_mac_addr_hi[1] =  interface->ctlr.dest_addr[0];
+        enbl_req.dst_mac_addr_lo[0] =  ctlr->dest_addr[5];
+        enbl_req.dst_mac_addr_lo[1] =  ctlr->dest_addr[4];
+        enbl_req.dst_mac_addr_mid[0] = ctlr->dest_addr[3];
+        enbl_req.dst_mac_addr_mid[1] = ctlr->dest_addr[2];
+        enbl_req.dst_mac_addr_hi[0] = ctlr->dest_addr[1];
+        enbl_req.dst_mac_addr_hi[1] = ctlr->dest_addr[0];
 
         port_id = fc_host_port_id(lport->host);
         if (port_id != tgt->sid) {
@@ -419,6 +421,7 @@ int bnx2fc_send_session_disable_req(struct fcoe_port *port,
                                     struct bnx2fc_rport *tgt)
 {
         struct bnx2fc_interface *interface = port->priv;
+        struct fcoe_ctlr *ctlr = bnx2fc_to_ctlr(interface);
         struct bnx2fc_hba *hba = interface->hba;
         struct fcoe_kwqe_conn_enable_disable disable_req;
         struct kwqe *kwqe_arr[2];
@@ -440,12 +443,12 @@ int bnx2fc_send_session_disable_req(struct fcoe_port *port,
         disable_req.src_mac_addr_hi[0] =  tgt->src_addr[1];
         disable_req.src_mac_addr_hi[1] =  tgt->src_addr[0];
 
-        disable_req.dst_mac_addr_lo[0] =  interface->ctlr.dest_addr[5];
-        disable_req.dst_mac_addr_lo[1] =  interface->ctlr.dest_addr[4];
-        disable_req.dst_mac_addr_mid[0] =  interface->ctlr.dest_addr[3];
-        disable_req.dst_mac_addr_mid[1] =  interface->ctlr.dest_addr[2];
-        disable_req.dst_mac_addr_hi[0] =  interface->ctlr.dest_addr[1];
-        disable_req.dst_mac_addr_hi[1] =  interface->ctlr.dest_addr[0];
+        disable_req.dst_mac_addr_lo[0] =  ctlr->dest_addr[5];
+        disable_req.dst_mac_addr_lo[1] =  ctlr->dest_addr[4];
+        disable_req.dst_mac_addr_mid[0] = ctlr->dest_addr[3];
+        disable_req.dst_mac_addr_mid[1] = ctlr->dest_addr[2];
+        disable_req.dst_mac_addr_hi[0] = ctlr->dest_addr[1];
+        disable_req.dst_mac_addr_hi[1] = ctlr->dest_addr[0];
 
         port_id = tgt->sid;
         disable_req.s_id[0] = (port_id & 0x000000FF);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index e897ce975bb8..4f7453b9e41e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -810,8 +810,22 @@ retry_tmf:
         spin_lock_bh(&tgt->tgt_lock);
 
         io_req->wait_for_comp = 0;
-        if (!(test_bit(BNX2FC_FLAG_TM_COMPL, &io_req->req_flags)))
+        if (!(test_bit(BNX2FC_FLAG_TM_COMPL, &io_req->req_flags))) {
                 set_bit(BNX2FC_FLAG_TM_TIMEOUT, &io_req->req_flags);
+                if (io_req->on_tmf_queue) {
+                        list_del_init(&io_req->link);
+                        io_req->on_tmf_queue = 0;
+                }
+                io_req->wait_for_comp = 1;
+                bnx2fc_initiate_cleanup(io_req);
+                spin_unlock_bh(&tgt->tgt_lock);
+                rc = wait_for_completion_timeout(&io_req->tm_done,
+                                                 BNX2FC_FW_TIMEOUT);
+                spin_lock_bh(&tgt->tgt_lock);
+                io_req->wait_for_comp = 0;
+                if (!rc)
+                        kref_put(&io_req->refcount, bnx2fc_cmd_release);
+        }
 
         spin_unlock_bh(&tgt->tgt_lock);
 
@@ -1089,6 +1103,48 @@ int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
         return bnx2fc_initiate_tmf(sc_cmd, FCP_TMF_LUN_RESET);
 }
 
+int bnx2fc_expl_logo(struct fc_lport *lport, struct bnx2fc_cmd *io_req)
+{
+        struct bnx2fc_rport *tgt = io_req->tgt;
+        struct fc_rport_priv *rdata = tgt->rdata;
+        int logo_issued;
+        int rc = SUCCESS;
+        int wait_cnt = 0;
+
+        BNX2FC_IO_DBG(io_req, "Expl logo - tgt flags = 0x%lx\n",
+                      tgt->flags);
+        logo_issued = test_and_set_bit(BNX2FC_FLAG_EXPL_LOGO,
+                                       &tgt->flags);
+        io_req->wait_for_comp = 1;
+        bnx2fc_initiate_cleanup(io_req);
+
+        spin_unlock_bh(&tgt->tgt_lock);
+
+        wait_for_completion(&io_req->tm_done);
+
+        io_req->wait_for_comp = 0;
+        /*
+         * release the reference taken in eh_abort to allow the
+         * target to re-login after flushing IOs
+         */
+         kref_put(&io_req->refcount, bnx2fc_cmd_release);
+
+        if (!logo_issued) {
+                clear_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags);
+                mutex_lock(&lport->disc.disc_mutex);
+                lport->tt.rport_logoff(rdata);
+                mutex_unlock(&lport->disc.disc_mutex);
+                do {
+                        msleep(BNX2FC_RELOGIN_WAIT_TIME);
+                        if (wait_cnt++ > BNX2FC_RELOGIN_WAIT_CNT) {
+                                rc = FAILED;
+                                break;
+                        }
+                } while (!test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags));
+        }
+        spin_lock_bh(&tgt->tgt_lock);
+        return rc;
+}
 /**
  * bnx2fc_eh_abort - eh_abort_handler api to abort an outstanding
  *                      SCSI command
@@ -1103,10 +1159,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
         struct fc_rport_libfc_priv *rp = rport->dd_data;
         struct bnx2fc_cmd *io_req;
         struct fc_lport *lport;
-        struct fc_rport_priv *rdata;
         struct bnx2fc_rport *tgt;
-        int logo_issued;
-        int wait_cnt = 0;
         int rc = FAILED;
 
 
@@ -1183,58 +1236,31 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
         list_add_tail(&io_req->link, &tgt->io_retire_queue);
 
         init_completion(&io_req->tm_done);
-        io_req->wait_for_comp = 1;
 
-        if (!test_and_set_bit(BNX2FC_FLAG_ISSUE_ABTS, &io_req->req_flags)) {
-                /* Cancel the current timer running on this io_req */
-                if (cancel_delayed_work(&io_req->timeout_work))
-                        kref_put(&io_req->refcount,
-                                 bnx2fc_cmd_release); /* drop timer hold */
-                set_bit(BNX2FC_FLAG_EH_ABORT, &io_req->req_flags);
-                rc = bnx2fc_initiate_abts(io_req);
-        } else {
+        if (test_and_set_bit(BNX2FC_FLAG_ISSUE_ABTS, &io_req->req_flags)) {
                 printk(KERN_ERR PFX "eh_abort: io_req (xid = 0x%x) "
                                 "already in abts processing\n", io_req->xid);
                 if (cancel_delayed_work(&io_req->timeout_work))
                         kref_put(&io_req->refcount,
                                  bnx2fc_cmd_release); /* drop timer hold */
-                bnx2fc_initiate_cleanup(io_req);
+                rc = bnx2fc_expl_logo(lport, io_req);
+                goto out;
+        }
 
+        /* Cancel the current timer running on this io_req */
+        if (cancel_delayed_work(&io_req->timeout_work))
+                kref_put(&io_req->refcount,
+                         bnx2fc_cmd_release); /* drop timer hold */
+        set_bit(BNX2FC_FLAG_EH_ABORT, &io_req->req_flags);
+        io_req->wait_for_comp = 1;
+        rc = bnx2fc_initiate_abts(io_req);
+        if (rc == FAILED) {
+                bnx2fc_initiate_cleanup(io_req);
                 spin_unlock_bh(&tgt->tgt_lock);
-
                 wait_for_completion(&io_req->tm_done);
-
                 spin_lock_bh(&tgt->tgt_lock);
                 io_req->wait_for_comp = 0;
-                rdata = io_req->tgt->rdata;
-                logo_issued = test_and_set_bit(BNX2FC_FLAG_EXPL_LOGO,
-                                               &tgt->flags);
-                kref_put(&io_req->refcount, bnx2fc_cmd_release);
-                spin_unlock_bh(&tgt->tgt_lock);
-
-                if (!logo_issued) {
-                        BNX2FC_IO_DBG(io_req, "Expl logo - tgt flags = 0x%lx\n",
-                                      tgt->flags);
-                        mutex_lock(&lport->disc.disc_mutex);
-                        lport->tt.rport_logoff(rdata);
-                        mutex_unlock(&lport->disc.disc_mutex);
-                        do {
-                                msleep(BNX2FC_RELOGIN_WAIT_TIME);
-                                /*
-                                 * If session not recovered, let SCSI-ml
-                                 * escalate error recovery.
-                                 */
-                                if (wait_cnt++ > BNX2FC_RELOGIN_WAIT_CNT)
-                                        return FAILED;
-                        } while (!test_bit(BNX2FC_FLAG_SESSION_READY,
-                                           &tgt->flags));
-                }
-                return SUCCESS;
-        }
-        if (rc == FAILED) {
-                kref_put(&io_req->refcount, bnx2fc_cmd_release);
-                spin_unlock_bh(&tgt->tgt_lock);
-                return rc;
+                goto done;
         }
         spin_unlock_bh(&tgt->tgt_lock);
 
@@ -1247,7 +1273,8 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
                 /* Let the scsi-ml try to recover this command */
                 printk(KERN_ERR PFX "abort failed, xid = 0x%x\n",
                        io_req->xid);
-                rc = FAILED;
+                rc = bnx2fc_expl_logo(lport, io_req);
+                goto out;
         } else {
                 /*
                  * We come here even when there was a race condition
@@ -1259,9 +1286,10 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
                 bnx2fc_scsi_done(io_req, DID_ABORT);
                 kref_put(&io_req->refcount, bnx2fc_cmd_release);
         }
-
+done:
         /* release the reference taken in eh_abort */
         kref_put(&io_req->refcount, bnx2fc_cmd_release);
+out:
         spin_unlock_bh(&tgt->tgt_lock);
         return rc;
 }
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index c1800b531270..082a25c3117e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -185,6 +185,16 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
                 BUG_ON(rc);
         }
 
+        list_for_each_safe(list, tmp, &tgt->active_tm_queue) {
+                i++;
+                io_req = (struct bnx2fc_cmd *)list;
+                list_del_init(&io_req->link);
+                io_req->on_tmf_queue = 0;
+                BNX2FC_IO_DBG(io_req, "tm_queue cleanup\n");
+                if (io_req->wait_for_comp)
+                        complete(&io_req->tm_done);
+        }
+
         list_for_each_safe(list, tmp, &tgt->els_queue) {
                 i++;
                 io_req = (struct bnx2fc_cmd *)list;
@@ -213,8 +223,17 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
 
                 BNX2FC_IO_DBG(io_req, "retire_queue flush\n");
 
-                if (cancel_delayed_work(&io_req->timeout_work))
+                if (cancel_delayed_work(&io_req->timeout_work)) {
+                        if (test_and_clear_bit(BNX2FC_FLAG_EH_ABORT,
+                                                &io_req->req_flags)) {
+                                /* Handle eh_abort timeout */
+                                BNX2FC_IO_DBG(io_req, "eh_abort for IO "
+                                              "in retire_q\n");
+                                if (io_req->wait_for_comp)
+                                        complete(&io_req->tm_done);
+                        }
                         kref_put(&io_req->refcount, bnx2fc_cmd_release);
+                }
 
                 clear_bit(BNX2FC_FLAG_ISSUE_RRQ, &io_req->req_flags);
         }
diff --git a/drivers/scsi/fcoe/Makefile b/drivers/scsi/fcoe/Makefile
index f6d37d0271f7..aed0f5db3668 100644
--- a/drivers/scsi/fcoe/Makefile
+++ b/drivers/scsi/fcoe/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FCOE) += fcoe.o
 obj-$(CONFIG_LIBFCOE) += libfcoe.o
 
-libfcoe-objs := fcoe_ctlr.o fcoe_transport.o
+libfcoe-objs := fcoe_ctlr.o fcoe_transport.o fcoe_sysfs.o
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 76e3d0b5bfa6..fe30b1b65e1d 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -41,6 +41,7 @@
 
 #include <scsi/fc/fc_encaps.h>
 #include <scsi/fc/fc_fip.h>
+#include <scsi/fc/fc_fcoe.h>
 
 #include <scsi/libfc.h>
 #include <scsi/fc_frame.h>
@@ -150,6 +151,21 @@ static int fcoe_vport_create(struct fc_vport *, bool disabled);
 static int fcoe_vport_disable(struct fc_vport *, bool disable);
 static void fcoe_set_vport_symbolic_name(struct fc_vport *);
 static void fcoe_set_port_id(struct fc_lport *, u32, struct fc_frame *);
+static void fcoe_ctlr_get_lesb(struct fcoe_ctlr_device *);
+static void fcoe_fcf_get_vlan_id(struct fcoe_fcf_device *);
+
+static struct fcoe_sysfs_function_template fcoe_sysfs_templ = {
+        .get_fcoe_ctlr_mode = fcoe_ctlr_get_fip_mode,
+        .get_fcoe_ctlr_link_fail = fcoe_ctlr_get_lesb,
+        .get_fcoe_ctlr_vlink_fail = fcoe_ctlr_get_lesb,
+        .get_fcoe_ctlr_miss_fka = fcoe_ctlr_get_lesb,
+        .get_fcoe_ctlr_symb_err = fcoe_ctlr_get_lesb,
+        .get_fcoe_ctlr_err_block = fcoe_ctlr_get_lesb,
+        .get_fcoe_ctlr_fcs_error = fcoe_ctlr_get_lesb,
+
+        .get_fcoe_fcf_selected = fcoe_fcf_get_selected,
+        .get_fcoe_fcf_vlan_id = fcoe_fcf_get_vlan_id,
+};
 
 static struct libfc_function_template fcoe_libfc_fcn_templ = {
         .frame_send = fcoe_xmit,
@@ -282,7 +298,7 @@ static struct scsi_host_template fcoe_shost_template = {
 static int fcoe_interface_setup(struct fcoe_interface *fcoe,
                                 struct net_device *netdev)
 {
-        struct fcoe_ctlr *fip = &fcoe->ctlr;
+        struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
         struct netdev_hw_addr *ha;
         struct net_device *real_dev;
         u8 flogi_maddr[ETH_ALEN];
@@ -366,7 +382,10 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
 static struct fcoe_interface *fcoe_interface_create(struct net_device *netdev,
                                                     enum fip_state fip_mode)
 {
+        struct fcoe_ctlr_device *ctlr_dev;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
+        int size;
         int err;
 
         if (!try_module_get(THIS_MODULE)) {
@@ -376,27 +395,32 @@ static struct fcoe_interface *fcoe_interface_create(struct net_device *netdev,
                 goto out;
         }
 
-        fcoe = kzalloc(sizeof(*fcoe), GFP_KERNEL);
-        if (!fcoe) {
-                FCOE_NETDEV_DBG(netdev, "Could not allocate fcoe structure\n");
+        size = sizeof(struct fcoe_ctlr) + sizeof(struct fcoe_interface);
+        ctlr_dev = fcoe_ctlr_device_add(&netdev->dev, &fcoe_sysfs_templ,
+                                        size);
+        if (!ctlr_dev) {
+                FCOE_DBG("Failed to add fcoe_ctlr_device\n");
                 fcoe = ERR_PTR(-ENOMEM);
                 goto out_putmod;
         }
 
+        ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+        fcoe = fcoe_ctlr_priv(ctlr);
+
         dev_hold(netdev);
 
         /*
          * Initialize FIP.
          */
-        fcoe_ctlr_init(&fcoe->ctlr, fip_mode);
-        fcoe->ctlr.send = fcoe_fip_send;
-        fcoe->ctlr.update_mac = fcoe_update_src_mac;
-        fcoe->ctlr.get_src_addr = fcoe_get_src_mac;
+        fcoe_ctlr_init(ctlr, fip_mode);
+        ctlr->send = fcoe_fip_send;
+        ctlr->update_mac = fcoe_update_src_mac;
+        ctlr->get_src_addr = fcoe_get_src_mac;
 
         err = fcoe_interface_setup(fcoe, netdev);
         if (err) {
-                fcoe_ctlr_destroy(&fcoe->ctlr);
-                kfree(fcoe);
+                fcoe_ctlr_destroy(ctlr);
+                fcoe_ctlr_device_delete(ctlr_dev);
                 dev_put(netdev);
                 fcoe = ERR_PTR(err);
                 goto out_putmod;
@@ -419,7 +443,7 @@ out:
 static void fcoe_interface_remove(struct fcoe_interface *fcoe)
 {
         struct net_device *netdev = fcoe->netdev;
-        struct fcoe_ctlr *fip = &fcoe->ctlr;
+        struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
         u8 flogi_maddr[ETH_ALEN];
         const struct net_device_ops *ops;
 
@@ -462,7 +486,8 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe)
 static void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
 {
         struct net_device *netdev = fcoe->netdev;
-        struct fcoe_ctlr *fip = &fcoe->ctlr;
+        struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
+        struct fcoe_ctlr_device *ctlr_dev = fcoe_ctlr_to_ctlr_dev(fip);
 
         rtnl_lock();
         if (!fcoe->removed)
@@ -472,8 +497,8 @@ static void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
         /* Release the self-reference taken during fcoe_interface_create() */
         /* tear-down the FCoE controller */
         fcoe_ctlr_destroy(fip);
-        scsi_host_put(fcoe->ctlr.lp->host);
-        kfree(fcoe);
+        scsi_host_put(fip->lp->host);
+        fcoe_ctlr_device_delete(ctlr_dev);
         dev_put(netdev);
         module_put(THIS_MODULE);
 }
@@ -493,9 +518,11 @@ static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *netdev,
                          struct net_device *orig_dev)
 {
         struct fcoe_interface *fcoe;
+        struct fcoe_ctlr *ctlr;
 
         fcoe = container_of(ptype, struct fcoe_interface, fip_packet_type);
-        fcoe_ctlr_recv(&fcoe->ctlr, skb);
+        ctlr = fcoe_to_ctlr(fcoe);
+        fcoe_ctlr_recv(ctlr, skb);
         return 0;
 }
 
@@ -645,11 +672,13 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
         u32 mfs;
         u64 wwnn, wwpn;
         struct fcoe_interface *fcoe;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_port *port;
 
         /* Setup lport private data to point to fcoe softc */
         port = lport_priv(lport);
         fcoe = port->priv;
+        ctlr = fcoe_to_ctlr(fcoe);
 
         /*
          * Determine max frame size based on underlying device and optional
@@ -676,10 +705,10 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
 
         if (!lport->vport) {
                 if (fcoe_get_wwn(netdev, &wwnn, NETDEV_FCOE_WWNN))
-                        wwnn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr, 1, 0);
+                        wwnn = fcoe_wwn_from_mac(ctlr->ctl_src_addr, 1, 0);
                 fc_set_wwnn(lport, wwnn);
                 if (fcoe_get_wwn(netdev, &wwpn, NETDEV_FCOE_WWPN))
-                        wwpn = fcoe_wwn_from_mac(fcoe->ctlr.ctl_src_addr,
+                        wwpn = fcoe_wwn_from_mac(ctlr->ctl_src_addr,
                                                  2, 0);
                 fc_set_wwpn(lport, wwpn);
         }
@@ -1056,6 +1085,7 @@ static int fcoe_ddp_done(struct fc_lport *lport, u16 xid)
 static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
                                        struct device *parent, int npiv)
 {
+        struct fcoe_ctlr *ctlr = fcoe_to_ctlr(fcoe);
         struct net_device *netdev = fcoe->netdev;
         struct fc_lport *lport, *n_port;
         struct fcoe_port *port;
@@ -1119,7 +1149,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
         }
 
         /* Initialize the library */
-        rc = fcoe_libfc_config(lport, &fcoe->ctlr, &fcoe_libfc_fcn_templ, 1);
+        rc = fcoe_libfc_config(lport, ctlr, &fcoe_libfc_fcn_templ, 1);
         if (rc) {
                 FCOE_NETDEV_DBG(netdev, "Could not configure libfc for the "
                                 "interface\n");
@@ -1386,6 +1416,7 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
 {
         struct fc_lport *lport;
         struct fcoe_rcv_info *fr;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct fc_frame_header *fh;
         struct fcoe_percpu_s *fps;
@@ -1393,7 +1424,8 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
         unsigned int cpu;
 
         fcoe = container_of(ptype, struct fcoe_interface, fcoe_packet_type);
-        lport = fcoe->ctlr.lp;
+        ctlr = fcoe_to_ctlr(fcoe);
+        lport = ctlr->lp;
         if (unlikely(!lport)) {
                 FCOE_NETDEV_DBG(netdev, "Cannot find hba structure");
                 goto err2;
@@ -1409,8 +1441,8 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
 
         eh = eth_hdr(skb);
 
-        if (is_fip_mode(&fcoe->ctlr) &&
-            compare_ether_addr(eh->h_source, fcoe->ctlr.dest_addr)) {
+        if (is_fip_mode(ctlr) &&
+            compare_ether_addr(eh->h_source, ctlr->dest_addr)) {
                 FCOE_NETDEV_DBG(netdev, "wrong source mac address:%pM\n",
                                 eh->h_source);
                 goto err;
@@ -1544,6 +1576,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
         unsigned int elen;              /* eth header, may include vlan */
         struct fcoe_port *port = lport_priv(lport);
         struct fcoe_interface *fcoe = port->priv;
+        struct fcoe_ctlr *ctlr = fcoe_to_ctlr(fcoe);
         u8 sof, eof;
         struct fcoe_hdr *hp;
 
@@ -1559,7 +1592,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
         }
 
         if (unlikely(fh->fh_type == FC_TYPE_ELS) &&
-            fcoe_ctlr_els_send(&fcoe->ctlr, lport, skb))
+            fcoe_ctlr_els_send(ctlr, lport, skb))
                 return 0;
 
         sof = fr_sof(fp);
@@ -1623,12 +1656,12 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
         /* fill up mac and fcoe headers */
         eh = eth_hdr(skb);
         eh->h_proto = htons(ETH_P_FCOE);
-        memcpy(eh->h_dest, fcoe->ctlr.dest_addr, ETH_ALEN);
-        if (fcoe->ctlr.map_dest)
+        memcpy(eh->h_dest, ctlr->dest_addr, ETH_ALEN);
+        if (ctlr->map_dest)
                 memcpy(eh->h_dest + 3, fh->fh_d_id, 3);
 
-        if (unlikely(fcoe->ctlr.flogi_oxid != FC_XID_UNKNOWN))
-                memcpy(eh->h_source, fcoe->ctlr.ctl_src_addr, ETH_ALEN);
+        if (unlikely(ctlr->flogi_oxid != FC_XID_UNKNOWN))
+                memcpy(eh->h_source, ctlr->ctl_src_addr, ETH_ALEN);
         else
                 memcpy(eh->h_source, port->data_src_addr, ETH_ALEN);
 
@@ -1677,6 +1710,7 @@ static void fcoe_percpu_flush_done(struct sk_buff *skb)
 static inline int fcoe_filter_frames(struct fc_lport *lport,
                                      struct fc_frame *fp)
 {
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct fc_frame_header *fh;
         struct sk_buff *skb = (struct sk_buff *)fp;
@@ -1698,7 +1732,8 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
                 return 0;
 
         fcoe = ((struct fcoe_port *)lport_priv(lport))->priv;
-        if (is_fip_mode(&fcoe->ctlr) && fc_frame_payload_op(fp) == ELS_LOGO &&
+        ctlr = fcoe_to_ctlr(fcoe);
+        if (is_fip_mode(ctlr) && fc_frame_payload_op(fp) == ELS_LOGO &&
             ntoh24(fh->fh_s_id) == FC_FID_FLOGI) {
                 FCOE_DBG("fcoe: dropping FCoE lport LOGO in fip mode\n");
                 return -EINVAL;
@@ -1877,6 +1912,7 @@ static int fcoe_dcb_app_notification(struct notifier_block *notifier,
                                      ulong event, void *ptr)
 {
         struct dcb_app_type *entry = ptr;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct net_device *netdev;
         struct fcoe_port *port;
@@ -1894,6 +1930,8 @@ static int fcoe_dcb_app_notification(struct notifier_block *notifier,
         if (!fcoe)
                 return NOTIFY_OK;
 
+        ctlr = fcoe_to_ctlr(fcoe);
+
         if (entry->dcbx & DCB_CAP_DCBX_VER_CEE)
                 prio = ffs(entry->app.priority) - 1;
         else
@@ -1904,10 +1942,10 @@ static int fcoe_dcb_app_notification(struct notifier_block *notifier,
 
         if (entry->app.protocol == ETH_P_FIP ||
             entry->app.protocol == ETH_P_FCOE)
-                fcoe->ctlr.priority = prio;
+                ctlr->priority = prio;
 
         if (entry->app.protocol == ETH_P_FCOE) {
-                port = lport_priv(fcoe->ctlr.lp);
+                port = lport_priv(ctlr->lp);
                 port->priority = prio;
         }
 
@@ -1929,6 +1967,7 @@ static int fcoe_device_notification(struct notifier_block *notifier,
 {
         struct fc_lport *lport = NULL;
         struct net_device *netdev = ptr;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct fcoe_port *port;
         struct fcoe_dev_stats *stats;
@@ -1938,7 +1977,8 @@ static int fcoe_device_notification(struct notifier_block *notifier,
 
         list_for_each_entry(fcoe, &fcoe_hostlist, list) {
                 if (fcoe->netdev == netdev) {
-                        lport = fcoe->ctlr.lp;
+                        ctlr = fcoe_to_ctlr(fcoe);
+                        lport = ctlr->lp;
                         break;
                 }
         }
@@ -1967,7 +2007,7 @@ static int fcoe_device_notification(struct notifier_block *notifier,
                 break;
         case NETDEV_UNREGISTER:
                 list_del(&fcoe->list);
-                port = lport_priv(fcoe->ctlr.lp);
+                port = lport_priv(ctlr->lp);
                 queue_work(fcoe_wq, &port->destroy_work);
                 goto out;
                 break;
@@ -1982,8 +2022,8 @@ static int fcoe_device_notification(struct notifier_block *notifier,
         fcoe_link_speed_update(lport);
 
         if (link_possible && !fcoe_link_ok(lport))
-                fcoe_ctlr_link_up(&fcoe->ctlr);
-        else if (fcoe_ctlr_link_down(&fcoe->ctlr)) {
+                fcoe_ctlr_link_up(ctlr);
+        else if (fcoe_ctlr_link_down(ctlr)) {
                 stats = per_cpu_ptr(lport->dev_stats, get_cpu());
                 stats->LinkFailureCount++;
                 put_cpu();
@@ -2003,6 +2043,7 @@ out:
  */
 static int fcoe_disable(struct net_device *netdev)
 {
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         int rc = 0;
 
@@ -2013,8 +2054,9 @@ static int fcoe_disable(struct net_device *netdev)
         rtnl_unlock();
 
         if (fcoe) {
-                fcoe_ctlr_link_down(&fcoe->ctlr);
-                fcoe_clean_pending_queue(fcoe->ctlr.lp);
+                ctlr = fcoe_to_ctlr(fcoe);
+                fcoe_ctlr_link_down(ctlr);
+                fcoe_clean_pending_queue(ctlr->lp);
         } else
                 rc = -ENODEV;
 
@@ -2032,6 +2074,7 @@ static int fcoe_disable(struct net_device *netdev)
  */
 static int fcoe_enable(struct net_device *netdev)
 {
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         int rc = 0;
 
@@ -2040,11 +2083,17 @@ static int fcoe_enable(struct net_device *netdev)
         fcoe = fcoe_hostlist_lookup_port(netdev);
         rtnl_unlock();
 
-        if (!fcoe)
+        if (!fcoe) {
                 rc = -ENODEV;
-        else if (!fcoe_link_ok(fcoe->ctlr.lp))
-                fcoe_ctlr_link_up(&fcoe->ctlr);
+                goto out;
+        }
+
+        ctlr = fcoe_to_ctlr(fcoe);
+
+        if (!fcoe_link_ok(ctlr->lp))
+                fcoe_ctlr_link_up(ctlr);
 
+out:
         mutex_unlock(&fcoe_config_mutex);
         return rc;
 }
@@ -2059,6 +2108,7 @@ static int fcoe_enable(struct net_device *netdev)
  */
 static int fcoe_destroy(struct net_device *netdev)
 {
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct fc_lport *lport;
         struct fcoe_port *port;
@@ -2071,7 +2121,8 @@ static int fcoe_destroy(struct net_device *netdev)
                 rc = -ENODEV;
                 goto out_nodev;
         }
-        lport = fcoe->ctlr.lp;
+        ctlr = fcoe_to_ctlr(fcoe);
+        lport = ctlr->lp;
         port = lport_priv(lport);
         list_del(&fcoe->list);
         queue_work(fcoe_wq, &port->destroy_work);
@@ -2126,7 +2177,8 @@ static void fcoe_dcb_create(struct fcoe_interface *fcoe)
         int dcbx;
         u8 fup, up;
         struct net_device *netdev = fcoe->realdev;
-        struct fcoe_port *port = lport_priv(fcoe->ctlr.lp);
+        struct fcoe_ctlr *ctlr = fcoe_to_ctlr(fcoe);
+        struct fcoe_port *port = lport_priv(ctlr->lp);
         struct dcb_app app = {
                                 .priority = 0,
                                 .protocol = ETH_P_FCOE
@@ -2149,7 +2201,7 @@ static void fcoe_dcb_create(struct fcoe_interface *fcoe)
                 }
 
                 port->priority = ffs(up) ? ffs(up) - 1 : 0;
-                fcoe->ctlr.priority = ffs(fup) ? ffs(fup) - 1 : port->priority;
+                ctlr->priority = ffs(fup) ? ffs(fup) - 1 : port->priority;
         }
 #endif
 }
@@ -2166,6 +2218,8 @@ static void fcoe_dcb_create(struct fcoe_interface *fcoe)
 static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
 {
         int rc = 0;
+        struct fcoe_ctlr_device *ctlr_dev;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
         struct fc_lport *lport;
 
@@ -2184,7 +2238,9 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
                 goto out_nodev;
         }
 
-        lport = fcoe_if_create(fcoe, &netdev->dev, 0);
+        ctlr = fcoe_to_ctlr(fcoe);
+        ctlr_dev = fcoe_ctlr_to_ctlr_dev(ctlr);
+        lport = fcoe_if_create(fcoe, &ctlr_dev->dev, 0);
         if (IS_ERR(lport)) {
                 printk(KERN_ERR "fcoe: Failed to create interface (%s)\n",
                        netdev->name);
@@ -2195,7 +2251,7 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
         }
 
         /* Make this the "master" N_Port */
-        fcoe->ctlr.lp = lport;
+        ctlr->lp = lport;
 
         /* setup DCB priority attributes. */
         fcoe_dcb_create(fcoe);
@@ -2208,7 +2264,7 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
         fc_fabric_login(lport);
         if (!fcoe_link_ok(lport)) {
                 rtnl_unlock();
-                fcoe_ctlr_link_up(&fcoe->ctlr);
+                fcoe_ctlr_link_up(ctlr);
                 mutex_unlock(&fcoe_config_mutex);
                 return rc;
         }
@@ -2320,11 +2376,12 @@ static int fcoe_reset(struct Scsi_Host *shost)
         struct fc_lport *lport = shost_priv(shost);
         struct fcoe_port *port = lport_priv(lport);
         struct fcoe_interface *fcoe = port->priv;
+        struct fcoe_ctlr *ctlr = fcoe_to_ctlr(fcoe);
 
-        fcoe_ctlr_link_down(&fcoe->ctlr);
-        fcoe_clean_pending_queue(fcoe->ctlr.lp);
-        if (!fcoe_link_ok(fcoe->ctlr.lp))
-                fcoe_ctlr_link_up(&fcoe->ctlr);
+        fcoe_ctlr_link_down(ctlr);
+        fcoe_clean_pending_queue(ctlr->lp);
+        if (!fcoe_link_ok(ctlr->lp))
+                fcoe_ctlr_link_up(ctlr);
         return 0;
 }
 
@@ -2359,10 +2416,12 @@ fcoe_hostlist_lookup_port(const struct net_device *netdev)
  */
 static struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev)
 {
+        struct fcoe_ctlr *ctlr;
         struct fcoe_interface *fcoe;
 
         fcoe = fcoe_hostlist_lookup_port(netdev);
-        return (fcoe) ? fcoe->ctlr.lp : NULL;
+        ctlr = fcoe_to_ctlr(fcoe);
+        return (fcoe) ? ctlr->lp : NULL;
 }
 
 /**
@@ -2466,6 +2525,7 @@ module_init(fcoe_init);
 static void __exit fcoe_exit(void)
 {
         struct fcoe_interface *fcoe, *tmp;
+        struct fcoe_ctlr *ctlr;
         struct fcoe_port *port;
         unsigned int cpu;
 
@@ -2477,7 +2537,8 @@ static void __exit fcoe_exit(void)
         rtnl_lock();
         list_for_each_entry_safe(fcoe, tmp, &fcoe_hostlist, list) {
                 list_del(&fcoe->list);
-                port = lport_priv(fcoe->ctlr.lp);
+                ctlr = fcoe_to_ctlr(fcoe);
+                port = lport_priv(ctlr->lp);
                 queue_work(fcoe_wq, &port->destroy_work);
         }
         rtnl_unlock();
@@ -2573,7 +2634,7 @@ static struct fc_seq *fcoe_elsct_send(struct fc_lport *lport, u32 did,
 {
         struct fcoe_port *port = lport_priv(lport);
         struct fcoe_interface *fcoe = port->priv;
-        struct fcoe_ctlr *fip = &fcoe->ctlr;
+        struct fcoe_ctlr *fip = fcoe_to_ctlr(fcoe);
         struct fc_frame_header *fh = fc_frame_header_get(fp);
 
         switch (op) {
@@ -2730,6 +2791,40 @@ static void fcoe_get_lesb(struct fc_lport *lport,
         __fcoe_get_lesb(lport, fc_lesb, netdev);
 }
 
+static void fcoe_ctlr_get_lesb(struct fcoe_ctlr_device *ctlr_dev)
+{
+        struct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr_dev);
+        struct net_device *netdev = fcoe_netdev(fip->lp);
+        struct fcoe_fc_els_lesb *fcoe_lesb;
+        struct fc_els_lesb fc_lesb;
+
+        __fcoe_get_lesb(fip->lp, &fc_lesb, netdev);
+        fcoe_lesb = (struct fcoe_fc_els_lesb *)(&fc_lesb);
+
+        ctlr_dev->lesb.lesb_link_fail =
+                ntohl(fcoe_lesb->lesb_link_fail);
+        ctlr_dev->lesb.lesb_vlink_fail =
+                ntohl(fcoe_lesb->lesb_vlink_fail);
+        ctlr_dev->lesb.lesb_miss_fka =
+                ntohl(fcoe_lesb->lesb_miss_fka);
+        ctlr_dev->lesb.lesb_symb_err =
+                ntohl(fcoe_lesb->lesb_symb_err);
+        ctlr_dev->lesb.lesb_err_block =
+                ntohl(fcoe_lesb->lesb_err_block);
+        ctlr_dev->lesb.lesb_fcs_error =
+                ntohl(fcoe_lesb->lesb_fcs_error);
+}
+
+static void fcoe_fcf_get_vlan_id(struct fcoe_fcf_device *fcf_dev)
+{
+        struct fcoe_ctlr_device *ctlr_dev =
+                fcoe_fcf_dev_to_ctlr_dev(fcf_dev);
+        struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+        struct fcoe_interface *fcoe = fcoe_ctlr_priv(ctlr);
+
+        fcf_dev->vlan_id = vlan_dev_vlan_id(fcoe->netdev);
+}
+
 /**
  * fcoe_set_port_id() - Callback from libfc when Port_ID is set.
  * @lport: the local port
@@ -2747,7 +2842,8 @@ static void fcoe_set_port_id(struct fc_lport *lport,
 {
         struct fcoe_port *port = lport_priv(lport);
         struct fcoe_interface *fcoe = port->priv;
+        struct fcoe_ctlr *ctlr = fcoe_to_ctlr(fcoe);
 
         if (fp && fc_frame_payload_op(fp) == ELS_FLOGI)
-                fcoe_ctlr_recv_flogi(&fcoe->ctlr, lport, fp);
+                fcoe_ctlr_recv_flogi(ctlr, lport, fp);
 }
diff --git a/drivers/scsi/fcoe/fcoe.h b/drivers/scsi/fcoe/fcoe.h
index 96ac938d39cc..a624add4f8ec 100644
--- a/drivers/scsi/fcoe/fcoe.h
+++ b/drivers/scsi/fcoe/fcoe.h
@@ -68,7 +68,6 @@ do {                                                            	\
  * @netdev:           The associated net device
  * @fcoe_packet_type: FCoE packet type
  * @fip_packet_type:  FIP packet type
- * @ctlr:             The FCoE controller (for FIP)
  * @oem:              The offload exchange manager for all local port
  *                    instances associated with this port
  * @removed:          Indicates fcoe interface removed from net device
@@ -80,12 +79,15 @@ struct fcoe_interface {
         struct net_device  *realdev;
         struct packet_type fcoe_packet_type;
         struct packet_type fip_packet_type;
-        struct fcoe_ctlr   ctlr;
         struct fc_exch_mgr *oem;
         u8      removed;
 };
 
-#define fcoe_from_ctlr(fip) container_of(fip, struct fcoe_interface, ctlr)
+#define fcoe_to_ctlr(x)                                         \
+        (struct fcoe_ctlr *)(((struct fcoe_ctlr *)(x)) - 1)
+
+#define fcoe_from_ctlr(x)                       \
+        ((struct fcoe_interface *)((x) + 1))
 
 /**
  * fcoe_netdev() - Return the net device associated with a local port
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index 5a4c7250aa77..d68d57241ee6 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -160,6 +160,76 @@ void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_state mode)
 }
 EXPORT_SYMBOL(fcoe_ctlr_init);
 
+static int fcoe_sysfs_fcf_add(struct fcoe_fcf *new)
+{
+        struct fcoe_ctlr *fip = new->fip;
+        struct fcoe_ctlr_device *ctlr_dev = fcoe_ctlr_to_ctlr_dev(fip);
+        struct fcoe_fcf_device temp, *fcf_dev;
+        int rc = 0;
+
+        LIBFCOE_FIP_DBG(fip, "New FCF fab %16.16llx mac %pM\n",
+                        new->fabric_name, new->fcf_mac);
+
+        mutex_lock(&ctlr_dev->lock);
+
+        temp.fabric_name = new->fabric_name;
+        temp.switch_name = new->switch_name;
+        temp.fc_map = new->fc_map;
+        temp.vfid = new->vfid;
+        memcpy(temp.mac, new->fcf_mac, ETH_ALEN);
+        temp.priority = new->pri;
+        temp.fka_period = new->fka_period;
+        temp.selected = 0; /* default to unselected */
+
+        fcf_dev = fcoe_fcf_device_add(ctlr_dev, &temp);
+        if (unlikely(!fcf_dev)) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        /*
+         * The fcoe_sysfs layer can return a CONNECTED fcf that
+         * has a priv (fcf was never deleted) or a CONNECTED fcf
+         * that doesn't have a priv (fcf was deleted). However,
+         * libfcoe will always delete FCFs before trying to add
+         * them. This is ensured because both recv_adv and
+         * age_fcfs are protected by the the fcoe_ctlr's mutex.
+         * This means that we should never get a FCF with a
+         * non-NULL priv pointer.
+         */
+        BUG_ON(fcf_dev->priv);
+
+        fcf_dev->priv = new;
+        new->fcf_dev = fcf_dev;
+
+        list_add(&new->list, &fip->fcfs);
+        fip->fcf_count++;
+
+out:
+        mutex_unlock(&ctlr_dev->lock);
+        return rc;
+}
+
+static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new)
+{
+        struct fcoe_ctlr *fip = new->fip;
+        struct fcoe_ctlr_device *ctlr_dev = fcoe_ctlr_to_ctlr_dev(fip);
+        struct fcoe_fcf_device *fcf_dev;
+
+        list_del(&new->list);
+        fip->fcf_count--;
+
+        mutex_lock(&ctlr_dev->lock);
+
+        fcf_dev = fcoe_fcf_to_fcf_dev(new);
+        WARN_ON(!fcf_dev);
+        new->fcf_dev = NULL;
+        fcoe_fcf_device_delete(fcf_dev);
+        kfree(new);
+
+        mutex_unlock(&ctlr_dev->lock);
+}
+
 /**
  * fcoe_ctlr_reset_fcfs() - Reset and free all FCFs for a controller
  * @fip: The FCoE controller whose FCFs are to be reset
@@ -173,10 +243,10 @@ static void fcoe_ctlr_reset_fcfs(struct fcoe_ctlr *fip)
 
         fip->sel_fcf = NULL;
         list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
-                list_del(&fcf->list);
-                kfree(fcf);
+                fcoe_sysfs_fcf_del(fcf);
         }
-        fip->fcf_count = 0;
+        WARN_ON(fip->fcf_count);
+
         fip->sel_time = 0;
 }
 
@@ -717,8 +787,11 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
         unsigned long next_timer = jiffies + msecs_to_jiffies(FIP_VN_KA_PERIOD);
         unsigned long deadline;
         unsigned long sel_time = 0;
+        struct list_head del_list;
         struct fcoe_dev_stats *stats;
 
+        INIT_LIST_HEAD(&del_list);
+
         stats = per_cpu_ptr(fip->lp->dev_stats, get_cpu());
 
         list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
@@ -739,10 +812,13 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
                 if (time_after_eq(jiffies, deadline)) {
                         if (fip->sel_fcf == fcf)
                                 fip->sel_fcf = NULL;
+                        /*
+                         * Move to delete list so we can call
+                         * fcoe_sysfs_fcf_del (which can sleep)
+                         * after the put_cpu().
+                         */
                         list_del(&fcf->list);
-                        WARN_ON(!fip->fcf_count);
-                        fip->fcf_count--;
-                        kfree(fcf);
+                        list_add(&fcf->list, &del_list);
                         stats->VLinkFailureCount++;
                 } else {
                         if (time_after(next_timer, deadline))
@@ -753,6 +829,12 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
                 }
         }
         put_cpu();
+
+        list_for_each_entry_safe(fcf, next, &del_list, list) {
+                /* Removes fcf from current list */
+                fcoe_sysfs_fcf_del(fcf);
+        }
+
         if (sel_time && !fip->sel_fcf && !fip->sel_time) {
                 sel_time += msecs_to_jiffies(FCOE_CTLR_START_DELAY);
                 fip->sel_time = sel_time;
@@ -903,23 +985,23 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
 {
         struct fcoe_fcf *fcf;
         struct fcoe_fcf new;
-        struct fcoe_fcf *found;
         unsigned long sol_tov = msecs_to_jiffies(FCOE_CTRL_SOL_TOV);
         int first = 0;
         int mtu_valid;
+        int found = 0;
+        int rc = 0;
 
         if (fcoe_ctlr_parse_adv(fip, skb, &new))
                 return;
 
         mutex_lock(&fip->ctlr_mutex);
         first = list_empty(&fip->fcfs);
-        found = NULL;
         list_for_each_entry(fcf, &fip->fcfs, list) {
                 if (fcf->switch_name == new.switch_name &&
                     fcf->fabric_name == new.fabric_name &&
                     fcf->fc_map == new.fc_map &&
                     compare_ether_addr(fcf->fcf_mac, new.fcf_mac) == 0) {
-                        found = fcf;
+                        found = 1;
                         break;
                 }
         }
@@ -931,9 +1013,16 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
                 if (!fcf)
                         goto out;
 
-                fip->fcf_count++;
                 memcpy(fcf, &new, sizeof(new));
-                list_add(&fcf->list, &fip->fcfs);
+                fcf->fip = fip;
+                rc = fcoe_sysfs_fcf_add(fcf);
+                if (rc) {
+                        printk(KERN_ERR "Failed to allocate sysfs instance "
+                               "for FCF, fab %16.16llx mac %pM\n",
+                               new.fabric_name, new.fcf_mac);
+                        kfree(fcf);
+                        goto out;
+                }
         } else {
                 /*
                  * Update the FCF's keep-alive descriptor flags.
@@ -954,6 +1043,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
                 fcf->fka_period = new.fka_period;
                 memcpy(fcf->fcf_mac, new.fcf_mac, ETH_ALEN);
         }
+
         mtu_valid = fcoe_ctlr_mtu_valid(fcf);
         fcf->time = jiffies;
         if (!found)
@@ -996,6 +1086,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
                     time_before(fip->sel_time, fip->timer.expires))
                         mod_timer(&fip->timer, fip->sel_time);
         }
+
 out:
         mutex_unlock(&fip->ctlr_mutex);
 }
@@ -2718,9 +2809,9 @@ unlock:
 
 /**
  * fcoe_libfc_config() - Sets up libfc related properties for local port
- * @lp: The local port to configure libfc for
- * @fip: The FCoE controller in use by the local port
- * @tt: The libfc function template
+ * @lport:    The local port to configure libfc for
+ * @fip:      The FCoE controller in use by the local port
+ * @tt:       The libfc function template
  * @init_fcp: If non-zero, the FCP portion of libfc should be initialized
  *
  * Returns : 0 for success
@@ -2753,3 +2844,43 @@ int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip,
         return 0;
 }
 EXPORT_SYMBOL_GPL(fcoe_libfc_config);
+
+void fcoe_fcf_get_selected(struct fcoe_fcf_device *fcf_dev)
+{
+        struct fcoe_ctlr_device *ctlr_dev = fcoe_fcf_dev_to_ctlr_dev(fcf_dev);
+        struct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr_dev);
+        struct fcoe_fcf *fcf;
+
+        mutex_lock(&fip->ctlr_mutex);
+        mutex_lock(&ctlr_dev->lock);
+
+        fcf = fcoe_fcf_device_priv(fcf_dev);
+        if (fcf)
+                fcf_dev->selected = (fcf == fip->sel_fcf) ? 1 : 0;
+        else
+                fcf_dev->selected = 0;
+
+        mutex_unlock(&ctlr_dev->lock);
+        mutex_unlock(&fip->ctlr_mutex);
+}
+EXPORT_SYMBOL(fcoe_fcf_get_selected);
+
+void fcoe_ctlr_get_fip_mode(struct fcoe_ctlr_device *ctlr_dev)
+{
+        struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+
+        mutex_lock(&ctlr->ctlr_mutex);
+        switch (ctlr->mode) {
+        case FIP_MODE_FABRIC:
+                ctlr_dev->mode = FIP_CONN_TYPE_FABRIC;
+                break;
+        case FIP_MODE_VN2VN:
+                ctlr_dev->mode = FIP_CONN_TYPE_VN2VN;
+                break;
+        default:
+                ctlr_dev->mode = FIP_CONN_TYPE_UNKNOWN;
+                break;
+        }
+        mutex_unlock(&ctlr->ctlr_mutex);
+}
+EXPORT_SYMBOL(fcoe_ctlr_get_fip_mode);
diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
new file mode 100644
index 000000000000..2bc163198d33
--- /dev/null
+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -0,0 +1,832 @@
+/*
+ * Copyright(c) 2011 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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 St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/etherdevice.h>
+
+#include <scsi/fcoe_sysfs.h>
+
+static atomic_t ctlr_num;
+static atomic_t fcf_num;
+
+/*
+ * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
+ * should insulate the loss of a fcf.
+ */
+static unsigned int fcoe_fcf_dev_loss_tmo = 1800;  /* seconds */
+
+module_param_named(fcf_dev_loss_tmo, fcoe_fcf_dev_loss_tmo,
+                   uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(fcf_dev_loss_tmo,
+                 "Maximum number of seconds that libfcoe should"
+                 " insulate the loss of a fcf. Once this value is"
+                 " exceeded, the fcf is removed.");
+
+/*
+ * These are used by the fcoe_*_show_function routines, they
+ * are intentionally placed in the .c file as they're not intended
+ * for use throughout the code.
+ */
+#define fcoe_ctlr_id(x)                         \
+        ((x)->id)
+#define fcoe_ctlr_work_q_name(x)                \
+        ((x)->work_q_name)
+#define fcoe_ctlr_work_q(x)                     \
+        ((x)->work_q)
+#define fcoe_ctlr_devloss_work_q_name(x)        \
+        ((x)->devloss_work_q_name)
+#define fcoe_ctlr_devloss_work_q(x)             \
+        ((x)->devloss_work_q)
+#define fcoe_ctlr_mode(x)                       \
+        ((x)->mode)
+#define fcoe_ctlr_fcf_dev_loss_tmo(x)           \
+        ((x)->fcf_dev_loss_tmo)
+#define fcoe_ctlr_link_fail(x)                  \
+        ((x)->lesb.lesb_link_fail)
+#define fcoe_ctlr_vlink_fail(x)                 \
+        ((x)->lesb.lesb_vlink_fail)
+#define fcoe_ctlr_miss_fka(x)                   \
+        ((x)->lesb.lesb_miss_fka)
+#define fcoe_ctlr_symb_err(x)                   \
+        ((x)->lesb.lesb_symb_err)
+#define fcoe_ctlr_err_block(x)                  \
+        ((x)->lesb.lesb_err_block)
+#define fcoe_ctlr_fcs_error(x)                  \
+        ((x)->lesb.lesb_fcs_error)
+#define fcoe_fcf_state(x)                       \
+        ((x)->state)
+#define fcoe_fcf_fabric_name(x)                 \
+        ((x)->fabric_name)
+#define fcoe_fcf_switch_name(x)                 \
+        ((x)->switch_name)
+#define fcoe_fcf_fc_map(x)                      \
+        ((x)->fc_map)
+#define fcoe_fcf_vfid(x)                        \
+        ((x)->vfid)
+#define fcoe_fcf_mac(x)                         \
+        ((x)->mac)
+#define fcoe_fcf_priority(x)                    \
+        ((x)->priority)
+#define fcoe_fcf_fka_period(x)                  \
+        ((x)->fka_period)
+#define fcoe_fcf_dev_loss_tmo(x)                \
+        ((x)->dev_loss_tmo)
+#define fcoe_fcf_selected(x)                    \
+        ((x)->selected)
+#define fcoe_fcf_vlan_id(x)                     \
+        ((x)->vlan_id)
+
+/*
+ * dev_loss_tmo attribute
+ */
+static int fcoe_str_to_dev_loss(const char *buf, unsigned long *val)
+{
+        int ret;
+
+        ret = kstrtoul(buf, 0, val);
+        if (ret || *val < 0)
+                return -EINVAL;
+        /*
+         * Check for overflow; dev_loss_tmo is u32
+         */
+        if (*val > UINT_MAX)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int fcoe_fcf_set_dev_loss_tmo(struct fcoe_fcf_device *fcf,
+                                     unsigned long val)
+{
+        if ((fcf->state == FCOE_FCF_STATE_UNKNOWN) ||
+            (fcf->state == FCOE_FCF_STATE_DISCONNECTED) ||
+            (fcf->state == FCOE_FCF_STATE_DELETED))
+                return -EBUSY;
+        /*
+         * Check for overflow; dev_loss_tmo is u32
+         */
+        if (val > UINT_MAX)
+                return -EINVAL;
+
+        fcoe_fcf_dev_loss_tmo(fcf) = val;
+        return 0;
+}
+
+#define FCOE_DEVICE_ATTR(_prefix, _name, _mode, _show, _store)  \
+struct device_attribute device_attr_fcoe_##_prefix##_##_name =  \
+        __ATTR(_name, _mode, _show, _store)
+
+#define fcoe_ctlr_show_function(field, format_string, sz, cast) \
+static ssize_t show_fcoe_ctlr_device_##field(struct device *dev, \
+                                            struct device_attribute *attr, \
+                                            char *buf)                  \
+{                                                                       \
+        struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);               \
+        if (ctlr->f->get_fcoe_ctlr_##field)                             \
+                ctlr->f->get_fcoe_ctlr_##field(ctlr);                   \
+        return snprintf(buf, sz, format_string,                         \
+                        cast fcoe_ctlr_##field(ctlr));                  \
+}
+
+#define fcoe_fcf_show_function(field, format_string, sz, cast)  \
+static ssize_t show_fcoe_fcf_device_##field(struct device *dev, \
+                                           struct device_attribute *attr, \
+                                           char *buf)                   \
+{                                                                       \
+        struct fcoe_fcf_device *fcf = dev_to_fcf(dev);                  \
+        struct fcoe_ctlr_device *ctlr = fcoe_fcf_dev_to_ctlr_dev(fcf);  \
+        if (ctlr->f->get_fcoe_fcf_##field)                              \
+                ctlr->f->get_fcoe_fcf_##field(fcf);                     \
+        return snprintf(buf, sz, format_string,                         \
+                        cast fcoe_fcf_##field(fcf));                    \
+}
+
+#define fcoe_ctlr_private_show_function(field, format_string, sz, cast) \
+static ssize_t show_fcoe_ctlr_device_##field(struct device *dev, \
+                                            struct device_attribute *attr, \
+                                            char *buf)                  \
+{                                                                       \
+        struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);               \
+        return snprintf(buf, sz, format_string, cast fcoe_ctlr_##field(ctlr)); \
+}
+
+#define fcoe_fcf_private_show_function(field, format_string, sz, cast)  \
+static ssize_t show_fcoe_fcf_device_##field(struct device *dev, \
+                                           struct device_attribute *attr, \
+                                           char *buf)                   \
+{                                                               \
+        struct fcoe_fcf_device *fcf = dev_to_fcf(dev);                  \
+        return snprintf(buf, sz, format_string, cast fcoe_fcf_##field(fcf)); \
+}
+
+#define fcoe_ctlr_private_rd_attr(field, format_string, sz)             \
+        fcoe_ctlr_private_show_function(field, format_string, sz, )     \
+        static FCOE_DEVICE_ATTR(ctlr, field, S_IRUGO,                   \
+                                show_fcoe_ctlr_device_##field, NULL)
+
+#define fcoe_ctlr_rd_attr(field, format_string, sz)                     \
+        fcoe_ctlr_show_function(field, format_string, sz, )             \
+        static FCOE_DEVICE_ATTR(ctlr, field, S_IRUGO,                   \
+                                show_fcoe_ctlr_device_##field, NULL)
+
+#define fcoe_fcf_rd_attr(field, format_string, sz)                      \
+        fcoe_fcf_show_function(field, format_string, sz, )              \
+        static FCOE_DEVICE_ATTR(fcf, field, S_IRUGO,                    \
+                                show_fcoe_fcf_device_##field, NULL)
+
+#define fcoe_fcf_private_rd_attr(field, format_string, sz)              \
+        fcoe_fcf_private_show_function(field, format_string, sz, )      \
+        static FCOE_DEVICE_ATTR(fcf, field, S_IRUGO,                    \
+                                show_fcoe_fcf_device_##field, NULL)
+
+#define fcoe_ctlr_private_rd_attr_cast(field, format_string, sz, cast)  \
+        fcoe_ctlr_private_show_function(field, format_string, sz, (cast)) \
+        static FCOE_DEVICE_ATTR(ctlr, field, S_IRUGO,                   \
+                                show_fcoe_ctlr_device_##field, NULL)
+
+#define fcoe_fcf_private_rd_attr_cast(field, format_string, sz, cast)   \
+        fcoe_fcf_private_show_function(field, format_string, sz, (cast)) \
+        static FCOE_DEVICE_ATTR(fcf, field, S_IRUGO,                    \
+                                show_fcoe_fcf_device_##field, NULL)
+
+#define fcoe_enum_name_search(title, table_type, table)                 \
+static const char *get_fcoe_##title##_name(enum table_type table_key)   \
+{                                                                       \
+        int i;                                                          \
+        char *name = NULL;                                              \
+                                                                        \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {                       \
+                if (table[i].value == table_key) {                      \
+                        name = table[i].name;                           \
+                        break;                                          \
+                }                                                       \
+        }                                                               \
+        return name;                                                    \
+}
+
+static struct {
+        enum fcf_state value;
+        char           *name;
+} fcf_state_names[] = {
+        { FCOE_FCF_STATE_UNKNOWN,      "Unknown" },
+        { FCOE_FCF_STATE_DISCONNECTED, "Disconnected" },
+        { FCOE_FCF_STATE_CONNECTED,    "Connected" },
+};
+fcoe_enum_name_search(fcf_state, fcf_state, fcf_state_names)
+#define FCOE_FCF_STATE_MAX_NAMELEN 50
+
+static ssize_t show_fcf_state(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        struct fcoe_fcf_device *fcf = dev_to_fcf(dev);
+        const char *name;
+        name = get_fcoe_fcf_state_name(fcf->state);
+        if (!name)
+                return -EINVAL;
+        return snprintf(buf, FCOE_FCF_STATE_MAX_NAMELEN, "%s\n", name);
+}
+static FCOE_DEVICE_ATTR(fcf, state, S_IRUGO, show_fcf_state, NULL);
+
+static struct {
+        enum fip_conn_type value;
+        char               *name;
+} fip_conn_type_names[] = {
+        { FIP_CONN_TYPE_UNKNOWN, "Unknown" },
+        { FIP_CONN_TYPE_FABRIC, "Fabric" },
+        { FIP_CONN_TYPE_VN2VN, "VN2VN" },
+};
+fcoe_enum_name_search(ctlr_mode, fip_conn_type, fip_conn_type_names)
+#define FCOE_CTLR_MODE_MAX_NAMELEN 50
+
+static ssize_t show_ctlr_mode(struct device *dev,
+                              struct device_attribute *attr,
+                              char *buf)
+{
+        struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+        const char *name;
+
+        if (ctlr->f->get_fcoe_ctlr_mode)
+                ctlr->f->get_fcoe_ctlr_mode(ctlr);
+
+        name = get_fcoe_ctlr_mode_name(ctlr->mode);
+        if (!name)
+                return -EINVAL;
+        return snprintf(buf, FCOE_CTLR_MODE_MAX_NAMELEN,
+                        "%s\n", name);
+}
+static FCOE_DEVICE_ATTR(ctlr, mode, S_IRUGO,
+                        show_ctlr_mode, NULL);
+
+static ssize_t
+store_private_fcoe_ctlr_fcf_dev_loss_tmo(struct device *dev,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
+{
+        struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+        struct fcoe_fcf_device *fcf;
+        unsigned long val;
+        int rc;
+
+        rc = fcoe_str_to_dev_loss(buf, &val);
+        if (rc)
+                return rc;
+
+        fcoe_ctlr_fcf_dev_loss_tmo(ctlr) = val;
+        mutex_lock(&ctlr->lock);
+        list_for_each_entry(fcf, &ctlr->fcfs, peers)
+                fcoe_fcf_set_dev_loss_tmo(fcf, val);
+        mutex_unlock(&ctlr->lock);
+        return count;
+}
+fcoe_ctlr_private_show_function(fcf_dev_loss_tmo, "%d\n", 20, );
+static FCOE_DEVICE_ATTR(ctlr, fcf_dev_loss_tmo, S_IRUGO | S_IWUSR,
+                        show_fcoe_ctlr_device_fcf_dev_loss_tmo,
+                        store_private_fcoe_ctlr_fcf_dev_loss_tmo);
+
+/* Link Error Status Block (LESB) */
+fcoe_ctlr_rd_attr(link_fail, "%u\n", 20);
+fcoe_ctlr_rd_attr(vlink_fail, "%u\n", 20);
+fcoe_ctlr_rd_attr(miss_fka, "%u\n", 20);
+fcoe_ctlr_rd_attr(symb_err, "%u\n", 20);
+fcoe_ctlr_rd_attr(err_block, "%u\n", 20);
+fcoe_ctlr_rd_attr(fcs_error, "%u\n", 20);
+
+fcoe_fcf_private_rd_attr_cast(fabric_name, "0x%llx\n", 20, unsigned long long);
+fcoe_fcf_private_rd_attr_cast(switch_name, "0x%llx\n", 20, unsigned long long);
+fcoe_fcf_private_rd_attr(priority, "%u\n", 20);
+fcoe_fcf_private_rd_attr(fc_map, "0x%x\n", 20);
+fcoe_fcf_private_rd_attr(vfid, "%u\n", 20);
+fcoe_fcf_private_rd_attr(mac, "%pM\n", 20);
+fcoe_fcf_private_rd_attr(fka_period, "%u\n", 20);
+fcoe_fcf_rd_attr(selected, "%u\n", 20);
+fcoe_fcf_rd_attr(vlan_id, "%u\n", 20);
+
+fcoe_fcf_private_show_function(dev_loss_tmo, "%d\n", 20, )
+static ssize_t
+store_fcoe_fcf_dev_loss_tmo(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        struct fcoe_fcf_device *fcf = dev_to_fcf(dev);
+        unsigned long val;
+        int rc;
+
+        rc = fcoe_str_to_dev_loss(buf, &val);
+        if (rc)
+                return rc;
+
+        rc = fcoe_fcf_set_dev_loss_tmo(fcf, val);
+        if (rc)
+                return rc;
+        return count;
+}
+static FCOE_DEVICE_ATTR(fcf, dev_loss_tmo, S_IRUGO | S_IWUSR,
+                        show_fcoe_fcf_device_dev_loss_tmo,
+                        store_fcoe_fcf_dev_loss_tmo);
+
+static struct attribute *fcoe_ctlr_lesb_attrs[] = {
+        &device_attr_fcoe_ctlr_link_fail.attr,
+        &device_attr_fcoe_ctlr_vlink_fail.attr,
+        &device_attr_fcoe_ctlr_miss_fka.attr,
+        &device_attr_fcoe_ctlr_symb_err.attr,
+        &device_attr_fcoe_ctlr_err_block.attr,
+        &device_attr_fcoe_ctlr_fcs_error.attr,
+        NULL,
+};
+
+static struct attribute_group fcoe_ctlr_lesb_attr_group = {
+        .name = "lesb",
+        .attrs = fcoe_ctlr_lesb_attrs,
+};
+
+static struct attribute *fcoe_ctlr_attrs[] = {
+        &device_attr_fcoe_ctlr_fcf_dev_loss_tmo.attr,
+        &device_attr_fcoe_ctlr_mode.attr,
+        NULL,
+};
+
+static struct attribute_group fcoe_ctlr_attr_group = {
+        .attrs = fcoe_ctlr_attrs,
+};
+
+static const struct attribute_group *fcoe_ctlr_attr_groups[] = {
+        &fcoe_ctlr_attr_group,
+        &fcoe_ctlr_lesb_attr_group,
+        NULL,
+};
+
+static struct attribute *fcoe_fcf_attrs[] = {
+        &device_attr_fcoe_fcf_fabric_name.attr,
+        &device_attr_fcoe_fcf_switch_name.attr,
+        &device_attr_fcoe_fcf_dev_loss_tmo.attr,
+        &device_attr_fcoe_fcf_fc_map.attr,
+        &device_attr_fcoe_fcf_vfid.attr,
+        &device_attr_fcoe_fcf_mac.attr,
+        &device_attr_fcoe_fcf_priority.attr,
+        &device_attr_fcoe_fcf_fka_period.attr,
+        &device_attr_fcoe_fcf_state.attr,
+        &device_attr_fcoe_fcf_selected.attr,
+        &device_attr_fcoe_fcf_vlan_id.attr,
+        NULL
+};
+
+static struct attribute_group fcoe_fcf_attr_group = {
+        .attrs = fcoe_fcf_attrs,
+};
+
+static const struct attribute_group *fcoe_fcf_attr_groups[] = {
+        &fcoe_fcf_attr_group,
+        NULL,
+};
+
+struct bus_type fcoe_bus_type;
+
+static int fcoe_bus_match(struct device *dev,
+                          struct device_driver *drv)
+{
+        if (dev->bus == &fcoe_bus_type)
+                return 1;
+        return 0;
+}
+
+/**
+ * fcoe_ctlr_device_release() - Release the FIP ctlr memory
+ * @dev: Pointer to the FIP ctlr's embedded device
+ *
+ * Called when the last FIP ctlr reference is released.
+ */
+static void fcoe_ctlr_device_release(struct device *dev)
+{
+        struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+        kfree(ctlr);
+}
+
+/**
+ * fcoe_fcf_device_release() - Release the FIP fcf memory
+ * @dev: Pointer to the fcf's embedded device
+ *
+ * Called when the last FIP fcf reference is released.
+ */
+static void fcoe_fcf_device_release(struct device *dev)
+{
+        struct fcoe_fcf_device *fcf = dev_to_fcf(dev);
+        kfree(fcf);
+}
+
+struct device_type fcoe_ctlr_device_type = {
+        .name = "fcoe_ctlr",
+        .groups = fcoe_ctlr_attr_groups,
+        .release = fcoe_ctlr_device_release,
+};
+
+struct device_type fcoe_fcf_device_type = {
+        .name = "fcoe_fcf",
+        .groups = fcoe_fcf_attr_groups,
+        .release = fcoe_fcf_device_release,
+};
+
+struct bus_type fcoe_bus_type = {
+        .name = "fcoe",
+        .match = &fcoe_bus_match,
+};
+
+/**
+ * fcoe_ctlr_device_flush_work() - Flush a FIP ctlr's workqueue
+ * @ctlr: Pointer to the FIP ctlr whose workqueue is to be flushed
+ */
+void fcoe_ctlr_device_flush_work(struct fcoe_ctlr_device *ctlr)
+{
+        if (!fcoe_ctlr_work_q(ctlr)) {
+                printk(KERN_ERR
+                       "ERROR: FIP Ctlr '%d' attempted to flush work, "
+                       "when no workqueue created.\n", ctlr->id);
+                dump_stack();
+                return;
+        }
+
+        flush_workqueue(fcoe_ctlr_work_q(ctlr));
+}
+
+/**
+ * fcoe_ctlr_device_queue_work() - Schedule work for a FIP ctlr's workqueue
+ * @ctlr: Pointer to the FIP ctlr who owns the devloss workqueue
+ * @work:   Work to queue for execution
+ *
+ * Return value:
+ *      1 on success / 0 already queued / < 0 for error
+ */
+int fcoe_ctlr_device_queue_work(struct fcoe_ctlr_device *ctlr,
+                               struct work_struct *work)
+{
+        if (unlikely(!fcoe_ctlr_work_q(ctlr))) {
+                printk(KERN_ERR
+                       "ERROR: FIP Ctlr '%d' attempted to queue work, "
+                       "when no workqueue created.\n", ctlr->id);
+                dump_stack();
+
+                return -EINVAL;
+        }
+
+        return queue_work(fcoe_ctlr_work_q(ctlr), work);
+}
+
+/**
+ * fcoe_ctlr_device_flush_devloss() - Flush a FIP ctlr's devloss workqueue
+ * @ctlr: Pointer to FIP ctlr whose workqueue is to be flushed
+ */
+void fcoe_ctlr_device_flush_devloss(struct fcoe_ctlr_device *ctlr)
+{
+        if (!fcoe_ctlr_devloss_work_q(ctlr)) {
+                printk(KERN_ERR
+                       "ERROR: FIP Ctlr '%d' attempted to flush work, "
+                       "when no workqueue created.\n", ctlr->id);
+                dump_stack();
+                return;
+        }
+
+        flush_workqueue(fcoe_ctlr_devloss_work_q(ctlr));
+}
+
+/**
+ * fcoe_ctlr_device_queue_devloss_work() - Schedule work for a FIP ctlr's devloss workqueue
+ * @ctlr: Pointer to the FIP ctlr who owns the devloss workqueue
+ * @work:   Work to queue for execution
+ * @delay:  jiffies to delay the work queuing
+ *
+ * Return value:
+ *      1 on success / 0 already queued / < 0 for error
+ */
+int fcoe_ctlr_device_queue_devloss_work(struct fcoe_ctlr_device *ctlr,
+                                       struct delayed_work *work,
+                                       unsigned long delay)
+{
+        if (unlikely(!fcoe_ctlr_devloss_work_q(ctlr))) {
+                printk(KERN_ERR
+                       "ERROR: FIP Ctlr '%d' attempted to queue work, "
+                       "when no workqueue created.\n", ctlr->id);
+                dump_stack();
+
+                return -EINVAL;
+        }
+
+        return queue_delayed_work(fcoe_ctlr_devloss_work_q(ctlr), work, delay);
+}
+
+static int fcoe_fcf_device_match(struct fcoe_fcf_device *new,
+                                 struct fcoe_fcf_device *old)
+{
+        if (new->switch_name == old->switch_name &&
+            new->fabric_name == old->fabric_name &&
+            new->fc_map == old->fc_map &&
+            compare_ether_addr(new->mac, old->mac) == 0)
+                return 1;
+        return 0;
+}
+
+/**
+ * fcoe_ctlr_device_add() - Add a FIP ctlr to sysfs
+ * @parent:    The parent device to which the fcoe_ctlr instance
+ *             should be attached
+ * @f:         The LLD's FCoE sysfs function template pointer
+ * @priv_size: Size to be allocated with the fcoe_ctlr_device for the LLD
+ *
+ * This routine allocates a FIP ctlr object with some additional memory
+ * for the LLD. The FIP ctlr is initialized, added to sysfs and then
+ * attributes are added to it.
+ */
+struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
+                                    struct fcoe_sysfs_function_template *f,
+                                    int priv_size)
+{
+        struct fcoe_ctlr_device *ctlr;
+        int error = 0;
+
+        ctlr = kzalloc(sizeof(struct fcoe_ctlr_device) + priv_size,
+                       GFP_KERNEL);
+        if (!ctlr)
+                goto out;
+
+        ctlr->id = atomic_inc_return(&ctlr_num) - 1;
+        ctlr->f = f;
+        INIT_LIST_HEAD(&ctlr->fcfs);
+        mutex_init(&ctlr->lock);
+        ctlr->dev.parent = parent;
+        ctlr->dev.bus = &fcoe_bus_type;
+        ctlr->dev.type = &fcoe_ctlr_device_type;
+
+        ctlr->fcf_dev_loss_tmo = fcoe_fcf_dev_loss_tmo;
+
+        snprintf(ctlr->work_q_name, sizeof(ctlr->work_q_name),
+                 "ctlr_wq_%d", ctlr->id);
+        ctlr->work_q = create_singlethread_workqueue(
+                ctlr->work_q_name);
+        if (!ctlr->work_q)
+                goto out_del;
+
+        snprintf(ctlr->devloss_work_q_name,
+                 sizeof(ctlr->devloss_work_q_name),
+                 "ctlr_dl_wq_%d", ctlr->id);
+        ctlr->devloss_work_q = create_singlethread_workqueue(
+                ctlr->devloss_work_q_name);
+        if (!ctlr->devloss_work_q)
+                goto out_del_q;
+
+        dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id);
+        error = device_register(&ctlr->dev);
+        if (error)
+                goto out_del_q2;
+
+        return ctlr;
+
+out_del_q2:
+        destroy_workqueue(ctlr->devloss_work_q);
+        ctlr->devloss_work_q = NULL;
+out_del_q:
+        destroy_workqueue(ctlr->work_q);
+        ctlr->work_q = NULL;
+out_del:
+        kfree(ctlr);
+out:
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(fcoe_ctlr_device_add);
+
+/**
+ * fcoe_ctlr_device_delete() - Delete a FIP ctlr and its subtree from sysfs
+ * @ctlr: A pointer to the ctlr to be deleted
+ *
+ * Deletes a FIP ctlr and any fcfs attached
+ * to it. Deleting fcfs will cause their childen
+ * to be deleted as well.
+ *
+ * The ctlr is detached from sysfs and it's resources
+ * are freed (work q), but the memory is not freed
+ * until its last reference is released.
+ *
+ * This routine expects no locks to be held before
+ * calling.
+ *
+ * TODO: Currently there are no callbacks to clean up LLD data
+ * for a fcoe_fcf_device. LLDs must keep this in mind as they need
+ * to clean up each of their LLD data for all fcoe_fcf_device before
+ * calling fcoe_ctlr_device_delete.
+ */
+void fcoe_ctlr_device_delete(struct fcoe_ctlr_device *ctlr)
+{
+        struct fcoe_fcf_device *fcf, *next;
+        /* Remove any attached fcfs */
+        mutex_lock(&ctlr->lock);
+        list_for_each_entry_safe(fcf, next,
+                                 &ctlr->fcfs, peers) {
+                list_del(&fcf->peers);
+                fcf->state = FCOE_FCF_STATE_DELETED;
+                fcoe_ctlr_device_queue_work(ctlr, &fcf->delete_work);
+        }
+        mutex_unlock(&ctlr->lock);
+
+        fcoe_ctlr_device_flush_work(ctlr);
+
+        destroy_workqueue(ctlr->devloss_work_q);
+        ctlr->devloss_work_q = NULL;
+        destroy_workqueue(ctlr->work_q);
+        ctlr->work_q = NULL;
+
+        device_unregister(&ctlr->dev);
+}
+EXPORT_SYMBOL_GPL(fcoe_ctlr_device_delete);
+
+/**
+ * fcoe_fcf_device_final_delete() - Final delete routine
+ * @work: The FIP fcf's embedded work struct
+ *
+ * It is expected that the fcf has been removed from
+ * the FIP ctlr's list before calling this routine.
+ */
+static void fcoe_fcf_device_final_delete(struct work_struct *work)
+{
+        struct fcoe_fcf_device *fcf =
+                container_of(work, struct fcoe_fcf_device, delete_work);
+        struct fcoe_ctlr_device *ctlr = fcoe_fcf_dev_to_ctlr_dev(fcf);
+
+        /*
+         * Cancel any outstanding timers. These should really exist
+         * only when rmmod'ing the LLDD and we're asking for
+         * immediate termination of the rports
+         */
+        if (!cancel_delayed_work(&fcf->dev_loss_work))
+                fcoe_ctlr_device_flush_devloss(ctlr);
+
+        device_unregister(&fcf->dev);
+}
+
+/**
+ * fip_timeout_deleted_fcf() - Delete a fcf when the devloss timer fires
+ * @work: The FIP fcf's embedded work struct
+ *
+ * Removes the fcf from the FIP ctlr's list of fcfs and
+ * queues the final deletion.
+ */
+static void fip_timeout_deleted_fcf(struct work_struct *work)
+{
+        struct fcoe_fcf_device *fcf =
+                container_of(work, struct fcoe_fcf_device, dev_loss_work.work);
+        struct fcoe_ctlr_device *ctlr = fcoe_fcf_dev_to_ctlr_dev(fcf);
+
+        mutex_lock(&ctlr->lock);
+
+        /*
+         * If the fcf is deleted or reconnected before the timer
+         * fires the devloss queue will be flushed, but the state will
+         * either be CONNECTED or DELETED. If that is the case we
+         * cancel deleting the fcf.
+         */
+        if (fcf->state != FCOE_FCF_STATE_DISCONNECTED)
+                goto out;
+
+        dev_printk(KERN_ERR, &fcf->dev,
+                   "FIP fcf connection time out: removing fcf\n");
+
+        list_del(&fcf->peers);
+        fcf->state = FCOE_FCF_STATE_DELETED;
+        fcoe_ctlr_device_queue_work(ctlr, &fcf->delete_work);
+
+out:
+        mutex_unlock(&ctlr->lock);
+}
+
+/**
+ * fcoe_fcf_device_delete() - Delete a FIP fcf
+ * @fcf: Pointer to the fcf which is to be deleted
+ *
+ * Queues the FIP fcf on the devloss workqueue
+ *
+ * Expects the ctlr_attrs mutex to be held for fcf
+ * state change.
+ */
+void fcoe_fcf_device_delete(struct fcoe_fcf_device *fcf)
+{
+        struct fcoe_ctlr_device *ctlr = fcoe_fcf_dev_to_ctlr_dev(fcf);
+        int timeout = fcf->dev_loss_tmo;
+
+        if (fcf->state != FCOE_FCF_STATE_CONNECTED)
+                return;
+
+        fcf->state = FCOE_FCF_STATE_DISCONNECTED;
+
+        /*
+         * FCF will only be re-connected by the LLD calling
+         * fcoe_fcf_device_add, and it should be setting up
+         * priv then.
+         */
+        fcf->priv = NULL;
+
+        fcoe_ctlr_device_queue_devloss_work(ctlr, &fcf->dev_loss_work,
+                                           timeout * HZ);
+}
+EXPORT_SYMBOL_GPL(fcoe_fcf_device_delete);
+
+/**
+ * fcoe_fcf_device_add() - Add a FCoE sysfs fcoe_fcf_device to the system
+ * @ctlr:    The fcoe_ctlr_device that will be the fcoe_fcf_device parent
+ * @new_fcf: A temporary FCF used for lookups on the current list of fcfs
+ *
+ * Expects to be called with the ctlr->lock held
+ */
+struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
+                                            struct fcoe_fcf_device *new_fcf)
+{
+        struct fcoe_fcf_device *fcf;
+        int error = 0;
+
+        list_for_each_entry(fcf, &ctlr->fcfs, peers) {
+                if (fcoe_fcf_device_match(new_fcf, fcf)) {
+                        if (fcf->state == FCOE_FCF_STATE_CONNECTED)
+                                return fcf;
+
+                        fcf->state = FCOE_FCF_STATE_CONNECTED;
+
+                        if (!cancel_delayed_work(&fcf->dev_loss_work))
+                                fcoe_ctlr_device_flush_devloss(ctlr);
+
+                        return fcf;
+                }
+        }
+
+        fcf = kzalloc(sizeof(struct fcoe_fcf_device), GFP_ATOMIC);
+        if (unlikely(!fcf))
+                goto out;
+
+        INIT_WORK(&fcf->delete_work, fcoe_fcf_device_final_delete);
+        INIT_DELAYED_WORK(&fcf->dev_loss_work, fip_timeout_deleted_fcf);
+
+        fcf->dev.parent = &ctlr->dev;
+        fcf->dev.bus = &fcoe_bus_type;
+        fcf->dev.type = &fcoe_fcf_device_type;
+        fcf->id = atomic_inc_return(&fcf_num) - 1;
+        fcf->state = FCOE_FCF_STATE_UNKNOWN;
+
+        fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
+
+        dev_set_name(&fcf->dev, "fcf_%d", fcf->id);
+
+        fcf->fabric_name = new_fcf->fabric_name;
+        fcf->switch_name = new_fcf->switch_name;
+        fcf->fc_map = new_fcf->fc_map;
+        fcf->vfid = new_fcf->vfid;
+        memcpy(fcf->mac, new_fcf->mac, ETH_ALEN);
+        fcf->priority = new_fcf->priority;
+        fcf->fka_period = new_fcf->fka_period;
+        fcf->selected = new_fcf->selected;
+
+        error = device_register(&fcf->dev);
+        if (error)
+                goto out_del;
+
+        fcf->state = FCOE_FCF_STATE_CONNECTED;
+        list_add_tail(&fcf->peers, &ctlr->fcfs);
+
+        return fcf;
+
+out_del:
+        kfree(fcf);
+out:
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(fcoe_fcf_device_add);
+
+int __init fcoe_sysfs_setup(void)
+{
+        int error;
+
+        atomic_set(&ctlr_num, 0);
+        atomic_set(&fcf_num, 0);
+
+        error = bus_register(&fcoe_bus_type);
+        if (error)
+                return error;
+
+        return 0;
+}
+
+void __exit fcoe_sysfs_teardown(void)
+{
+        bus_unregister(&fcoe_bus_type);
+}
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 710e149d41b6..b46f43dced78 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -815,9 +815,17 @@ out_nodev:
  */
 static int __init libfcoe_init(void)
 {
-        fcoe_transport_init();
+        int rc = 0;
 
-        return 0;
+        rc = fcoe_transport_init();
+        if (rc)
+                return rc;
+
+        rc = fcoe_sysfs_setup();
+        if (rc)
+                fcoe_transport_exit();
+
+        return rc;
 }
 module_init(libfcoe_init);
 
@@ -826,6 +834,7 @@ module_init(libfcoe_init);
  */
 static void __exit libfcoe_exit(void)
 {
+        fcoe_sysfs_teardown();
         fcoe_transport_exit();
 }
 module_exit(libfcoe_exit);
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 6102ef2cb2d8..9d46fcbe7755 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1792,7 +1792,7 @@ static inline void _base_writeq(__u64 b, volatile void __iomem *addr,
 static inline u8
 _base_get_msix_index(struct MPT2SAS_ADAPTER *ioc)
 {
-        return ioc->cpu_msix_table[smp_processor_id()];
+        return ioc->cpu_msix_table[raw_smp_processor_id()];
 }
 
 /**
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 6208d562890d..317a7fdc3b82 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -25,3 +25,12 @@ config SCSI_QLA_FC
         Firmware images can be retrieved from:
 
                 ftp://ftp.qlogic.com/outgoing/linux/firmware/
+
+config TCM_QLA2XXX
+        tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
+        depends on SCSI_QLA_FC && TARGET_CORE
+        select LIBFC
+        select BTREE
+        default n
+        ---help---
+        Say Y here to enable the TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs
diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile
index 5df782f4a097..dce7d788cdc9 100644
--- a/drivers/scsi/qla2xxx/Makefile
+++ b/drivers/scsi/qla2xxx/Makefile
@@ -1,5 +1,6 @@
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
                 qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
-        qla_nx.o
+        qla_nx.o qla_target.o
 
 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
+obj-$(CONFIG_TCM_QLA2XXX) += tcm_qla2xxx.o
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 5926f5a87ea8..5ab953029f8d 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
+#include "qla_target.h"
 
 #include <linux/kthread.h>
 #include <linux/vmalloc.h>
@@ -576,6 +577,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 scsi_block_requests(vha->host);
                 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 if (IS_QLA82XX(ha)) {
+                        ha->flags.isp82xx_no_md_cap = 1;
                         qla82xx_idc_lock(ha);
                         qla82xx_set_reset_owner(vha);
                         qla82xx_idc_unlock(ha);
@@ -585,7 +587,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
                 scsi_unblock_requests(vha->host);
                 break;
         case 0x2025d:
-                if (!IS_QLA81XX(ha))
+                if (!IS_QLA81XX(ha) || !IS_QLA8031(ha))
                         return -EPERM;
 
                 ql_log(ql_log_info, vha, 0x706f,
@@ -1105,9 +1107,8 @@ qla2x00_total_isp_aborts_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
-        struct qla_hw_data *ha = vha->hw;
         return snprintf(buf, PAGE_SIZE, "%d\n",
-            ha->qla_stats.total_isp_aborts);
+            vha->qla_stats.total_isp_aborts);
 }
 
 static ssize_t
@@ -1154,7 +1155,7 @@ qla2x00_phy_version_show(struct device *dev, struct device_attribute *attr,
         scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
@@ -1537,7 +1538,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         dma_addr_t stats_dma;
         struct fc_host_statistics *pfc_host_stat;
 
-        pfc_host_stat = &ha->fc_host_stat;
+        pfc_host_stat = &vha->fc_host_stat;
         memset(pfc_host_stat, -1, sizeof(struct fc_host_statistics));
 
         if (test_bit(UNLOADING, &vha->dpc_flags))
@@ -1580,8 +1581,8 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
                 pfc_host_stat->dumped_frames = stats->dumped_frames;
                 pfc_host_stat->nos_count = stats->nos_rcvd;
         }
-        pfc_host_stat->fcp_input_megabytes = ha->qla_stats.input_bytes >> 20;
-        pfc_host_stat->fcp_output_megabytes = ha->qla_stats.output_bytes >> 20;
+        pfc_host_stat->fcp_input_megabytes = vha->qla_stats.input_bytes >> 20;
+        pfc_host_stat->fcp_output_megabytes = vha->qla_stats.output_bytes >> 20;
 
 done_free:
         dma_pool_free(ha->s_dma_pool, stats, stats_dma);
@@ -1737,6 +1738,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
         fc_host_supported_speeds(vha->host) =
                 fc_host_supported_speeds(base_vha->host);
 
+        qlt_vport_create(vha, ha);
         qla24xx_vport_disable(fc_vport, disable);
 
         if (ha->flags.cpu_affinity_enabled) {
@@ -1951,12 +1953,16 @@ qla2x00_init_host_attr(scsi_qla_host_t *vha)
         fc_host_dev_loss_tmo(vha->host) = ha->port_down_retry_count;
         fc_host_node_name(vha->host) = wwn_to_u64(vha->node_name);
         fc_host_port_name(vha->host) = wwn_to_u64(vha->port_name);
-        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
+        fc_host_supported_classes(vha->host) = ha->tgt.enable_class_2 ?
+                        (FC_COS_CLASS2|FC_COS_CLASS3) : FC_COS_CLASS3;
         fc_host_max_npiv_vports(vha->host) = ha->max_npiv_vports;
         fc_host_npiv_vports_inuse(vha->host) = ha->cur_vport_count;
 
         if (IS_CNA_CAPABLE(ha))
                 speed = FC_PORTSPEED_10GBIT;
+        else if (IS_QLA2031(ha))
+                speed = FC_PORTSPEED_16GBIT | FC_PORTSPEED_8GBIT |
+                    FC_PORTSPEED_4GBIT;
         else if (IS_QLA25XX(ha))
                 speed = FC_PORTSPEED_8GBIT | FC_PORTSPEED_4GBIT |
                     FC_PORTSPEED_2GBIT | FC_PORTSPEED_1GBIT;
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index bc3cc6d91117..c68883806c54 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -297,7 +297,6 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
 
                 /* Initialize all required  fields of fcport */
                 fcport->vha = vha;
-                fcport->vp_idx = vha->vp_idx;
                 fcport->d_id.b.al_pa =
                         bsg_job->request->rqst_data.h_els.port_id[0];
                 fcport->d_id.b.area =
@@ -483,7 +482,6 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
 
         /* Initialize all required  fields of fcport */
         fcport->vha = vha;
-        fcport->vp_idx = vha->vp_idx;
         fcport->d_id.b.al_pa = bsg_job->request->rqst_data.h_ct.port_id[0];
         fcport->d_id.b.area = bsg_job->request->rqst_data.h_ct.port_id[1];
         fcport->d_id.b.domain = bsg_job->request->rqst_data.h_ct.port_id[2];
@@ -544,7 +542,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
         int rval = 0;
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 goto done_set_internal;
 
         new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
@@ -586,7 +584,7 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
         uint16_t new_config[4];
         struct qla_hw_data *ha = vha->hw;
 
-        if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+        if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 goto done_reset_internal;
 
         memset(new_config, 0 , sizeof(new_config));
@@ -710,8 +708,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
         elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
 
         if ((ha->current_topology == ISP_CFG_F ||
-            (atomic_read(&vha->loop_state) == LOOP_DOWN) ||
-            ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) &&
+            ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
             le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
             && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
                 elreq.options == EXTERNAL_LOOPBACK) {
@@ -1402,6 +1399,9 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
         if (rval)
                 return rval;
 
+        /* Set the isp82xx_no_md_cap not to capture minidump */
+        ha->flags.isp82xx_no_md_cap = 1;
+
         sg_copy_to_buffer(bsg_job->request_payload.sg_list,
             bsg_job->request_payload.sg_cnt, ha->optrom_buffer,
             ha->optrom_region_size);
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 62324a1d5573..fdee5611f3e2 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -11,27 +11,31 @@
  * ----------------------------------------------------------------------
  * |             Level            |   Last Value Used  |     Holes      |
  * ----------------------------------------------------------------------
- * | Module Init and Probe        |       0x0120       | 0x4b,0xba,0xfa |
- * | Mailbox commands             |       0x113e       | 0x112c-0x112e  |
+ * | Module Init and Probe        |       0x0122       | 0x4b,0xba,0xfa |
+ * | Mailbox commands             |       0x1140       | 0x111a-0x111b  |
+ * |                              |                    | 0x112c-0x112e  |
  * |                              |                    | 0x113a         |
  * | Device Discovery             |       0x2086       | 0x2020-0x2022  |
  * | Queue Command and IO tracing |       0x3030       | 0x3006,0x3008  |
  * |                              |                    | 0x302d-0x302e  |
- * | DPC Thread                   |       0x401c       |                |
- * | Async Events                 |       0x505d       | 0x502b-0x502f  |
+ * | DPC Thread                   |       0x401c       | 0x4002,0x4013  |
+ * | Async Events                 |       0x505f       | 0x502b-0x502f  |
  * |                              |                    | 0x5047,0x5052  |
- * | Timer Routines               |       0x6011       | 0x600e-0x600f  |
+ * | Timer Routines               |       0x6011       |                |
  * | User Space Interactions      |       0x709f       | 0x7018,0x702e, |
  * |                              |                    | 0x7039,0x7045, |
  * |                              |                    | 0x7073-0x7075, |
  * |                              |                    | 0x708c         |
  * | Task Management              |       0x803c       | 0x8025-0x8026  |
  * |                              |                    | 0x800b,0x8039  |
- * | AER/EEH                      |       0x900f       |                |
+ * | AER/EEH                      |       0x9011       |                |
  * | Virtual Port                 |       0xa007       |                |
- * | ISP82XX Specific             |       0xb054       | 0xb053         |
+ * | ISP82XX Specific             |       0xb054       | 0xb024         |
  * | MultiQ                       |       0xc00c       |                |
  * | Misc                         |       0xd010       |                |
+ * | Target Mode                  |       0xe06f       |                |
+ * | Target Mode Management       |       0xf071       |                |
+ * | Target Mode Task Management  |       0x1000b      |                |
  * ----------------------------------------------------------------------
  */
 
@@ -379,6 +383,54 @@ qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
 }
 
 static inline void *
+qla2xxx_copy_atioqueues(struct qla_hw_data *ha, void *ptr,
+        uint32_t **last_chain)
+{
+        struct qla2xxx_mqueue_chain *q;
+        struct qla2xxx_mqueue_header *qh;
+        uint32_t num_queues;
+        int que;
+        struct {
+                int length;
+                void *ring;
+        } aq, *aqp;
+
+        if (!ha->tgt.atio_q_length)
+                return ptr;
+
+        num_queues = 1;
+        aqp = &aq;
+        aqp->length = ha->tgt.atio_q_length;
+        aqp->ring = ha->tgt.atio_ring;
+
+        for (que = 0; que < num_queues; que++) {
+                /* aqp = ha->atio_q_map[que]; */
+                q = ptr;
+                *last_chain = &q->type;
+                q->type = __constant_htonl(DUMP_CHAIN_QUEUE);
+                q->chain_size = htonl(
+                    sizeof(struct qla2xxx_mqueue_chain) +
+                    sizeof(struct qla2xxx_mqueue_header) +
+                    (aqp->length * sizeof(request_t)));
+                ptr += sizeof(struct qla2xxx_mqueue_chain);
+
+                /* Add header. */
+                qh = ptr;
+                qh->queue = __constant_htonl(TYPE_ATIO_QUEUE);
+                qh->number = htonl(que);
+                qh->size = htonl(aqp->length * sizeof(request_t));
+                ptr += sizeof(struct qla2xxx_mqueue_header);
+
+                /* Add data. */
+                memcpy(ptr, aqp->ring, aqp->length * sizeof(request_t));
+
+                ptr += aqp->length * sizeof(request_t);
+        }
+
+        return ptr;
+}
+
+static inline void *
 qla25xx_copy_mqueues(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
 {
         struct qla2xxx_mqueue_chain *q;
@@ -873,6 +925,8 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         struct qla24xx_fw_dump *fw;
         uint32_t        ext_mem_cnt;
         void            *nxt;
+        void            *nxt_chain;
+        uint32_t        *last_chain = NULL;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
 
         if (IS_QLA82XX(ha))
@@ -1091,6 +1145,16 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
 
         qla24xx_copy_eft(ha, nxt);
 
+        nxt_chain = (void *)ha->fw_dump + ha->chain_offset;
+        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
+        if (last_chain) {
+                ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
+                *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
+        }
+
+        /* Adjust valid length. */
+        ha->fw_dump_len = (nxt_chain - (void *)ha->fw_dump);
+
 qla24xx_fw_dump_failed_0:
         qla2xxx_dump_post_process(base_vha, rval);
 
@@ -1399,6 +1463,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         /* Chain entries -- started with MQ. */
         nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
         nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
+        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
         if (last_chain) {
                 ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
                 *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
@@ -1717,6 +1782,7 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
         /* Chain entries -- started with MQ. */
         nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
         nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
+        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
         if (last_chain) {
                 ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
                 *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
@@ -2218,6 +2284,7 @@ copy_queue:
         /* Chain entries -- started with MQ. */
         nxt_chain = qla25xx_copy_fce(ha, nxt_chain, &last_chain);
         nxt_chain = qla25xx_copy_mqueues(ha, nxt_chain, &last_chain);
+        nxt_chain = qla2xxx_copy_atioqueues(ha, nxt_chain, &last_chain);
         if (last_chain) {
                 ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
                 *last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index 2157bdf1569a..f278df8cce0f 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -244,6 +244,7 @@ struct qla2xxx_mqueue_header {
         uint32_t queue;
 #define TYPE_REQUEST_QUEUE      0x1
 #define TYPE_RESPONSE_QUEUE     0x2
+#define TYPE_ATIO_QUEUE         0x3
         uint32_t number;
         uint32_t size;
 };
@@ -339,3 +340,11 @@ ql_log_pci(uint32_t, struct pci_dev *pdev, int32_t, const char *fmt, ...);
 #define ql_dbg_misc     0x00010000 /* For dumping everything that is not
                                     * not covered by upper categories
                                     */
+#define ql_dbg_verbose  0x00008000 /* More verbosity for each level
+                                    * This is to be used with other levels where
+                                    * more verbosity is required. It might not
+                                    * be applicable to all the levels.
+                                    */
+#define ql_dbg_tgt      0x00004000 /* Target mode */
+#define ql_dbg_tgt_mgt  0x00002000 /* Target mode management */
+#define ql_dbg_tgt_tmr  0x00001000 /* Target mode task management */
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index a2443031dbe7..39007f53aec0 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -186,6 +186,7 @@
 #define RESPONSE_ENTRY_CNT_2100         64      /* Number of response entries.*/
 #define RESPONSE_ENTRY_CNT_2300         512     /* Number of response entries.*/
 #define RESPONSE_ENTRY_CNT_MQ           128     /* Number of response entries.*/
+#define ATIO_ENTRY_CNT_24XX             4096    /* Number of ATIO entries. */
 
 struct req_que;
 
@@ -1234,11 +1235,27 @@ typedef struct {
  * ISP queue - response queue entry definition.
  */
 typedef struct {
-        uint8_t         data[60];
+        uint8_t         entry_type;             /* Entry type. */
+        uint8_t         entry_count;            /* Entry count. */
+        uint8_t         sys_define;             /* System defined. */
+        uint8_t         entry_status;           /* Entry Status. */
+        uint32_t        handle;                 /* System defined handle */
+        uint8_t         data[52];
         uint32_t        signature;
 #define RESPONSE_PROCESSED      0xDEADDEAD      /* Signature */
 } response_t;
 
+/*
+ * ISP queue - ATIO queue entry definition.
+ */
+struct atio {
+        uint8_t         entry_type;             /* Entry type. */
+        uint8_t         entry_count;            /* Entry count. */
+        uint8_t         data[58];
+        uint32_t        signature;
+#define ATIO_PROCESSED 0xDEADDEAD               /* Signature */
+};
+
 typedef union {
         uint16_t extended;
         struct {
@@ -1719,11 +1736,13 @@ typedef struct fc_port {
         struct fc_rport *rport, *drport;
         u32 supported_classes;
 
-        uint16_t vp_idx;
         uint8_t fc4_type;
         uint8_t scan_state;
 } fc_port_t;
 
+#define QLA_FCPORT_SCAN_NONE    0
+#define QLA_FCPORT_SCAN_FOUND   1
+
 /*
  * Fibre channel port/lun states.
  */
@@ -1747,6 +1766,7 @@ static const char * const port_state_str[] = {
 #define FCF_LOGIN_NEEDED        BIT_1
 #define FCF_FCP2_DEVICE         BIT_2
 #define FCF_ASYNC_SENT          BIT_3
+#define FCF_CONF_COMP_SUPPORTED BIT_4
 
 /* No loop ID flag. */
 #define FC_NO_LOOP_ID           0x1000
@@ -2419,6 +2439,40 @@ struct qlfc_fw {
         uint32_t len;
 };
 
+struct qlt_hw_data {
+        /* Protected by hw lock */
+        uint32_t enable_class_2:1;
+        uint32_t enable_explicit_conf:1;
+        uint32_t ini_mode_force_reverse:1;
+        uint32_t node_name_set:1;
+
+        dma_addr_t atio_dma;    /* Physical address. */
+        struct atio *atio_ring; /* Base virtual address */
+        struct atio *atio_ring_ptr;     /* Current address. */
+        uint16_t atio_ring_index; /* Current index. */
+        uint16_t atio_q_length;
+
+        void *target_lport_ptr;
+        struct qla_tgt_func_tmpl *tgt_ops;
+        struct qla_tgt *qla_tgt;
+        struct qla_tgt_cmd *cmds[MAX_OUTSTANDING_COMMANDS];
+        uint16_t current_handle;
+
+        struct qla_tgt_vp_map *tgt_vp_map;
+        struct mutex tgt_mutex;
+        struct mutex tgt_host_action_mutex;
+
+        int saved_set;
+        uint16_t saved_exchange_count;
+        uint32_t saved_firmware_options_1;
+        uint32_t saved_firmware_options_2;
+        uint32_t saved_firmware_options_3;
+        uint8_t saved_firmware_options[2];
+        uint8_t saved_add_firmware_options[2];
+
+        uint8_t tgt_node_name[WWN_SIZE];
+};
+
 /*
  * Qlogic host adapter specific data structure.
 */
@@ -2460,7 +2514,9 @@ struct qla_hw_data {
                 uint32_t        thermal_supported:1;
                 uint32_t        isp82xx_reset_hdlr_active:1;
                 uint32_t        isp82xx_reset_owner:1;
-                /* 28 bits */
+                uint32_t        isp82xx_no_md_cap:1;
+                uint32_t        host_shutting_down:1;
+                /* 30 bits */
         } flags;
 
         /* This spinlock is used to protect "io transactions", you must
@@ -2804,7 +2860,6 @@ struct qla_hw_data {
                                         /* ISP2322: red, green, amber. */
         uint16_t        zio_mode;
         uint16_t        zio_timer;
-        struct fc_host_statistics fc_host_stat;
 
         struct qla_msix_entry *msix_entries;
 
@@ -2817,7 +2872,6 @@ struct qla_hw_data {
         int             cur_vport_count;
 
         struct qla_chip_state_84xx *cs84xx;
-        struct qla_statistics qla_stats;
         struct isp_operations *isp_ops;
         struct workqueue_struct *wq;
         struct qlfc_fw fw_buf;
@@ -2863,6 +2917,8 @@ struct qla_hw_data {
         dma_addr_t      md_tmplt_hdr_dma;
         void            *md_dump;
         uint32_t        md_dump_size;
+
+        struct qlt_hw_data tgt;
 };
 
 /*
@@ -2920,6 +2976,7 @@ typedef struct scsi_qla_host {
 #define FCOE_CTX_RESET_NEEDED   18      /* Initiate FCoE context reset */
 #define MPI_RESET_NEEDED        19      /* Initiate MPI FW reset */
 #define ISP_QUIESCE_NEEDED      20      /* Driver need some quiescence */
+#define SCR_PENDING             21      /* SCR in target mode */
 
         uint32_t        device_flags;
 #define SWITCH_FOUND            BIT_0
@@ -2979,10 +3036,21 @@ typedef struct scsi_qla_host {
         struct req_que *req;
         int             fw_heartbeat_counter;
         int             seconds_since_last_heartbeat;
+        struct fc_host_statistics fc_host_stat;
+        struct qla_statistics qla_stats;
 
         atomic_t        vref_count;
 } scsi_qla_host_t;
 
+#define SET_VP_IDX      1
+#define SET_AL_PA       2
+#define RESET_VP_IDX    3
+#define RESET_AL_PA     4
+struct qla_tgt_vp_map {
+        uint8_t idx;
+        scsi_qla_host_t *vha;
+};
+
 /*
  * Macros to help code, maintain, etc.
  */
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 9f065804bd12..9eacd2df111b 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -175,6 +175,7 @@ extern int  qla2x00_vp_abort_isp(scsi_qla_host_t *);
 /*
  * Global Function Prototypes in qla_iocb.c source file.
  */
+
 extern uint16_t qla2x00_calc_iocbs_32(uint16_t);
 extern uint16_t qla2x00_calc_iocbs_64(uint16_t);
 extern void qla2x00_build_scsi_iocbs_32(srb_t *, cmd_entry_t *, uint16_t);
@@ -188,6 +189,8 @@ extern uint16_t qla24xx_calc_iocbs(scsi_qla_host_t *, uint16_t);
 extern void qla24xx_build_scsi_iocbs(srb_t *, struct cmd_type_7 *, uint16_t);
 extern int qla24xx_dif_start_scsi(srb_t *);
 
+extern void *qla2x00_alloc_iocbs(scsi_qla_host_t *, srb_t *);
+extern int qla2x00_issue_marker(scsi_qla_host_t *, int);
 
 /*
  * Global Function Prototypes in qla_mbx.c source file.
@@ -239,6 +242,9 @@ extern int
 qla2x00_init_firmware(scsi_qla_host_t *, uint16_t);
 
 extern int
+qla2x00_get_node_name_list(scsi_qla_host_t *, void **, int *);
+
+extern int
 qla2x00_get_port_database(scsi_qla_host_t *, fc_port_t *, uint8_t);
 
 extern int
@@ -383,6 +389,8 @@ extern int qla2x00_request_irqs(struct qla_hw_data *, struct rsp_que *);
 extern void qla2x00_free_irqs(scsi_qla_host_t *);
 
 extern int qla2x00_get_data_rate(scsi_qla_host_t *);
+extern char *qla2x00_get_link_speed_str(struct qla_hw_data *);
+
 /*
  * Global Function Prototypes in qla_sup.c source file.
  */
@@ -546,6 +554,7 @@ extern void qla2x00_sp_free(void *, void *);
 extern void qla2x00_sp_timeout(unsigned long);
 extern void qla2x00_bsg_job_done(void *, void *, int);
 extern void qla2x00_bsg_sp_free(void *, void *);
+extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);
 
 /* Interrupt related */
 extern irqreturn_t qla82xx_intr_handler(int, void *);
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 3128f80441f5..05260d25fe46 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
+#include "qla_target.h"
 
 static int qla2x00_sns_ga_nxt(scsi_qla_host_t *, fc_port_t *);
 static int qla2x00_sns_gid_pt(scsi_qla_host_t *, sw_info_t *);
@@ -556,7 +557,8 @@ qla2x00_rff_id(scsi_qla_host_t *vha)
         ct_req->req.rff_id.port_id[1] = vha->d_id.b.area;
         ct_req->req.rff_id.port_id[2] = vha->d_id.b.al_pa;
 
-        ct_req->req.rff_id.fc4_feature = BIT_1;
+        qlt_rff_id(vha, ct_req);
+
         ct_req->req.rff_id.fc4_type = 0x08;             /* SCSI - FCP */
 
         /* Execute MS IOCB */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b9465643396b..ca5084743135 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -17,6 +17,9 @@
 #include <asm/prom.h>
 #endif
 
+#include <target/target_core_base.h>
+#include "qla_target.h"
+
 /*
 *  QLogic ISP2x00 Hardware Support Function Prototypes.
 */
@@ -518,7 +521,10 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
                         return QLA_FUNCTION_FAILED;
                 }
         }
-        rval = qla2x00_init_rings(vha);
+
+        if (qla_ini_mode_enabled(vha))
+                rval = qla2x00_init_rings(vha);
+
         ha->flags.chip_reset_done = 1;
 
         if (rval == QLA_SUCCESS && IS_QLA84XX(ha)) {
@@ -1233,6 +1239,8 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
                         mq_size += ha->max_rsp_queues *
                             (rsp->length * sizeof(response_t));
                 }
+                if (ha->tgt.atio_q_length)
+                        mq_size += ha->tgt.atio_q_length * sizeof(request_t);
                 /* Allocate memory for Fibre Channel Event Buffer. */
                 if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha))
                         goto try_eft;
@@ -1696,6 +1704,12 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
         icb->response_q_address[0] = cpu_to_le32(LSD(rsp->dma));
         icb->response_q_address[1] = cpu_to_le32(MSD(rsp->dma));
 
+        /* Setup ATIO queue dma pointers for target mode */
+        icb->atio_q_inpointer = __constant_cpu_to_le16(0);
+        icb->atio_q_length = cpu_to_le16(ha->tgt.atio_q_length);
+        icb->atio_q_address[0] = cpu_to_le32(LSD(ha->tgt.atio_dma));
+        icb->atio_q_address[1] = cpu_to_le32(MSD(ha->tgt.atio_dma));
+
         if (ha->mqenable || IS_QLA83XX(ha)) {
                 icb->qos = __constant_cpu_to_le16(QLA_DEFAULT_QUE_QOS);
                 icb->rid = __constant_cpu_to_le16(rid);
@@ -1739,6 +1753,8 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
                 WRT_REG_DWORD(&reg->isp24.rsp_q_in, 0);
                 WRT_REG_DWORD(&reg->isp24.rsp_q_out, 0);
         }
+        qlt_24xx_config_rings(vha, reg);
+
         /* PCI posting */
         RD_REG_DWORD(&ioreg->hccr);
 }
@@ -1794,6 +1810,11 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
 
         spin_unlock(&ha->vport_slock);
 
+        ha->tgt.atio_ring_ptr = ha->tgt.atio_ring;
+        ha->tgt.atio_ring_index = 0;
+        /* Initialize ATIO queue entries */
+        qlt_init_atio_q_entries(vha);
+
         ha->isp_ops->config_rings(vha);
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -2051,6 +2072,10 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
         vha->d_id.b.area = area;
         vha->d_id.b.al_pa = al_pa;
 
+        spin_lock(&ha->vport_slock);
+        qlt_update_vp_map(vha, SET_AL_PA);
+        spin_unlock(&ha->vport_slock);
+
         if (!vha->flags.init_done)
                 ql_log(ql_log_info, vha, 0x2010,
                     "Topology - %s, Host Loop address 0x%x.\n",
@@ -2185,7 +2210,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
             nv->id[2] != 'P' || nv->id[3] != ' ' || nv->nvram_version < 1) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_warn, vha, 0x0064,
-                    "Inconisistent NVRAM "
+                    "Inconsistent NVRAM "
                     "detected: checksum=0x%x id=%c version=0x%x.\n",
                     chksum, nv->id[0], nv->nvram_version);
                 ql_log(ql_log_warn, vha, 0x0065,
@@ -2270,7 +2295,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
         if (IS_QLA23XX(ha)) {
                 nv->firmware_options[0] |= BIT_2;
                 nv->firmware_options[0] &= ~BIT_3;
-                nv->firmware_options[0] &= ~BIT_6;
+                nv->special_options[0] &= ~BIT_6;
                 nv->add_firmware_options[1] |= BIT_5 | BIT_4;
 
                 if (IS_QLA2300(ha)) {
@@ -2467,14 +2492,21 @@ qla2x00_rport_del(void *data)
 {
         fc_port_t *fcport = data;
         struct fc_rport *rport;
+        scsi_qla_host_t *vha = fcport->vha;
         unsigned long flags;
 
         spin_lock_irqsave(fcport->vha->host->host_lock, flags);
         rport = fcport->drport ? fcport->drport: fcport->rport;
         fcport->drport = NULL;
         spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
-        if (rport)
+        if (rport) {
                 fc_remote_port_delete(rport);
+                /*
+                 * Release the target mode FC NEXUS in qla_target.c code
+                 * if target mod is enabled.
+                 */
+                qlt_fc_port_deleted(vha, fcport);
+        }
 }
 
 /**
@@ -2495,11 +2527,11 @@ qla2x00_alloc_fcport(scsi_qla_host_t *vha, gfp_t flags)
 
         /* Setup fcport template structure. */
         fcport->vha = vha;
-        fcport->vp_idx = vha->vp_idx;
         fcport->port_type = FCT_UNKNOWN;
         fcport->loop_id = FC_NO_LOOP_ID;
         qla2x00_set_fcport_state(fcport, FCS_UNCONFIGURED);
         fcport->supported_classes = FC_COS_UNSPECIFIED;
+        fcport->scan_state = QLA_FCPORT_SCAN_NONE;
 
         return fcport;
 }
@@ -2726,7 +2758,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
                 new_fcport->d_id.b.area = area;
                 new_fcport->d_id.b.al_pa = al_pa;
                 new_fcport->loop_id = loop_id;
-                new_fcport->vp_idx = vha->vp_idx;
                 rval2 = qla2x00_get_port_database(vha, new_fcport, 0);
                 if (rval2 != QLA_SUCCESS) {
                         ql_dbg(ql_dbg_disc, vha, 0x201a,
@@ -2760,10 +2791,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 
                 if (!found) {
                         /* New device, add to fcports list. */
-                        if (vha->vp_idx) {
-                                new_fcport->vha = vha;
-                                new_fcport->vp_idx = vha->vp_idx;
-                        }
                         list_add_tail(&new_fcport->list, &vha->vp_fcports);
 
                         /* Allocate a new replacement fcport. */
@@ -2800,8 +2827,6 @@ cleanup_allocation:
 static void
 qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
 {
-#define LS_UNKNOWN      2
-        static char *link_speeds[] = { "1", "2", "?", "4", "8", "10" };
         char *link_speed;
         int rval;
         uint16_t mb[4];
@@ -2829,11 +2854,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
                     fcport->port_name[6], fcport->port_name[7], rval,
                     fcport->fp_speed, mb[0], mb[1]);
         } else {
-                link_speed = link_speeds[LS_UNKNOWN];
-                if (fcport->fp_speed < 5)
-                        link_speed = link_speeds[fcport->fp_speed];
-                else if (fcport->fp_speed == 0x13)
-                        link_speed = link_speeds[5];
+                link_speed = qla2x00_get_link_speed_str(ha);
                 ql_dbg(ql_dbg_disc, vha, 0x2005,
                     "iIDMA adjusted to %s GB/s "
                     "on %02x%02x%02x%02x%02x%02x%02x%02x.\n", link_speed,
@@ -2864,6 +2885,12 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
                     "Unable to allocate fc remote port.\n");
                 return;
         }
+        /*
+         * Create target mode FC NEXUS in qla_target.c if target mode is
+         * enabled..
+         */
+        qlt_fc_port_added(vha, fcport);
+
         spin_lock_irqsave(fcport->vha->host->host_lock, flags);
         *((fc_port_t **)rport->dd_data) = fcport;
         spin_unlock_irqrestore(fcport->vha->host->host_lock, flags);
@@ -2921,7 +2948,7 @@ static int
 qla2x00_configure_fabric(scsi_qla_host_t *vha)
 {
         int     rval;
-        fc_port_t       *fcport, *fcptemp;
+        fc_port_t       *fcport;
         uint16_t        next_loopid;
         uint16_t        mb[MAILBOX_REGISTER_COUNT];
         uint16_t        loop_id;
@@ -2959,7 +2986,7 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                     0xfc, mb, BIT_1|BIT_0);
                 if (rval != QLA_SUCCESS) {
                         set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
-                        return rval;
+                        break;
                 }
                 if (mb[0] != MBS_COMMAND_COMPLETE) {
                         ql_dbg(ql_dbg_disc, vha, 0x2042,
@@ -2991,21 +3018,16 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                         }
                 }
 
-#define QLA_FCPORT_SCAN         1
-#define QLA_FCPORT_FOUND        2
-
-                list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                        fcport->scan_state = QLA_FCPORT_SCAN;
-                }
-
                 rval = qla2x00_find_all_fabric_devs(vha, &new_fcports);
                 if (rval != QLA_SUCCESS)
                         break;
 
-                /*
-                 * Logout all previous fabric devices marked lost, except
-                 * FCP2 devices.
-                 */
+                /* Add new ports to existing port list */
+                list_splice_tail_init(&new_fcports, &vha->vp_fcports);
+
+                /* Starting free loop ID. */
+                next_loopid = ha->min_external_loopid;
+
                 list_for_each_entry(fcport, &vha->vp_fcports, list) {
                         if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
                                 break;
@@ -3013,7 +3035,8 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                         if ((fcport->flags & FCF_FABRIC_DEVICE) == 0)
                                 continue;
 
-                        if (fcport->scan_state == QLA_FCPORT_SCAN &&
+                        /* Logout lost/gone fabric devices (non-FCP2) */
+                        if (fcport->scan_state != QLA_FCPORT_SCAN_FOUND &&
                             atomic_read(&fcport->state) == FCS_ONLINE) {
                                 qla2x00_mark_device_lost(vha, fcport,
                                     ql2xplogiabsentdevice, 0);
@@ -3026,78 +3049,30 @@ qla2x00_configure_fabric(scsi_qla_host_t *vha)
                                             fcport->d_id.b.domain,
                                             fcport->d_id.b.area,
                                             fcport->d_id.b.al_pa);
-                                        fcport->loop_id = FC_NO_LOOP_ID;
                                 }
-                        }
-                }
-
-                /* Starting free loop ID. */
-                next_loopid = ha->min_external_loopid;
-
-                /*
-                 * Scan through our port list and login entries that need to be
-                 * logged in.
-                 */
-                list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                        if (atomic_read(&vha->loop_down_timer) ||
-                            test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
-                                break;
-
-                        if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 ||
-                            (fcport->flags & FCF_LOGIN_NEEDED) == 0)
                                 continue;
-
-                        if (fcport->loop_id == FC_NO_LOOP_ID) {
-                                fcport->loop_id = next_loopid;
-                                rval = qla2x00_find_new_loop_id(
-                                    base_vha, fcport);
-                                if (rval != QLA_SUCCESS) {
-                                        /* Ran out of IDs to use */
-                                        break;
-                                }
                         }
-                        /* Login and update database */
-                        qla2x00_fabric_dev_login(vha, fcport, &next_loopid);
-                }
-
-                /* Exit if out of loop IDs. */
-                if (rval != QLA_SUCCESS) {
-                        break;
-                }
-
-                /*
-                 * Login and add the new devices to our port list.
-                 */
-                list_for_each_entry_safe(fcport, fcptemp, &new_fcports, list) {
-                        if (atomic_read(&vha->loop_down_timer) ||
-                            test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
-                                break;
-
-                        /* Find a new loop ID to use. */
-                        fcport->loop_id = next_loopid;
-                        rval = qla2x00_find_new_loop_id(base_vha, fcport);
-                        if (rval != QLA_SUCCESS) {
-                                /* Ran out of IDs to use */
-                                break;
+                        fcport->scan_state = QLA_FCPORT_SCAN_NONE;
+
+                        /* Login fabric devices that need a login */
+                        if ((fcport->flags & FCF_LOGIN_NEEDED) != 0 &&
+                            atomic_read(&vha->loop_down_timer) == 0) {
+                                if (fcport->loop_id == FC_NO_LOOP_ID) {
+                                        fcport->loop_id = next_loopid;
+                                        rval = qla2x00_find_new_loop_id(
+                                            base_vha, fcport);
+                                        if (rval != QLA_SUCCESS) {
+                                                /* Ran out of IDs to use */
+                                                continue;
+                                        }
+                                }
                         }
 
                         /* Login and update database */
                         qla2x00_fabric_dev_login(vha, fcport, &next_loopid);
-
-                        if (vha->vp_idx) {
-                                fcport->vha = vha;
-                                fcport->vp_idx = vha->vp_idx;
-                        }
-                        list_move_tail(&fcport->list, &vha->vp_fcports);
                 }
         } while (0);
 
-        /* Free all new device structures not processed. */
-        list_for_each_entry_safe(fcport, fcptemp, &new_fcports, list) {
-                list_del(&fcport->list);
-                kfree(fcport);
-        }
-
         if (rval) {
                 ql_dbg(ql_dbg_disc, vha, 0x2068,
                     "Configure fabric error exit rval=%d.\n", rval);
@@ -3287,7 +3262,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha,
                             WWN_SIZE))
                                 continue;
 
-                        fcport->scan_state = QLA_FCPORT_FOUND;
+                        fcport->scan_state = QLA_FCPORT_SCAN_FOUND;
 
                         found++;
 
@@ -3595,6 +3570,12 @@ qla2x00_fabric_login(scsi_qla_host_t *vha, fc_port_t *fcport,
                         if (mb[10] & BIT_1)
                                 fcport->supported_classes |= FC_COS_CLASS3;
 
+                        if (IS_FWI2_CAPABLE(ha)) {
+                                if (mb[10] & BIT_7)
+                                        fcport->flags |=
+                                            FCF_CONF_COMP_SUPPORTED;
+                        }
+
                         rval = QLA_SUCCESS;
                         break;
                 } else if (mb[0] == MBS_LOOP_ID_USED) {
@@ -3841,7 +3822,7 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
                 vha->flags.online = 0;
         ha->flags.chip_reset_done = 0;
         clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-        ha->qla_stats.total_isp_aborts++;
+        vha->qla_stats.total_isp_aborts++;
 
         ql_log(ql_log_info, vha, 0x00af,
             "Performing ISP error recovery - ha=%p.\n", ha);
@@ -4066,6 +4047,7 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = ha->req_q_map[0];
         struct rsp_que *rsp = ha->rsp_q_map[0];
+        unsigned long flags;
 
         /* If firmware needs to be loaded */
         if (qla2x00_isp_firmware(vha)) {
@@ -4090,6 +4072,16 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
                         qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);
 
                         vha->flags.online = 1;
+
+                        /*
+                         * Process any ATIO queue entries that came in
+                         * while we weren't online.
+                         */
+                        spin_lock_irqsave(&ha->hardware_lock, flags);
+                        if (qla_tgt_mode_enabled(vha))
+                                qlt_24xx_process_atio_queue(vha);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
                         /* Wait at most MAX_TARGET RSCNs for a stable link. */
                         wait_time = 256;
                         do {
@@ -4279,7 +4271,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
             nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_warn, vha, 0x006b,
-                    "Inconisistent NVRAM detected: checksum=0x%x id=%c "
+                    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
                     "version=0x%x.\n", chksum, nv->id[0], nv->nvram_version);
                 ql_log(ql_log_warn, vha, 0x006c,
                     "Falling back to functioning (yet invalid -- WWPN) "
@@ -4330,6 +4322,15 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
                 rval = 1;
         }
 
+        if (!qla_ini_mode_enabled(vha)) {
+                /* Don't enable full login after initial LIP */
+                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
+                /* Don't enable LIP full login for initiator */
+                nv->host_p &= __constant_cpu_to_le32(~BIT_10);
+        }
+
+        qlt_24xx_config_nvram_stage1(vha, nv);
+
         /* Reset Initialization control block */
         memset(icb, 0, ha->init_cb_size);
 
@@ -4357,8 +4358,10 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
         qla2x00_set_model_info(vha, nv->model_name, sizeof(nv->model_name),
             "QLA2462");
 
-        /* Use alternate WWN? */
+        qlt_24xx_config_nvram_stage2(vha, icb);
+
         if (nv->host_p & __constant_cpu_to_le32(BIT_15)) {
+                /* Use alternate WWN? */
                 memcpy(icb->node_name, nv->alternate_node_name, WWN_SIZE);
                 memcpy(icb->port_name, nv->alternate_port_name, WWN_SIZE);
         }
@@ -5029,7 +5032,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
             nv->nvram_version < __constant_cpu_to_le16(ICB_VERSION)) {
                 /* Reset NVRAM data. */
                 ql_log(ql_log_info, vha, 0x0073,
-                    "Inconisistent NVRAM detected: checksum=0x%x id=%c "
+                    "Inconsistent NVRAM detected: checksum=0x%x id=%c "
                     "version=0x%x.\n", chksum, nv->id[0],
                     le16_to_cpu(nv->nvram_version));
                 ql_log(ql_log_info, vha, 0x0074,
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index eac950924497..70dbf53d9e0f 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
+#include "qla_target.h"
 
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -23,18 +24,17 @@ qla2x00_get_cmd_direction(srb_t *sp)
 {
         uint16_t cflags;
         struct scsi_cmnd *cmd = GET_CMD_SP(sp);
+        struct scsi_qla_host *vha = sp->fcport->vha;
 
         cflags = 0;
 
         /* Set transfer direction */
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                 cflags = CF_WRITE;
-                sp->fcport->vha->hw->qla_stats.output_bytes +=
-                    scsi_bufflen(cmd);
+                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
         } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 cflags = CF_READ;
-                sp->fcport->vha->hw->qla_stats.input_bytes +=
-                    scsi_bufflen(cmd);
+                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
         }
         return (cflags);
 }
@@ -385,9 +385,10 @@ qla2x00_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                             (req->ring_index - cnt);
+                /* If still no head room then bail out */
+                if (req->cnt < (req_cnt + 2))
+                        goto queuing_error;
         }
-        if (req->cnt < (req_cnt + 2))
-                goto queuing_error;
 
         /* Build command packet */
         req->current_outstanding_cmd = handle;
@@ -470,7 +471,7 @@ queuing_error:
 /**
  * qla2x00_start_iocbs() - Execute the IOCB command
  */
-static void
+void
 qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)
 {
         struct qla_hw_data *ha = vha->hw;
@@ -571,6 +572,29 @@ qla2x00_marker(struct scsi_qla_host *vha, struct req_que *req,
         return (ret);
 }
 
+/*
+ * qla2x00_issue_marker
+ *
+ * Issue marker
+ * Caller CAN have hardware lock held as specified by ha_locked parameter.
+ * Might release it, then reaquire.
+ */
+int qla2x00_issue_marker(scsi_qla_host_t *vha, int ha_locked)
+{
+        if (ha_locked) {
+                if (__qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,
+                                        MK_SYNC_ALL) != QLA_SUCCESS)
+                        return QLA_FUNCTION_FAILED;
+        } else {
+                if (qla2x00_marker(vha, vha->req, vha->req->rsp, 0, 0,
+                                        MK_SYNC_ALL) != QLA_SUCCESS)
+                        return QLA_FUNCTION_FAILED;
+        }
+        vha->marker_needed = 0;
+
+        return QLA_SUCCESS;
+}
+
 /**
  * qla24xx_calc_iocbs() - Determine number of Command Type 3 and
  * Continuation Type 1 IOCBs to allocate.
@@ -629,11 +653,11 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *sp, struct cmd_type_6 *cmd_pkt,
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                 cmd_pkt->control_flags =
                     __constant_cpu_to_le16(CF_WRITE_DATA);
-                ha->qla_stats.output_bytes += scsi_bufflen(cmd);
+                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
         } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 cmd_pkt->control_flags =
                     __constant_cpu_to_le16(CF_READ_DATA);
-                ha->qla_stats.input_bytes += scsi_bufflen(cmd);
+                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
         }
 
         cur_seg = scsi_sglist(cmd);
@@ -745,13 +769,11 @@ qla24xx_build_scsi_iocbs(srb_t *sp, struct cmd_type_7 *cmd_pkt,
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                 cmd_pkt->task_mgmt_flags =
                     __constant_cpu_to_le16(TMF_WRITE_DATA);
-                sp->fcport->vha->hw->qla_stats.output_bytes +=
-                    scsi_bufflen(cmd);
+                vha->qla_stats.output_bytes += scsi_bufflen(cmd);
         } else if (cmd->sc_data_direction == DMA_FROM_DEVICE) {
                 cmd_pkt->task_mgmt_flags =
                     __constant_cpu_to_le16(TMF_READ_DATA);
-                sp->fcport->vha->hw->qla_stats.input_bytes +=
-                    scsi_bufflen(cmd);
+                vha->qla_stats.input_bytes += scsi_bufflen(cmd);
         }
 
         /* One DSD is available in the Command Type 3 IOCB */
@@ -1245,7 +1267,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
                 return QLA_SUCCESS;
         }
 
-        cmd_pkt->vp_index = sp->fcport->vp_idx;
+        cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
 
         /* Set transfer direction */
         if (cmd->sc_data_direction == DMA_TO_DEVICE) {
@@ -1502,9 +1524,9 @@ qla24xx_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                                 (req->ring_index - cnt);
+                if (req->cnt < (req_cnt + 2))
+                        goto queuing_error;
         }
-        if (req->cnt < (req_cnt + 2))
-                goto queuing_error;
 
         /* Build command packet. */
         req->current_outstanding_cmd = handle;
@@ -1527,7 +1549,7 @@ qla24xx_start_scsi(srb_t *sp)
         cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
         cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
         cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-        cmd_pkt->vp_index = sp->fcport->vp_idx;
+        cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
 
         int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
         host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
@@ -1717,11 +1739,10 @@ qla24xx_dif_start_scsi(srb_t *sp)
                 else
                         req->cnt = req->length -
                                 (req->ring_index - cnt);
+                if (req->cnt < (req_cnt + 2))
+                        goto queuing_error;
         }
 
-        if (req->cnt < (req_cnt + 2))
-                goto queuing_error;
-
         status |= QDSS_GOT_Q_SPACE;
 
         /* Build header part of command packet (excluding the OPCODE). */
@@ -1898,7 +1919,7 @@ qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->port_id[0] = sp->fcport->d_id.b.al_pa;
         logio->port_id[1] = sp->fcport->d_id.b.area;
         logio->port_id[2] = sp->fcport->d_id.b.domain;
-        logio->vp_index = sp->fcport->vp_idx;
+        logio->vp_index = sp->fcport->vha->vp_idx;
 }
 
 static void
@@ -1922,7 +1943,7 @@ qla2x00_login_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain);
         mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 |
             sp->fcport->d_id.b.al_pa);
-        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
 }
 
 static void
@@ -1935,7 +1956,7 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->port_id[0] = sp->fcport->d_id.b.al_pa;
         logio->port_id[1] = sp->fcport->d_id.b.area;
         logio->port_id[2] = sp->fcport->d_id.b.domain;
-        logio->vp_index = sp->fcport->vp_idx;
+        logio->vp_index = sp->fcport->vha->vp_idx;
 }
 
 static void
@@ -1952,7 +1973,7 @@ qla2x00_logout_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb2 = cpu_to_le16(sp->fcport->d_id.b.domain);
         mbx->mb3 = cpu_to_le16(sp->fcport->d_id.b.area << 8 |
             sp->fcport->d_id.b.al_pa);
-        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
         /* Implicit: mbx->mbx10 = 0. */
 }
 
@@ -1962,7 +1983,7 @@ qla24xx_adisc_iocb(srb_t *sp, struct logio_entry_24xx *logio)
         logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;
         logio->control_flags = cpu_to_le16(LCF_COMMAND_ADISC);
         logio->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-        logio->vp_index = sp->fcport->vp_idx;
+        logio->vp_index = sp->fcport->vha->vp_idx;
 }
 
 static void
@@ -1983,7 +2004,7 @@ qla2x00_adisc_iocb(srb_t *sp, struct mbx_entry *mbx)
         mbx->mb3 = cpu_to_le16(LSW(ha->async_pd_dma));
         mbx->mb6 = cpu_to_le16(MSW(MSD(ha->async_pd_dma)));
         mbx->mb7 = cpu_to_le16(LSW(MSD(ha->async_pd_dma)));
-        mbx->mb9 = cpu_to_le16(sp->fcport->vp_idx);
+        mbx->mb9 = cpu_to_le16(sp->fcport->vha->vp_idx);
 }
 
 static void
@@ -2009,7 +2030,7 @@ qla24xx_tm_iocb(srb_t *sp, struct tsk_mgmt_entry *tsk)
         tsk->port_id[0] = fcport->d_id.b.al_pa;
         tsk->port_id[1] = fcport->d_id.b.area;
         tsk->port_id[2] = fcport->d_id.b.domain;
-        tsk->vp_index = fcport->vp_idx;
+        tsk->vp_index = fcport->vha->vp_idx;
 
         if (flags == TCF_LUN_RESET) {
                 int_to_scsilun(lun, &tsk->lun);
@@ -2030,7 +2051,7 @@ qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
         els_iocb->handle = sp->handle;
         els_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);
         els_iocb->tx_dsd_count = __constant_cpu_to_le16(bsg_job->request_payload.sg_cnt);
-        els_iocb->vp_index = sp->fcport->vp_idx;
+        els_iocb->vp_index = sp->fcport->vha->vp_idx;
         els_iocb->sof_type = EST_SOFI3;
         els_iocb->rx_dsd_count = __constant_cpu_to_le16(bsg_job->reply_payload.sg_cnt);
 
@@ -2160,7 +2181,7 @@ qla24xx_ct_iocb(srb_t *sp, struct ct_entry_24xx *ct_iocb)
         ct_iocb->handle = sp->handle;
 
         ct_iocb->nport_handle = cpu_to_le16(sp->fcport->loop_id);
-        ct_iocb->vp_index = sp->fcport->vp_idx;
+        ct_iocb->vp_index = sp->fcport->vha->vp_idx;
         ct_iocb->comp_status = __constant_cpu_to_le16(0);
 
         ct_iocb->cmd_dsd_count =
@@ -2343,11 +2364,10 @@ sufficient_dsds:
                         else
                                 req->cnt = req->length -
                                         (req->ring_index - cnt);
+                        if (req->cnt < (req_cnt + 2))
+                                goto queuing_error;
                 }
 
-                if (req->cnt < (req_cnt + 2))
-                        goto queuing_error;
-
                 ctx = sp->u.scmd.ctx =
                     mempool_alloc(ha->ctx_mempool, GFP_ATOMIC);
                 if (!ctx) {
@@ -2362,7 +2382,7 @@ sufficient_dsds:
                 if (!ctx->fcp_cmnd) {
                         ql_log(ql_log_fatal, vha, 0x3011,
                             "Failed to allocate fcp_cmnd for cmd=%p.\n", cmd);
-                        goto queuing_error_fcp_cmnd;
+                        goto queuing_error;
                 }
 
                 /* Initialize the DSD list and dma handle */
@@ -2400,7 +2420,7 @@ sufficient_dsds:
                 cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
                 cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
                 cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-                cmd_pkt->vp_index = sp->fcport->vp_idx;
+                cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
 
                 /* Build IOCB segments */
                 if (qla24xx_build_scsi_type_6_iocbs(sp, cmd_pkt, tot_dsds))
@@ -2489,7 +2509,7 @@ sufficient_dsds:
                 cmd_pkt->port_id[0] = sp->fcport->d_id.b.al_pa;
                 cmd_pkt->port_id[1] = sp->fcport->d_id.b.area;
                 cmd_pkt->port_id[2] = sp->fcport->d_id.b.domain;
-                cmd_pkt->vp_index = sp->fcport->vp_idx;
+                cmd_pkt->vp_index = sp->fcport->vha->vp_idx;
 
                 int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
                 host_to_fcp_swap((uint8_t *)&cmd_pkt->lun,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index ce42288049b5..6f67a9d4998b 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
+#include "qla_target.h"
 
 #include <linux/delay.h>
 #include <linux/slab.h>
@@ -309,6 +310,28 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
                     "IDC failed to post ACK.\n");
 }
 
+#define LS_UNKNOWN      2
+char *
+qla2x00_get_link_speed_str(struct qla_hw_data *ha)
+{
+        static char *link_speeds[] = {"1", "2", "?", "4", "8", "16", "10"};
+        char *link_speed;
+        int fw_speed = ha->link_data_rate;
+
+        if (IS_QLA2100(ha) || IS_QLA2200(ha))
+                link_speed = link_speeds[0];
+        else if (fw_speed == 0x13)
+                link_speed = link_speeds[6];
+        else {
+                link_speed = link_speeds[LS_UNKNOWN];
+                if (fw_speed < 6)
+                        link_speed =
+                            link_speeds[fw_speed];
+        }
+
+        return link_speed;
+}
+
 /**
  * qla2x00_async_event() - Process aynchronous events.
  * @ha: SCSI driver HA context
@@ -317,9 +340,6 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
 void
 qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
 {
-#define LS_UNKNOWN      2
-        static char *link_speeds[] = { "1", "2", "?", "4", "8", "16", "10" };
-        char            *link_speed;
         uint16_t        handle_cnt;
         uint16_t        cnt, mbx;
         uint32_t        handles[5];
@@ -454,8 +474,8 @@ skip_rio:
         case MBA_WAKEUP_THRES:          /* Request Queue Wake-up */
                 ql_dbg(ql_dbg_async, vha, 0x5008,
                     "Asynchronous WAKEUP_THRES.\n");
-                break;
 
+                break;
         case MBA_LIP_OCCURRED:          /* Loop Initialization Procedure */
                 ql_dbg(ql_dbg_async, vha, 0x5009,
                     "LIP occurred (%x).\n", mb[1]);
@@ -479,20 +499,14 @@ skip_rio:
                 break;
 
         case MBA_LOOP_UP:               /* Loop Up Event */
-                if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
-                        link_speed = link_speeds[0];
+                if (IS_QLA2100(ha) || IS_QLA2200(ha))
                         ha->link_data_rate = PORT_SPEED_1GB;
-                } else {
-                        link_speed = link_speeds[LS_UNKNOWN];
-                        if (mb[1] < 6)
-                                link_speed = link_speeds[mb[1]];
-                        else if (mb[1] == 0x13)
-                                link_speed = link_speeds[6];
+                else
                         ha->link_data_rate = mb[1];
-                }
 
                 ql_dbg(ql_dbg_async, vha, 0x500a,
-                    "LOOP UP detected (%s Gbps).\n", link_speed);
+                    "LOOP UP detected (%s Gbps).\n",
+                    qla2x00_get_link_speed_str(ha));
 
                 vha->flags.management_server_logged_in = 0;
                 qla2x00_post_aen_work(vha, FCH_EVT_LINKUP, ha->link_data_rate);
@@ -638,6 +652,8 @@ skip_rio:
                         ql_dbg(ql_dbg_async, vha, 0x5010,
                             "Port unavailable %04x %04x %04x.\n",
                             mb[1], mb[2], mb[3]);
+                        ql_log(ql_log_warn, vha, 0x505e,
+                            "Link is offline.\n");
 
                         if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
                                 atomic_set(&vha->loop_state, LOOP_DOWN);
@@ -670,12 +686,17 @@ skip_rio:
                         ql_dbg(ql_dbg_async, vha, 0x5011,
                             "Asynchronous PORT UPDATE ignored %04x/%04x/%04x.\n",
                             mb[1], mb[2], mb[3]);
+
+                        qlt_async_event(mb[0], vha, mb);
                         break;
                 }
 
                 ql_dbg(ql_dbg_async, vha, 0x5012,
                     "Port database changed %04x %04x %04x.\n",
                     mb[1], mb[2], mb[3]);
+                ql_log(ql_log_warn, vha, 0x505f,
+                    "Link is operational (%s Gbps).\n",
+                    qla2x00_get_link_speed_str(ha));
 
                 /*
                  * Mark all devices as missing so we will login again.
@@ -684,8 +705,13 @@ skip_rio:
 
                 qla2x00_mark_all_devices_lost(vha, 1);
 
+                if (vha->vp_idx == 0 && !qla_ini_mode_enabled(vha))
+                        set_bit(SCR_PENDING, &vha->dpc_flags);
+
                 set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                 set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
+
+                qlt_async_event(mb[0], vha, mb);
                 break;
 
         case MBA_RSCN_UPDATE:           /* State Change Registration */
@@ -807,6 +833,8 @@ skip_rio:
                     mb[0], mb[1], mb[2], mb[3]);
         }
 
+        qlt_async_event(mb[0], vha, mb);
+
         if (!vha->vp_idx && ha->num_vhosts)
                 qla2x00_alert_all_vps(rsp, mb);
 }
@@ -1172,6 +1200,9 @@ qla24xx_logio_entry(scsi_qla_host_t *vha, struct req_que *req,
                 } else if (iop[0] & BIT_5)
                         fcport->port_type = FCT_INITIATOR;
 
+                if (iop[0] & BIT_7)
+                        fcport->flags |= FCF_CONF_COMP_SUPPORTED;
+
                 if (logio->io_parameter[7] || logio->io_parameter[8])
                         fcport->supported_classes |= FC_COS_CLASS2;
                 if (logio->io_parameter[9] || logio->io_parameter[10])
@@ -1986,6 +2017,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
 
                 if (pkt->entry_status != 0) {
                         qla2x00_error_entry(vha, rsp, (sts_entry_t *) pkt);
+
+                        (void)qlt_24xx_process_response_error(vha, pkt);
+
                         ((response_t *)pkt)->signature = RESPONSE_PROCESSED;
                         wmb();
                         continue;
@@ -2016,6 +2050,14 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
                 case ELS_IOCB_TYPE:
                         qla24xx_els_ct_entry(vha, rsp->req, pkt, ELS_IOCB_TYPE);
                         break;
+                case ABTS_RECV_24XX:
+                        /* ensure that the ATIO queue is empty */
+                        qlt_24xx_process_atio_queue(vha);
+                case ABTS_RESP_24XX:
+                case CTIO_TYPE7:
+                case NOTIFY_ACK_TYPE:
+                        qlt_response_pkt_all_vps(vha, (response_t *)pkt);
+                        break;
                 case MARKER_TYPE:
                         /* Do nothing in this case, this check is to prevent it
                          * from falling into default case
@@ -2168,6 +2210,13 @@ qla24xx_intr_handler(int irq, void *dev_id)
                 case 0x14:
                         qla24xx_process_response_queue(vha, rsp);
                         break;
+                case 0x1C: /* ATIO queue updated */
+                        qlt_24xx_process_atio_queue(vha);
+                        break;
+                case 0x1D: /* ATIO and response queues updated */
+                        qlt_24xx_process_atio_queue(vha);
+                        qla24xx_process_response_queue(vha, rsp);
+                        break;
                 default:
                         ql_dbg(ql_dbg_async, vha, 0x504f,
                             "Unrecognized interrupt type (%d).\n", stat * 0xff);
@@ -2312,6 +2361,13 @@ qla24xx_msix_default(int irq, void *dev_id)
                 case 0x14:
                         qla24xx_process_response_queue(vha, rsp);
                         break;
+                case 0x1C: /* ATIO queue updated */
+                        qlt_24xx_process_atio_queue(vha);
+                        break;
+                case 0x1D: /* ATIO and response queues updated */
+                        qlt_24xx_process_atio_queue(vha);
+                        qla24xx_process_response_queue(vha, rsp);
+                        break;
                 default:
                         ql_dbg(ql_dbg_async, vha, 0x5051,
                             "Unrecognized interrupt type (%d).\n", stat & 0xff);
@@ -2564,7 +2620,15 @@ void
 qla2x00_free_irqs(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
-        struct rsp_que *rsp = ha->rsp_q_map[0];
+        struct rsp_que *rsp;
+
+        /*
+         * We need to check that ha->rsp_q_map is valid in case we are called
+         * from a probe failure context.
+         */
+        if (!ha->rsp_q_map || !ha->rsp_q_map[0])
+                return;
+        rsp = ha->rsp_q_map[0];
 
         if (ha->flags.msix_enabled)
                 qla24xx_disable_msix(ha);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index b4a23394a7bd..d5ce92c0a8fc 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
 #include "qla_def.h"
+#include "qla_target.h"
 
 #include <linux/delay.h>
 #include <linux/gfp.h>
@@ -270,11 +271,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                         ictrl = RD_REG_WORD(&reg->isp.ictrl);
                 }
                 ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1119,
-                    "MBX Command timeout for cmd %x.\n", command);
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111a,
-                    "iocontrol=%x jiffies=%lx.\n", ictrl, jiffies);
-                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111b,
-                    "mb[0] = 0x%x.\n", mb0);
+                    "MBX Command timeout for cmd %x, iocontrol=%x jiffies=%lx "
+                    "mb[0]=0x%x\n", command, ictrl, jiffies, mb0);
                 ql_dump_regs(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1019);
 
                 /*
@@ -320,7 +318,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                                             CRB_NIU_XG_PAUSE_CTL_P1);
                                 }
                                 ql_log(ql_log_info, base_vha, 0x101c,
-                                    "Mailbox cmd timeout occured, cmd=0x%x, "
+                                    "Mailbox cmd timeout occurred, cmd=0x%x, "
                                     "mb[0]=0x%x, eeh_busy=0x%x. Scheduling ISP "
                                     "abort.\n", command, mcp->mb[0],
                                     ha->flags.eeh_busy);
@@ -345,7 +343,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                                             CRB_NIU_XG_PAUSE_CTL_P1);
                                 }
                                 ql_log(ql_log_info, base_vha, 0x101e,
-                                    "Mailbox cmd timeout occured, cmd=0x%x, "
+                                    "Mailbox cmd timeout occurred, cmd=0x%x, "
                                     "mb[0]=0x%x. Scheduling ISP abort ",
                                     command, mcp->mb[0]);
                                 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
@@ -390,7 +388,8 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1022, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1022,
+            "Entered %s.\n", __func__);
 
         if (MSW(risc_addr) || IS_FWI2_CAPABLE(ha)) {
                 mcp->mb[0] = MBC_LOAD_RISC_RAM_EXTENDED;
@@ -424,7 +423,8 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1023,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1024, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1024,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -454,7 +454,8 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1025, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1025,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_EXECUTE_FIRMWARE;
         mcp->out_mb = MBX_0;
@@ -489,10 +490,11 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 if (IS_FWI2_CAPABLE(ha)) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1027,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1027,
                             "Done exchanges=%x.\n", mcp->mb[1]);
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1028, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1028,
+                            "Done %s.\n", __func__);
                 }
         }
 
@@ -523,7 +525,8 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
         mbx_cmd_t       *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1029, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1029,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_VERSION;
         mcp->out_mb = MBX_0;
@@ -561,11 +564,11 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
                         ha->fw_attributes_h = mcp->mb[15];
                         ha->fw_attributes_ext[0] = mcp->mb[16];
                         ha->fw_attributes_ext[1] = mcp->mb[17];
-                        ql_dbg(ql_dbg_mbx, vha, 0x1139,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1139,
                             "%s: FW_attributes Upper: 0x%x, Lower: 0x%x.\n",
                             __func__, mcp->mb[15], mcp->mb[6]);
                 } else
-                        ql_dbg(ql_dbg_mbx, vha, 0x112f,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x112f,
                             "%s: FwAttributes [Upper]  invalid, MB6:%04x\n",
                             __func__, mcp->mb[6]);
         }
@@ -576,7 +579,8 @@ failed:
                 ql_dbg(ql_dbg_mbx, vha, 0x102a, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x102b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102b,
+                    "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -602,7 +606,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x102c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_OPTION;
         mcp->out_mb = MBX_0;
@@ -620,7 +625,8 @@ qla2x00_get_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                 fwopts[2] = mcp->mb[2];
                 fwopts[3] = mcp->mb[3];
 
-                ql_dbg(ql_dbg_mbx, vha, 0x102e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102e,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -648,7 +654,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x102f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x102f,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_FIRMWARE_OPTION;
         mcp->mb[1] = fwopts[1];
@@ -676,7 +683,8 @@ qla2x00_set_fw_options(scsi_qla_host_t *vha, uint16_t *fwopts)
                     "Failed=%x (%x/%x).\n", rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1031, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1031,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -704,7 +712,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1032, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1032,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST;
         mcp->mb[1] = 0xAAAA;
@@ -734,7 +743,8 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1033, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1034, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1034,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -762,7 +772,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1035, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1035,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_VERIFY_CHECKSUM;
         mcp->out_mb = MBX_0;
@@ -787,7 +798,8 @@ qla2x00_verify_checksum(scsi_qla_host_t *vha, uint32_t risc_addr)
                     "Failed=%x chm sum=%x.\n", rval, IS_FWI2_CAPABLE(vha->hw) ?
                     (mcp->mb[2] << 16) | mcp->mb[1] : mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1037, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1037,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -819,7 +831,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
         mbx_cmd_t       mc;
         mbx_cmd_t       *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1038, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1038,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IOCB_COMMAND_A64;
         mcp->mb[1] = 0;
@@ -842,7 +855,8 @@ qla2x00_issue_iocb_timeout(scsi_qla_host_t *vha, void *buffer,
                 /* Mask reserved bits. */
                 sts_entry->entry_status &=
                     IS_FWI2_CAPABLE(vha->hw) ? RF_MASK_24XX : RF_MASK;
-                ql_dbg(ql_dbg_mbx, vha, 0x103a, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103a,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -884,7 +898,8 @@ qla2x00_abort_command(srb_t *sp)
         struct req_que *req = vha->req;
         struct scsi_cmnd *cmd = GET_CMD_SP(sp);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x103b, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103b,
+            "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -915,7 +930,8 @@ qla2x00_abort_command(srb_t *sp)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x103c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x103d, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103d,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -934,7 +950,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         l = l;
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x103e, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103e,
+            "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -955,7 +972,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
         mcp->flags = 0;
         rval = qla2x00_mailbox_command(vha, mcp);
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x103f, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x103f,
+                    "Failed=%x.\n", rval);
         }
 
         /* Issue marker IOCB. */
@@ -965,7 +983,8 @@ qla2x00_abort_target(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1040,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1041, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1041,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -983,7 +1002,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
 
         vha = fcport->vha;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1042, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1042,
+            "Entered %s.\n", __func__);
 
         req = vha->hw->req_q_map[0];
         rsp = req->rsp;
@@ -1012,7 +1032,8 @@ qla2x00_lun_reset(struct fc_port *fcport, unsigned int l, int tag)
                 ql_dbg(ql_dbg_mbx, vha, 0x1044,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1045, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1045,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1046,7 +1067,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1046, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1046,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
         mcp->mb[9] = vha->vp_idx;
@@ -1074,7 +1096,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
                 /*EMPTY*/
                 ql_dbg(ql_dbg_mbx, vha, 0x1047, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1048, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1048,
+                    "Done %s.\n", __func__);
 
                 if (IS_CNA_CAPABLE(vha->hw)) {
                         vha->fcoe_vlan_id = mcp->mb[9] & 0xfff;
@@ -1115,7 +1138,8 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1049, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1049,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RETRY_COUNT;
         mcp->out_mb = MBX_0;
@@ -1138,7 +1162,7 @@ qla2x00_get_retry_cnt(scsi_qla_host_t *vha, uint8_t *retry_cnt, uint8_t *tov,
                         *tov = ratov;
                 }
 
-                ql_dbg(ql_dbg_mbx, vha, 0x104b,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104b,
                     "Done %s mb3=%d ratov=%d.\n", __func__, mcp->mb[3], ratov);
         }
 
@@ -1170,7 +1194,8 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x104c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104c,
+            "Entered %s.\n", __func__);
 
         if (IS_QLA82XX(ha) && ql2xdbwr)
                 qla82xx_wr_32(ha, ha->nxdb_wr_ptr,
@@ -1213,9 +1238,100 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x104e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104e,
+                    "Done %s.\n", __func__);
+        }
+
+        return rval;
+}
+
+/*
+ * qla2x00_get_node_name_list
+ *      Issue get node name list mailbox command, kmalloc()
+ *      and return the resulting list. Caller must kfree() it!
+ *
+ * Input:
+ *      ha = adapter state pointer.
+ *      out_data = resulting list
+ *      out_len = length of the resulting list
+ *
+ * Returns:
+ *      qla2x00 local function return status code.
+ *
+ * Context:
+ *      Kernel context.
+ */
+int
+qla2x00_get_node_name_list(scsi_qla_host_t *vha, void **out_data, int *out_len)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_port_24xx_data *list = NULL;
+        void *pmap;
+        mbx_cmd_t mc;
+        dma_addr_t pmap_dma;
+        ulong dma_size;
+        int rval, left;
+
+        left = 1;
+        while (left > 0) {
+                dma_size = left * sizeof(*list);
+                pmap = dma_alloc_coherent(&ha->pdev->dev, dma_size,
+                                         &pmap_dma, GFP_KERNEL);
+                if (!pmap) {
+                        ql_log(ql_log_warn, vha, 0x113f,
+                            "%s(%ld): DMA Alloc failed of %ld\n",
+                            __func__, vha->host_no, dma_size);
+                        rval = QLA_MEMORY_ALLOC_FAILED;
+                        goto out;
+                }
+
+                mc.mb[0] = MBC_PORT_NODE_NAME_LIST;
+                mc.mb[1] = BIT_1 | BIT_3;
+                mc.mb[2] = MSW(pmap_dma);
+                mc.mb[3] = LSW(pmap_dma);
+                mc.mb[6] = MSW(MSD(pmap_dma));
+                mc.mb[7] = LSW(MSD(pmap_dma));
+                mc.mb[8] = dma_size;
+                mc.out_mb = MBX_0|MBX_1|MBX_2|MBX_3|MBX_6|MBX_7|MBX_8;
+                mc.in_mb = MBX_0|MBX_1;
+                mc.tov = 30;
+                mc.flags = MBX_DMA_IN;
+
+                rval = qla2x00_mailbox_command(vha, &mc);
+                if (rval != QLA_SUCCESS) {
+                        if ((mc.mb[0] == MBS_COMMAND_ERROR) &&
+                            (mc.mb[1] == 0xA)) {
+                                left += le16_to_cpu(mc.mb[2]) /
+                                    sizeof(struct qla_port_24xx_data);
+                                goto restart;
+                        }
+                        goto out_free;
+                }
+
+                left = 0;
+
+                list = kzalloc(dma_size, GFP_KERNEL);
+                if (!list) {
+                        ql_log(ql_log_warn, vha, 0x1140,
+                            "%s(%ld): failed to allocate node names list "
+                            "structure.\n", __func__, vha->host_no);
+                        rval = QLA_MEMORY_ALLOC_FAILED;
+                        goto out_free;
+                }
+
+                memcpy(list, pmap, dma_size);
+restart:
+                dma_free_coherent(&ha->pdev->dev, dma_size, pmap, pmap_dma);
         }
 
+        *out_data = list;
+        *out_len = dma_size;
+
+out:
+        return rval;
+
+out_free:
+        dma_free_coherent(&ha->pdev->dev, dma_size, pmap, pmap_dma);
         return rval;
 }
 
@@ -1246,7 +1362,8 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
         dma_addr_t pd_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x104f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x104f,
+            "Entered %s.\n", __func__);
 
         pd24 = NULL;
         pd = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pd_dma);
@@ -1326,6 +1443,13 @@ qla2x00_get_port_database(scsi_qla_host_t *vha, fc_port_t *fcport, uint8_t opt)
                         fcport->port_type = FCT_INITIATOR;
                 else
                         fcport->port_type = FCT_TARGET;
+
+                /* Passback COS information. */
+                fcport->supported_classes = (pd24->flags & PDF_CLASS_2) ?
+                                FC_COS_CLASS2 : FC_COS_CLASS3;
+
+                if (pd24->prli_svc_param_word_3[0] & BIT_7)
+                        fcport->flags |= FCF_CONF_COMP_SUPPORTED;
         } else {
                 uint64_t zero = 0;
 
@@ -1378,7 +1502,8 @@ gpd_error_out:
                     "Failed=%x mb[0]=%x mb[1]=%x.\n", rval,
                     mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1053, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1053,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1407,7 +1532,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1054, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1054,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
         mcp->out_mb = MBX_0;
@@ -1433,7 +1559,8 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
                 ql_dbg(ql_dbg_mbx, vha, 0x1055, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1056, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1056,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1465,7 +1592,8 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1057, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1057,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_PORT_NAME;
         mcp->mb[9] = vha->vp_idx;
@@ -1499,7 +1627,8 @@ qla2x00_get_port_name(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t *name,
                         name[7] = LSB(mcp->mb[7]);
                 }
 
-                ql_dbg(ql_dbg_mbx, vha, 0x1059, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1059,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1527,7 +1656,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105a, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
+            "Entered %s.\n", __func__);
 
         if (IS_CNA_CAPABLE(vha->hw)) {
                 /* Logout across all FCFs. */
@@ -1564,7 +1694,8 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x105b, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x105c, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105c,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1596,9 +1727,10 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105d,
+            "Entered %s.\n", __func__);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x105e,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105e,
             "Retry cnt=%d ratov=%d total tov=%d.\n",
             vha->hw->retry_count, vha->hw->login_timeout, mcp->tov);
 
@@ -1622,7 +1754,8 @@ qla2x00_send_sns(scsi_qla_host_t *vha, dma_addr_t sns_phys_address,
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1060, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1060,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1641,7 +1774,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1061, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1061,
+            "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 req = ha->req_q_map[0];
@@ -1715,7 +1849,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                         break;
                 }
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1066, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1066,
+                    "Done %s.\n", __func__);
 
                 iop[0] = le32_to_cpu(lg->io_parameter[0]);
 
@@ -1733,6 +1868,10 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                         mb[10] |= BIT_0;        /* Class 2. */
                 if (lg->io_parameter[9] || lg->io_parameter[10])
                         mb[10] |= BIT_1;        /* Class 3. */
+                if (lg->io_parameter[0] & __constant_cpu_to_le32(BIT_7))
+                        mb[10] |= BIT_7;        /* Confirmed Completion
+                                                 * Allowed
+                                                 */
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1770,7 +1909,8 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1067, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1067,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGIN_FABRIC_PORT;
         mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
@@ -1818,7 +1958,8 @@ qla2x00_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1069, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1069,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -1849,7 +1990,8 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x106a, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106a,
+            "Entered %s.\n", __func__);
 
         if (IS_FWI2_CAPABLE(ha))
                 return qla24xx_login_fabric(vha, fcport->loop_id,
@@ -1891,7 +2033,8 @@ qla2x00_login_local_device(scsi_qla_host_t *vha, fc_port_t *fcport,
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[6], mcp->mb[7]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x106c, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106c,
+                    "Done %s.\n", __func__);
         }
 
         return (rval);
@@ -1908,7 +2051,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         struct req_que *req;
         struct rsp_que *rsp;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x106d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x106d,
+            "Entered %s.\n", __func__);
 
         lg = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &lg_dma);
         if (lg == NULL) {
@@ -1952,7 +2096,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     le32_to_cpu(lg->io_parameter[1]));
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1072, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1072,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1984,7 +2129,8 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1073, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1073,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT;
         mcp->out_mb = MBX_1|MBX_0;
@@ -2007,7 +2153,8 @@ qla2x00_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain,
                     "Failed=%x mb[1]=%x.\n", rval, mcp->mb[1]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1075, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1075,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2035,7 +2182,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1076, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1076,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_LIP_FULL_LOGIN;
         mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0;
@@ -2052,7 +2200,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1077, "Failed=%x.\n", rval);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x1078, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1078,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2078,7 +2227,8 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1079, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1079,
+            "Entered %s.\n", __func__);
 
         if (id_list == NULL)
                 return QLA_FUNCTION_FAILED;
@@ -2110,7 +2260,8 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
                 ql_dbg(ql_dbg_mbx, vha, 0x107a, "Failed=%x.\n", rval);
         } else {
                 *entries = mcp->mb[1];
-                ql_dbg(ql_dbg_mbx, vha, 0x107b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107b,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2138,7 +2289,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x107c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_RESOURCE_COUNTS;
         mcp->out_mb = MBX_0;
@@ -2154,7 +2306,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
                 ql_dbg(ql_dbg_mbx, vha, 0x107d,
                     "Failed mb[0]=%x.\n", mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x107e,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107e,
                     "Done %s mb1=%x mb2=%x mb3=%x mb6=%x mb7=%x mb10=%x "
                     "mb11=%x mb12=%x.\n", __func__, mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[6], mcp->mb[7], mcp->mb[10],
@@ -2201,7 +2353,8 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         dma_addr_t pmap_dma;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x107f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x107f,
+            "Entered %s.\n", __func__);
 
         pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
         if (pmap  == NULL) {
@@ -2224,7 +2377,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         rval = qla2x00_mailbox_command(vha, mcp);
 
         if (rval == QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x1081,
+                ql_dbg(ql_dbg_mbx + ql_dbg_buffer, vha, 0x1081,
                     "mb0/mb1=%x/%X FC/AL position map size (%x).\n",
                     mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]);
                 ql_dump_buffer(ql_dbg_mbx + ql_dbg_buffer, vha, 0x111d,
@@ -2238,7 +2391,8 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x1082, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1083, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1083,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2267,7 +2421,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
         uint32_t *siter, *diter, dwords;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1084, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1084,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_STATUS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2301,7 +2456,8 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         /* Copy over data -- firmware data is LE. */
-                        ql_dbg(ql_dbg_mbx, vha, 0x1086, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1086,
+                            "Done %s.\n", __func__);
                         dwords = offsetof(struct link_statistics, unused1) / 4;
                         siter = diter = &stats->link_fail_cnt;
                         while (dwords--)
@@ -2324,7 +2480,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
         mbx_cmd_t *mcp = &mc;
         uint32_t *siter, *diter, dwords;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1088, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GET_LINK_PRIV_STATS;
         mcp->mb[2] = MSW(stats_dma);
@@ -2346,7 +2503,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,
                             "Failed mb[0]=%x.\n", mcp->mb[0]);
                         rval = QLA_FUNCTION_FAILED;
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x108a, "Done %s.\n", __func__);
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108a,
+                            "Done %s.\n", __func__);
                         /* Copy over data -- firmware data is LE. */
                         dwords = sizeof(struct link_statistics) / 4;
                         siter = diter = &stats->link_fail_cnt;
@@ -2375,7 +2533,8 @@ qla24xx_abort_command(srb_t *sp)
         struct qla_hw_data *ha = vha->hw;
         struct req_que *req = vha->req;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x108c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c,
+            "Entered %s.\n", __func__);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
@@ -2404,7 +2563,7 @@ qla24xx_abort_command(srb_t *sp)
         abt->port_id[0] = fcport->d_id.b.al_pa;
         abt->port_id[1] = fcport->d_id.b.area;
         abt->port_id[2] = fcport->d_id.b.domain;
-        abt->vp_index = fcport->vp_idx;
+        abt->vp_index = fcport->vha->vp_idx;
 
         abt->req_que_no = cpu_to_le16(req->id);
 
@@ -2423,7 +2582,8 @@ qla24xx_abort_command(srb_t *sp)
                     le16_to_cpu(abt->nport_handle));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1091, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1091,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, abt, abt_dma);
@@ -2455,7 +2615,8 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         ha = vha->hw;
         req = vha->req;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1092, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1092,
+            "Entered %s.\n", __func__);
 
         if (ha->flags.cpu_affinity_enabled)
                 rsp = ha->rsp_q_map[tag + 1];
@@ -2478,7 +2639,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         tsk->p.tsk.port_id[0] = fcport->d_id.b.al_pa;
         tsk->p.tsk.port_id[1] = fcport->d_id.b.area;
         tsk->p.tsk.port_id[2] = fcport->d_id.b.domain;
-        tsk->p.tsk.vp_index = fcport->vp_idx;
+        tsk->p.tsk.vp_index = fcport->vha->vp_idx;
         if (type == TCF_LUN_RESET) {
                 int_to_scsilun(l, &tsk->p.tsk.lun);
                 host_to_fcp_swap((uint8_t *)&tsk->p.tsk.lun,
@@ -2504,7 +2665,7 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
         } else if (le16_to_cpu(sts->scsi_status) &
             SS_RESPONSE_INFO_LEN_VALID) {
                 if (le32_to_cpu(sts->rsp_data_len) < 4) {
-                        ql_dbg(ql_dbg_mbx, vha, 0x1097,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1097,
                             "Ignoring inconsistent data length -- not enough "
                             "response info (%d).\n",
                             le32_to_cpu(sts->rsp_data_len));
@@ -2523,7 +2684,8 @@ __qla24xx_issue_tmf(char *name, uint32_t type, struct fc_port *fcport,
                 ql_dbg(ql_dbg_mbx, vha, 0x1099,
                     "Failed to issue marker IOCB (%x).\n", rval2);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x109a, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109a,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, tsk, tsk_dma);
@@ -2564,7 +2726,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (!IS_QLA23XX(ha) && !IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x109b, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109b,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_GEN_SYSTEM_ERROR;
         mcp->out_mb = MBX_0;
@@ -2576,7 +2739,8 @@ qla2x00_system_error(scsi_qla_host_t *vha)
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x109c, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x109d, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109d,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2596,7 +2760,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x109e, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x109e,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SERDES_PARAMS;
         mcp->mb[1] = BIT_0;
@@ -2615,7 +2780,8 @@ qla2x00_set_serdes_params(scsi_qla_host_t *vha, uint16_t sw_em_1g,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
                 /*EMPTY*/
-                ql_dbg(ql_dbg_mbx, vha, 0x10a0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a0,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2631,7 +2797,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a1, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a1,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_STOP_FIRMWARE;
         mcp->mb[1] = 0;
@@ -2646,7 +2813,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
                 if (mcp->mb[0] == MBS_INVALID_COMMAND)
                         rval = QLA_INVALID_COMMAND;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a3, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a3,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2660,7 +2828,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a4, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a4,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2686,7 +2855,8 @@ qla2x00_enable_eft_trace(scsi_qla_host_t *vha, dma_addr_t eft_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a6,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2699,7 +2869,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10a7, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a7,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2719,7 +2890,8 @@ qla2x00_disable_eft_trace(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10a9, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10a9,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2733,7 +2905,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10aa, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10aa,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA25XX(vha->hw) && !IS_QLA81XX(vha->hw) &&
             !IS_QLA83XX(vha->hw))
@@ -2764,7 +2937,8 @@ qla2x00_enable_fce_trace(scsi_qla_host_t *vha, dma_addr_t fce_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ac, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ac,
+                    "Done %s.\n", __func__);
 
                 if (mb)
                         memcpy(mb, mcp->mb, 8 * sizeof(*mb));
@@ -2782,7 +2956,8 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ad, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ad,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2804,7 +2979,8 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10af, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10af,
+                    "Done %s.\n", __func__);
 
                 if (wr)
                         *wr = (uint64_t) mcp->mb[5] << 48 |
@@ -2829,7 +3005,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b0, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b0,
+            "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2854,7 +3031,8 @@ qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10b1, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b2, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b2,
+                    "Done %s.\n", __func__);
                 if (port_speed)
                         *port_speed = mcp->mb[3];
         }
@@ -2870,7 +3048,8 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b3, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b3,
+            "Entered %s.\n", __func__);
 
         if (!IS_IIDMA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -2897,9 +3076,11 @@ qla2x00_set_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,
         }
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b4, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10b4,
+                    "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b5, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b5,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -2915,24 +3096,25 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
         scsi_qla_host_t *vp;
         unsigned long   flags;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10b6, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b6,
+            "Entered %s.\n", __func__);
 
         if (rptid_entry->entry_status != 0)
                 return;
 
         if (rptid_entry->format == 0) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10b7,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b7,
                     "Format 0 : Number of VPs setup %d, number of "
                     "VPs acquired %d.\n",
                     MSB(le16_to_cpu(rptid_entry->vp_count)),
                     LSB(le16_to_cpu(rptid_entry->vp_count)));
-                ql_dbg(ql_dbg_mbx, vha, 0x10b8,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b8,
                     "Primary port id %02x%02x%02x.\n",
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
                     rptid_entry->port_id[0]);
         } else if (rptid_entry->format == 1) {
                 vp_idx = LSB(stat);
-                ql_dbg(ql_dbg_mbx, vha, 0x10b9,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b9,
                     "Format 1: VP[%d] enabled - status %d - with "
                     "port id %02x%02x%02x.\n", vp_idx, MSB(stat),
                     rptid_entry->port_id[2], rptid_entry->port_id[1],
@@ -2999,7 +3181,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
 
         /* This can be called by the parent */
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10bb, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10bb,
+            "Entered %s.\n", __func__);
 
         vpmod = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &vpmod_dma);
         if (!vpmod) {
@@ -3015,6 +3198,9 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
         vpmod->vp_count = 1;
         vpmod->vp_index1 = vha->vp_idx;
         vpmod->options_idx1 = BIT_3|BIT_4|BIT_5;
+
+        qlt_modify_vp_config(vha, vpmod);
+
         memcpy(vpmod->node_name_idx1, vha->node_name, WWN_SIZE);
         memcpy(vpmod->port_name_idx1, vha->port_name, WWN_SIZE);
         vpmod->entry_count = 1;
@@ -3035,7 +3221,8 @@ qla24xx_modify_vp_config(scsi_qla_host_t *vha)
                 rval = QLA_FUNCTION_FAILED;
         } else {
                 /* EMPTY */
-                ql_dbg(ql_dbg_mbx, vha, 0x10c0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c0,
+                    "Done %s.\n", __func__);
                 fc_vport_set_state(vha->fc_vport, FC_VPORT_INITIALIZING);
         }
         dma_pool_free(ha->s_dma_pool, vpmod, vpmod_dma);
@@ -3069,7 +3256,7 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
         int     vp_index = vha->vp_idx;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c1,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c1,
             "Entered %s enabling index %d.\n", __func__, vp_index);
 
         if (vp_index == 0 || vp_index >= ha->max_npiv_vports)
@@ -3112,7 +3299,8 @@ qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)
                     le16_to_cpu(vce->comp_status));
                 rval = QLA_FUNCTION_FAILED;
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10c6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c6,
+                    "Done %s.\n", __func__);
         }
 
         dma_pool_free(ha->s_dma_pool, vce, vce_dma);
@@ -3149,14 +3337,8 @@ qla2x00_send_change_request(scsi_qla_host_t *vha, uint16_t format,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c7, "Entered %s.\n", __func__);
-
-        /*
-         * This command is implicitly executed by firmware during login for the
-         * physical hosts
-         */
-        if (vp_idx == 0)
-                return QLA_FUNCTION_FAILED;
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c7,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SEND_CHANGE_REQUEST;
         mcp->mb[1] = format;
@@ -3185,7 +3367,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1009, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1009,
+            "Entered %s.\n", __func__);
 
         if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {
                 mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;
@@ -3219,7 +3402,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
                 ql_dbg(ql_dbg_mbx, vha, 0x1008,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1007, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1007,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3244,7 +3428,8 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
         unsigned long flags;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10c8, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10c8,
+            "Entered %s.\n", __func__);
 
         mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma);
         if (mn == NULL) {
@@ -3285,7 +3470,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                 status[0] = le16_to_cpu(mn->p.rsp.comp_status);
                 status[1] = status[0] == CS_VCS_CHIP_FAILURE ?
                     le16_to_cpu(mn->p.rsp.failure_code) : 0;
-                ql_dbg(ql_dbg_mbx, vha, 0x10ce,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ce,
                     "cs=%x fc=%x.\n", status[0], status[1]);
 
                 if (status[0] != CS_COMPLETE) {
@@ -3299,7 +3484,7 @@ qla84xx_verify_chip(struct scsi_qla_host *vha, uint16_t *status)
                                 retry = 1;
                         }
                 } else {
-                        ql_dbg(ql_dbg_mbx, vha, 0x10d0,
+                        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d0,
                             "Firmware updated to %x.\n",
                             le32_to_cpu(mn->p.rsp.fw_ver));
 
@@ -3316,9 +3501,11 @@ verify_done:
         dma_pool_free(ha->s_dma_pool, mn, mn_dma);
 
         if (rval != QLA_SUCCESS) {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d1, "Failed=%x.\n", rval);
+                ql_dbg(ql_dbg_mbx, vha, 0x10d1,
+                    "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d2, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d2,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3334,7 +3521,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d3, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d3,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = req->options;
@@ -3388,7 +3576,8 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d4,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d5, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d5,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3404,7 +3593,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         struct device_reg_25xxmq __iomem *reg;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d6, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d6,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
         mcp->mb[1] = rsp->options;
@@ -3456,7 +3646,8 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
                 ql_dbg(ql_dbg_mbx, vha, 0x10d7,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10d8, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d8,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3469,7 +3660,8 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10d9, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10d9,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_IDC_ACK;
         memcpy(&mcp->mb[1], mb, QLA_IDC_ACK_REGS * sizeof(uint16_t));
@@ -3483,7 +3675,8 @@ qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x10da,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10db, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10db,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3496,7 +3689,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10dc, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10dc,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3514,7 +3708,8 @@ qla81xx_fac_get_sector_size(scsi_qla_host_t *vha, uint32_t *sector_size)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10de, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10de,
+                    "Done %s.\n", __func__);
                 *sector_size = mcp->mb[1];
         }
 
@@ -3531,7 +3726,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10df, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10df,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = enable ? FAC_OPT_CMD_WRITE_ENABLE :
@@ -3547,7 +3743,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *vha, int enable)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e1, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e1,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3563,7 +3760,8 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
         if (!IS_QLA81XX(vha->hw) && !IS_QLA83XX(vha->hw))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e2, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;
         mcp->mb[1] = FAC_OPT_CMD_ERASE_SECTOR;
@@ -3582,7 +3780,8 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e4, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3595,7 +3794,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e5, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e5,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_RESTART_MPI_FW;
         mcp->out_mb = MBX_0;
@@ -3609,7 +3809,8 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10e7, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e7,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3624,7 +3825,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10e8, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3654,7 +3856,8 @@ qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10e9,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ea, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3669,7 +3872,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10eb, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10eb,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -3699,7 +3903,8 @@ qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,
                 ql_dbg(ql_dbg_mbx, vha, 0x10ec,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10ed, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ed,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3713,7 +3918,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ee, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ee,
+            "Entered %s.\n", __func__);
 
         if (!IS_CNA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3735,7 +3941,8 @@ qla2x00_get_xgmac_stats(scsi_qla_host_t *vha, dma_addr_t stats_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f0, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f0,
+                    "Done %s.\n", __func__);
 
 
                 *actual_size = mcp->mb[2] << 2;
@@ -3752,7 +3959,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f1, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f1,
+            "Entered %s.\n", __func__);
 
         if (!IS_CNA_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3775,7 +3983,8 @@ qla2x00_get_dcbx_params(scsi_qla_host_t *vha, dma_addr_t tlv_dma,
                     "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f3, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f3,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -3788,7 +3997,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f4, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f4,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3805,7 +4015,8 @@ qla2x00_read_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t *data)
                 ql_dbg(ql_dbg_mbx, vha, 0x10f5,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f6, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f6,
+                    "Done %s.\n", __func__);
                 *data = mcp->mb[3] << 16 | mcp->mb[2];
         }
 
@@ -3821,7 +4032,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         uint32_t iter_cnt = 0x1;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10f7, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f7,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
@@ -3865,7 +4077,8 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "mb[19]=%x.\n", rval, mcp->mb[0], mcp->mb[1], mcp->mb[2],
                     mcp->mb[3], mcp->mb[18], mcp->mb[19]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10f9, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f9,
+                    "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -3882,7 +4095,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10fa, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fa,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
@@ -3926,7 +4140,8 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
                     "Failed=%x mb[0]=%x mb[1]=%x.\n",
                     rval, mcp->mb[0], mcp->mb[1]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10fc, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fc,
+                    "Done %s.\n", __func__);
         }
 
         /* Copy mailbox information */
@@ -3941,7 +4156,7 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10fd,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fd,
             "Entered %s enable_diag=%d.\n", __func__, enable_diagnostic);
 
         mcp->mb[0] = MBC_ISP84XX_RESET;
@@ -3955,7 +4170,8 @@ qla84xx_reset_chip(scsi_qla_host_t *vha, uint16_t enable_diagnostic)
         if (rval != QLA_SUCCESS)
                 ql_dbg(ql_dbg_mbx, vha, 0x10fe, "Failed=%x.\n", rval);
         else
-                ql_dbg(ql_dbg_mbx, vha, 0x10ff, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ff,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
@@ -3967,7 +4183,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1100, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1100,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(vha->hw))
                 return QLA_FUNCTION_FAILED;
@@ -3986,7 +4203,8 @@ qla2x00_write_ram_word(scsi_qla_host_t *vha, uint32_t risc_addr, uint32_t data)
                 ql_dbg(ql_dbg_mbx, vha, 0x1101,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1102, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1102,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4003,7 +4221,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
 
         rval = QLA_SUCCESS;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1103, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1103,
+            "Entered %s.\n", __func__);
 
         clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
 
@@ -4046,7 +4265,8 @@ qla81xx_write_mpi_register(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x1104,
                     "Failed=%x mb[0]=%x.\n", rval, mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1105, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1105,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4060,7 +4280,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1106, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1106,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4078,7 +4299,8 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1107,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1108, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1108,
+                    "Done %s.\n", __func__);
                 if (mcp->mb[1] != 0x7)
                         ha->link_data_rate = mcp->mb[1];
         }
@@ -4094,7 +4316,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1109, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1109,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4113,7 +4336,8 @@ qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 /* Copy all bits to preserve original value */
                 memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4);
 
-                ql_dbg(ql_dbg_mbx, vha, 0x110b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110b,
+                    "Done %s.\n", __func__);
         }
         return rval;
 }
@@ -4125,7 +4349,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x110c, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110c,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_SET_PORT_CONFIG;
         /* Copy all bits to preserve original setting */
@@ -4140,7 +4365,8 @@ qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
                 ql_dbg(ql_dbg_mbx, vha, 0x110d,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else
-                ql_dbg(ql_dbg_mbx, vha, 0x110e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110e,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
@@ -4155,7 +4381,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         mbx_cmd_t *mcp = &mc;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x110f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x110f,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA24XX_TYPE(ha) && !IS_QLA25XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4183,7 +4410,8 @@ qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
         if (rval != QLA_SUCCESS) {
                 ql_dbg(ql_dbg_mbx, vha, 0x10cd, "Failed=%x.\n", rval);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x10cc, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10cc,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4196,7 +4424,8 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         uint8_t byte;
         struct qla_hw_data *ha = vha->hw;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x10ca, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ca,
+            "Entered %s.\n", __func__);
 
         /* Integer part */
         rval = qla2x00_read_sfp(vha, 0, &byte, 0x98, 0x01, 1, BIT_13|BIT_0);
@@ -4216,7 +4445,8 @@ qla2x00_get_thermal_temp(scsi_qla_host_t *vha, uint16_t *temp, uint16_t *frac)
         }
         *frac = (byte >> 6) * 25;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1018, "Done %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1018,
+            "Done %s.\n", __func__);
 fail:
         return rval;
 }
@@ -4229,7 +4459,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1017, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1017,
+            "Entered %s.\n", __func__);
 
         if (!IS_FWI2_CAPABLE(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4248,7 +4479,8 @@ qla82xx_mbx_intr_enable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x1016,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x100e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100e,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4262,7 +4494,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
         mbx_cmd_t mc;
         mbx_cmd_t *mcp = &mc;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x100d, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100d,
+            "Entered %s.\n", __func__);
 
         if (!IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
@@ -4281,7 +4514,8 @@ qla82xx_mbx_intr_disable(scsi_qla_host_t *vha)
                 ql_dbg(ql_dbg_mbx, vha, 0x100c,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x100b, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x100b,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4295,7 +4529,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         int rval = QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x111f, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111f,
+            "Entered %s.\n", __func__);
 
         memset(mcp->mb, 0 , sizeof(mcp->mb));
         mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
@@ -4318,7 +4553,8 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
                     (mcp->mb[1] << 16) | mcp->mb[0],
                     (mcp->mb[3] << 16) | mcp->mb[2]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1121, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1121,
+                    "Done %s.\n", __func__);
                 ha->md_template_size = ((mcp->mb[3] << 16) | mcp->mb[2]);
                 if (!ha->md_template_size) {
                         ql_dbg(ql_dbg_mbx, vha, 0x1122,
@@ -4337,7 +4573,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
         mbx_cmd_t *mcp = &mc;
         int rval = QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1123, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1123,
+            "Entered %s.\n", __func__);
 
         ha->md_tmplt_hdr = dma_alloc_coherent(&ha->pdev->dev,
            ha->md_template_size, &ha->md_tmplt_hdr_dma, GFP_KERNEL);
@@ -4372,7 +4609,8 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
                     ((mcp->mb[1] << 16) | mcp->mb[0]),
                     ((mcp->mb[3] << 16) | mcp->mb[2]));
         } else
-                ql_dbg(ql_dbg_mbx, vha, 0x1126, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1126,
+                    "Done %s.\n", __func__);
         return rval;
 }
 
@@ -4387,7 +4625,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1133, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1133,
+            "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
         mcp->mb[0] = MBC_SET_LED_CONFIG;
@@ -4412,7 +4651,8 @@ qla81xx_set_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
                 ql_dbg(ql_dbg_mbx, vha, 0x1134,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1135, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1135,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4429,7 +4669,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
         if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1136, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1136,
+            "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
         mcp->mb[0] = MBC_GET_LED_CONFIG;
@@ -4454,7 +4695,8 @@ qla81xx_get_led_config(scsi_qla_host_t *vha, uint16_t *led_cfg)
                         led_cfg[4] = mcp->mb[5];
                         led_cfg[5] = mcp->mb[6];
                 }
-                ql_dbg(ql_dbg_mbx, vha, 0x1138, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1138,
+                    "Done %s.\n", __func__);
         }
 
         return rval;
@@ -4471,7 +4713,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
         if (!IS_QLA82XX(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1127,
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1127,
                 "Entered %s.\n", __func__);
 
         memset(mcp, 0, sizeof(mbx_cmd_t));
@@ -4491,7 +4733,7 @@ qla82xx_mbx_beacon_ctl(scsi_qla_host_t *vha, int enable)
                 ql_dbg(ql_dbg_mbx, vha, 0x1128,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1129,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1129,
                     "Done %s.\n", __func__);
         }
 
@@ -4509,7 +4751,8 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
         if (!IS_QLA83XX(ha))
                 return QLA_FUNCTION_FAILED;
 
-        ql_dbg(ql_dbg_mbx, vha, 0x1130, "Entered %s.\n", __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1130,
+            "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_WRITE_REMOTE_REG;
         mcp->mb[1] = LSW(reg);
@@ -4527,7 +4770,7 @@ qla83xx_write_remote_reg(scsi_qla_host_t *vha, uint32_t reg, uint32_t data)
                 ql_dbg(ql_dbg_mbx, vha, 0x1131,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         } else {
-                ql_dbg(ql_dbg_mbx, vha, 0x1132,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1132,
                     "Done %s.\n", __func__);
         }
 
@@ -4543,13 +4786,14 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
         mbx_cmd_t *mcp = &mc;
 
         if (IS_QLA2100(ha) || IS_QLA2200(ha)) {
-                ql_dbg(ql_dbg_mbx, vha, 0x113b,
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113b,
                     "Implicit LOGO Unsupported.\n");
                 return QLA_FUNCTION_FAILED;
         }
 
 
-        ql_dbg(ql_dbg_mbx, vha, 0x113c, "Done %s.\n",  __func__);
+        ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113c,
+            "Entering %s.\n",  __func__);
 
         /* Perform Implicit LOGO. */
         mcp->mb[0] = MBC_PORT_LOGOUT;
@@ -4564,7 +4808,8 @@ qla2x00_port_logout(scsi_qla_host_t *vha, struct fc_port *fcport)
                 ql_dbg(ql_dbg_mbx, vha, 0x113d,
                     "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);
         else
-                ql_dbg(ql_dbg_mbx, vha, 0x113e, "Done %s.\n", __func__);
+                ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x113e,
+                    "Done %s.\n", __func__);
 
         return rval;
 }
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index aa062a1b0ca4..3e8b32419e68 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -6,6 +6,7 @@
  */
 #include "qla_def.h"
 #include "qla_gbl.h"
+#include "qla_target.h"
 
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
@@ -49,6 +50,9 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
 
         spin_lock_irqsave(&ha->vport_slock, flags);
         list_add_tail(&vha->list, &ha->vp_list);
+
+        qlt_update_vp_map(vha, SET_VP_IDX);
+
         spin_unlock_irqrestore(&ha->vport_slock, flags);
 
         mutex_unlock(&ha->vport_lock);
@@ -79,6 +83,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
                 spin_lock_irqsave(&ha->vport_slock, flags);
         }
         list_del(&vha->list);
+        qlt_update_vp_map(vha, RESET_VP_IDX);
         spin_unlock_irqrestore(&ha->vport_slock, flags);
 
         vp_id = vha->vp_idx;
@@ -134,7 +139,7 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha)
         list_for_each_entry(fcport, &vha->vp_fcports, list) {
                 ql_dbg(ql_dbg_vport, vha, 0xa001,
                     "Marking port dead, loop_id=0x%04x : %x.\n",
-                    fcport->loop_id, fcport->vp_idx);
+                    fcport->loop_id, fcport->vha->vp_idx);
 
                 qla2x00_mark_device_lost(vha, fcport, 0, 0);
                 qla2x00_set_fcport_state(fcport, FCS_UNCONFIGURED);
@@ -150,6 +155,9 @@ qla24xx_disable_vp(scsi_qla_host_t *vha)
         atomic_set(&vha->loop_state, LOOP_DOWN);
         atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 
+        /* Remove port id from vp target map */
+        qlt_update_vp_map(vha, RESET_AL_PA);
+
         qla2x00_mark_vp_devices_dead(vha);
         atomic_set(&vha->vp_state, VP_FAILED);
         vha->flags.management_server_logged_in = 0;
@@ -295,10 +303,8 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 static int
 qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
 {
-        ql_dbg(ql_dbg_dpc, vha, 0x4012,
-            "Entering %s.\n", __func__);
-        ql_dbg(ql_dbg_dpc, vha, 0x4013,
-            "vp_flags: 0x%lx.\n", vha->vp_flags);
+        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x4012,
+            "Entering %s vp_flags: 0x%lx.\n", __func__, vha->vp_flags);
 
         qla2x00_do_work(vha);
 
@@ -348,7 +354,7 @@ qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
                 }
         }
 
-        ql_dbg(ql_dbg_dpc, vha, 0x401c,
+        ql_dbg(ql_dbg_dpc + ql_dbg_verbose, vha, 0x401c,
             "Exiting %s.\n", __func__);
         return 0;
 }
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index de722a933438..caf627ba7fa8 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1190,12 +1190,12 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
         }
 
         /* Offset in flash = lower 16 bits
-         * Number of enteries = upper 16 bits
+         * Number of entries = upper 16 bits
          */
         offset = n & 0xffffU;
         n = (n >> 16) & 0xffffU;
 
-        /* number of addr/value pair should not exceed 1024 enteries */
+        /* number of addr/value pair should not exceed 1024 entries */
         if (n  >= 1024) {
                 ql_log(ql_log_fatal, vha, 0x0071,
                     "Card flash not initialized:n=0x%x.\n", n);
@@ -2050,7 +2050,7 @@ qla82xx_intr_handler(int irq, void *dev_id)
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
-                ql_log(ql_log_info, NULL, 0xb054,
+                ql_log(ql_log_info, NULL, 0xb053,
                     "%s: NULL response queue pointer.\n", __func__);
                 return IRQ_NONE;
         }
@@ -2446,7 +2446,7 @@ qla82xx_load_fw(scsi_qla_host_t *vha)
 
         if (qla82xx_fw_load_from_flash(ha) == QLA_SUCCESS) {
                 ql_log(ql_log_info, vha, 0x00a1,
-                    "Firmware loaded successully from flash.\n");
+                    "Firmware loaded successfully from flash.\n");
                 return QLA_SUCCESS;
         } else {
                 ql_log(ql_log_warn, vha, 0x0108,
@@ -2461,7 +2461,7 @@ try_blob_fw:
         blob = ha->hablob = qla2x00_request_firmware(vha);
         if (!blob) {
                 ql_log(ql_log_fatal, vha, 0x00a3,
-                    "Firmware image not preset.\n");
+                    "Firmware image not present.\n");
                 goto fw_load_failed;
         }
 
@@ -2689,7 +2689,7 @@ qla82xx_write_flash_data(struct scsi_qla_host *vha, uint32_t *dwptr,
                 if (!optrom) {
                         ql_log(ql_log_warn, vha, 0xb01b,
                             "Unable to allocate memory "
-                            "for optron burst write (%x KB).\n",
+                            "for optrom burst write (%x KB).\n",
                             OPTROM_BURST_SIZE / 1024);
                 }
         }
@@ -2960,9 +2960,8 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha)
                          * changing the state to DEV_READY
                          */
                         ql_log(ql_log_info, vha, 0xb023,
-                            "%s : QUIESCENT TIMEOUT.\n", QLA2XXX_DRIVER_NAME);
-                        ql_log(ql_log_info, vha, 0xb024,
-                            "DRV_ACTIVE:%d DRV_STATE:%d.\n",
+                            "%s : QUIESCENT TIMEOUT DRV_ACTIVE:%d "
+                            "DRV_STATE:%d.\n", QLA2XXX_DRIVER_NAME,
                             drv_active, drv_state);
                         qla82xx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
                             QLA82XX_DEV_READY);
@@ -3129,7 +3128,7 @@ qla82xx_need_reset_handler(scsi_qla_host_t *vha)
                 if (ql2xmdenable) {
                         if (qla82xx_md_collect(vha))
                                 ql_log(ql_log_warn, vha, 0xb02c,
-                                    "Not able to collect minidump.\n");
+                                    "Minidump not collected.\n");
                 } else
                         ql_log(ql_log_warn, vha, 0xb04f,
                             "Minidump disabled.\n");
@@ -3160,11 +3159,11 @@ qla82xx_check_md_needed(scsi_qla_host_t *vha)
                                     "Firmware version differs "
                                     "Previous version: %d:%d:%d - "
                                     "New version: %d:%d:%d\n",
+                                    fw_major_version, fw_minor_version,
+                                    fw_subminor_version,
                                     ha->fw_major_version,
                                     ha->fw_minor_version,
-                                    ha->fw_subminor_version,
-                                    fw_major_version, fw_minor_version,
-                                    fw_subminor_version);
+                                    ha->fw_subminor_version);
                                 /* Release MiniDump resources */
                                 qla82xx_md_free(vha);
                                 /* ALlocate MiniDump resources */
@@ -3325,6 +3324,30 @@ exit:
         return rval;
 }
 
+static int qla82xx_check_temp(scsi_qla_host_t *vha)
+{
+        uint32_t temp, temp_state, temp_val;
+        struct qla_hw_data *ha = vha->hw;
+
+        temp = qla82xx_rd_32(ha, CRB_TEMP_STATE);
+        temp_state = qla82xx_get_temp_state(temp);
+        temp_val = qla82xx_get_temp_val(temp);
+
+        if (temp_state == QLA82XX_TEMP_PANIC) {
+                ql_log(ql_log_warn, vha, 0x600e,
+                    "Device temperature %d degrees C exceeds "
+                    " maximum allowed. Hardware has been shut down.\n",
+                    temp_val);
+                return 1;
+        } else if (temp_state == QLA82XX_TEMP_WARN) {
+                ql_log(ql_log_warn, vha, 0x600f,
+                    "Device temperature %d degrees C exceeds "
+                    "operating range. Immediate action needed.\n",
+                    temp_val);
+        }
+        return 0;
+}
+
 void qla82xx_clear_pending_mbx(scsi_qla_host_t *vha)
 {
         struct qla_hw_data *ha = vha->hw;
@@ -3347,18 +3370,20 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
         /* don't poll if reset is going on */
         if (!ha->flags.isp82xx_reset_hdlr_active) {
                 dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-                if (dev_state == QLA82XX_DEV_NEED_RESET &&
+                if (qla82xx_check_temp(vha)) {
+                        set_bit(ISP_UNRECOVERABLE, &vha->dpc_flags);
+                        ha->flags.isp82xx_fw_hung = 1;
+                        qla82xx_clear_pending_mbx(vha);
+                } else if (dev_state == QLA82XX_DEV_NEED_RESET &&
                     !test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags)) {
                         ql_log(ql_log_warn, vha, 0x6001,
                             "Adapter reset needed.\n");
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
-                        qla2xxx_wake_dpc(vha);
                 } else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&
                         !test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) {
                         ql_log(ql_log_warn, vha, 0x6002,
                             "Quiescent needed.\n");
                         set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags);
-                        qla2xxx_wake_dpc(vha);
                 } else {
                         if (qla82xx_check_fw_alive(vha)) {
                                 ql_dbg(ql_dbg_timer, vha, 0x6011,
@@ -3398,7 +3423,6 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
                                         set_bit(ISP_ABORT_NEEDED,
                                             &vha->dpc_flags);
                                 }
-                                qla2xxx_wake_dpc(vha);
                                 ha->flags.isp82xx_fw_hung = 1;
                                 ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n");
                                 qla82xx_clear_pending_mbx(vha);
@@ -4113,6 +4137,14 @@ qla82xx_md_collect(scsi_qla_host_t *vha)
                 goto md_failed;
         }
 
+        if (ha->flags.isp82xx_no_md_cap) {
+                ql_log(ql_log_warn, vha, 0xb054,
+                    "Forced reset from application, "
+                    "ignore minidump capture\n");
+                ha->flags.isp82xx_no_md_cap = 0;
+                goto md_failed;
+        }
+
         if (qla82xx_validate_template_chksum(vha)) {
                 ql_log(ql_log_info, vha, 0xb039,
                     "Template checksum validation error\n");
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 4ac50e274661..6eb210e3cc63 100644
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -26,6 +26,7 @@
 #define CRB_RCVPEG_STATE                QLA82XX_REG(0x13c)
 #define BOOT_LOADER_DIMM_STATUS         QLA82XX_REG(0x54)
 #define CRB_DMA_SHIFT                   QLA82XX_REG(0xcc)
+#define CRB_TEMP_STATE                  QLA82XX_REG(0x1b4)
 #define QLA82XX_DMA_SHIFT_VALUE         0x55555555
 
 #define QLA82XX_HW_H0_CH_HUB_ADR    0x05
@@ -561,7 +562,6 @@
 #define QLA82XX_FW_VERSION_SUB          (QLA82XX_CAM_RAM(0x158))
 #define QLA82XX_PCIE_REG(reg)           (QLA82XX_CRB_PCIE + (reg))
 
-#define PCIE_CHICKEN3                   (0x120c8)
 #define PCIE_SETUP_FUNCTION             (0x12040)
 #define PCIE_SETUP_FUNCTION2            (0x12048)
 
@@ -1178,4 +1178,16 @@ static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,
 #define CRB_NIU_XG_PAUSE_CTL_P0        0x1
 #define CRB_NIU_XG_PAUSE_CTL_P1        0x8
 
+#define qla82xx_get_temp_val(x)          ((x) >> 16)
+#define qla82xx_get_temp_state(x)        ((x) & 0xffff)
+#define qla82xx_encode_temp(val, state)  (((val) << 16) | (state))
+
+/*
+ * Temperature control.
+ */
+enum {
+        QLA82XX_TEMP_NORMAL = 0x1, /* Normal operating range */
+        QLA82XX_TEMP_WARN,         /* Sound alert, temperature getting high */
+        QLA82XX_TEMP_PANIC         /* Fatal error, hardware has shut down. */
+};
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c9c56a8427f3..6d1d873a20e2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -13,12 +13,13 @@
 #include <linux/mutex.h>
 #include <linux/kobject.h>
 #include <linux/slab.h>
-
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsicam.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
 
+#include "qla_target.h"
+
 /*
  * Driver version
  */
@@ -40,6 +41,12 @@ static struct kmem_cache *ctx_cachep;
  */
 int ql_errlev = ql_log_all;
 
+int ql2xenableclass2;
+module_param(ql2xenableclass2, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xenableclass2,
+                "Specify if Class 2 operations are supported from the very "
+                "beginning. Default is 0 - class 2 not supported.");
+
 int ql2xlogintimeout = 20;
 module_param(ql2xlogintimeout, int, S_IRUGO);
 MODULE_PARM_DESC(ql2xlogintimeout,
@@ -255,6 +262,8 @@ struct scsi_host_template qla2xxx_driver_template = {
 
         .max_sectors            = 0xFFFF,
         .shost_attrs            = qla2x00_host_attrs,
+
+        .supported_mode         = MODE_INITIATOR,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -306,7 +315,8 @@ static void qla2x00_free_fw_dump(struct qla_hw_data *);
 static void qla2x00_mem_free(struct qla_hw_data *);
 
 /* -------------------------------------------------------------------------- */
-static int qla2x00_alloc_queues(struct qla_hw_data *ha)
+static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
+                                struct rsp_que *rsp)
 {
         scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
         ha->req_q_map = kzalloc(sizeof(struct req_que *) * ha->max_req_queues,
@@ -324,6 +334,12 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha)
                     "Unable to allocate memory for response queue ptrs.\n");
                 goto fail_rsp_map;
         }
+        /*
+         * Make sure we record at least the request and response queue zero in
+         * case we need to free them if part of the probe fails.
+         */
+        ha->rsp_q_map[0] = rsp;
+        ha->req_q_map[0] = req;
         set_bit(0, ha->rsp_qid_map);
         set_bit(0, ha->req_qid_map);
         return 1;
@@ -642,12 +658,12 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 
         if (ha->flags.eeh_busy) {
                 if (ha->flags.pci_channel_io_perm_failure) {
-                        ql_dbg(ql_dbg_io, vha, 0x3001,
+                        ql_dbg(ql_dbg_aer, vha, 0x9010,
                             "PCI Channel IO permanent failure, exiting "
                             "cmd=%p.\n", cmd);
                         cmd->result = DID_NO_CONNECT << 16;
                 } else {
-                        ql_dbg(ql_dbg_io, vha, 0x3002,
+                        ql_dbg(ql_dbg_aer, vha, 0x9011,
                             "EEH_Busy, Requeuing the cmd=%p.\n", cmd);
                         cmd->result = DID_REQUEUE << 16;
                 }
@@ -657,7 +673,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
         rval = fc_remote_port_chkready(rport);
         if (rval) {
                 cmd->result = rval;
-                ql_dbg(ql_dbg_io, vha, 0x3003,
+                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3003,
                     "fc_remote_port_chkready failed for cmd=%p, rval=0x%x.\n",
                     cmd, rval);
                 goto qc24_fail_command;
@@ -1136,7 +1152,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
         ret = FAILED;
 
         ql_log(ql_log_info, vha, 0x8012,
-            "BUS RESET ISSUED nexus=%ld:%d%d.\n", vha->host_no, id, lun);
+            "BUS RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
 
         if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {
                 ql_log(ql_log_fatal, vha, 0x8013,
@@ -2180,6 +2196,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ql_dbg_pci(ql_dbg_init, pdev, 0x000a,
             "Memory allocated for ha=%p.\n", ha);
         ha->pdev = pdev;
+        ha->tgt.enable_class_2 = ql2xenableclass2;
 
         /* Clear our data area */
         ha->bars = bars;
@@ -2243,6 +2260,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_24XX;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
+                ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct mid_init_cb_24xx);
                 ha->gid_list_info_size = 8;
@@ -2258,6 +2276,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->mbx_count = MAILBOX_REGISTER_COUNT;
                 req_length = REQUEST_ENTRY_CNT_24XX;
                 rsp_length = RESPONSE_ENTRY_CNT_2300;
+                ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct mid_init_cb_24xx);
                 ha->gid_list_info_size = 8;
@@ -2417,6 +2436,17 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             host->max_cmd_len, host->max_channel, host->max_lun,
             host->transportt, sht->vendor_id);
 
+que_init:
+        /* Alloc arrays of request and response ring ptrs */
+        if (!qla2x00_alloc_queues(ha, req, rsp)) {
+                ql_log(ql_log_fatal, base_vha, 0x003d,
+                    "Failed to allocate memory for queue pointers..."
+                    "aborting.\n");
+                goto probe_init_failed;
+        }
+
+        qlt_probe_one_stage1(base_vha, ha);
+
         /* Set up the irqs */
         ret = qla2x00_request_irqs(ha, rsp);
         if (ret)
@@ -2424,20 +2454,10 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pci_save_state(pdev);
 
-        /* Alloc arrays of request and response ring ptrs */
-que_init:
-        if (!qla2x00_alloc_queues(ha)) {
-                ql_log(ql_log_fatal, base_vha, 0x003d,
-                    "Failed to allocate memory for queue pointers.. aborting.\n");
-                goto probe_init_failed;
-        }
-
-        ha->rsp_q_map[0] = rsp;
-        ha->req_q_map[0] = req;
+        /* Assign back pointers */
         rsp->req = req;
         req->rsp = rsp;
-        set_bit(0, ha->req_qid_map);
-        set_bit(0, ha->rsp_qid_map);
+
         /* FWI2-capable only. */
         req->req_q_in = &ha->iobase->isp24.req_q_in;
         req->req_q_out = &ha->iobase->isp24.req_q_out;
@@ -2514,6 +2534,14 @@ que_init:
         ql_dbg(ql_dbg_init, base_vha, 0x00ee,
             "DPC thread started successfully.\n");
 
+        /*
+         * If we're not coming up in initiator mode, we might sit for
+         * a while without waking up the dpc thread, which leads to a
+         * stuck process warning.  So just kick the dpc once here and
+         * let the kthread start (and go back to sleep in qla2x00_do_dpc).
+         */
+        qla2xxx_wake_dpc(base_vha);
+
 skip_dpc:
         list_add_tail(&base_vha->list, &ha->vp_list);
         base_vha->host->irq = ha->pdev->irq;
@@ -2559,7 +2587,11 @@ skip_dpc:
         ql_dbg(ql_dbg_init, base_vha, 0x00f2,
             "Init done and hba is online.\n");
 
-        scsi_scan_host(host);
+        if (qla_ini_mode_enabled(base_vha))
+                scsi_scan_host(host);
+        else
+                ql_dbg(ql_dbg_init, base_vha, 0x0122,
+                        "skipping scsi_scan_host() for non-initiator port\n");
 
         qla2x00_alloc_sysfs_attr(base_vha);
 
@@ -2577,11 +2609,17 @@ skip_dpc:
             base_vha->host_no,
             ha->isp_ops->fw_version_str(base_vha, fw_str));
 
+        qlt_add_target(ha, base_vha);
+
         return 0;
 
 probe_init_failed:
         qla2x00_free_req_que(ha, req);
+        ha->req_q_map[0] = NULL;
+        clear_bit(0, ha->req_qid_map);
         qla2x00_free_rsp_que(ha, rsp);
+        ha->rsp_q_map[0] = NULL;
+        clear_bit(0, ha->rsp_qid_map);
         ha->max_req_queues = ha->max_rsp_queues = 0;
 
 probe_failed:
@@ -2621,6 +2659,22 @@ probe_out:
 }
 
 static void
+qla2x00_stop_dpc_thread(scsi_qla_host_t *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct task_struct *t = ha->dpc_thread;
+
+        if (ha->dpc_thread == NULL)
+                return;
+        /*
+         * qla2xxx_wake_dpc checks for ->dpc_thread
+         * so we need to zero it out.
+         */
+        ha->dpc_thread = NULL;
+        kthread_stop(t);
+}
+
+static void
 qla2x00_shutdown(struct pci_dev *pdev)
 {
         scsi_qla_host_t *vha;
@@ -2663,9 +2717,18 @@ qla2x00_remove_one(struct pci_dev *pdev)
         struct qla_hw_data  *ha;
         unsigned long flags;
 
+        /*
+         * If the PCI device is disabled that means that probe failed and any
+         * resources should be have cleaned up on probe exit.
+         */
+        if (!atomic_read(&pdev->enable_cnt))
+                return;
+
         base_vha = pci_get_drvdata(pdev);
         ha = base_vha->hw;
 
+        ha->flags.host_shutting_down = 1;
+
         mutex_lock(&ha->vport_lock);
         while (ha->cur_vport_count) {
                 struct Scsi_Host *scsi_host;
@@ -2719,6 +2782,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
                 ha->dpc_thread = NULL;
                 kthread_stop(t);
         }
+        qlt_remove_target(ha, base_vha);
 
         qla2x00_free_sysfs_attr(base_vha);
 
@@ -2770,17 +2834,7 @@ qla2x00_free_device(scsi_qla_host_t *vha)
         if (vha->timer_active)
                 qla2x00_stop_timer(vha);
 
-        /* Kill the kernel thread for this host */
-        if (ha->dpc_thread) {
-                struct task_struct *t = ha->dpc_thread;
-
-                /*
-                 * qla2xxx_wake_dpc checks for ->dpc_thread
-                 * so we need to zero it out.
-                 */
-                ha->dpc_thread = NULL;
-                kthread_stop(t);
-        }
+        qla2x00_stop_dpc_thread(vha);
 
         qla25xx_delete_queues(vha);
 
@@ -2842,8 +2896,10 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
                 spin_unlock_irqrestore(vha->host->host_lock, flags);
                 set_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
                 qla2xxx_wake_dpc(base_vha);
-        } else
+        } else {
                 fc_remote_port_delete(rport);
+                qlt_fc_port_deleted(vha, fcport);
+        }
 }
 
 /*
@@ -2859,7 +2915,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport,
     int do_login, int defer)
 {
         if (atomic_read(&fcport->state) == FCS_ONLINE &&
-            vha->vp_idx == fcport->vp_idx) {
+            vha->vp_idx == fcport->vha->vp_idx) {
                 qla2x00_set_fcport_state(fcport, FCS_DEVICE_LOST);
                 qla2x00_schedule_rport_del(vha, fcport, defer);
         }
@@ -2908,7 +2964,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
         fc_port_t *fcport;
 
         list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                if (vha->vp_idx != 0 && vha->vp_idx != fcport->vp_idx)
+                if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx)
                         continue;
 
                 /*
@@ -2921,7 +2977,7 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
                         qla2x00_set_fcport_state(fcport, FCS_DEVICE_LOST);
                         if (defer)
                                 qla2x00_schedule_rport_del(vha, fcport, defer);
-                        else if (vha->vp_idx == fcport->vp_idx)
+                        else if (vha->vp_idx == fcport->vha->vp_idx)
                                 qla2x00_schedule_rport_del(vha, fcport, defer);
                 }
         }
@@ -2946,10 +3002,13 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,
         if (!ha->init_cb)
                 goto fail;
 
+        if (qlt_mem_alloc(ha) < 0)
+                goto fail_free_init_cb;
+
         ha->gid_list = dma_alloc_coherent(&ha->pdev->dev,
                 qla2x00_gid_list_size(ha), &ha->gid_list_dma, GFP_KERNEL);
         if (!ha->gid_list)
-                goto fail_free_init_cb;
+                goto fail_free_tgt_mem;
 
         ha->srb_mempool = mempool_create_slab_pool(SRB_MIN_REQ, srb_cachep);
         if (!ha->srb_mempool)
@@ -3167,6 +3226,8 @@ fail_free_gid_list:
         ha->gid_list_dma);
         ha->gid_list = NULL;
         ha->gid_list_dma = 0;
+fail_free_tgt_mem:
+        qlt_mem_free(ha);
 fail_free_init_cb:
         dma_free_coherent(&ha->pdev->dev, ha->init_cb_size, ha->init_cb,
         ha->init_cb_dma);
@@ -3282,6 +3343,8 @@ qla2x00_mem_free(struct qla_hw_data *ha)
         if (ha->ctx_mempool)
                 mempool_destroy(ha->ctx_mempool);
 
+        qlt_mem_free(ha);
+
         if (ha->init_cb)
                 dma_free_coherent(&ha->pdev->dev, ha->init_cb_size,
                         ha->init_cb, ha->init_cb_dma);
@@ -3311,6 +3374,10 @@ qla2x00_mem_free(struct qla_hw_data *ha)
 
         ha->gid_list = NULL;
         ha->gid_list_dma = 0;
+
+        ha->tgt.atio_ring = NULL;
+        ha->tgt.atio_dma = 0;
+        ha->tgt.tgt_vp_map = NULL;
 }
 
 struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht,
@@ -3671,10 +3738,9 @@ qla2x00_do_dpc(void *data)
 
                 ha->dpc_active = 1;
 
-                ql_dbg(ql_dbg_dpc, base_vha, 0x4001,
-                    "DPC handler waking up.\n");
-                ql_dbg(ql_dbg_dpc, base_vha, 0x4002,
-                    "dpc_flags=0x%lx.\n", base_vha->dpc_flags);
+                ql_dbg(ql_dbg_dpc + ql_dbg_verbose, base_vha, 0x4001,
+                    "DPC handler waking up, dpc_flags=0x%lx.\n",
+                    base_vha->dpc_flags);
 
                 qla2x00_do_work(base_vha);
 
@@ -3740,6 +3806,16 @@ qla2x00_do_dpc(void *data)
                         clear_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
                 }
 
+                if (test_bit(SCR_PENDING, &base_vha->dpc_flags)) {
+                        int ret;
+                        ret = qla2x00_send_change_request(base_vha, 0x3, 0);
+                        if (ret != QLA_SUCCESS)
+                                ql_log(ql_log_warn, base_vha, 0x121,
+                                    "Failed to enable receiving of RSCN "
+                                    "requests: 0x%x.\n", ret);
+                        clear_bit(SCR_PENDING, &base_vha->dpc_flags);
+                }
+
                 if (test_bit(ISP_QUIESCE_NEEDED, &base_vha->dpc_flags)) {
                         ql_dbg(ql_dbg_dpc, base_vha, 0x4009,
                             "Quiescence mode scheduled.\n");
@@ -4457,6 +4533,21 @@ qla2x00_module_init(void)
                 return -ENOMEM;
         }
 
+        /* Initialize target kmem_cache and mem_pools */
+        ret = qlt_init();
+        if (ret < 0) {
+                kmem_cache_destroy(srb_cachep);
+                return ret;
+        } else if (ret > 0) {
+                /*
+                 * If initiator mode is explictly disabled by qlt_init(),
+                 * prevent scsi_transport_fc.c:fc_scsi_scan_rport() from
+                 * performing scsi_scan_target() during LOOP UP event.
+                 */
+                qla2xxx_transport_functions.disable_target_scan = 1;
+                qla2xxx_transport_vport_functions.disable_target_scan = 1;
+        }
+
         /* Derive version string. */
         strcpy(qla2x00_version_str, QLA2XXX_VERSION);
         if (ql2xextended_error_logging)
@@ -4468,6 +4559,7 @@ qla2x00_module_init(void)
                 kmem_cache_destroy(srb_cachep);
                 ql_log(ql_log_fatal, NULL, 0x0002,
                     "fc_attach_transport failed...Failing load!.\n");
+                qlt_exit();
                 return -ENODEV;
         }
 
@@ -4481,6 +4573,7 @@ qla2x00_module_init(void)
             fc_attach_transport(&qla2xxx_transport_vport_functions);
         if (!qla2xxx_transport_vport_template) {
                 kmem_cache_destroy(srb_cachep);
+                qlt_exit();
                 fc_release_transport(qla2xxx_transport_template);
                 ql_log(ql_log_fatal, NULL, 0x0004,
                     "fc_attach_transport vport failed...Failing load!.\n");
@@ -4492,6 +4585,7 @@ qla2x00_module_init(void)
         ret = pci_register_driver(&qla2xxx_pci_driver);
         if (ret) {
                 kmem_cache_destroy(srb_cachep);
+                qlt_exit();
                 fc_release_transport(qla2xxx_transport_template);
                 fc_release_transport(qla2xxx_transport_vport_template);
                 ql_log(ql_log_fatal, NULL, 0x0006,
@@ -4511,6 +4605,7 @@ qla2x00_module_exit(void)
         pci_unregister_driver(&qla2xxx_pci_driver);
         qla2x00_release_firmware();
         kmem_cache_destroy(srb_cachep);
+        qlt_exit();
         if (ctx_cachep)
                 kmem_cache_destroy(ctx_cachep);
         fc_release_transport(qla2xxx_transport_template);
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
new file mode 100644
index 000000000000..6986552b47e6
--- /dev/null
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -0,0 +1,4972 @@
+/*
+ *  qla_target.c SCSI LLD infrastructure for QLogic 22xx/23xx/24xx/25xx
+ *
+ *  based on qla2x00t.c code:
+ *
+ *  Copyright (C) 2004 - 2010 Vladislav Bolkhovitin <vst@vlnb.net>
+ *  Copyright (C) 2004 - 2005 Leonid Stoljar
+ *  Copyright (C) 2006 Nathaniel Clark <nate@misrule.us>
+ *  Copyright (C) 2006 - 2010 ID7 Ltd.
+ *
+ *  Forward port and refactoring to modern qla2xxx and target/configfs
+ *
+ *  Copyright (C) 2010-2011 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, version 2
+ *  of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/blkdev.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/list.h>
+#include <linux/workqueue.h>
+#include <asm/unaligned.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+#include <target/target_core_base.h>
+#include <target/target_core_fabric.h>
+
+#include "qla_def.h"
+#include "qla_target.h"
+
+static char *qlini_mode = QLA2XXX_INI_MODE_STR_ENABLED;
+module_param(qlini_mode, charp, S_IRUGO);
+MODULE_PARM_DESC(qlini_mode,
+        "Determines when initiator mode will be enabled. Possible values: "
+        "\"exclusive\" - initiator mode will be enabled on load, "
+        "disabled on enabling target mode and then on disabling target mode "
+        "enabled back; "
+        "\"disabled\" - initiator mode will never be enabled; "
+        "\"enabled\" (default) - initiator mode will always stay enabled.");
+
+static int ql2x_ini_mode = QLA2XXX_INI_MODE_EXCLUSIVE;
+
+/*
+ * From scsi/fc/fc_fcp.h
+ */
+enum fcp_resp_rsp_codes {
+        FCP_TMF_CMPL = 0,
+        FCP_DATA_LEN_INVALID = 1,
+        FCP_CMND_FIELDS_INVALID = 2,
+        FCP_DATA_PARAM_MISMATCH = 3,
+        FCP_TMF_REJECTED = 4,
+        FCP_TMF_FAILED = 5,
+        FCP_TMF_INVALID_LUN = 9,
+};
+
+/*
+ * fc_pri_ta from scsi/fc/fc_fcp.h
+ */
+#define FCP_PTA_SIMPLE      0   /* simple task attribute */
+#define FCP_PTA_HEADQ       1   /* head of queue task attribute */
+#define FCP_PTA_ORDERED     2   /* ordered task attribute */
+#define FCP_PTA_ACA         4   /* auto. contigent allegiance */
+#define FCP_PTA_MASK        7   /* mask for task attribute field */
+#define FCP_PRI_SHIFT       3   /* priority field starts in bit 3 */
+#define FCP_PRI_RESVD_MASK  0x80        /* reserved bits in priority field */
+
+/*
+ * This driver calls qla2x00_alloc_iocbs() and qla2x00_issue_marker(), which
+ * must be called under HW lock and could unlock/lock it inside.
+ * It isn't an issue, since in the current implementation on the time when
+ * those functions are called:
+ *
+ *   - Either context is IRQ and only IRQ handler can modify HW data,
+ *     including rings related fields,
+ *
+ *   - Or access to target mode variables from struct qla_tgt doesn't
+ *     cross those functions boundaries, except tgt_stop, which
+ *     additionally protected by irq_cmd_count.
+ */
+/* Predefs for callbacks handed to qla2xxx LLD */
+static void qlt_24xx_atio_pkt(struct scsi_qla_host *ha,
+        struct atio_from_isp *pkt);
+static void qlt_response_pkt(struct scsi_qla_host *ha, response_t *pkt);
+static int qlt_issue_task_mgmt(struct qla_tgt_sess *sess, uint32_t lun,
+        int fn, void *iocb, int flags);
+static void qlt_send_term_exchange(struct scsi_qla_host *ha, struct qla_tgt_cmd
+        *cmd, struct atio_from_isp *atio, int ha_locked);
+static void qlt_reject_free_srr_imm(struct scsi_qla_host *ha,
+        struct qla_tgt_srr_imm *imm, int ha_lock);
+/*
+ * Global Variables
+ */
+static struct kmem_cache *qla_tgt_cmd_cachep;
+static struct kmem_cache *qla_tgt_mgmt_cmd_cachep;
+static mempool_t *qla_tgt_mgmt_cmd_mempool;
+static struct workqueue_struct *qla_tgt_wq;
+static DEFINE_MUTEX(qla_tgt_mutex);
+static LIST_HEAD(qla_tgt_glist);
+
+/* ha->hardware_lock supposed to be held on entry (to protect tgt->sess_list) */
+static struct qla_tgt_sess *qlt_find_sess_by_port_name(
+        struct qla_tgt *tgt,
+        const uint8_t *port_name)
+{
+        struct qla_tgt_sess *sess;
+
+        list_for_each_entry(sess, &tgt->sess_list, sess_list_entry) {
+                if (!memcmp(sess->port_name, port_name, WWN_SIZE))
+                        return sess;
+        }
+
+        return NULL;
+}
+
+/* Might release hw lock, then reaquire!! */
+static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked)
+{
+        /* Send marker if required */
+        if (unlikely(vha->marker_needed != 0)) {
+                int rc = qla2x00_issue_marker(vha, vha_locked);
+                if (rc != QLA_SUCCESS) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe03d,
+                            "qla_target(%d): issue_marker() failed\n",
+                            vha->vp_idx);
+                }
+                return rc;
+        }
+        return QLA_SUCCESS;
+}
+
+static inline
+struct scsi_qla_host *qlt_find_host_by_d_id(struct scsi_qla_host *vha,
+        uint8_t *d_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        uint8_t vp_idx;
+
+        if ((vha->d_id.b.area != d_id[1]) || (vha->d_id.b.domain != d_id[0]))
+                return NULL;
+
+        if (vha->d_id.b.al_pa == d_id[2])
+                return vha;
+
+        BUG_ON(ha->tgt.tgt_vp_map == NULL);
+        vp_idx = ha->tgt.tgt_vp_map[d_id[2]].idx;
+        if (likely(test_bit(vp_idx, ha->vp_idx_map)))
+                return ha->tgt.tgt_vp_map[vp_idx].vha;
+
+        return NULL;
+}
+
+static inline
+struct scsi_qla_host *qlt_find_host_by_vp_idx(struct scsi_qla_host *vha,
+        uint16_t vp_idx)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        if (vha->vp_idx == vp_idx)
+                return vha;
+
+        BUG_ON(ha->tgt.tgt_vp_map == NULL);
+        if (likely(test_bit(vp_idx, ha->vp_idx_map)))
+                return ha->tgt.tgt_vp_map[vp_idx].vha;
+
+        return NULL;
+}
+
+void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
+        struct atio_from_isp *atio)
+{
+        switch (atio->u.raw.entry_type) {
+        case ATIO_TYPE7:
+        {
+                struct scsi_qla_host *host = qlt_find_host_by_d_id(vha,
+                    atio->u.isp24.fcp_hdr.d_id);
+                if (unlikely(NULL == host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe03e,
+                            "qla_target(%d): Received ATIO_TYPE7 "
+                            "with unknown d_id %x:%x:%x\n", vha->vp_idx,
+                            atio->u.isp24.fcp_hdr.d_id[0],
+                            atio->u.isp24.fcp_hdr.d_id[1],
+                            atio->u.isp24.fcp_hdr.d_id[2]);
+                        break;
+                }
+                qlt_24xx_atio_pkt(host, atio);
+                break;
+        }
+
+        case IMMED_NOTIFY_TYPE:
+        {
+                struct scsi_qla_host *host = vha;
+                struct imm_ntfy_from_isp *entry =
+                    (struct imm_ntfy_from_isp *)atio;
+
+                if ((entry->u.isp24.vp_index != 0xFF) &&
+                    (entry->u.isp24.nport_handle != 0xFFFF)) {
+                        host = qlt_find_host_by_vp_idx(vha,
+                            entry->u.isp24.vp_index);
+                        if (unlikely(!host)) {
+                                ql_dbg(ql_dbg_tgt, vha, 0xe03f,
+                                    "qla_target(%d): Received "
+                                    "ATIO (IMMED_NOTIFY_TYPE) "
+                                    "with unknown vp_index %d\n",
+                                    vha->vp_idx, entry->u.isp24.vp_index);
+                                break;
+                        }
+                }
+                qlt_24xx_atio_pkt(host, atio);
+                break;
+        }
+
+        default:
+                ql_dbg(ql_dbg_tgt, vha, 0xe040,
+                    "qla_target(%d): Received unknown ATIO atio "
+                    "type %x\n", vha->vp_idx, atio->u.raw.entry_type);
+                break;
+        }
+
+        return;
+}
+
+void qlt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
+{
+        switch (pkt->entry_type) {
+        case CTIO_TYPE7:
+        {
+                struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;
+                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
+                    entry->vp_index);
+                if (unlikely(!host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe041,
+                            "qla_target(%d): Response pkt (CTIO_TYPE7) "
+                            "received, with unknown vp_index %d\n",
+                            vha->vp_idx, entry->vp_index);
+                        break;
+                }
+                qlt_response_pkt(host, pkt);
+                break;
+        }
+
+        case IMMED_NOTIFY_TYPE:
+        {
+                struct scsi_qla_host *host = vha;
+                struct imm_ntfy_from_isp *entry =
+                    (struct imm_ntfy_from_isp *)pkt;
+
+                host = qlt_find_host_by_vp_idx(vha, entry->u.isp24.vp_index);
+                if (unlikely(!host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe042,
+                            "qla_target(%d): Response pkt (IMMED_NOTIFY_TYPE) "
+                            "received, with unknown vp_index %d\n",
+                            vha->vp_idx, entry->u.isp24.vp_index);
+                        break;
+                }
+                qlt_response_pkt(host, pkt);
+                break;
+        }
+
+        case NOTIFY_ACK_TYPE:
+        {
+                struct scsi_qla_host *host = vha;
+                struct nack_to_isp *entry = (struct nack_to_isp *)pkt;
+
+                if (0xFF != entry->u.isp24.vp_index) {
+                        host = qlt_find_host_by_vp_idx(vha,
+                            entry->u.isp24.vp_index);
+                        if (unlikely(!host)) {
+                                ql_dbg(ql_dbg_tgt, vha, 0xe043,
+                                    "qla_target(%d): Response "
+                                    "pkt (NOTIFY_ACK_TYPE) "
+                                    "received, with unknown "
+                                    "vp_index %d\n", vha->vp_idx,
+                                    entry->u.isp24.vp_index);
+                                break;
+                        }
+                }
+                qlt_response_pkt(host, pkt);
+                break;
+        }
+
+        case ABTS_RECV_24XX:
+        {
+                struct abts_recv_from_24xx *entry =
+                    (struct abts_recv_from_24xx *)pkt;
+                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
+                    entry->vp_index);
+                if (unlikely(!host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe044,
+                            "qla_target(%d): Response pkt "
+                            "(ABTS_RECV_24XX) received, with unknown "
+                            "vp_index %d\n", vha->vp_idx, entry->vp_index);
+                        break;
+                }
+                qlt_response_pkt(host, pkt);
+                break;
+        }
+
+        case ABTS_RESP_24XX:
+        {
+                struct abts_resp_to_24xx *entry =
+                    (struct abts_resp_to_24xx *)pkt;
+                struct scsi_qla_host *host = qlt_find_host_by_vp_idx(vha,
+                    entry->vp_index);
+                if (unlikely(!host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe045,
+                            "qla_target(%d): Response pkt "
+                            "(ABTS_RECV_24XX) received, with unknown "
+                            "vp_index %d\n", vha->vp_idx, entry->vp_index);
+                        break;
+                }
+                qlt_response_pkt(host, pkt);
+                break;
+        }
+
+        default:
+                qlt_response_pkt(vha, pkt);
+                break;
+        }
+
+}
+
+static void qlt_free_session_done(struct work_struct *work)
+{
+        struct qla_tgt_sess *sess = container_of(work, struct qla_tgt_sess,
+            free_work);
+        struct qla_tgt *tgt = sess->tgt;
+        struct scsi_qla_host *vha = sess->vha;
+        struct qla_hw_data *ha = vha->hw;
+
+        BUG_ON(!tgt);
+        /*
+         * Release the target session for FC Nexus from fabric module code.
+         */
+        if (sess->se_sess != NULL)
+                ha->tgt.tgt_ops->free_session(sess);
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,
+            "Unregistration of sess %p finished\n", sess);
+
+        kfree(sess);
+        /*
+         * We need to protect against race, when tgt is freed before or
+         * inside wake_up()
+         */
+        tgt->sess_count--;
+        if (tgt->sess_count == 0)
+                wake_up_all(&tgt->waitQ);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+void qlt_unreg_sess(struct qla_tgt_sess *sess)
+{
+        struct scsi_qla_host *vha = sess->vha;
+
+        vha->hw->tgt.tgt_ops->clear_nacl_from_fcport_map(sess);
+
+        list_del(&sess->sess_list_entry);
+        if (sess->deleted)
+                list_del(&sess->del_list_entry);
+
+        INIT_WORK(&sess->free_work, qlt_free_session_done);
+        schedule_work(&sess->free_work);
+}
+EXPORT_SYMBOL(qlt_unreg_sess);
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess = NULL;
+        uint32_t unpacked_lun, lun = 0;
+        uint16_t loop_id;
+        int res = 0;
+        struct imm_ntfy_from_isp *n = (struct imm_ntfy_from_isp *)iocb;
+        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
+
+        loop_id = le16_to_cpu(n->u.isp24.nport_handle);
+        if (loop_id == 0xFFFF) {
+#if 0 /* FIXME: Re-enable Global event handling.. */
+                /* Global event */
+                atomic_inc(&ha->tgt.qla_tgt->tgt_global_resets_count);
+                qlt_clear_tgt_db(ha->tgt.qla_tgt, 1);
+                if (!list_empty(&ha->tgt.qla_tgt->sess_list)) {
+                        sess = list_entry(ha->tgt.qla_tgt->sess_list.next,
+                            typeof(*sess), sess_list_entry);
+                        switch (mcmd) {
+                        case QLA_TGT_NEXUS_LOSS_SESS:
+                                mcmd = QLA_TGT_NEXUS_LOSS;
+                                break;
+                        case QLA_TGT_ABORT_ALL_SESS:
+                                mcmd = QLA_TGT_ABORT_ALL;
+                                break;
+                        case QLA_TGT_NEXUS_LOSS:
+                        case QLA_TGT_ABORT_ALL:
+                                break;
+                        default:
+                                ql_dbg(ql_dbg_tgt, vha, 0xe046,
+                                    "qla_target(%d): Not allowed "
+                                    "command %x in %s", vha->vp_idx,
+                                    mcmd, __func__);
+                                sess = NULL;
+                                break;
+                        }
+                } else
+                        sess = NULL;
+#endif
+        } else {
+                sess = ha->tgt.tgt_ops->find_sess_by_loop_id(vha, loop_id);
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe000,
+            "Using sess for qla_tgt_reset: %p\n", sess);
+        if (!sess) {
+                res = -ESRCH;
+                return res;
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe047,
+            "scsi(%ld): resetting (session %p from port "
+            "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x, "
+            "mcmd %x, loop_id %d)\n", vha->host_no, sess,
+            sess->port_name[0], sess->port_name[1],
+            sess->port_name[2], sess->port_name[3],
+            sess->port_name[4], sess->port_name[5],
+            sess->port_name[6], sess->port_name[7],
+            mcmd, loop_id);
+
+        lun = a->u.isp24.fcp_cmnd.lun;
+        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
+
+        return qlt_issue_task_mgmt(sess, unpacked_lun, mcmd,
+            iocb, QLA24XX_MGMT_SEND_NACK);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess,
+        bool immediate)
+{
+        struct qla_tgt *tgt = sess->tgt;
+        uint32_t dev_loss_tmo = tgt->ha->port_down_retry_count + 5;
+
+        if (sess->deleted)
+                return;
+
+        ql_dbg(ql_dbg_tgt, sess->vha, 0xe001,
+            "Scheduling sess %p for deletion\n", sess);
+        list_add_tail(&sess->del_list_entry, &tgt->del_sess_list);
+        sess->deleted = 1;
+
+        if (immediate)
+                dev_loss_tmo = 0;
+
+        sess->expires = jiffies + dev_loss_tmo * HZ;
+
+        ql_dbg(ql_dbg_tgt, sess->vha, 0xe048,
+            "qla_target(%d): session for port %02x:%02x:%02x:"
+            "%02x:%02x:%02x:%02x:%02x (loop ID %d) scheduled for "
+            "deletion in %u secs (expires: %lu) immed: %d\n",
+            sess->vha->vp_idx,
+            sess->port_name[0], sess->port_name[1],
+            sess->port_name[2], sess->port_name[3],
+            sess->port_name[4], sess->port_name[5],
+            sess->port_name[6], sess->port_name[7],
+            sess->loop_id, dev_loss_tmo, sess->expires, immediate);
+
+        if (immediate)
+                schedule_delayed_work(&tgt->sess_del_work, 0);
+        else
+                schedule_delayed_work(&tgt->sess_del_work,
+                    jiffies - sess->expires);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static void qlt_clear_tgt_db(struct qla_tgt *tgt, bool local_only)
+{
+        struct qla_tgt_sess *sess;
+
+        list_for_each_entry(sess, &tgt->sess_list, sess_list_entry)
+                qlt_schedule_sess_for_deletion(sess, true);
+
+        /* At this point tgt could be already dead */
+}
+
+static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,
+        uint16_t *loop_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        dma_addr_t gid_list_dma;
+        struct gid_list_info *gid_list;
+        char *id_iter;
+        int res, rc, i;
+        uint16_t entries;
+
+        gid_list = dma_alloc_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
+            &gid_list_dma, GFP_KERNEL);
+        if (!gid_list) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf044,
+                    "qla_target(%d): DMA Alloc failed of %u\n",
+                    vha->vp_idx, qla2x00_gid_list_size(ha));
+                return -ENOMEM;
+        }
+
+        /* Get list of logged in devices */
+        rc = qla2x00_get_id_list(vha, gid_list, gid_list_dma, &entries);
+        if (rc != QLA_SUCCESS) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf045,
+                    "qla_target(%d): get_id_list() failed: %x\n",
+                    vha->vp_idx, rc);
+                res = -1;
+                goto out_free_id_list;
+        }
+
+        id_iter = (char *)gid_list;
+        res = -1;
+        for (i = 0; i < entries; i++) {
+                struct gid_list_info *gid = (struct gid_list_info *)id_iter;
+                if ((gid->al_pa == s_id[2]) &&
+                    (gid->area == s_id[1]) &&
+                    (gid->domain == s_id[0])) {
+                        *loop_id = le16_to_cpu(gid->loop_id);
+                        res = 0;
+                        break;
+                }
+                id_iter += ha->gid_list_info_size;
+        }
+
+out_free_id_list:
+        dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
+            gid_list, gid_list_dma);
+        return res;
+}
+
+static bool qlt_check_fcport_exist(struct scsi_qla_host *vha,
+        struct qla_tgt_sess *sess)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_port_24xx_data *pmap24;
+        bool res, found = false;
+        int rc, i;
+        uint16_t loop_id = 0xFFFF; /* to eliminate compiler's warning */
+        uint16_t entries;
+        void *pmap;
+        int pmap_len;
+        fc_port_t *fcport;
+        int global_resets;
+
+retry:
+        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
+
+        rc = qla2x00_get_node_name_list(vha, &pmap, &pmap_len);
+        if (rc != QLA_SUCCESS) {
+                res = false;
+                goto out;
+        }
+
+        pmap24 = pmap;
+        entries = pmap_len/sizeof(*pmap24);
+
+        for (i = 0; i < entries; ++i) {
+                if (!memcmp(sess->port_name, pmap24[i].port_name, WWN_SIZE)) {
+                        loop_id = le16_to_cpu(pmap24[i].loop_id);
+                        found = true;
+                        break;
+                }
+        }
+
+        kfree(pmap);
+
+        if (!found) {
+                res = false;
+                goto out;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf046,
+            "qlt_check_fcport_exist(): loop_id %d", loop_id);
+
+        fcport = kzalloc(sizeof(*fcport), GFP_KERNEL);
+        if (fcport == NULL) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf047,
+                    "qla_target(%d): Allocation of tmp FC port failed",
+                    vha->vp_idx);
+                res = false;
+                goto out;
+        }
+
+        fcport->loop_id = loop_id;
+
+        rc = qla2x00_get_port_database(vha, fcport, 0);
+        if (rc != QLA_SUCCESS) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf048,
+                    "qla_target(%d): Failed to retrieve fcport "
+                    "information -- get_port_database() returned %x "
+                    "(loop_id=0x%04x)", vha->vp_idx, rc, loop_id);
+                res = false;
+                goto out_free_fcport;
+        }
+
+        if (global_resets !=
+            atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf002,
+                    "qla_target(%d): global reset during session discovery"
+                    " (counter was %d, new %d), retrying",
+                    vha->vp_idx, global_resets,
+                    atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count));
+                goto retry;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf003,
+            "Updating sess %p s_id %x:%x:%x, loop_id %d) to d_id %x:%x:%x, "
+            "loop_id %d", sess, sess->s_id.b.domain, sess->s_id.b.al_pa,
+            sess->s_id.b.area, sess->loop_id, fcport->d_id.b.domain,
+            fcport->d_id.b.al_pa, fcport->d_id.b.area, fcport->loop_id);
+
+        sess->s_id = fcport->d_id;
+        sess->loop_id = fcport->loop_id;
+        sess->conf_compl_supported = !!(fcport->flags &
+            FCF_CONF_COMP_SUPPORTED);
+
+        res = true;
+
+out_free_fcport:
+        kfree(fcport);
+
+out:
+        return res;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static void qlt_undelete_sess(struct qla_tgt_sess *sess)
+{
+        BUG_ON(!sess->deleted);
+
+        list_del(&sess->del_list_entry);
+        sess->deleted = 0;
+}
+
+static void qlt_del_sess_work_fn(struct delayed_work *work)
+{
+        struct qla_tgt *tgt = container_of(work, struct qla_tgt,
+            sess_del_work);
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        while (!list_empty(&tgt->del_sess_list)) {
+                sess = list_entry(tgt->del_sess_list.next, typeof(*sess),
+                    del_list_entry);
+                if (time_after_eq(jiffies, sess->expires)) {
+                        bool cancel;
+
+                        qlt_undelete_sess(sess);
+
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                        cancel = qlt_check_fcport_exist(vha, sess);
+
+                        if (cancel) {
+                                if (sess->deleted) {
+                                        /*
+                                         * sess was again deleted while we were
+                                         * discovering it
+                                         */
+                                        spin_lock_irqsave(&ha->hardware_lock,
+                                            flags);
+                                        continue;
+                                }
+
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf049,
+                                    "qla_target(%d): cancel deletion of "
+                                    "session for port %02x:%02x:%02x:%02x:%02x:"
+                                    "%02x:%02x:%02x (loop ID %d), because "
+                                    " it isn't deleted by firmware",
+                                    vha->vp_idx, sess->port_name[0],
+                                    sess->port_name[1], sess->port_name[2],
+                                    sess->port_name[3], sess->port_name[4],
+                                    sess->port_name[5], sess->port_name[6],
+                                    sess->port_name[7], sess->loop_id);
+                        } else {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
+                                    "Timeout: sess %p about to be deleted\n",
+                                    sess);
+                                ha->tgt.tgt_ops->shutdown_sess(sess);
+                                ha->tgt.tgt_ops->put_sess(sess);
+                        }
+
+                        spin_lock_irqsave(&ha->hardware_lock, flags);
+                } else {
+                        schedule_delayed_work(&tgt->sess_del_work,
+                            jiffies - sess->expires);
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+/*
+ * Adds an extra ref to allow to drop hw lock after adding sess to the list.
+ * Caller must put it.
+ */
+static struct qla_tgt_sess *qlt_create_sess(
+        struct scsi_qla_host *vha,
+        fc_port_t *fcport,
+        bool local)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess;
+        unsigned long flags;
+        unsigned char be_sid[3];
+
+        /* Check to avoid double sessions */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        list_for_each_entry(sess, &ha->tgt.qla_tgt->sess_list,
+                                sess_list_entry) {
+                if (!memcmp(sess->port_name, fcport->port_name, WWN_SIZE)) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
+                            "Double sess %p found (s_id %x:%x:%x, "
+                            "loop_id %d), updating to d_id %x:%x:%x, "
+                            "loop_id %d", sess, sess->s_id.b.domain,
+                            sess->s_id.b.al_pa, sess->s_id.b.area,
+                            sess->loop_id, fcport->d_id.b.domain,
+                            fcport->d_id.b.al_pa, fcport->d_id.b.area,
+                            fcport->loop_id);
+
+                        if (sess->deleted)
+                                qlt_undelete_sess(sess);
+
+                        kref_get(&sess->se_sess->sess_kref);
+                        sess->s_id = fcport->d_id;
+                        sess->loop_id = fcport->loop_id;
+                        sess->conf_compl_supported = !!(fcport->flags &
+                            FCF_CONF_COMP_SUPPORTED);
+                        if (sess->local && !local)
+                                sess->local = 0;
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+                        return sess;
+                }
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        sess = kzalloc(sizeof(*sess), GFP_KERNEL);
+        if (!sess) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04a,
+                    "qla_target(%u): session allocation failed, "
+                    "all commands from port %02x:%02x:%02x:%02x:"
+                    "%02x:%02x:%02x:%02x will be refused", vha->vp_idx,
+                    fcport->port_name[0], fcport->port_name[1],
+                    fcport->port_name[2], fcport->port_name[3],
+                    fcport->port_name[4], fcport->port_name[5],
+                    fcport->port_name[6], fcport->port_name[7]);
+
+                return NULL;
+        }
+        sess->tgt = ha->tgt.qla_tgt;
+        sess->vha = vha;
+        sess->s_id = fcport->d_id;
+        sess->loop_id = fcport->loop_id;
+        sess->local = local;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf006,
+            "Adding sess %p to tgt %p via ->check_initiator_node_acl()\n",
+            sess, ha->tgt.qla_tgt);
+
+        be_sid[0] = sess->s_id.b.domain;
+        be_sid[1] = sess->s_id.b.area;
+        be_sid[2] = sess->s_id.b.al_pa;
+        /*
+         * Determine if this fc_port->port_name is allowed to access
+         * target mode using explict NodeACLs+MappedLUNs, or using
+         * TPG demo mode.  If this is successful a target mode FC nexus
+         * is created.
+         */
+        if (ha->tgt.tgt_ops->check_initiator_node_acl(vha,
+            &fcport->port_name[0], sess, &be_sid[0], fcport->loop_id) < 0) {
+                kfree(sess);
+                return NULL;
+        }
+        /*
+         * Take an extra reference to ->sess_kref here to handle qla_tgt_sess
+         * access across ->hardware_lock reaquire.
+         */
+        kref_get(&sess->se_sess->sess_kref);
+
+        sess->conf_compl_supported = !!(fcport->flags &
+            FCF_CONF_COMP_SUPPORTED);
+        BUILD_BUG_ON(sizeof(sess->port_name) != sizeof(fcport->port_name));
+        memcpy(sess->port_name, fcport->port_name, sizeof(sess->port_name));
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        list_add_tail(&sess->sess_list_entry, &ha->tgt.qla_tgt->sess_list);
+        ha->tgt.qla_tgt->sess_count++;
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04b,
+            "qla_target(%d): %ssession for wwn %02x:%02x:%02x:%02x:"
+            "%02x:%02x:%02x:%02x (loop_id %d, s_id %x:%x:%x, confirmed"
+            " completion %ssupported) added\n",
+            vha->vp_idx, local ?  "local " : "", fcport->port_name[0],
+            fcport->port_name[1], fcport->port_name[2], fcport->port_name[3],
+            fcport->port_name[4], fcport->port_name[5], fcport->port_name[6],
+            fcport->port_name[7], fcport->loop_id, sess->s_id.b.domain,
+            sess->s_id.b.area, sess->s_id.b.al_pa, sess->conf_compl_supported ?
+            "" : "not ");
+
+        return sess;
+}
+
+/*
+ * Called from drivers/scsi/qla2xxx/qla_init.c:qla2x00_reg_remote_port()
+ */
+void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_sess *sess;
+        unsigned long flags;
+
+        if (!vha->hw->tgt.tgt_ops)
+                return;
+
+        if (!tgt || (fcport->port_type != FCT_INITIATOR))
+                return;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        if (tgt->tgt_stop) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                return;
+        }
+        sess = qlt_find_sess_by_port_name(tgt, fcport->port_name);
+        if (!sess) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+                mutex_lock(&ha->tgt.tgt_mutex);
+                sess = qlt_create_sess(vha, fcport, false);
+                mutex_unlock(&ha->tgt.tgt_mutex);
+
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+        } else {
+                kref_get(&sess->se_sess->sess_kref);
+
+                if (sess->deleted) {
+                        qlt_undelete_sess(sess);
+
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04c,
+                            "qla_target(%u): %ssession for port %02x:"
+                            "%02x:%02x:%02x:%02x:%02x:%02x:%02x (loop ID %d) "
+                            "reappeared\n", vha->vp_idx, sess->local ? "local "
+                            : "", sess->port_name[0], sess->port_name[1],
+                            sess->port_name[2], sess->port_name[3],
+                            sess->port_name[4], sess->port_name[5],
+                            sess->port_name[6], sess->port_name[7],
+                            sess->loop_id);
+
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf007,
+                            "Reappeared sess %p\n", sess);
+                }
+                sess->s_id = fcport->d_id;
+                sess->loop_id = fcport->loop_id;
+                sess->conf_compl_supported = !!(fcport->flags &
+                    FCF_CONF_COMP_SUPPORTED);
+        }
+
+        if (sess && sess->local) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04d,
+                    "qla_target(%u): local session for "
+                    "port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x "
+                    "(loop ID %d) became global\n", vha->vp_idx,
+                    fcport->port_name[0], fcport->port_name[1],
+                    fcport->port_name[2], fcport->port_name[3],
+                    fcport->port_name[4], fcport->port_name[5],
+                    fcport->port_name[6], fcport->port_name[7],
+                    sess->loop_id);
+                sess->local = 0;
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        ha->tgt.tgt_ops->put_sess(sess);
+}
+
+void qlt_fc_port_deleted(struct scsi_qla_host *vha, fc_port_t *fcport)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_sess *sess;
+        unsigned long flags;
+
+        if (!vha->hw->tgt.tgt_ops)
+                return;
+
+        if (!tgt || (fcport->port_type != FCT_INITIATOR))
+                return;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        if (tgt->tgt_stop) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                return;
+        }
+        sess = qlt_find_sess_by_port_name(tgt, fcport->port_name);
+        if (!sess) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                return;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf008, "qla_tgt_fc_port_deleted %p", sess);
+
+        sess->local = 1;
+        qlt_schedule_sess_for_deletion(sess, false);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+static inline int test_tgt_sess_count(struct qla_tgt *tgt)
+{
+        struct qla_hw_data *ha = tgt->ha;
+        unsigned long flags;
+        int res;
+        /*
+         * We need to protect against race, when tgt is freed before or
+         * inside wake_up()
+         */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        ql_dbg(ql_dbg_tgt, tgt->vha, 0xe002,
+            "tgt %p, empty(sess_list)=%d sess_count=%d\n",
+            tgt, list_empty(&tgt->sess_list), tgt->sess_count);
+        res = (tgt->sess_count == 0);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return res;
+}
+
+/* Called by tcm_qla2xxx configfs code */
+void qlt_stop_phase1(struct qla_tgt *tgt)
+{
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_hw_data *ha = tgt->ha;
+        unsigned long flags;
+
+        if (tgt->tgt_stop || tgt->tgt_stopped) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf04e,
+                    "Already in tgt->tgt_stop or tgt_stopped state\n");
+                dump_stack();
+                return;
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe003, "Stopping target for host %ld(%p)\n",
+            vha->host_no, vha);
+        /*
+         * Mutex needed to sync with qla_tgt_fc_port_[added,deleted].
+         * Lock is needed, because we still can get an incoming packet.
+         */
+        mutex_lock(&ha->tgt.tgt_mutex);
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        tgt->tgt_stop = 1;
+        qlt_clear_tgt_db(tgt, true);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        mutex_unlock(&ha->tgt.tgt_mutex);
+
+        flush_delayed_work_sync(&tgt->sess_del_work);
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf009,
+            "Waiting for sess works (tgt %p)", tgt);
+        spin_lock_irqsave(&tgt->sess_work_lock, flags);
+        while (!list_empty(&tgt->sess_works_list)) {
+                spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
+                flush_scheduled_work();
+                spin_lock_irqsave(&tgt->sess_work_lock, flags);
+        }
+        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00a,
+            "Waiting for tgt %p: list_empty(sess_list)=%d "
+            "sess_count=%d\n", tgt, list_empty(&tgt->sess_list),
+            tgt->sess_count);
+
+        wait_event(tgt->waitQ, test_tgt_sess_count(tgt));
+
+        /* Big hammer */
+        if (!ha->flags.host_shutting_down && qla_tgt_mode_enabled(vha))
+                qlt_disable_vha(vha);
+
+        /* Wait for sessions to clear out (just in case) */
+        wait_event(tgt->waitQ, test_tgt_sess_count(tgt));
+}
+EXPORT_SYMBOL(qlt_stop_phase1);
+
+/* Called by tcm_qla2xxx configfs code */
+void qlt_stop_phase2(struct qla_tgt *tgt)
+{
+        struct qla_hw_data *ha = tgt->ha;
+        unsigned long flags;
+
+        if (tgt->tgt_stopped) {
+                ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf04f,
+                    "Already in tgt->tgt_stopped state\n");
+                dump_stack();
+                return;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00b,
+            "Waiting for %d IRQ commands to complete (tgt %p)",
+            tgt->irq_cmd_count, tgt);
+
+        mutex_lock(&ha->tgt.tgt_mutex);
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        while (tgt->irq_cmd_count != 0) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                udelay(2);
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+        }
+        tgt->tgt_stop = 0;
+        tgt->tgt_stopped = 1;
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        mutex_unlock(&ha->tgt.tgt_mutex);
+
+        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00c, "Stop of tgt %p finished",
+            tgt);
+}
+EXPORT_SYMBOL(qlt_stop_phase2);
+
+/* Called from qlt_remove_target() -> qla2x00_remove_one() */
+void qlt_release(struct qla_tgt *tgt)
+{
+        struct qla_hw_data *ha = tgt->ha;
+
+        if ((ha->tgt.qla_tgt != NULL) && !tgt->tgt_stopped)
+                qlt_stop_phase2(tgt);
+
+        ha->tgt.qla_tgt = NULL;
+
+        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00d,
+            "Release of tgt %p finished\n", tgt);
+
+        kfree(tgt);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_sched_sess_work(struct qla_tgt *tgt, int type,
+        const void *param, unsigned int param_size)
+{
+        struct qla_tgt_sess_work_param *prm;
+        unsigned long flags;
+
+        prm = kzalloc(sizeof(*prm), GFP_ATOMIC);
+        if (!prm) {
+                ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf050,
+                    "qla_target(%d): Unable to create session "
+                    "work, command will be refused", 0);
+                return -ENOMEM;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, tgt->vha, 0xf00e,
+            "Scheduling work (type %d, prm %p)"
+            " to find session for param %p (size %d, tgt %p)\n",
+            type, prm, param, param_size, tgt);
+
+        prm->type = type;
+        memcpy(&prm->tm_iocb, param, param_size);
+
+        spin_lock_irqsave(&tgt->sess_work_lock, flags);
+        list_add_tail(&prm->sess_works_list_entry, &tgt->sess_works_list);
+        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
+
+        schedule_work(&tgt->sess_work);
+
+        return 0;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_send_notify_ack(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *ntfy,
+        uint32_t add_flags, uint16_t resp_code, int resp_code_valid,
+        uint16_t srr_flags, uint16_t srr_reject_code, uint8_t srr_explan)
+{
+        struct qla_hw_data *ha = vha->hw;
+        request_t *pkt;
+        struct nack_to_isp *nack;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe004, "Sending NOTIFY_ACK (ha=%p)\n", ha);
+
+        /* Send marker if required */
+        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
+                return;
+
+        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
+        if (!pkt) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe049,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet\n", vha->vp_idx, __func__);
+                return;
+        }
+
+        if (ha->tgt.qla_tgt != NULL)
+                ha->tgt.qla_tgt->notify_ack_expected++;
+
+        pkt->entry_type = NOTIFY_ACK_TYPE;
+        pkt->entry_count = 1;
+
+        nack = (struct nack_to_isp *)pkt;
+        nack->ox_id = ntfy->ox_id;
+
+        nack->u.isp24.nport_handle = ntfy->u.isp24.nport_handle;
+        if (le16_to_cpu(ntfy->u.isp24.status) == IMM_NTFY_ELS) {
+                nack->u.isp24.flags = ntfy->u.isp24.flags &
+                        __constant_cpu_to_le32(NOTIFY24XX_FLAGS_PUREX_IOCB);
+        }
+        nack->u.isp24.srr_rx_id = ntfy->u.isp24.srr_rx_id;
+        nack->u.isp24.status = ntfy->u.isp24.status;
+        nack->u.isp24.status_subcode = ntfy->u.isp24.status_subcode;
+        nack->u.isp24.exchange_address = ntfy->u.isp24.exchange_address;
+        nack->u.isp24.srr_rel_offs = ntfy->u.isp24.srr_rel_offs;
+        nack->u.isp24.srr_ui = ntfy->u.isp24.srr_ui;
+        nack->u.isp24.srr_flags = cpu_to_le16(srr_flags);
+        nack->u.isp24.srr_reject_code = srr_reject_code;
+        nack->u.isp24.srr_reject_code_expl = srr_explan;
+        nack->u.isp24.vp_index = ntfy->u.isp24.vp_index;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe005,
+            "qla_target(%d): Sending 24xx Notify Ack %d\n",
+            vha->vp_idx, nack->u.isp24.status);
+
+        qla2x00_start_iocbs(vha, vha->req);
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_24xx_send_abts_resp(struct scsi_qla_host *vha,
+        struct abts_recv_from_24xx *abts, uint32_t status,
+        bool ids_reversed)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct abts_resp_to_24xx *resp;
+        uint32_t f_ctl;
+        uint8_t *p;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe006,
+            "Sending task mgmt ABTS response (ha=%p, atio=%p, status=%x\n",
+            ha, abts, status);
+
+        /* Send marker if required */
+        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
+                return;
+
+        resp = (struct abts_resp_to_24xx *)qla2x00_alloc_iocbs(vha, NULL);
+        if (!resp) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe04a,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet", vha->vp_idx, __func__);
+                return;
+        }
+
+        resp->entry_type = ABTS_RESP_24XX;
+        resp->entry_count = 1;
+        resp->nport_handle = abts->nport_handle;
+        resp->vp_index = vha->vp_idx;
+        resp->sof_type = abts->sof_type;
+        resp->exchange_address = abts->exchange_address;
+        resp->fcp_hdr_le = abts->fcp_hdr_le;
+        f_ctl = __constant_cpu_to_le32(F_CTL_EXCH_CONTEXT_RESP |
+            F_CTL_LAST_SEQ | F_CTL_END_SEQ |
+            F_CTL_SEQ_INITIATIVE);
+        p = (uint8_t *)&f_ctl;
+        resp->fcp_hdr_le.f_ctl[0] = *p++;
+        resp->fcp_hdr_le.f_ctl[1] = *p++;
+        resp->fcp_hdr_le.f_ctl[2] = *p;
+        if (ids_reversed) {
+                resp->fcp_hdr_le.d_id[0] = abts->fcp_hdr_le.d_id[0];
+                resp->fcp_hdr_le.d_id[1] = abts->fcp_hdr_le.d_id[1];
+                resp->fcp_hdr_le.d_id[2] = abts->fcp_hdr_le.d_id[2];
+                resp->fcp_hdr_le.s_id[0] = abts->fcp_hdr_le.s_id[0];
+                resp->fcp_hdr_le.s_id[1] = abts->fcp_hdr_le.s_id[1];
+                resp->fcp_hdr_le.s_id[2] = abts->fcp_hdr_le.s_id[2];
+        } else {
+                resp->fcp_hdr_le.d_id[0] = abts->fcp_hdr_le.s_id[0];
+                resp->fcp_hdr_le.d_id[1] = abts->fcp_hdr_le.s_id[1];
+                resp->fcp_hdr_le.d_id[2] = abts->fcp_hdr_le.s_id[2];
+                resp->fcp_hdr_le.s_id[0] = abts->fcp_hdr_le.d_id[0];
+                resp->fcp_hdr_le.s_id[1] = abts->fcp_hdr_le.d_id[1];
+                resp->fcp_hdr_le.s_id[2] = abts->fcp_hdr_le.d_id[2];
+        }
+        resp->exchange_addr_to_abort = abts->exchange_addr_to_abort;
+        if (status == FCP_TMF_CMPL) {
+                resp->fcp_hdr_le.r_ctl = R_CTL_BASIC_LINK_SERV | R_CTL_B_ACC;
+                resp->payload.ba_acct.seq_id_valid = SEQ_ID_INVALID;
+                resp->payload.ba_acct.low_seq_cnt = 0x0000;
+                resp->payload.ba_acct.high_seq_cnt = 0xFFFF;
+                resp->payload.ba_acct.ox_id = abts->fcp_hdr_le.ox_id;
+                resp->payload.ba_acct.rx_id = abts->fcp_hdr_le.rx_id;
+        } else {
+                resp->fcp_hdr_le.r_ctl = R_CTL_BASIC_LINK_SERV | R_CTL_B_RJT;
+                resp->payload.ba_rjt.reason_code =
+                        BA_RJT_REASON_CODE_UNABLE_TO_PERFORM;
+                /* Other bytes are zero */
+        }
+
+        ha->tgt.qla_tgt->abts_resp_expected++;
+
+        qla2x00_start_iocbs(vha, vha->req);
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
+        struct abts_resp_from_24xx_fw *entry)
+{
+        struct ctio7_to_24xx *ctio;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe007,
+            "Sending retry TERM EXCH CTIO7 (ha=%p)\n", vha->hw);
+        /* Send marker if required */
+        if (qlt_issue_marker(vha, 1) != QLA_SUCCESS)
+                return;
+
+        ctio = (struct ctio7_to_24xx *)qla2x00_alloc_iocbs(vha, NULL);
+        if (ctio == NULL) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe04b,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet\n", vha->vp_idx, __func__);
+                return;
+        }
+
+        /*
+         * We've got on entrance firmware's response on by us generated
+         * ABTS response. So, in it ID fields are reversed.
+         */
+
+        ctio->entry_type = CTIO_TYPE7;
+        ctio->entry_count = 1;
+        ctio->nport_handle = entry->nport_handle;
+        ctio->handle = QLA_TGT_SKIP_HANDLE |    CTIO_COMPLETION_HANDLE_MARK;
+        ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+        ctio->vp_index = vha->vp_idx;
+        ctio->initiator_id[0] = entry->fcp_hdr_le.d_id[0];
+        ctio->initiator_id[1] = entry->fcp_hdr_le.d_id[1];
+        ctio->initiator_id[2] = entry->fcp_hdr_le.d_id[2];
+        ctio->exchange_addr = entry->exchange_addr_to_abort;
+        ctio->u.status1.flags =
+            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
+                CTIO7_FLAGS_TERMINATE);
+        ctio->u.status1.ox_id = entry->fcp_hdr_le.ox_id;
+
+        qla2x00_start_iocbs(vha, vha->req);
+
+        qlt_24xx_send_abts_resp(vha, (struct abts_recv_from_24xx *)entry,
+            FCP_TMF_CMPL, true);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
+        struct abts_recv_from_24xx *abts, struct qla_tgt_sess *sess)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_mgmt_cmd *mcmd;
+        int rc;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,
+            "qla_target(%d): task abort (tag=%d)\n",
+            vha->vp_idx, abts->exchange_addr_to_abort);
+
+        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
+        if (mcmd == NULL) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf051,
+                    "qla_target(%d): %s: Allocation of ABORT cmd failed",
+                    vha->vp_idx, __func__);
+                return -ENOMEM;
+        }
+        memset(mcmd, 0, sizeof(*mcmd));
+
+        mcmd->sess = sess;
+        memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));
+
+        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, 0, TMR_ABORT_TASK,
+            abts->exchange_addr_to_abort);
+        if (rc != 0) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,
+                    "qla_target(%d):  tgt_ops->handle_tmr()"
+                    " failed: %d", vha->vp_idx, rc);
+                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_24xx_handle_abts(struct scsi_qla_host *vha,
+        struct abts_recv_from_24xx *abts)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess;
+        uint32_t tag = abts->exchange_addr_to_abort;
+        uint8_t s_id[3];
+        int rc;
+
+        if (le32_to_cpu(abts->fcp_hdr_le.parameter) & ABTS_PARAM_ABORT_SEQ) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf053,
+                    "qla_target(%d): ABTS: Abort Sequence not "
+                    "supported\n", vha->vp_idx);
+                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
+                return;
+        }
+
+        if (tag == ATIO_EXCHANGE_ADDRESS_UNKNOWN) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf010,
+                    "qla_target(%d): ABTS: Unknown Exchange "
+                    "Address received\n", vha->vp_idx);
+                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
+                return;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf011,
+            "qla_target(%d): task abort (s_id=%x:%x:%x, "
+            "tag=%d, param=%x)\n", vha->vp_idx, abts->fcp_hdr_le.s_id[2],
+            abts->fcp_hdr_le.s_id[1], abts->fcp_hdr_le.s_id[0], tag,
+            le32_to_cpu(abts->fcp_hdr_le.parameter));
+
+        s_id[0] = abts->fcp_hdr_le.s_id[2];
+        s_id[1] = abts->fcp_hdr_le.s_id[1];
+        s_id[2] = abts->fcp_hdr_le.s_id[0];
+
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha, s_id);
+        if (!sess) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf012,
+                    "qla_target(%d): task abort for non-existant session\n",
+                    vha->vp_idx);
+                rc = qlt_sched_sess_work(ha->tgt.qla_tgt,
+                    QLA_TGT_SESS_WORK_ABORT, abts, sizeof(*abts));
+                if (rc != 0) {
+                        qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED,
+                            false);
+                }
+                return;
+        }
+
+        rc = __qlt_24xx_handle_abts(vha, abts, sess);
+        if (rc != 0) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf054,
+                    "qla_target(%d): __qlt_24xx_handle_abts() failed: %d\n",
+                    vha->vp_idx, rc);
+                qlt_24xx_send_abts_resp(vha, abts, FCP_TMF_REJECTED, false);
+                return;
+        }
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
+        struct qla_tgt_mgmt_cmd *mcmd, uint32_t resp_code)
+{
+        struct atio_from_isp *atio = &mcmd->orig_iocb.atio;
+        struct ctio7_to_24xx *ctio;
+
+        ql_dbg(ql_dbg_tgt, ha, 0xe008,
+            "Sending task mgmt CTIO7 (ha=%p, atio=%p, resp_code=%x\n",
+            ha, atio, resp_code);
+
+        /* Send marker if required */
+        if (qlt_issue_marker(ha, 1) != QLA_SUCCESS)
+                return;
+
+        ctio = (struct ctio7_to_24xx *)qla2x00_alloc_iocbs(ha, NULL);
+        if (ctio == NULL) {
+                ql_dbg(ql_dbg_tgt, ha, 0xe04c,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet\n", ha->vp_idx, __func__);
+                return;
+        }
+
+        ctio->entry_type = CTIO_TYPE7;
+        ctio->entry_count = 1;
+        ctio->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
+        ctio->nport_handle = mcmd->sess->loop_id;
+        ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+        ctio->vp_index = ha->vp_idx;
+        ctio->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
+        ctio->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
+        ctio->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
+        ctio->exchange_addr = atio->u.isp24.exchange_addr;
+        ctio->u.status1.flags = (atio->u.isp24.attr << 9) |
+            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
+                CTIO7_FLAGS_SEND_STATUS);
+        ctio->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
+        ctio->u.status1.scsi_status =
+            __constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
+        ctio->u.status1.response_len = __constant_cpu_to_le16(8);
+        ((uint32_t *)ctio->u.status1.sense_data)[0] = cpu_to_be32(resp_code);
+
+        qla2x00_start_iocbs(ha, ha->req);
+}
+
+void qlt_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)
+{
+        mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
+}
+EXPORT_SYMBOL(qlt_free_mcmd);
+
+/* callback from target fabric module code */
+void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
+{
+        struct scsi_qla_host *vha = mcmd->sess->vha;
+        struct qla_hw_data *ha = vha->hw;
+        unsigned long flags;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf013,
+            "TM response mcmd (%p) status %#x state %#x",
+            mcmd, mcmd->fc_tm_rsp, mcmd->flags);
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        if (mcmd->flags == QLA24XX_MGMT_SEND_NACK)
+                qlt_send_notify_ack(vha, &mcmd->orig_iocb.imm_ntfy,
+                    0, 0, 0, 0, 0, 0);
+        else {
+                if (mcmd->se_cmd.se_tmr_req->function == TMR_ABORT_TASK)
+                        qlt_24xx_send_abts_resp(vha, &mcmd->orig_iocb.abts,
+                            mcmd->fc_tm_rsp, false);
+                else
+                        qlt_24xx_send_task_mgmt_ctio(vha, mcmd,
+                            mcmd->fc_tm_rsp);
+        }
+        /*
+         * Make the callback for ->free_mcmd() to queue_work() and invoke
+         * target_put_sess_cmd() to drop cmd_kref to 1.  The final
+         * target_put_sess_cmd() call will be made from TFO->check_stop_free()
+         * -> tcm_qla2xxx_check_stop_free() to release the TMR associated se_cmd
+         * descriptor after TFO->queue_tm_rsp() -> tcm_qla2xxx_queue_tm_rsp() ->
+         * qlt_xmit_tm_rsp() returns here..
+         */
+        ha->tgt.tgt_ops->free_mcmd(mcmd);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+EXPORT_SYMBOL(qlt_xmit_tm_rsp);
+
+/* No locks */
+static int qlt_pci_map_calc_cnt(struct qla_tgt_prm *prm)
+{
+        struct qla_tgt_cmd *cmd = prm->cmd;
+
+        BUG_ON(cmd->sg_cnt == 0);
+
+        prm->sg = (struct scatterlist *)cmd->sg;
+        prm->seg_cnt = pci_map_sg(prm->tgt->ha->pdev, cmd->sg,
+            cmd->sg_cnt, cmd->dma_data_direction);
+        if (unlikely(prm->seg_cnt == 0))
+                goto out_err;
+
+        prm->cmd->sg_mapped = 1;
+
+        /*
+         * If greater than four sg entries then we need to allocate
+         * the continuation entries
+         */
+        if (prm->seg_cnt > prm->tgt->datasegs_per_cmd)
+                prm->req_cnt += DIV_ROUND_UP(prm->seg_cnt -
+                    prm->tgt->datasegs_per_cmd, prm->tgt->datasegs_per_cont);
+
+        ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe009, "seg_cnt=%d, req_cnt=%d\n",
+            prm->seg_cnt, prm->req_cnt);
+        return 0;
+
+out_err:
+        ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe04d,
+            "qla_target(%d): PCI mapping failed: sg_cnt=%d",
+            0, prm->cmd->sg_cnt);
+        return -1;
+}
+
+static inline void qlt_unmap_sg(struct scsi_qla_host *vha,
+        struct qla_tgt_cmd *cmd)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        BUG_ON(!cmd->sg_mapped);
+        pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
+        cmd->sg_mapped = 0;
+}
+
+static int qlt_check_reserve_free_req(struct scsi_qla_host *vha,
+        uint32_t req_cnt)
+{
+        struct qla_hw_data *ha = vha->hw;
+        device_reg_t __iomem *reg = ha->iobase;
+        uint32_t cnt;
+
+        if (vha->req->cnt < (req_cnt + 2)) {
+                cnt = (uint16_t)RD_REG_DWORD(&reg->isp24.req_q_out);
+
+                ql_dbg(ql_dbg_tgt, vha, 0xe00a,
+                    "Request ring circled: cnt=%d, vha->->ring_index=%d, "
+                    "vha->req->cnt=%d, req_cnt=%d\n", cnt,
+                    vha->req->ring_index, vha->req->cnt, req_cnt);
+                if  (vha->req->ring_index < cnt)
+                        vha->req->cnt = cnt - vha->req->ring_index;
+                else
+                        vha->req->cnt = vha->req->length -
+                            (vha->req->ring_index - cnt);
+        }
+
+        if (unlikely(vha->req->cnt < (req_cnt + 2))) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe00b,
+                    "qla_target(%d): There is no room in the "
+                    "request ring: vha->req->ring_index=%d, vha->req->cnt=%d, "
+                    "req_cnt=%d\n", vha->vp_idx, vha->req->ring_index,
+                    vha->req->cnt, req_cnt);
+                return -EAGAIN;
+        }
+        vha->req->cnt -= req_cnt;
+
+        return 0;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static inline void *qlt_get_req_pkt(struct scsi_qla_host *vha)
+{
+        /* Adjust ring index. */
+        vha->req->ring_index++;
+        if (vha->req->ring_index == vha->req->length) {
+                vha->req->ring_index = 0;
+                vha->req->ring_ptr = vha->req->ring;
+        } else {
+                vha->req->ring_ptr++;
+        }
+        return (cont_entry_t *)vha->req->ring_ptr;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static inline uint32_t qlt_make_handle(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        uint32_t h;
+
+        h = ha->tgt.current_handle;
+        /* always increment cmd handle */
+        do {
+                ++h;
+                if (h > MAX_OUTSTANDING_COMMANDS)
+                        h = 1; /* 0 is QLA_TGT_NULL_HANDLE */
+                if (h == ha->tgt.current_handle) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe04e,
+                            "qla_target(%d): Ran out of "
+                            "empty cmd slots in ha %p\n", vha->vp_idx, ha);
+                        h = QLA_TGT_NULL_HANDLE;
+                        break;
+                }
+        } while ((h == QLA_TGT_NULL_HANDLE) ||
+            (h == QLA_TGT_SKIP_HANDLE) ||
+            (ha->tgt.cmds[h-1] != NULL));
+
+        if (h != QLA_TGT_NULL_HANDLE)
+                ha->tgt.current_handle = h;
+
+        return h;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
+        struct scsi_qla_host *vha)
+{
+        uint32_t h;
+        struct ctio7_to_24xx *pkt;
+        struct qla_hw_data *ha = vha->hw;
+        struct atio_from_isp *atio = &prm->cmd->atio;
+
+        pkt = (struct ctio7_to_24xx *)vha->req->ring_ptr;
+        prm->pkt = pkt;
+        memset(pkt, 0, sizeof(*pkt));
+
+        pkt->entry_type = CTIO_TYPE7;
+        pkt->entry_count = (uint8_t)prm->req_cnt;
+        pkt->vp_index = vha->vp_idx;
+
+        h = qlt_make_handle(vha);
+        if (unlikely(h == QLA_TGT_NULL_HANDLE)) {
+                /*
+                 * CTIO type 7 from the firmware doesn't provide a way to
+                 * know the initiator's LOOP ID, hence we can't find
+                 * the session and, so, the command.
+                 */
+                return -EAGAIN;
+        } else
+                ha->tgt.cmds[h-1] = prm->cmd;
+
+        pkt->handle = h | CTIO_COMPLETION_HANDLE_MARK;
+        pkt->nport_handle = prm->cmd->loop_id;
+        pkt->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+        pkt->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
+        pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
+        pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
+        pkt->exchange_addr = atio->u.isp24.exchange_addr;
+        pkt->u.status0.flags |= (atio->u.isp24.attr << 9);
+        pkt->u.status0.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
+        pkt->u.status0.relative_offset = cpu_to_le32(prm->cmd->offset);
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe00c,
+            "qla_target(%d): handle(cmd) -> %08x, timeout %d, ox_id %#x\n",
+            vha->vp_idx, pkt->handle, QLA_TGT_TIMEOUT,
+            le16_to_cpu(pkt->u.status0.ox_id));
+        return 0;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. We have already made sure
+ * that there is sufficient amount of request entries to not drop it.
+ */
+static void qlt_load_cont_data_segments(struct qla_tgt_prm *prm,
+        struct scsi_qla_host *vha)
+{
+        int cnt;
+        uint32_t *dword_ptr;
+        int enable_64bit_addressing = prm->tgt->tgt_enable_64bit_addr;
+
+        /* Build continuation packets */
+        while (prm->seg_cnt > 0) {
+                cont_a64_entry_t *cont_pkt64 =
+                        (cont_a64_entry_t *)qlt_get_req_pkt(vha);
+
+                /*
+                 * Make sure that from cont_pkt64 none of
+                 * 64-bit specific fields used for 32-bit
+                 * addressing. Cast to (cont_entry_t *) for
+                 * that.
+                 */
+
+                memset(cont_pkt64, 0, sizeof(*cont_pkt64));
+
+                cont_pkt64->entry_count = 1;
+                cont_pkt64->sys_define = 0;
+
+                if (enable_64bit_addressing) {
+                        cont_pkt64->entry_type = CONTINUE_A64_TYPE;
+                        dword_ptr =
+                            (uint32_t *)&cont_pkt64->dseg_0_address;
+                } else {
+                        cont_pkt64->entry_type = CONTINUE_TYPE;
+                        dword_ptr =
+                            (uint32_t *)&((cont_entry_t *)
+                                cont_pkt64)->dseg_0_address;
+                }
+
+                /* Load continuation entry data segments */
+                for (cnt = 0;
+                    cnt < prm->tgt->datasegs_per_cont && prm->seg_cnt;
+                    cnt++, prm->seg_cnt--) {
+                        *dword_ptr++ =
+                            cpu_to_le32(pci_dma_lo32
+                                (sg_dma_address(prm->sg)));
+                        if (enable_64bit_addressing) {
+                                *dword_ptr++ =
+                                    cpu_to_le32(pci_dma_hi32
+                                        (sg_dma_address
+                                        (prm->sg)));
+                        }
+                        *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
+
+                        ql_dbg(ql_dbg_tgt, vha, 0xe00d,
+                            "S/G Segment Cont. phys_addr=%llx:%llx, len=%d\n",
+                            (long long unsigned int)
+                            pci_dma_hi32(sg_dma_address(prm->sg)),
+                            (long long unsigned int)
+                            pci_dma_lo32(sg_dma_address(prm->sg)),
+                            (int)sg_dma_len(prm->sg));
+
+                        prm->sg = sg_next(prm->sg);
+                }
+        }
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. We have already made sure
+ * that there is sufficient amount of request entries to not drop it.
+ */
+static void qlt_load_data_segments(struct qla_tgt_prm *prm,
+        struct scsi_qla_host *vha)
+{
+        int cnt;
+        uint32_t *dword_ptr;
+        int enable_64bit_addressing = prm->tgt->tgt_enable_64bit_addr;
+        struct ctio7_to_24xx *pkt24 = (struct ctio7_to_24xx *)prm->pkt;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe00e,
+            "iocb->scsi_status=%x, iocb->flags=%x\n",
+            le16_to_cpu(pkt24->u.status0.scsi_status),
+            le16_to_cpu(pkt24->u.status0.flags));
+
+        pkt24->u.status0.transfer_length = cpu_to_le32(prm->cmd->bufflen);
+
+        /* Setup packet address segment pointer */
+        dword_ptr = pkt24->u.status0.dseg_0_address;
+
+        /* Set total data segment count */
+        if (prm->seg_cnt)
+                pkt24->dseg_count = cpu_to_le16(prm->seg_cnt);
+
+        if (prm->seg_cnt == 0) {
+                /* No data transfer */
+                *dword_ptr++ = 0;
+                *dword_ptr = 0;
+                return;
+        }
+
+        /* If scatter gather */
+        ql_dbg(ql_dbg_tgt, vha, 0xe00f, "%s", "Building S/G data segments...");
+
+        /* Load command entry data segments */
+        for (cnt = 0;
+            (cnt < prm->tgt->datasegs_per_cmd) && prm->seg_cnt;
+            cnt++, prm->seg_cnt--) {
+                *dword_ptr++ =
+                    cpu_to_le32(pci_dma_lo32(sg_dma_address(prm->sg)));
+                if (enable_64bit_addressing) {
+                        *dword_ptr++ =
+                            cpu_to_le32(pci_dma_hi32(
+                                sg_dma_address(prm->sg)));
+                }
+                *dword_ptr++ = cpu_to_le32(sg_dma_len(prm->sg));
+
+                ql_dbg(ql_dbg_tgt, vha, 0xe010,
+                    "S/G Segment phys_addr=%llx:%llx, len=%d\n",
+                    (long long unsigned int)pci_dma_hi32(sg_dma_address(
+                    prm->sg)),
+                    (long long unsigned int)pci_dma_lo32(sg_dma_address(
+                    prm->sg)),
+                    (int)sg_dma_len(prm->sg));
+
+                prm->sg = sg_next(prm->sg);
+        }
+
+        qlt_load_cont_data_segments(prm, vha);
+}
+
+static inline int qlt_has_data(struct qla_tgt_cmd *cmd)
+{
+        return cmd->bufflen > 0;
+}
+
+/*
+ * Called without ha->hardware_lock held
+ */
+static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
+        struct qla_tgt_prm *prm, int xmit_type, uint8_t scsi_status,
+        uint32_t *full_req_cnt)
+{
+        struct qla_tgt *tgt = cmd->tgt;
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct se_cmd *se_cmd = &cmd->se_cmd;
+
+        if (unlikely(cmd->aborted)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
+                    "qla_target(%d): terminating exchange "
+                    "for aborted cmd=%p (se_cmd=%p, tag=%d)", vha->vp_idx, cmd,
+                    se_cmd, cmd->tag);
+
+                cmd->state = QLA_TGT_STATE_ABORTED;
+
+                qlt_send_term_exchange(vha, cmd, &cmd->atio, 0);
+
+                /* !! At this point cmd could be already freed !! */
+                return QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED;
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe011, "qla_target(%d): tag=%u\n",
+            vha->vp_idx, cmd->tag);
+
+        prm->cmd = cmd;
+        prm->tgt = tgt;
+        prm->rq_result = scsi_status;
+        prm->sense_buffer = &cmd->sense_buffer[0];
+        prm->sense_buffer_len = TRANSPORT_SENSE_BUFFER;
+        prm->sg = NULL;
+        prm->seg_cnt = -1;
+        prm->req_cnt = 1;
+        prm->add_status_pkt = 0;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe012, "rq_result=%x, xmit_type=%x\n",
+            prm->rq_result, xmit_type);
+
+        /* Send marker if required */
+        if (qlt_issue_marker(vha, 0) != QLA_SUCCESS)
+                return -EFAULT;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe013, "CTIO start: vha(%d)\n", vha->vp_idx);
+
+        if ((xmit_type & QLA_TGT_XMIT_DATA) && qlt_has_data(cmd)) {
+                if  (qlt_pci_map_calc_cnt(prm) != 0)
+                        return -EAGAIN;
+        }
+
+        *full_req_cnt = prm->req_cnt;
+
+        if (se_cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
+                prm->residual = se_cmd->residual_count;
+                ql_dbg(ql_dbg_tgt, vha, 0xe014,
+                    "Residual underflow: %d (tag %d, "
+                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
+                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
+                    cmd->bufflen, prm->rq_result);
+                prm->rq_result |= SS_RESIDUAL_UNDER;
+        } else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
+                prm->residual = se_cmd->residual_count;
+                ql_dbg(ql_dbg_tgt, vha, 0xe015,
+                    "Residual overflow: %d (tag %d, "
+                    "op %x, bufflen %d, rq_result %x)\n", prm->residual,
+                    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
+                    cmd->bufflen, prm->rq_result);
+                prm->rq_result |= SS_RESIDUAL_OVER;
+        }
+
+        if (xmit_type & QLA_TGT_XMIT_STATUS) {
+                /*
+                 * If QLA_TGT_XMIT_DATA is not set, add_status_pkt will be
+                 * ignored in *xmit_response() below
+                 */
+                if (qlt_has_data(cmd)) {
+                        if (QLA_TGT_SENSE_VALID(prm->sense_buffer) ||
+                            (IS_FWI2_CAPABLE(ha) &&
+                            (prm->rq_result != 0))) {
+                                prm->add_status_pkt = 1;
+                                (*full_req_cnt)++;
+                        }
+                }
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe016,
+            "req_cnt=%d, full_req_cnt=%d, add_status_pkt=%d\n",
+            prm->req_cnt, *full_req_cnt, prm->add_status_pkt);
+
+        return 0;
+}
+
+static inline int qlt_need_explicit_conf(struct qla_hw_data *ha,
+        struct qla_tgt_cmd *cmd, int sending_sense)
+{
+        if (ha->tgt.enable_class_2)
+                return 0;
+
+        if (sending_sense)
+                return cmd->conf_compl_supported;
+        else
+                return ha->tgt.enable_explicit_conf &&
+                    cmd->conf_compl_supported;
+}
+
+#ifdef CONFIG_QLA_TGT_DEBUG_SRR
+/*
+ *  Original taken from the XFS code
+ */
+static unsigned long qlt_srr_random(void)
+{
+        static int Inited;
+        static unsigned long RandomValue;
+        static DEFINE_SPINLOCK(lock);
+        /* cycles pseudo-randomly through all values between 1 and 2^31 - 2 */
+        register long rv;
+        register long lo;
+        register long hi;
+        unsigned long flags;
+
+        spin_lock_irqsave(&lock, flags);
+        if (!Inited) {
+                RandomValue = jiffies;
+                Inited = 1;
+        }
+        rv = RandomValue;
+        hi = rv / 127773;
+        lo = rv % 127773;
+        rv = 16807 * lo - 2836 * hi;
+        if (rv <= 0)
+                rv += 2147483647;
+        RandomValue = rv;
+        spin_unlock_irqrestore(&lock, flags);
+        return rv;
+}
+
+static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
+{
+#if 0 /* This is not a real status packets lost, so it won't lead to SRR */
+        if ((*xmit_type & QLA_TGT_XMIT_STATUS) && (qlt_srr_random() % 200)
+            == 50) {
+                *xmit_type &= ~QLA_TGT_XMIT_STATUS;
+                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf015,
+                    "Dropping cmd %p (tag %d) status", cmd, cmd->tag);
+        }
+#endif
+        /*
+         * It's currently not possible to simulate SRRs for FCP_WRITE without
+         * a physical link layer failure, so don't even try here..
+         */
+        if (cmd->dma_data_direction != DMA_FROM_DEVICE)
+                return;
+
+        if (qlt_has_data(cmd) && (cmd->sg_cnt > 1) &&
+            ((qlt_srr_random() % 100) == 20)) {
+                int i, leave = 0;
+                unsigned int tot_len = 0;
+
+                while (leave == 0)
+                        leave = qlt_srr_random() % cmd->sg_cnt;
+
+                for (i = 0; i < leave; i++)
+                        tot_len += cmd->sg[i].length;
+
+                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf016,
+                    "Cutting cmd %p (tag %d) buffer"
+                    " tail to len %d, sg_cnt %d (cmd->bufflen %d,"
+                    " cmd->sg_cnt %d)", cmd, cmd->tag, tot_len, leave,
+                    cmd->bufflen, cmd->sg_cnt);
+
+                cmd->bufflen = tot_len;
+                cmd->sg_cnt = leave;
+        }
+
+        if (qlt_has_data(cmd) && ((qlt_srr_random() % 100) == 70)) {
+                unsigned int offset = qlt_srr_random() % cmd->bufflen;
+
+                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf017,
+                    "Cutting cmd %p (tag %d) buffer head "
+                    "to offset %d (cmd->bufflen %d)", cmd, cmd->tag, offset,
+                    cmd->bufflen);
+                if (offset == 0)
+                        *xmit_type &= ~QLA_TGT_XMIT_DATA;
+                else if (qlt_set_data_offset(cmd, offset)) {
+                        ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf018,
+                            "qlt_set_data_offset() failed (tag %d)", cmd->tag);
+                }
+        }
+}
+#else
+static inline void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
+{}
+#endif
+
+static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio,
+        struct qla_tgt_prm *prm)
+{
+        prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
+            (uint32_t)sizeof(ctio->u.status1.sense_data));
+        ctio->u.status0.flags |=
+            __constant_cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
+        if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) {
+                ctio->u.status0.flags |= __constant_cpu_to_le16(
+                    CTIO7_FLAGS_EXPLICIT_CONFORM |
+                    CTIO7_FLAGS_CONFORM_REQ);
+        }
+        ctio->u.status0.residual = cpu_to_le32(prm->residual);
+        ctio->u.status0.scsi_status = cpu_to_le16(prm->rq_result);
+        if (QLA_TGT_SENSE_VALID(prm->sense_buffer)) {
+                int i;
+
+                if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 1)) {
+                        if (prm->cmd->se_cmd.scsi_status != 0) {
+                                ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe017,
+                                    "Skipping EXPLICIT_CONFORM and "
+                                    "CTIO7_FLAGS_CONFORM_REQ for FCP READ w/ "
+                                    "non GOOD status\n");
+                                goto skip_explict_conf;
+                        }
+                        ctio->u.status1.flags |= __constant_cpu_to_le16(
+                            CTIO7_FLAGS_EXPLICIT_CONFORM |
+                            CTIO7_FLAGS_CONFORM_REQ);
+                }
+skip_explict_conf:
+                ctio->u.status1.flags &=
+                    ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
+                ctio->u.status1.flags |=
+                    __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
+                ctio->u.status1.scsi_status |=
+                    __constant_cpu_to_le16(SS_SENSE_LEN_VALID);
+                ctio->u.status1.sense_length =
+                    cpu_to_le16(prm->sense_buffer_len);
+                for (i = 0; i < prm->sense_buffer_len/4; i++)
+                        ((uint32_t *)ctio->u.status1.sense_data)[i] =
+                                cpu_to_be32(((uint32_t *)prm->sense_buffer)[i]);
+#if 0
+                if (unlikely((prm->sense_buffer_len % 4) != 0)) {
+                        static int q;
+                        if (q < 10) {
+                                ql_dbg(ql_dbg_tgt, vha, 0xe04f,
+                                    "qla_target(%d): %d bytes of sense "
+                                    "lost", prm->tgt->ha->vp_idx,
+                                    prm->sense_buffer_len % 4);
+                                q++;
+                        }
+                }
+#endif
+        } else {
+                ctio->u.status1.flags &=
+                    ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
+                ctio->u.status1.flags |=
+                    __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
+                ctio->u.status1.sense_length = 0;
+                memset(ctio->u.status1.sense_data, 0,
+                    sizeof(ctio->u.status1.sense_data));
+        }
+
+        /* Sense with len > 24, is it possible ??? */
+}
+
+/*
+ * Callback to setup response of xmit_type of QLA_TGT_XMIT_DATA and *
+ * QLA_TGT_XMIT_STATUS for >= 24xx silicon
+ */
+int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
+        uint8_t scsi_status)
+{
+        struct scsi_qla_host *vha = cmd->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct ctio7_to_24xx *pkt;
+        struct qla_tgt_prm prm;
+        uint32_t full_req_cnt = 0;
+        unsigned long flags = 0;
+        int res;
+
+        memset(&prm, 0, sizeof(prm));
+        qlt_check_srr_debug(cmd, &xmit_type);
+
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe018,
+            "is_send_status=%d, cmd->bufflen=%d, cmd->sg_cnt=%d, "
+            "cmd->dma_data_direction=%d\n", (xmit_type & QLA_TGT_XMIT_STATUS) ?
+            1 : 0, cmd->bufflen, cmd->sg_cnt, cmd->dma_data_direction);
+
+        res = qlt_pre_xmit_response(cmd, &prm, xmit_type, scsi_status,
+            &full_req_cnt);
+        if (unlikely(res != 0)) {
+                if (res == QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED)
+                        return 0;
+
+                return res;
+        }
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        /* Does F/W have an IOCBs for this request */
+        res = qlt_check_reserve_free_req(vha, full_req_cnt);
+        if (unlikely(res))
+                goto out_unmap_unlock;
+
+        res = qlt_24xx_build_ctio_pkt(&prm, vha);
+        if (unlikely(res != 0))
+                goto out_unmap_unlock;
+
+
+        pkt = (struct ctio7_to_24xx *)prm.pkt;
+
+        if (qlt_has_data(cmd) && (xmit_type & QLA_TGT_XMIT_DATA)) {
+                pkt->u.status0.flags |=
+                    __constant_cpu_to_le16(CTIO7_FLAGS_DATA_IN |
+                        CTIO7_FLAGS_STATUS_MODE_0);
+
+                qlt_load_data_segments(&prm, vha);
+
+                if (prm.add_status_pkt == 0) {
+                        if (xmit_type & QLA_TGT_XMIT_STATUS) {
+                                pkt->u.status0.scsi_status =
+                                    cpu_to_le16(prm.rq_result);
+                                pkt->u.status0.residual =
+                                    cpu_to_le32(prm.residual);
+                                pkt->u.status0.flags |= __constant_cpu_to_le16(
+                                    CTIO7_FLAGS_SEND_STATUS);
+                                if (qlt_need_explicit_conf(ha, cmd, 0)) {
+                                        pkt->u.status0.flags |=
+                                            __constant_cpu_to_le16(
+                                                CTIO7_FLAGS_EXPLICIT_CONFORM |
+                                                CTIO7_FLAGS_CONFORM_REQ);
+                                }
+                        }
+
+                } else {
+                        /*
+                         * We have already made sure that there is sufficient
+                         * amount of request entries to not drop HW lock in
+                         * req_pkt().
+                         */
+                        struct ctio7_to_24xx *ctio =
+                                (struct ctio7_to_24xx *)qlt_get_req_pkt(vha);
+
+                        ql_dbg(ql_dbg_tgt, vha, 0xe019,
+                            "Building additional status packet\n");
+
+                        memcpy(ctio, pkt, sizeof(*ctio));
+                        ctio->entry_count = 1;
+                        ctio->dseg_count = 0;
+                        ctio->u.status1.flags &= ~__constant_cpu_to_le16(
+                            CTIO7_FLAGS_DATA_IN);
+
+                        /* Real finish is ctio_m1's finish */
+                        pkt->handle |= CTIO_INTERMEDIATE_HANDLE_MARK;
+                        pkt->u.status0.flags |= __constant_cpu_to_le16(
+                            CTIO7_FLAGS_DONT_RET_CTIO);
+                        qlt_24xx_init_ctio_to_isp((struct ctio7_to_24xx *)ctio,
+                            &prm);
+                        pr_debug("Status CTIO7: %p\n", ctio);
+                }
+        } else
+                qlt_24xx_init_ctio_to_isp(pkt, &prm);
+
+
+        cmd->state = QLA_TGT_STATE_PROCESSED; /* Mid-level is done processing */
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe01a,
+            "Xmitting CTIO7 response pkt for 24xx: %p scsi_status: 0x%02x\n",
+            pkt, scsi_status);
+
+        qla2x00_start_iocbs(vha, vha->req);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return 0;
+
+out_unmap_unlock:
+        if (cmd->sg_mapped)
+                qlt_unmap_sg(vha, cmd);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return res;
+}
+EXPORT_SYMBOL(qlt_xmit_response);
+
+int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
+{
+        struct ctio7_to_24xx *pkt;
+        struct scsi_qla_host *vha = cmd->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = cmd->tgt;
+        struct qla_tgt_prm prm;
+        unsigned long flags;
+        int res = 0;
+
+        memset(&prm, 0, sizeof(prm));
+        prm.cmd = cmd;
+        prm.tgt = tgt;
+        prm.sg = NULL;
+        prm.req_cnt = 1;
+
+        /* Send marker if required */
+        if (qlt_issue_marker(vha, 0) != QLA_SUCCESS)
+                return -EIO;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe01b, "CTIO_start: vha(%d)",
+            (int)vha->vp_idx);
+
+        /* Calculate number of entries and segments required */
+        if (qlt_pci_map_calc_cnt(&prm) != 0)
+                return -EAGAIN;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        /* Does F/W have an IOCBs for this request */
+        res = qlt_check_reserve_free_req(vha, prm.req_cnt);
+        if (res != 0)
+                goto out_unlock_free_unmap;
+
+        res = qlt_24xx_build_ctio_pkt(&prm, vha);
+        if (unlikely(res != 0))
+                goto out_unlock_free_unmap;
+        pkt = (struct ctio7_to_24xx *)prm.pkt;
+        pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
+            CTIO7_FLAGS_STATUS_MODE_0);
+        qlt_load_data_segments(&prm, vha);
+
+        cmd->state = QLA_TGT_STATE_NEED_DATA;
+
+        qla2x00_start_iocbs(vha, vha->req);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return res;
+
+out_unlock_free_unmap:
+        if (cmd->sg_mapped)
+                qlt_unmap_sg(vha, cmd);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        return res;
+}
+EXPORT_SYMBOL(qlt_rdy_to_xfer);
+
+/* If hardware_lock held on entry, might drop it, then reaquire */
+/* This function sends the appropriate CTIO to ISP 2xxx or 24xx */
+static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
+        struct qla_tgt_cmd *cmd,
+        struct atio_from_isp *atio)
+{
+        struct ctio7_to_24xx *ctio24;
+        struct qla_hw_data *ha = vha->hw;
+        request_t *pkt;
+        int ret = 0;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe01c, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
+
+        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
+        if (pkt == NULL) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe050,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet\n", vha->vp_idx, __func__);
+                return -ENOMEM;
+        }
+
+        if (cmd != NULL) {
+                if (cmd->state < QLA_TGT_STATE_PROCESSED) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe051,
+                            "qla_target(%d): Terminating cmd %p with "
+                            "incorrect state %d\n", vha->vp_idx, cmd,
+                            cmd->state);
+                } else
+                        ret = 1;
+        }
+
+        pkt->entry_count = 1;
+        pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
+
+        ctio24 = (struct ctio7_to_24xx *)pkt;
+        ctio24->entry_type = CTIO_TYPE7;
+        ctio24->nport_handle = cmd ? cmd->loop_id : CTIO7_NHANDLE_UNRECOGNIZED;
+        ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+        ctio24->vp_index = vha->vp_idx;
+        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
+        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
+        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
+        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
+        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
+            __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
+                CTIO7_FLAGS_TERMINATE);
+        ctio24->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
+
+        /* Most likely, it isn't needed */
+        ctio24->u.status1.residual = get_unaligned((uint32_t *)
+            &atio->u.isp24.fcp_cmnd.add_cdb[
+            atio->u.isp24.fcp_cmnd.add_cdb_len]);
+        if (ctio24->u.status1.residual != 0)
+                ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
+
+        qla2x00_start_iocbs(vha, vha->req);
+        return ret;
+}
+
+static void qlt_send_term_exchange(struct scsi_qla_host *vha,
+        struct qla_tgt_cmd *cmd, struct atio_from_isp *atio, int ha_locked)
+{
+        unsigned long flags;
+        int rc;
+
+        if (qlt_issue_marker(vha, ha_locked) < 0)
+                return;
+
+        if (ha_locked) {
+                rc = __qlt_send_term_exchange(vha, cmd, atio);
+                goto done;
+        }
+        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
+        rc = __qlt_send_term_exchange(vha, cmd, atio);
+        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
+done:
+        if (rc == 1) {
+                if (!ha_locked && !in_interrupt())
+                        msleep(250); /* just in case */
+
+                vha->hw->tgt.tgt_ops->free_cmd(cmd);
+        }
+}
+
+void qlt_free_cmd(struct qla_tgt_cmd *cmd)
+{
+        BUG_ON(cmd->sg_mapped);
+
+        if (unlikely(cmd->free_sg))
+                kfree(cmd->sg);
+        kmem_cache_free(qla_tgt_cmd_cachep, cmd);
+}
+EXPORT_SYMBOL(qlt_free_cmd);
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_prepare_srr_ctio(struct scsi_qla_host *vha,
+        struct qla_tgt_cmd *cmd, void *ctio)
+{
+        struct qla_tgt_srr_ctio *sc;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_srr_imm *imm;
+
+        tgt->ctio_srr_id++;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf019,
+            "qla_target(%d): CTIO with SRR status received\n", vha->vp_idx);
+
+        if (!ctio) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf055,
+                    "qla_target(%d): SRR CTIO, but ctio is NULL\n",
+                    vha->vp_idx);
+                return -EINVAL;
+        }
+
+        sc = kzalloc(sizeof(*sc), GFP_ATOMIC);
+        if (sc != NULL) {
+                sc->cmd = cmd;
+                /* IRQ is already OFF */
+                spin_lock(&tgt->srr_lock);
+                sc->srr_id = tgt->ctio_srr_id;
+                list_add_tail(&sc->srr_list_entry,
+                    &tgt->srr_ctio_list);
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01a,
+                    "CTIO SRR %p added (id %d)\n", sc, sc->srr_id);
+                if (tgt->imm_srr_id == tgt->ctio_srr_id) {
+                        int found = 0;
+                        list_for_each_entry(imm, &tgt->srr_imm_list,
+                            srr_list_entry) {
+                                if (imm->srr_id == sc->srr_id) {
+                                        found = 1;
+                                        break;
+                                }
+                        }
+                        if (found) {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01b,
+                                    "Scheduling srr work\n");
+                                schedule_work(&tgt->srr_work);
+                        } else {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf056,
+                                    "qla_target(%d): imm_srr_id "
+                                    "== ctio_srr_id (%d), but there is no "
+                                    "corresponding SRR IMM, deleting CTIO "
+                                    "SRR %p\n", vha->vp_idx,
+                                    tgt->ctio_srr_id, sc);
+                                list_del(&sc->srr_list_entry);
+                                spin_unlock(&tgt->srr_lock);
+
+                                kfree(sc);
+                                return -EINVAL;
+                        }
+                }
+                spin_unlock(&tgt->srr_lock);
+        } else {
+                struct qla_tgt_srr_imm *ti;
+
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf057,
+                    "qla_target(%d): Unable to allocate SRR CTIO entry\n",
+                    vha->vp_idx);
+                spin_lock(&tgt->srr_lock);
+                list_for_each_entry_safe(imm, ti, &tgt->srr_imm_list,
+                    srr_list_entry) {
+                        if (imm->srr_id == tgt->ctio_srr_id) {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01c,
+                                    "IMM SRR %p deleted (id %d)\n",
+                                    imm, imm->srr_id);
+                                list_del(&imm->srr_list_entry);
+                                qlt_reject_free_srr_imm(vha, imm, 1);
+                        }
+                }
+                spin_unlock(&tgt->srr_lock);
+
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static int qlt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
+        struct qla_tgt_cmd *cmd, uint32_t status)
+{
+        int term = 0;
+
+        if (ctio != NULL) {
+                struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;
+                term = !(c->flags &
+                    __constant_cpu_to_le16(OF_TERM_EXCH));
+        } else
+                term = 1;
+
+        if (term)
+                qlt_send_term_exchange(vha, cmd, &cmd->atio, 1);
+
+        return term;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static inline struct qla_tgt_cmd *qlt_get_cmd(struct scsi_qla_host *vha,
+        uint32_t handle)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        handle--;
+        if (ha->tgt.cmds[handle] != NULL) {
+                struct qla_tgt_cmd *cmd = ha->tgt.cmds[handle];
+                ha->tgt.cmds[handle] = NULL;
+                return cmd;
+        } else
+                return NULL;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static struct qla_tgt_cmd *qlt_ctio_to_cmd(struct scsi_qla_host *vha,
+        uint32_t handle, void *ctio)
+{
+        struct qla_tgt_cmd *cmd = NULL;
+
+        /* Clear out internal marks */
+        handle &= ~(CTIO_COMPLETION_HANDLE_MARK |
+            CTIO_INTERMEDIATE_HANDLE_MARK);
+
+        if (handle != QLA_TGT_NULL_HANDLE) {
+                if (unlikely(handle == QLA_TGT_SKIP_HANDLE)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe01d, "%s",
+                            "SKIP_HANDLE CTIO\n");
+                        return NULL;
+                }
+                /* handle-1 is actually used */
+                if (unlikely(handle > MAX_OUTSTANDING_COMMANDS)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe052,
+                            "qla_target(%d): Wrong handle %x received\n",
+                            vha->vp_idx, handle);
+                        return NULL;
+                }
+                cmd = qlt_get_cmd(vha, handle);
+                if (unlikely(cmd == NULL)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe053,
+                            "qla_target(%d): Suspicious: unable to "
+                            "find the command with handle %x\n", vha->vp_idx,
+                            handle);
+                        return NULL;
+                }
+        } else if (ctio != NULL) {
+                /* We can't get loop ID from CTIO7 */
+                ql_dbg(ql_dbg_tgt, vha, 0xe054,
+                    "qla_target(%d): Wrong CTIO received: QLA24xx doesn't "
+                    "support NULL handles\n", vha->vp_idx);
+                return NULL;
+        }
+
+        return cmd;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
+        uint32_t status, void *ctio)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct se_cmd *se_cmd;
+        struct target_core_fabric_ops *tfo;
+        struct qla_tgt_cmd *cmd;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe01e,
+            "qla_target(%d): handle(ctio %p status %#x) <- %08x\n",
+            vha->vp_idx, ctio, status, handle);
+
+        if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
+                /* That could happen only in case of an error/reset/abort */
+                if (status != CTIO_SUCCESS) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01d,
+                            "Intermediate CTIO received"
+                            " (status %x)\n", status);
+                }
+                return;
+        }
+
+        cmd = qlt_ctio_to_cmd(vha, handle, ctio);
+        if (cmd == NULL)
+                return;
+
+        se_cmd = &cmd->se_cmd;
+        tfo = se_cmd->se_tfo;
+
+        if (cmd->sg_mapped)
+                qlt_unmap_sg(vha, cmd);
+
+        if (unlikely(status != CTIO_SUCCESS)) {
+                switch (status & 0xFFFF) {
+                case CTIO_LIP_RESET:
+                case CTIO_TARGET_RESET:
+                case CTIO_ABORTED:
+                case CTIO_TIMEOUT:
+                case CTIO_INVALID_RX_ID:
+                        /* They are OK */
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf058,
+                            "qla_target(%d): CTIO with "
+                            "status %#x received, state %x, se_cmd %p, "
+                            "(LIP_RESET=e, ABORTED=2, TARGET_RESET=17, "
+                            "TIMEOUT=b, INVALID_RX_ID=8)\n", vha->vp_idx,
+                            status, cmd->state, se_cmd);
+                        break;
+
+                case CTIO_PORT_LOGGED_OUT:
+                case CTIO_PORT_UNAVAILABLE:
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf059,
+                            "qla_target(%d): CTIO with PORT LOGGED "
+                            "OUT (29) or PORT UNAVAILABLE (28) status %x "
+                            "received (state %x, se_cmd %p)\n", vha->vp_idx,
+                            status, cmd->state, se_cmd);
+                        break;
+
+                case CTIO_SRR_RECEIVED:
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05a,
+                            "qla_target(%d): CTIO with SRR_RECEIVED"
+                            " status %x received (state %x, se_cmd %p)\n",
+                            vha->vp_idx, status, cmd->state, se_cmd);
+                        if (qlt_prepare_srr_ctio(vha, cmd, ctio) != 0)
+                                break;
+                        else
+                                return;
+
+                default:
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05b,
+                            "qla_target(%d): CTIO with error status "
+                            "0x%x received (state %x, se_cmd %p\n",
+                            vha->vp_idx, status, cmd->state, se_cmd);
+                        break;
+                }
+
+                if (cmd->state != QLA_TGT_STATE_NEED_DATA)
+                        if (qlt_term_ctio_exchange(vha, ctio, cmd, status))
+                                return;
+        }
+
+        if (cmd->state == QLA_TGT_STATE_PROCESSED) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe01f, "Command %p finished\n", cmd);
+        } else if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
+                int rx_status = 0;
+
+                cmd->state = QLA_TGT_STATE_DATA_IN;
+
+                if (unlikely(status != CTIO_SUCCESS))
+                        rx_status = -EIO;
+                else
+                        cmd->write_data_transferred = 1;
+
+                ql_dbg(ql_dbg_tgt, vha, 0xe020,
+                    "Data received, context %x, rx_status %d\n",
+                    0x0, rx_status);
+
+                ha->tgt.tgt_ops->handle_data(cmd);
+                return;
+        } else if (cmd->state == QLA_TGT_STATE_ABORTED) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e,
+                    "Aborted command %p (tag %d) finished\n", cmd, cmd->tag);
+        } else {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c,
+                    "qla_target(%d): A command in state (%d) should "
+                    "not return a CTIO complete\n", vha->vp_idx, cmd->state);
+        }
+
+        if (unlikely(status != CTIO_SUCCESS)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01f, "Finishing failed CTIO\n");
+                dump_stack();
+        }
+
+        ha->tgt.tgt_ops->free_cmd(cmd);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+/* called via callback from qla2xxx */
+void qlt_ctio_completion(struct scsi_qla_host *vha, uint32_t handle)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+
+        if (likely(tgt == NULL)) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe021,
+                    "CTIO, but target mode not enabled"
+                    " (ha %d %p handle %#x)", vha->vp_idx, ha, handle);
+                return;
+        }
+
+        tgt->irq_cmd_count++;
+        qlt_do_ctio_completion(vha, handle, CTIO_SUCCESS, NULL);
+        tgt->irq_cmd_count--;
+}
+
+static inline int qlt_get_fcp_task_attr(struct scsi_qla_host *vha,
+        uint8_t task_codes)
+{
+        int fcp_task_attr;
+
+        switch (task_codes) {
+        case ATIO_SIMPLE_QUEUE:
+                fcp_task_attr = MSG_SIMPLE_TAG;
+                break;
+        case ATIO_HEAD_OF_QUEUE:
+                fcp_task_attr = MSG_HEAD_TAG;
+                break;
+        case ATIO_ORDERED_QUEUE:
+                fcp_task_attr = MSG_ORDERED_TAG;
+                break;
+        case ATIO_ACA_QUEUE:
+                fcp_task_attr = MSG_ACA_TAG;
+                break;
+        case ATIO_UNTAGGED:
+                fcp_task_attr = MSG_SIMPLE_TAG;
+                break;
+        default:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05d,
+                    "qla_target: unknown task code %x, use ORDERED instead\n",
+                    task_codes);
+                fcp_task_attr = MSG_ORDERED_TAG;
+                break;
+        }
+
+        return fcp_task_attr;
+}
+
+static struct qla_tgt_sess *qlt_make_local_sess(struct scsi_qla_host *,
+                                        uint8_t *);
+/*
+ * Process context for I/O path into tcm_qla2xxx code
+ */
+static void qlt_do_work(struct work_struct *work)
+{
+        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
+        scsi_qla_host_t *vha = cmd->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_sess *sess = NULL;
+        struct atio_from_isp *atio = &cmd->atio;
+        unsigned char *cdb;
+        unsigned long flags;
+        uint32_t data_length;
+        int ret, fcp_task_attr, data_dir, bidi = 0;
+
+        if (tgt->tgt_stop)
+                goto out_term;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
+            atio->u.isp24.fcp_hdr.s_id);
+        if (sess) {
+                if (unlikely(sess->tearing_down)) {
+                        sess = NULL;
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                        goto out_term;
+                } else {
+                        /*
+                         * Do the extra kref_get() before dropping
+                         * qla_hw_data->hardware_lock.
+                         */
+                        kref_get(&sess->se_sess->sess_kref);
+                }
+        }
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        if (unlikely(!sess)) {
+                uint8_t *s_id = atio->u.isp24.fcp_hdr.s_id;
+
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf022,
+                        "qla_target(%d): Unable to find wwn login"
+                        " (s_id %x:%x:%x), trying to create it manually\n",
+                        vha->vp_idx, s_id[0], s_id[1], s_id[2]);
+
+                if (atio->u.raw.entry_count > 1) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf023,
+                                "Dropping multy entry cmd %p\n", cmd);
+                        goto out_term;
+                }
+
+                mutex_lock(&ha->tgt.tgt_mutex);
+                sess = qlt_make_local_sess(vha, s_id);
+                /* sess has an extra creation ref. */
+                mutex_unlock(&ha->tgt.tgt_mutex);
+
+                if (!sess)
+                        goto out_term;
+        }
+
+        cmd->sess = sess;
+        cmd->loop_id = sess->loop_id;
+        cmd->conf_compl_supported = sess->conf_compl_supported;
+
+        cdb = &atio->u.isp24.fcp_cmnd.cdb[0];
+        cmd->tag = atio->u.isp24.exchange_addr;
+        cmd->unpacked_lun = scsilun_to_int(
+            (struct scsi_lun *)&atio->u.isp24.fcp_cmnd.lun);
+
+        if (atio->u.isp24.fcp_cmnd.rddata &&
+            atio->u.isp24.fcp_cmnd.wrdata) {
+                bidi = 1;
+                data_dir = DMA_TO_DEVICE;
+        } else if (atio->u.isp24.fcp_cmnd.rddata)
+                data_dir = DMA_FROM_DEVICE;
+        else if (atio->u.isp24.fcp_cmnd.wrdata)
+                data_dir = DMA_TO_DEVICE;
+        else
+                data_dir = DMA_NONE;
+
+        fcp_task_attr = qlt_get_fcp_task_attr(vha,
+            atio->u.isp24.fcp_cmnd.task_attr);
+        data_length = be32_to_cpu(get_unaligned((uint32_t *)
+            &atio->u.isp24.fcp_cmnd.add_cdb[
+            atio->u.isp24.fcp_cmnd.add_cdb_len]));
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe022,
+            "qla_target: START qla command: %p lun: 0x%04x (tag %d)\n",
+            cmd, cmd->unpacked_lun, cmd->tag);
+
+        ret = vha->hw->tgt.tgt_ops->handle_cmd(vha, cmd, cdb, data_length,
+            fcp_task_attr, data_dir, bidi);
+        if (ret != 0)
+                goto out_term;
+        /*
+         * Drop extra session reference from qla_tgt_handle_cmd_for_atio*(
+         */
+        ha->tgt.tgt_ops->put_sess(sess);
+        return;
+
+out_term:
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf020, "Terminating work cmd %p", cmd);
+        /*
+         * cmd has not sent to target yet, so pass NULL as the second
+         * argument to qlt_send_term_exchange() and free the memory here.
+         */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        qlt_send_term_exchange(vha, NULL, &cmd->atio, 1);
+        kmem_cache_free(qla_tgt_cmd_cachep, cmd);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        if (sess)
+                ha->tgt.tgt_ops->put_sess(sess);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,
+        struct atio_from_isp *atio)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_cmd *cmd;
+
+        if (unlikely(tgt->tgt_stop)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf021,
+                    "New command while device %p is shutting down\n", tgt);
+                return -EFAULT;
+        }
+
+        cmd = kmem_cache_zalloc(qla_tgt_cmd_cachep, GFP_ATOMIC);
+        if (!cmd) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05e,
+                    "qla_target(%d): Allocation of cmd failed\n", vha->vp_idx);
+                return -ENOMEM;
+        }
+
+        INIT_LIST_HEAD(&cmd->cmd_list);
+
+        memcpy(&cmd->atio, atio, sizeof(*atio));
+        cmd->state = QLA_TGT_STATE_NEW;
+        cmd->tgt = ha->tgt.qla_tgt;
+        cmd->vha = vha;
+
+        INIT_WORK(&cmd->work, qlt_do_work);
+        queue_work(qla_tgt_wq, &cmd->work);
+        return 0;
+
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_issue_task_mgmt(struct qla_tgt_sess *sess, uint32_t lun,
+        int fn, void *iocb, int flags)
+{
+        struct scsi_qla_host *vha = sess->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_mgmt_cmd *mcmd;
+        int res;
+        uint8_t tmr_func;
+
+        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
+        if (!mcmd) {
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10009,
+                    "qla_target(%d): Allocation of management "
+                    "command failed, some commands and their data could "
+                    "leak\n", vha->vp_idx);
+                return -ENOMEM;
+        }
+        memset(mcmd, 0, sizeof(*mcmd));
+        mcmd->sess = sess;
+
+        if (iocb) {
+                memcpy(&mcmd->orig_iocb.imm_ntfy, iocb,
+                    sizeof(mcmd->orig_iocb.imm_ntfy));
+        }
+        mcmd->tmr_func = fn;
+        mcmd->flags = flags;
+
+        switch (fn) {
+        case QLA_TGT_CLEAR_ACA:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10000,
+                    "qla_target(%d): CLEAR_ACA received\n", sess->vha->vp_idx);
+                tmr_func = TMR_CLEAR_ACA;
+                break;
+
+        case QLA_TGT_TARGET_RESET:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10001,
+                    "qla_target(%d): TARGET_RESET received\n",
+                    sess->vha->vp_idx);
+                tmr_func = TMR_TARGET_WARM_RESET;
+                break;
+
+        case QLA_TGT_LUN_RESET:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10002,
+                    "qla_target(%d): LUN_RESET received\n", sess->vha->vp_idx);
+                tmr_func = TMR_LUN_RESET;
+                break;
+
+        case QLA_TGT_CLEAR_TS:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10003,
+                    "qla_target(%d): CLEAR_TS received\n", sess->vha->vp_idx);
+                tmr_func = TMR_CLEAR_TASK_SET;
+                break;
+
+        case QLA_TGT_ABORT_TS:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10004,
+                    "qla_target(%d): ABORT_TS received\n", sess->vha->vp_idx);
+                tmr_func = TMR_ABORT_TASK_SET;
+                break;
+#if 0
+        case QLA_TGT_ABORT_ALL:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10005,
+                    "qla_target(%d): Doing ABORT_ALL_TASKS\n",
+                    sess->vha->vp_idx);
+                tmr_func = 0;
+                break;
+
+        case QLA_TGT_ABORT_ALL_SESS:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10006,
+                    "qla_target(%d): Doing ABORT_ALL_TASKS_SESS\n",
+                    sess->vha->vp_idx);
+                tmr_func = 0;
+                break;
+
+        case QLA_TGT_NEXUS_LOSS_SESS:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10007,
+                    "qla_target(%d): Doing NEXUS_LOSS_SESS\n",
+                    sess->vha->vp_idx);
+                tmr_func = 0;
+                break;
+
+        case QLA_TGT_NEXUS_LOSS:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x10008,
+                    "qla_target(%d): Doing NEXUS_LOSS\n", sess->vha->vp_idx);
+                tmr_func = 0;
+                break;
+#endif
+        default:
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x1000a,
+                    "qla_target(%d): Unknown task mgmt fn 0x%x\n",
+                    sess->vha->vp_idx, fn);
+                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
+                return -ENOSYS;
+        }
+
+        res = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, tmr_func, 0);
+        if (res != 0) {
+                ql_dbg(ql_dbg_tgt_tmr, vha, 0x1000b,
+                    "qla_target(%d): tgt.tgt_ops->handle_tmr() failed: %d\n",
+                    sess->vha->vp_idx, res);
+                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
+{
+        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt;
+        struct qla_tgt_sess *sess;
+        uint32_t lun, unpacked_lun;
+        int lun_size, fn;
+
+        tgt = ha->tgt.qla_tgt;
+
+        lun = a->u.isp24.fcp_cmnd.lun;
+        lun_size = sizeof(a->u.isp24.fcp_cmnd.lun);
+        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
+            a->u.isp24.fcp_hdr.s_id);
+        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
+
+        if (!sess) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf024,
+                    "qla_target(%d): task mgmt fn 0x%x for "
+                    "non-existant session\n", vha->vp_idx, fn);
+                return qlt_sched_sess_work(tgt, QLA_TGT_SESS_WORK_TM, iocb,
+                    sizeof(struct atio_from_isp));
+        }
+
+        return qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int __qlt_abort_task(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *iocb, struct qla_tgt_sess *sess)
+{
+        struct atio_from_isp *a = (struct atio_from_isp *)iocb;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_mgmt_cmd *mcmd;
+        uint32_t lun, unpacked_lun;
+        int rc;
+
+        mcmd = mempool_alloc(qla_tgt_mgmt_cmd_mempool, GFP_ATOMIC);
+        if (mcmd == NULL) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05f,
+                    "qla_target(%d): %s: Allocation of ABORT cmd failed\n",
+                    vha->vp_idx, __func__);
+                return -ENOMEM;
+        }
+        memset(mcmd, 0, sizeof(*mcmd));
+
+        mcmd->sess = sess;
+        memcpy(&mcmd->orig_iocb.imm_ntfy, iocb,
+            sizeof(mcmd->orig_iocb.imm_ntfy));
+
+        lun = a->u.isp24.fcp_cmnd.lun;
+        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
+
+        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, unpacked_lun, TMR_ABORT_TASK,
+            le16_to_cpu(iocb->u.isp2x.seq_id));
+        if (rc != 0) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf060,
+                    "qla_target(%d): tgt_ops->handle_tmr() failed: %d\n",
+                    vha->vp_idx, rc);
+                mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static int qlt_abort_task(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *iocb)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess;
+        int loop_id;
+
+        loop_id = GET_TARGET_ID(ha, (struct atio_from_isp *)iocb);
+
+        sess = ha->tgt.tgt_ops->find_sess_by_loop_id(vha, loop_id);
+        if (sess == NULL) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf025,
+                    "qla_target(%d): task abort for unexisting "
+                    "session\n", vha->vp_idx);
+                return qlt_sched_sess_work(ha->tgt.qla_tgt,
+                    QLA_TGT_SESS_WORK_ABORT, iocb, sizeof(*iocb));
+        }
+
+        return __qlt_abort_task(vha, iocb, sess);
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *iocb)
+{
+        struct qla_hw_data *ha = vha->hw;
+        int res = 0;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf026,
+            "qla_target(%d): Port ID: 0x%02x:%02x:%02x"
+            " ELS opcode: 0x%02x\n", vha->vp_idx, iocb->u.isp24.port_id[0],
+            iocb->u.isp24.port_id[1], iocb->u.isp24.port_id[2],
+            iocb->u.isp24.status_subcode);
+
+        switch (iocb->u.isp24.status_subcode) {
+        case ELS_PLOGI:
+        case ELS_FLOGI:
+        case ELS_PRLI:
+        case ELS_LOGO:
+        case ELS_PRLO:
+                res = qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS);
+                break;
+        case ELS_PDISC:
+        case ELS_ADISC:
+        {
+                struct qla_tgt *tgt = ha->tgt.qla_tgt;
+                if (tgt->link_reinit_iocb_pending) {
+                        qlt_send_notify_ack(vha, &tgt->link_reinit_iocb,
+                            0, 0, 0, 0, 0, 0);
+                        tgt->link_reinit_iocb_pending = 0;
+                }
+                res = 1; /* send notify ack */
+                break;
+        }
+
+        default:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf061,
+                    "qla_target(%d): Unsupported ELS command %x "
+                    "received\n", vha->vp_idx, iocb->u.isp24.status_subcode);
+                res = qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS);
+                break;
+        }
+
+        return res;
+}
+
+static int qlt_set_data_offset(struct qla_tgt_cmd *cmd, uint32_t offset)
+{
+        struct scatterlist *sg, *sgp, *sg_srr, *sg_srr_start = NULL;
+        size_t first_offset = 0, rem_offset = offset, tmp = 0;
+        int i, sg_srr_cnt, bufflen = 0;
+
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe023,
+            "Entering qla_tgt_set_data_offset: cmd: %p, cmd->sg: %p, "
+            "cmd->sg_cnt: %u, direction: %d\n",
+            cmd, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);
+
+        /*
+         * FIXME: Reject non zero SRR relative offset until we can test
+         * this code properly.
+         */
+        pr_debug("Rejecting non zero SRR rel_offs: %u\n", offset);
+        return -1;
+
+        if (!cmd->sg || !cmd->sg_cnt) {
+                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe055,
+                    "Missing cmd->sg or zero cmd->sg_cnt in"
+                    " qla_tgt_set_data_offset\n");
+                return -EINVAL;
+        }
+        /*
+         * Walk the current cmd->sg list until we locate the new sg_srr_start
+         */
+        for_each_sg(cmd->sg, sg, cmd->sg_cnt, i) {
+                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe024,
+                    "sg[%d]: %p page: %p, length: %d, offset: %d\n",
+                    i, sg, sg_page(sg), sg->length, sg->offset);
+
+                if ((sg->length + tmp) > offset) {
+                        first_offset = rem_offset;
+                        sg_srr_start = sg;
+                        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe025,
+                            "Found matching sg[%d], using %p as sg_srr_start, "
+                            "and using first_offset: %zu\n", i, sg,
+                            first_offset);
+                        break;
+                }
+                tmp += sg->length;
+                rem_offset -= sg->length;
+        }
+
+        if (!sg_srr_start) {
+                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe056,
+                    "Unable to locate sg_srr_start for offset: %u\n", offset);
+                return -EINVAL;
+        }
+        sg_srr_cnt = (cmd->sg_cnt - i);
+
+        sg_srr = kzalloc(sizeof(struct scatterlist) * sg_srr_cnt, GFP_KERNEL);
+        if (!sg_srr) {
+                ql_dbg(ql_dbg_tgt, cmd->vha, 0xe057,
+                    "Unable to allocate sgp\n");
+                return -ENOMEM;
+        }
+        sg_init_table(sg_srr, sg_srr_cnt);
+        sgp = &sg_srr[0];
+        /*
+         * Walk the remaining list for sg_srr_start, mapping to the newly
+         * allocated sg_srr taking first_offset into account.
+         */
+        for_each_sg(sg_srr_start, sg, sg_srr_cnt, i) {
+                if (first_offset) {
+                        sg_set_page(sgp, sg_page(sg),
+                            (sg->length - first_offset), first_offset);
+                        first_offset = 0;
+                } else {
+                        sg_set_page(sgp, sg_page(sg), sg->length, 0);
+                }
+                bufflen += sgp->length;
+
+                sgp = sg_next(sgp);
+                if (!sgp)
+                        break;
+        }
+
+        cmd->sg = sg_srr;
+        cmd->sg_cnt = sg_srr_cnt;
+        cmd->bufflen = bufflen;
+        cmd->offset += offset;
+        cmd->free_sg = 1;
+
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe026, "New cmd->sg: %p\n", cmd->sg);
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe027, "New cmd->sg_cnt: %u\n",
+            cmd->sg_cnt);
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe028, "New cmd->bufflen: %u\n",
+            cmd->bufflen);
+        ql_dbg(ql_dbg_tgt, cmd->vha, 0xe029, "New cmd->offset: %u\n",
+            cmd->offset);
+
+        if (cmd->sg_cnt < 0)
+                BUG();
+
+        if (cmd->bufflen < 0)
+                BUG();
+
+        return 0;
+}
+
+static inline int qlt_srr_adjust_data(struct qla_tgt_cmd *cmd,
+        uint32_t srr_rel_offs, int *xmit_type)
+{
+        int res = 0, rel_offs;
+
+        rel_offs = srr_rel_offs - cmd->offset;
+        ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf027, "srr_rel_offs=%d, rel_offs=%d",
+            srr_rel_offs, rel_offs);
+
+        *xmit_type = QLA_TGT_XMIT_ALL;
+
+        if (rel_offs < 0) {
+                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf062,
+                    "qla_target(%d): SRR rel_offs (%d) < 0",
+                    cmd->vha->vp_idx, rel_offs);
+                res = -1;
+        } else if (rel_offs == cmd->bufflen)
+                *xmit_type = QLA_TGT_XMIT_STATUS;
+        else if (rel_offs > 0)
+                res = qlt_set_data_offset(cmd, rel_offs);
+
+        return res;
+}
+
+/* No locks, thread context */
+static void qlt_handle_srr(struct scsi_qla_host *vha,
+        struct qla_tgt_srr_ctio *sctio, struct qla_tgt_srr_imm *imm)
+{
+        struct imm_ntfy_from_isp *ntfy =
+            (struct imm_ntfy_from_isp *)&imm->imm_ntfy;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_cmd *cmd = sctio->cmd;
+        struct se_cmd *se_cmd = &cmd->se_cmd;
+        unsigned long flags;
+        int xmit_type = 0, resp = 0;
+        uint32_t offset;
+        uint16_t srr_ui;
+
+        offset = le32_to_cpu(ntfy->u.isp24.srr_rel_offs);
+        srr_ui = ntfy->u.isp24.srr_ui;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf028, "SRR cmd %p, srr_ui %x\n",
+            cmd, srr_ui);
+
+        switch (srr_ui) {
+        case SRR_IU_STATUS:
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+                qlt_send_notify_ack(vha, ntfy,
+                    0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                xmit_type = QLA_TGT_XMIT_STATUS;
+                resp = 1;
+                break;
+        case SRR_IU_DATA_IN:
+                if (!cmd->sg || !cmd->sg_cnt) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf063,
+                            "Unable to process SRR_IU_DATA_IN due to"
+                            " missing cmd->sg, state: %d\n", cmd->state);
+                        dump_stack();
+                        goto out_reject;
+                }
+                if (se_cmd->scsi_status != 0) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe02a,
+                            "Rejecting SRR_IU_DATA_IN with non GOOD "
+                            "scsi_status\n");
+                        goto out_reject;
+                }
+                cmd->bufflen = se_cmd->data_length;
+
+                if (qlt_has_data(cmd)) {
+                        if (qlt_srr_adjust_data(cmd, offset, &xmit_type) != 0)
+                                goto out_reject;
+                        spin_lock_irqsave(&ha->hardware_lock, flags);
+                        qlt_send_notify_ack(vha, ntfy,
+                            0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                        resp = 1;
+                } else {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf064,
+                            "qla_target(%d): SRR for in data for cmd "
+                            "without them (tag %d, SCSI status %d), "
+                            "reject", vha->vp_idx, cmd->tag,
+                            cmd->se_cmd.scsi_status);
+                        goto out_reject;
+                }
+                break;
+        case SRR_IU_DATA_OUT:
+                if (!cmd->sg || !cmd->sg_cnt) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf065,
+                            "Unable to process SRR_IU_DATA_OUT due to"
+                            " missing cmd->sg\n");
+                        dump_stack();
+                        goto out_reject;
+                }
+                if (se_cmd->scsi_status != 0) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe02b,
+                            "Rejecting SRR_IU_DATA_OUT"
+                            " with non GOOD scsi_status\n");
+                        goto out_reject;
+                }
+                cmd->bufflen = se_cmd->data_length;
+
+                if (qlt_has_data(cmd)) {
+                        if (qlt_srr_adjust_data(cmd, offset, &xmit_type) != 0)
+                                goto out_reject;
+                        spin_lock_irqsave(&ha->hardware_lock, flags);
+                        qlt_send_notify_ack(vha, ntfy,
+                            0, 0, 0, NOTIFY_ACK_SRR_FLAGS_ACCEPT, 0, 0);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                        if (xmit_type & QLA_TGT_XMIT_DATA)
+                                qlt_rdy_to_xfer(cmd);
+                } else {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf066,
+                            "qla_target(%d): SRR for out data for cmd "
+                            "without them (tag %d, SCSI status %d), "
+                            "reject", vha->vp_idx, cmd->tag,
+                            cmd->se_cmd.scsi_status);
+                        goto out_reject;
+                }
+                break;
+        default:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf067,
+                    "qla_target(%d): Unknown srr_ui value %x",
+                    vha->vp_idx, srr_ui);
+                goto out_reject;
+        }
+
+        /* Transmit response in case of status and data-in cases */
+        if (resp)
+                qlt_xmit_response(cmd, xmit_type, se_cmd->scsi_status);
+
+        return;
+
+out_reject:
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        qlt_send_notify_ack(vha, ntfy, 0, 0, 0,
+            NOTIFY_ACK_SRR_FLAGS_REJECT,
+            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
+            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
+        if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
+                cmd->state = QLA_TGT_STATE_DATA_IN;
+                dump_stack();
+        } else
+                qlt_send_term_exchange(vha, cmd, &cmd->atio, 1);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+static void qlt_reject_free_srr_imm(struct scsi_qla_host *vha,
+        struct qla_tgt_srr_imm *imm, int ha_locked)
+{
+        struct qla_hw_data *ha = vha->hw;
+        unsigned long flags = 0;
+
+        if (!ha_locked)
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        qlt_send_notify_ack(vha, (void *)&imm->imm_ntfy, 0, 0, 0,
+            NOTIFY_ACK_SRR_FLAGS_REJECT,
+            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
+            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
+
+        if (!ha_locked)
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        kfree(imm);
+}
+
+static void qlt_handle_srr_work(struct work_struct *work)
+{
+        struct qla_tgt *tgt = container_of(work, struct qla_tgt, srr_work);
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_tgt_srr_ctio *sctio;
+        unsigned long flags;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf029, "Entering SRR work (tgt %p)\n",
+            tgt);
+
+restart:
+        spin_lock_irqsave(&tgt->srr_lock, flags);
+        list_for_each_entry(sctio, &tgt->srr_ctio_list, srr_list_entry) {
+                struct qla_tgt_srr_imm *imm, *i, *ti;
+                struct qla_tgt_cmd *cmd;
+                struct se_cmd *se_cmd;
+
+                imm = NULL;
+                list_for_each_entry_safe(i, ti, &tgt->srr_imm_list,
+                                                srr_list_entry) {
+                        if (i->srr_id == sctio->srr_id) {
+                                list_del(&i->srr_list_entry);
+                                if (imm) {
+                                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf068,
+                                          "qla_target(%d): There must be "
+                                          "only one IMM SRR per CTIO SRR "
+                                          "(IMM SRR %p, id %d, CTIO %p\n",
+                                          vha->vp_idx, i, i->srr_id, sctio);
+                                        qlt_reject_free_srr_imm(tgt->vha, i, 0);
+                                } else
+                                        imm = i;
+                        }
+                }
+
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02a,
+                    "IMM SRR %p, CTIO SRR %p (id %d)\n", imm, sctio,
+                    sctio->srr_id);
+
+                if (imm == NULL) {
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02b,
+                            "Not found matching IMM for SRR CTIO (id %d)\n",
+                            sctio->srr_id);
+                        continue;
+                } else
+                        list_del(&sctio->srr_list_entry);
+
+                spin_unlock_irqrestore(&tgt->srr_lock, flags);
+
+                cmd = sctio->cmd;
+                /*
+                 * Reset qla_tgt_cmd SRR values and SGL pointer+count to follow
+                 * tcm_qla2xxx_write_pending() and tcm_qla2xxx_queue_data_in()
+                 * logic..
+                 */
+                cmd->offset = 0;
+                if (cmd->free_sg) {
+                        kfree(cmd->sg);
+                        cmd->sg = NULL;
+                        cmd->free_sg = 0;
+                }
+                se_cmd = &cmd->se_cmd;
+
+                cmd->sg_cnt = se_cmd->t_data_nents;
+                cmd->sg = se_cmd->t_data_sg;
+
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,
+                    "SRR cmd %p (se_cmd %p, tag %d, op %x), "
+                    "sg_cnt=%d, offset=%d", cmd, &cmd->se_cmd, cmd->tag,
+                    se_cmd->t_task_cdb[0], cmd->sg_cnt, cmd->offset);
+
+                qlt_handle_srr(vha, sctio, imm);
+
+                kfree(imm);
+                kfree(sctio);
+                goto restart;
+        }
+        spin_unlock_irqrestore(&tgt->srr_lock, flags);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+static void qlt_prepare_srr_imm(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *iocb)
+{
+        struct qla_tgt_srr_imm *imm;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        struct qla_tgt_srr_ctio *sctio;
+
+        tgt->imm_srr_id++;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02d, "qla_target(%d): SRR received\n",
+            vha->vp_idx);
+
+        imm = kzalloc(sizeof(*imm), GFP_ATOMIC);
+        if (imm != NULL) {
+                memcpy(&imm->imm_ntfy, iocb, sizeof(imm->imm_ntfy));
+
+                /* IRQ is already OFF */
+                spin_lock(&tgt->srr_lock);
+                imm->srr_id = tgt->imm_srr_id;
+                list_add_tail(&imm->srr_list_entry,
+                    &tgt->srr_imm_list);
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02e,
+                    "IMM NTFY SRR %p added (id %d, ui %x)\n",
+                    imm, imm->srr_id, iocb->u.isp24.srr_ui);
+                if (tgt->imm_srr_id == tgt->ctio_srr_id) {
+                        int found = 0;
+                        list_for_each_entry(sctio, &tgt->srr_ctio_list,
+                            srr_list_entry) {
+                                if (sctio->srr_id == imm->srr_id) {
+                                        found = 1;
+                                        break;
+                                }
+                        }
+                        if (found) {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02f, "%s",
+                                    "Scheduling srr work\n");
+                                schedule_work(&tgt->srr_work);
+                        } else {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf030,
+                                    "qla_target(%d): imm_srr_id "
+                                    "== ctio_srr_id (%d), but there is no "
+                                    "corresponding SRR CTIO, deleting IMM "
+                                    "SRR %p\n", vha->vp_idx, tgt->ctio_srr_id,
+                                    imm);
+                                list_del(&imm->srr_list_entry);
+
+                                kfree(imm);
+
+                                spin_unlock(&tgt->srr_lock);
+                                goto out_reject;
+                        }
+                }
+                spin_unlock(&tgt->srr_lock);
+        } else {
+                struct qla_tgt_srr_ctio *ts;
+
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf069,
+                    "qla_target(%d): Unable to allocate SRR IMM "
+                    "entry, SRR request will be rejected\n", vha->vp_idx);
+
+                /* IRQ is already OFF */
+                spin_lock(&tgt->srr_lock);
+                list_for_each_entry_safe(sctio, ts, &tgt->srr_ctio_list,
+                    srr_list_entry) {
+                        if (sctio->srr_id == tgt->imm_srr_id) {
+                                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf031,
+                                    "CTIO SRR %p deleted (id %d)\n",
+                                    sctio, sctio->srr_id);
+                                list_del(&sctio->srr_list_entry);
+                                qlt_send_term_exchange(vha, sctio->cmd,
+                                    &sctio->cmd->atio, 1);
+                                kfree(sctio);
+                        }
+                }
+                spin_unlock(&tgt->srr_lock);
+                goto out_reject;
+        }
+
+        return;
+
+out_reject:
+        qlt_send_notify_ack(vha, iocb, 0, 0, 0,
+            NOTIFY_ACK_SRR_FLAGS_REJECT,
+            NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM,
+            NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL);
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+static void qlt_handle_imm_notify(struct scsi_qla_host *vha,
+        struct imm_ntfy_from_isp *iocb)
+{
+        struct qla_hw_data *ha = vha->hw;
+        uint32_t add_flags = 0;
+        int send_notify_ack = 1;
+        uint16_t status;
+
+        status = le16_to_cpu(iocb->u.isp2x.status);
+        switch (status) {
+        case IMM_NTFY_LIP_RESET:
+        {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf032,
+                    "qla_target(%d): LIP reset (loop %#x), subcode %x\n",
+                    vha->vp_idx, le16_to_cpu(iocb->u.isp24.nport_handle),
+                    iocb->u.isp24.status_subcode);
+
+                if (qlt_reset(vha, iocb, QLA_TGT_ABORT_ALL) == 0)
+                        send_notify_ack = 0;
+                break;
+        }
+
+        case IMM_NTFY_LIP_LINK_REINIT:
+        {
+                struct qla_tgt *tgt = ha->tgt.qla_tgt;
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,
+                    "qla_target(%d): LINK REINIT (loop %#x, "
+                    "subcode %x)\n", vha->vp_idx,
+                    le16_to_cpu(iocb->u.isp24.nport_handle),
+                    iocb->u.isp24.status_subcode);
+                if (tgt->link_reinit_iocb_pending) {
+                        qlt_send_notify_ack(vha, &tgt->link_reinit_iocb,
+                            0, 0, 0, 0, 0, 0);
+                }
+                memcpy(&tgt->link_reinit_iocb, iocb, sizeof(*iocb));
+                tgt->link_reinit_iocb_pending = 1;
+                /*
+                 * QLogic requires to wait after LINK REINIT for possible
+                 * PDISC or ADISC ELS commands
+                 */
+                send_notify_ack = 0;
+                break;
+        }
+
+        case IMM_NTFY_PORT_LOGOUT:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf034,
+                    "qla_target(%d): Port logout (loop "
+                    "%#x, subcode %x)\n", vha->vp_idx,
+                    le16_to_cpu(iocb->u.isp24.nport_handle),
+                    iocb->u.isp24.status_subcode);
+
+                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS_SESS) == 0)
+                        send_notify_ack = 0;
+                /* The sessions will be cleared in the callback, if needed */
+                break;
+
+        case IMM_NTFY_GLBL_TPRLO:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf035,
+                    "qla_target(%d): Global TPRLO (%x)\n", vha->vp_idx, status);
+                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS) == 0)
+                        send_notify_ack = 0;
+                /* The sessions will be cleared in the callback, if needed */
+                break;
+
+        case IMM_NTFY_PORT_CONFIG:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf036,
+                    "qla_target(%d): Port config changed (%x)\n", vha->vp_idx,
+                    status);
+                if (qlt_reset(vha, iocb, QLA_TGT_ABORT_ALL) == 0)
+                        send_notify_ack = 0;
+                /* The sessions will be cleared in the callback, if needed */
+                break;
+
+        case IMM_NTFY_GLBL_LOGO:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06a,
+                    "qla_target(%d): Link failure detected\n",
+                    vha->vp_idx);
+                /* I_T nexus loss */
+                if (qlt_reset(vha, iocb, QLA_TGT_NEXUS_LOSS) == 0)
+                        send_notify_ack = 0;
+                break;
+
+        case IMM_NTFY_IOCB_OVERFLOW:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06b,
+                    "qla_target(%d): Cannot provide requested "
+                    "capability (IOCB overflowed the immediate notify "
+                    "resource count)\n", vha->vp_idx);
+                break;
+
+        case IMM_NTFY_ABORT_TASK:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf037,
+                    "qla_target(%d): Abort Task (S %08x I %#x -> "
+                    "L %#x)\n", vha->vp_idx,
+                    le16_to_cpu(iocb->u.isp2x.seq_id),
+                    GET_TARGET_ID(ha, (struct atio_from_isp *)iocb),
+                    le16_to_cpu(iocb->u.isp2x.lun));
+                if (qlt_abort_task(vha, iocb) == 0)
+                        send_notify_ack = 0;
+                break;
+
+        case IMM_NTFY_RESOURCE:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06c,
+                    "qla_target(%d): Out of resources, host %ld\n",
+                    vha->vp_idx, vha->host_no);
+                break;
+
+        case IMM_NTFY_MSG_RX:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf038,
+                    "qla_target(%d): Immediate notify task %x\n",
+                    vha->vp_idx, iocb->u.isp2x.task_flags);
+                if (qlt_handle_task_mgmt(vha, iocb) == 0)
+                        send_notify_ack = 0;
+                break;
+
+        case IMM_NTFY_ELS:
+                if (qlt_24xx_handle_els(vha, iocb) == 0)
+                        send_notify_ack = 0;
+                break;
+
+        case IMM_NTFY_SRR:
+                qlt_prepare_srr_imm(vha, iocb);
+                send_notify_ack = 0;
+                break;
+
+        default:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06d,
+                    "qla_target(%d): Received unknown immediate "
+                    "notify status %x\n", vha->vp_idx, status);
+                break;
+        }
+
+        if (send_notify_ack)
+                qlt_send_notify_ack(vha, iocb, add_flags, 0, 0, 0, 0, 0);
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ * This function sends busy to ISP 2xxx or 24xx.
+ */
+static void qlt_send_busy(struct scsi_qla_host *vha,
+        struct atio_from_isp *atio, uint16_t status)
+{
+        struct ctio7_to_24xx *ctio24;
+        struct qla_hw_data *ha = vha->hw;
+        request_t *pkt;
+        struct qla_tgt_sess *sess = NULL;
+
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
+            atio->u.isp24.fcp_hdr.s_id);
+        if (!sess) {
+                qlt_send_term_exchange(vha, NULL, atio, 1);
+                return;
+        }
+        /* Sending marker isn't necessary, since we called from ISR */
+
+        pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
+        if (!pkt) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06e,
+                    "qla_target(%d): %s failed: unable to allocate "
+                    "request packet", vha->vp_idx, __func__);
+                return;
+        }
+
+        pkt->entry_count = 1;
+        pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
+
+        ctio24 = (struct ctio7_to_24xx *)pkt;
+        ctio24->entry_type = CTIO_TYPE7;
+        ctio24->nport_handle = sess->loop_id;
+        ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+        ctio24->vp_index = vha->vp_idx;
+        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
+        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
+        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
+        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
+        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
+            __constant_cpu_to_le16(
+                CTIO7_FLAGS_STATUS_MODE_1 | CTIO7_FLAGS_SEND_STATUS |
+                CTIO7_FLAGS_DONT_RET_CTIO);
+        /*
+         * CTIO from fw w/o se_cmd doesn't provide enough info to retry it,
+         * if the explicit conformation is used.
+         */
+        ctio24->u.status1.ox_id = swab16(atio->u.isp24.fcp_hdr.ox_id);
+        ctio24->u.status1.scsi_status = cpu_to_le16(status);
+        ctio24->u.status1.residual = get_unaligned((uint32_t *)
+            &atio->u.isp24.fcp_cmnd.add_cdb[
+            atio->u.isp24.fcp_cmnd.add_cdb_len]);
+        if (ctio24->u.status1.residual != 0)
+                ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
+
+        qla2x00_start_iocbs(vha, vha->req);
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+/* called via callback from qla2xxx */
+static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha,
+        struct atio_from_isp *atio)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        int rc;
+
+        if (unlikely(tgt == NULL)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf039,
+                    "ATIO pkt, but no tgt (ha %p)", ha);
+                return;
+        }
+        ql_dbg(ql_dbg_tgt, vha, 0xe02c,
+            "qla_target(%d): ATIO pkt %p: type %02x count %02x",
+            vha->vp_idx, atio, atio->u.raw.entry_type,
+            atio->u.raw.entry_count);
+        /*
+         * In tgt_stop mode we also should allow all requests to pass.
+         * Otherwise, some commands can stuck.
+         */
+
+        tgt->irq_cmd_count++;
+
+        switch (atio->u.raw.entry_type) {
+        case ATIO_TYPE7:
+                ql_dbg(ql_dbg_tgt, vha, 0xe02d,
+                    "ATIO_TYPE7 instance %d, lun %Lx, read/write %d/%d, "
+                    "add_cdb_len %d, data_length %04x, s_id %x:%x:%x\n",
+                    vha->vp_idx, atio->u.isp24.fcp_cmnd.lun,
+                    atio->u.isp24.fcp_cmnd.rddata,
+                    atio->u.isp24.fcp_cmnd.wrdata,
+                    atio->u.isp24.fcp_cmnd.add_cdb_len,
+                    be32_to_cpu(get_unaligned((uint32_t *)
+                        &atio->u.isp24.fcp_cmnd.add_cdb[
+                        atio->u.isp24.fcp_cmnd.add_cdb_len])),
+                    atio->u.isp24.fcp_hdr.s_id[0],
+                    atio->u.isp24.fcp_hdr.s_id[1],
+                    atio->u.isp24.fcp_hdr.s_id[2]);
+
+                if (unlikely(atio->u.isp24.exchange_addr ==
+                    ATIO_EXCHANGE_ADDRESS_UNKNOWN)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe058,
+                            "qla_target(%d): ATIO_TYPE7 "
+                            "received with UNKNOWN exchange address, "
+                            "sending QUEUE_FULL\n", vha->vp_idx);
+                        qlt_send_busy(vha, atio, SAM_STAT_TASK_SET_FULL);
+                        break;
+                }
+                if (likely(atio->u.isp24.fcp_cmnd.task_mgmt_flags == 0))
+                        rc = qlt_handle_cmd_for_atio(vha, atio);
+                else
+                        rc = qlt_handle_task_mgmt(vha, atio);
+                if (unlikely(rc != 0)) {
+                        if (rc == -ESRCH) {
+#if 1 /* With TERM EXCHANGE some FC cards refuse to boot */
+                                qlt_send_busy(vha, atio, SAM_STAT_BUSY);
+#else
+                                qlt_send_term_exchange(vha, NULL, atio, 1);
+#endif
+                        } else {
+                                if (tgt->tgt_stop) {
+                                        ql_dbg(ql_dbg_tgt, vha, 0xe059,
+                                            "qla_target: Unable to send "
+                                            "command to target for req, "
+                                            "ignoring.\n");
+                                } else {
+                                        ql_dbg(ql_dbg_tgt, vha, 0xe05a,
+                                            "qla_target(%d): Unable to send "
+                                            "command to target, sending BUSY "
+                                            "status.\n", vha->vp_idx);
+                                        qlt_send_busy(vha, atio, SAM_STAT_BUSY);
+                                }
+                        }
+                }
+                break;
+
+        case IMMED_NOTIFY_TYPE:
+        {
+                if (unlikely(atio->u.isp2x.entry_status != 0)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe05b,
+                            "qla_target(%d): Received ATIO packet %x "
+                            "with error status %x\n", vha->vp_idx,
+                            atio->u.raw.entry_type,
+                            atio->u.isp2x.entry_status);
+                        break;
+                }
+                ql_dbg(ql_dbg_tgt, vha, 0xe02e, "%s", "IMMED_NOTIFY ATIO");
+                qlt_handle_imm_notify(vha, (struct imm_ntfy_from_isp *)atio);
+                break;
+        }
+
+        default:
+                ql_dbg(ql_dbg_tgt, vha, 0xe05c,
+                    "qla_target(%d): Received unknown ATIO atio "
+                    "type %x\n", vha->vp_idx, atio->u.raw.entry_type);
+                break;
+        }
+
+        tgt->irq_cmd_count--;
+}
+
+/* ha->hardware_lock supposed to be held on entry */
+/* called via callback from qla2xxx */
+static void qlt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+
+        if (unlikely(tgt == NULL)) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe05d,
+                    "qla_target(%d): Response pkt %x received, but no "
+                    "tgt (ha %p)\n", vha->vp_idx, pkt->entry_type, ha);
+                return;
+        }
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe02f,
+            "qla_target(%d): response pkt %p: T %02x C %02x S %02x "
+            "handle %#x\n", vha->vp_idx, pkt, pkt->entry_type,
+            pkt->entry_count, pkt->entry_status, pkt->handle);
+
+        /*
+         * In tgt_stop mode we also should allow all requests to pass.
+         * Otherwise, some commands can stuck.
+         */
+
+        tgt->irq_cmd_count++;
+
+        switch (pkt->entry_type) {
+        case CTIO_TYPE7:
+        {
+                struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;
+                ql_dbg(ql_dbg_tgt, vha, 0xe030, "CTIO_TYPE7: instance %d\n",
+                    vha->vp_idx);
+                qlt_do_ctio_completion(vha, entry->handle,
+                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
+                    entry);
+                break;
+        }
+
+        case ACCEPT_TGT_IO_TYPE:
+        {
+                struct atio_from_isp *atio = (struct atio_from_isp *)pkt;
+                int rc;
+                ql_dbg(ql_dbg_tgt, vha, 0xe031,
+                    "ACCEPT_TGT_IO instance %d status %04x "
+                    "lun %04x read/write %d data_length %04x "
+                    "target_id %02x rx_id %04x\n ", vha->vp_idx,
+                    le16_to_cpu(atio->u.isp2x.status),
+                    le16_to_cpu(atio->u.isp2x.lun),
+                    atio->u.isp2x.execution_codes,
+                    le32_to_cpu(atio->u.isp2x.data_length), GET_TARGET_ID(ha,
+                    atio), atio->u.isp2x.rx_id);
+                if (atio->u.isp2x.status !=
+                    __constant_cpu_to_le16(ATIO_CDB_VALID)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe05e,
+                            "qla_target(%d): ATIO with error "
+                            "status %x received\n", vha->vp_idx,
+                            le16_to_cpu(atio->u.isp2x.status));
+                        break;
+                }
+                ql_dbg(ql_dbg_tgt, vha, 0xe032,
+                    "FCP CDB: 0x%02x, sizeof(cdb): %lu",
+                    atio->u.isp2x.cdb[0], (unsigned long
+                    int)sizeof(atio->u.isp2x.cdb));
+
+                rc = qlt_handle_cmd_for_atio(vha, atio);
+                if (unlikely(rc != 0)) {
+                        if (rc == -ESRCH) {
+#if 1 /* With TERM EXCHANGE some FC cards refuse to boot */
+                                qlt_send_busy(vha, atio, 0);
+#else
+                                qlt_send_term_exchange(vha, NULL, atio, 1);
+#endif
+                        } else {
+                                if (tgt->tgt_stop) {
+                                        ql_dbg(ql_dbg_tgt, vha, 0xe05f,
+                                            "qla_target: Unable to send "
+                                            "command to target, sending TERM "
+                                            "EXCHANGE for rsp\n");
+                                        qlt_send_term_exchange(vha, NULL,
+                                            atio, 1);
+                                } else {
+                                        ql_dbg(ql_dbg_tgt, vha, 0xe060,
+                                            "qla_target(%d): Unable to send "
+                                            "command to target, sending BUSY "
+                                            "status\n", vha->vp_idx);
+                                        qlt_send_busy(vha, atio, 0);
+                                }
+                        }
+                }
+        }
+        break;
+
+        case CONTINUE_TGT_IO_TYPE:
+        {
+                struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
+                ql_dbg(ql_dbg_tgt, vha, 0xe033,
+                    "CONTINUE_TGT_IO: instance %d\n", vha->vp_idx);
+                qlt_do_ctio_completion(vha, entry->handle,
+                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
+                    entry);
+                break;
+        }
+
+        case CTIO_A64_TYPE:
+        {
+                struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
+                ql_dbg(ql_dbg_tgt, vha, 0xe034, "CTIO_A64: instance %d\n",
+                    vha->vp_idx);
+                qlt_do_ctio_completion(vha, entry->handle,
+                    le16_to_cpu(entry->status)|(pkt->entry_status << 16),
+                    entry);
+                break;
+        }
+
+        case IMMED_NOTIFY_TYPE:
+                ql_dbg(ql_dbg_tgt, vha, 0xe035, "%s", "IMMED_NOTIFY\n");
+                qlt_handle_imm_notify(vha, (struct imm_ntfy_from_isp *)pkt);
+                break;
+
+        case NOTIFY_ACK_TYPE:
+                if (tgt->notify_ack_expected > 0) {
+                        struct nack_to_isp *entry = (struct nack_to_isp *)pkt;
+                        ql_dbg(ql_dbg_tgt, vha, 0xe036,
+                            "NOTIFY_ACK seq %08x status %x\n",
+                            le16_to_cpu(entry->u.isp2x.seq_id),
+                            le16_to_cpu(entry->u.isp2x.status));
+                        tgt->notify_ack_expected--;
+                        if (entry->u.isp2x.status !=
+                            __constant_cpu_to_le16(NOTIFY_ACK_SUCCESS)) {
+                                ql_dbg(ql_dbg_tgt, vha, 0xe061,
+                                    "qla_target(%d): NOTIFY_ACK "
+                                    "failed %x\n", vha->vp_idx,
+                                    le16_to_cpu(entry->u.isp2x.status));
+                        }
+                } else {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe062,
+                            "qla_target(%d): Unexpected NOTIFY_ACK received\n",
+                            vha->vp_idx);
+                }
+                break;
+
+        case ABTS_RECV_24XX:
+                ql_dbg(ql_dbg_tgt, vha, 0xe037,
+                    "ABTS_RECV_24XX: instance %d\n", vha->vp_idx);
+                qlt_24xx_handle_abts(vha, (struct abts_recv_from_24xx *)pkt);
+                break;
+
+        case ABTS_RESP_24XX:
+                if (tgt->abts_resp_expected > 0) {
+                        struct abts_resp_from_24xx_fw *entry =
+                                (struct abts_resp_from_24xx_fw *)pkt;
+                        ql_dbg(ql_dbg_tgt, vha, 0xe038,
+                            "ABTS_RESP_24XX: compl_status %x\n",
+                            entry->compl_status);
+                        tgt->abts_resp_expected--;
+                        if (le16_to_cpu(entry->compl_status) !=
+                            ABTS_RESP_COMPL_SUCCESS) {
+                                if ((entry->error_subcode1 == 0x1E) &&
+                                    (entry->error_subcode2 == 0)) {
+                                        /*
+                                         * We've got a race here: aborted
+                                         * exchange not terminated, i.e.
+                                         * response for the aborted command was
+                                         * sent between the abort request was
+                                         * received and processed.
+                                         * Unfortunately, the firmware has a
+                                         * silly requirement that all aborted
+                                         * exchanges must be explicitely
+                                         * terminated, otherwise it refuses to
+                                         * send responses for the abort
+                                         * requests. So, we have to
+                                         * (re)terminate the exchange and retry
+                                         * the abort response.
+                                         */
+                                        qlt_24xx_retry_term_exchange(vha,
+                                            entry);
+                                } else
+                                        ql_dbg(ql_dbg_tgt, vha, 0xe063,
+                                            "qla_target(%d): ABTS_RESP_24XX "
+                                            "failed %x (subcode %x:%x)",
+                                            vha->vp_idx, entry->compl_status,
+                                            entry->error_subcode1,
+                                            entry->error_subcode2);
+                        }
+                } else {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe064,
+                            "qla_target(%d): Unexpected ABTS_RESP_24XX "
+                            "received\n", vha->vp_idx);
+                }
+                break;
+
+        default:
+                ql_dbg(ql_dbg_tgt, vha, 0xe065,
+                    "qla_target(%d): Received unknown response pkt "
+                    "type %x\n", vha->vp_idx, pkt->entry_type);
+                break;
+        }
+
+        tgt->irq_cmd_count--;
+}
+
+/*
+ * ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
+ */
+void qlt_async_event(uint16_t code, struct scsi_qla_host *vha,
+        uint16_t *mailbox)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        int reason_code;
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe039,
+            "scsi(%ld): ha state %d init_done %d oper_mode %d topo %d\n",
+            vha->host_no, atomic_read(&vha->loop_state), vha->flags.init_done,
+            ha->operating_mode, ha->current_topology);
+
+        if (!ha->tgt.tgt_ops)
+                return;
+
+        if (unlikely(tgt == NULL)) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe03a,
+                    "ASYNC EVENT %#x, but no tgt (ha %p)\n", code, ha);
+                return;
+        }
+
+        if (((code == MBA_POINT_TO_POINT) || (code == MBA_CHG_IN_CONNECTION)) &&
+            IS_QLA2100(ha))
+                return;
+        /*
+         * In tgt_stop mode we also should allow all requests to pass.
+         * Otherwise, some commands can stuck.
+         */
+
+        tgt->irq_cmd_count++;
+
+        switch (code) {
+        case MBA_RESET:                 /* Reset */
+        case MBA_SYSTEM_ERR:            /* System Error */
+        case MBA_REQ_TRANSFER_ERR:      /* Request Transfer Error */
+        case MBA_RSP_TRANSFER_ERR:      /* Response Transfer Error */
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a,
+                    "qla_target(%d): System error async event %#x "
+                    "occured", vha->vp_idx, code);
+                break;
+        case MBA_WAKEUP_THRES:          /* Request Queue Wake-up. */
+                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                break;
+
+        case MBA_LOOP_UP:
+        {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b,
+                    "qla_target(%d): Async LOOP_UP occured "
+                    "(m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", vha->vp_idx,
+                    le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
+                    le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+                if (tgt->link_reinit_iocb_pending) {
+                        qlt_send_notify_ack(vha, (void *)&tgt->link_reinit_iocb,
+                            0, 0, 0, 0, 0, 0);
+                        tgt->link_reinit_iocb_pending = 0;
+                }
+                break;
+        }
+
+        case MBA_LIP_OCCURRED:
+        case MBA_LOOP_DOWN:
+        case MBA_LIP_RESET:
+        case MBA_RSCN_UPDATE:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c,
+                    "qla_target(%d): Async event %#x occured "
+                    "(m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", vha->vp_idx, code,
+                    le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
+                    le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+                break;
+
+        case MBA_PORT_UPDATE:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d,
+                    "qla_target(%d): Port update async event %#x "
+                    "occured: updating the ports database (m[1]=%x, m[2]=%x, "
+                    "m[3]=%x, m[4]=%x)", vha->vp_idx, code,
+                    le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
+                    le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+                reason_code = le16_to_cpu(mailbox[2]);
+                if (reason_code == 0x4)
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03e,
+                            "Async MB 2: Got PLOGI Complete\n");
+                else if (reason_code == 0x7)
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03f,
+                            "Async MB 2: Port Logged Out\n");
+                break;
+
+        default:
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040,
+                    "qla_target(%d): Async event %#x occured: "
+                    "ignore (m[1]=%x, m[2]=%x, m[3]=%x, m[4]=%x)", vha->vp_idx,
+                    code, le16_to_cpu(mailbox[1]), le16_to_cpu(mailbox[2]),
+                    le16_to_cpu(mailbox[3]), le16_to_cpu(mailbox[4]));
+                break;
+        }
+
+        tgt->irq_cmd_count--;
+}
+
+static fc_port_t *qlt_get_port_database(struct scsi_qla_host *vha,
+        uint16_t loop_id)
+{
+        fc_port_t *fcport;
+        int rc;
+
+        fcport = kzalloc(sizeof(*fcport), GFP_KERNEL);
+        if (!fcport) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf06f,
+                    "qla_target(%d): Allocation of tmp FC port failed",
+                    vha->vp_idx);
+                return NULL;
+        }
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf041, "loop_id %d", loop_id);
+
+        fcport->loop_id = loop_id;
+
+        rc = qla2x00_get_port_database(vha, fcport, 0);
+        if (rc != QLA_SUCCESS) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf070,
+                    "qla_target(%d): Failed to retrieve fcport "
+                    "information -- get_port_database() returned %x "
+                    "(loop_id=0x%04x)", vha->vp_idx, rc, loop_id);
+                kfree(fcport);
+                return NULL;
+        }
+
+        return fcport;
+}
+
+/* Must be called under tgt_mutex */
+static struct qla_tgt_sess *qlt_make_local_sess(struct scsi_qla_host *vha,
+        uint8_t *s_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess = NULL;
+        fc_port_t *fcport = NULL;
+        int rc, global_resets;
+        uint16_t loop_id = 0;
+
+retry:
+        global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count);
+
+        rc = qla24xx_get_loop_id(vha, s_id, &loop_id);
+        if (rc != 0) {
+                if ((s_id[0] == 0xFF) &&
+                    (s_id[1] == 0xFC)) {
+                        /*
+                         * This is Domain Controller, so it should be
+                         * OK to drop SCSI commands from it.
+                         */
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf042,
+                            "Unable to find initiator with S_ID %x:%x:%x",
+                            s_id[0], s_id[1], s_id[2]);
+                } else
+                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf071,
+                            "qla_target(%d): Unable to find "
+                            "initiator with S_ID %x:%x:%x",
+                            vha->vp_idx, s_id[0], s_id[1],
+                            s_id[2]);
+                return NULL;
+        }
+
+        fcport = qlt_get_port_database(vha, loop_id);
+        if (!fcport)
+                return NULL;
+
+        if (global_resets !=
+            atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count)) {
+                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf043,
+                    "qla_target(%d): global reset during session discovery "
+                    "(counter was %d, new %d), retrying", vha->vp_idx,
+                    global_resets,
+                    atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count));
+                goto retry;
+        }
+
+        sess = qlt_create_sess(vha, fcport, true);
+
+        kfree(fcport);
+        return sess;
+}
+
+static void qlt_abort_work(struct qla_tgt *tgt,
+        struct qla_tgt_sess_work_param *prm)
+{
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess = NULL;
+        unsigned long flags;
+        uint32_t be_s_id;
+        uint8_t s_id[3];
+        int rc;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        if (tgt->tgt_stop)
+                goto out_term;
+
+        s_id[0] = prm->abts.fcp_hdr_le.s_id[2];
+        s_id[1] = prm->abts.fcp_hdr_le.s_id[1];
+        s_id[2] = prm->abts.fcp_hdr_le.s_id[0];
+
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
+            (unsigned char *)&be_s_id);
+        if (!sess) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+                mutex_lock(&ha->tgt.tgt_mutex);
+                sess = qlt_make_local_sess(vha, s_id);
+                /* sess has got an extra creation ref */
+                mutex_unlock(&ha->tgt.tgt_mutex);
+
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+                if (!sess)
+                        goto out_term;
+        } else {
+                kref_get(&sess->se_sess->sess_kref);
+        }
+
+        if (tgt->tgt_stop)
+                goto out_term;
+
+        rc = __qlt_24xx_handle_abts(vha, &prm->abts, sess);
+        if (rc != 0)
+                goto out_term;
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        ha->tgt.tgt_ops->put_sess(sess);
+        return;
+
+out_term:
+        qlt_24xx_send_abts_resp(vha, &prm->abts, FCP_TMF_REJECTED, false);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        if (sess)
+                ha->tgt.tgt_ops->put_sess(sess);
+}
+
+static void qlt_tmr_work(struct qla_tgt *tgt,
+        struct qla_tgt_sess_work_param *prm)
+{
+        struct atio_from_isp *a = &prm->tm_iocb2;
+        struct scsi_qla_host *vha = tgt->vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt_sess *sess = NULL;
+        unsigned long flags;
+        uint8_t *s_id = NULL; /* to hide compiler warnings */
+        int rc;
+        uint32_t lun, unpacked_lun;
+        int lun_size, fn;
+        void *iocb;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+
+        if (tgt->tgt_stop)
+                goto out_term;
+
+        s_id = prm->tm_iocb2.u.isp24.fcp_hdr.s_id;
+        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha, s_id);
+        if (!sess) {
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+                mutex_lock(&ha->tgt.tgt_mutex);
+                sess = qlt_make_local_sess(vha, s_id);
+                /* sess has got an extra creation ref */
+                mutex_unlock(&ha->tgt.tgt_mutex);
+
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+                if (!sess)
+                        goto out_term;
+        } else {
+                kref_get(&sess->se_sess->sess_kref);
+        }
+
+        iocb = a;
+        lun = a->u.isp24.fcp_cmnd.lun;
+        lun_size = sizeof(lun);
+        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
+        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
+
+        rc = qlt_issue_task_mgmt(sess, unpacked_lun, fn, iocb, 0);
+        if (rc != 0)
+                goto out_term;
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        ha->tgt.tgt_ops->put_sess(sess);
+        return;
+
+out_term:
+        qlt_send_term_exchange(vha, NULL, &prm->tm_iocb2, 1);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        if (sess)
+                ha->tgt.tgt_ops->put_sess(sess);
+}
+
+static void qlt_sess_work_fn(struct work_struct *work)
+{
+        struct qla_tgt *tgt = container_of(work, struct qla_tgt, sess_work);
+        struct scsi_qla_host *vha = tgt->vha;
+        unsigned long flags;
+
+        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf000, "Sess work (tgt %p)", tgt);
+
+        spin_lock_irqsave(&tgt->sess_work_lock, flags);
+        while (!list_empty(&tgt->sess_works_list)) {
+                struct qla_tgt_sess_work_param *prm = list_entry(
+                    tgt->sess_works_list.next, typeof(*prm),
+                    sess_works_list_entry);
+
+                /*
+                 * This work can be scheduled on several CPUs at time, so we
+                 * must delete the entry to eliminate double processing
+                 */
+                list_del(&prm->sess_works_list_entry);
+
+                spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
+
+                switch (prm->type) {
+                case QLA_TGT_SESS_WORK_ABORT:
+                        qlt_abort_work(tgt, prm);
+                        break;
+                case QLA_TGT_SESS_WORK_TM:
+                        qlt_tmr_work(tgt, prm);
+                        break;
+                default:
+                        BUG_ON(1);
+                        break;
+                }
+
+                spin_lock_irqsave(&tgt->sess_work_lock, flags);
+
+                kfree(prm);
+        }
+        spin_unlock_irqrestore(&tgt->sess_work_lock, flags);
+}
+
+/* Must be called under tgt_host_action_mutex */
+int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
+{
+        struct qla_tgt *tgt;
+
+        if (!QLA_TGT_MODE_ENABLED())
+                return 0;
+
+        ql_dbg(ql_dbg_tgt, base_vha, 0xe03b,
+            "Registering target for host %ld(%p)", base_vha->host_no, ha);
+
+        BUG_ON((ha->tgt.qla_tgt != NULL) || (ha->tgt.tgt_ops != NULL));
+
+        tgt = kzalloc(sizeof(struct qla_tgt), GFP_KERNEL);
+        if (!tgt) {
+                ql_dbg(ql_dbg_tgt, base_vha, 0xe066,
+                    "Unable to allocate struct qla_tgt\n");
+                return -ENOMEM;
+        }
+
+        if (!(base_vha->host->hostt->supported_mode & MODE_TARGET))
+                base_vha->host->hostt->supported_mode |= MODE_TARGET;
+
+        tgt->ha = ha;
+        tgt->vha = base_vha;
+        init_waitqueue_head(&tgt->waitQ);
+        INIT_LIST_HEAD(&tgt->sess_list);
+        INIT_LIST_HEAD(&tgt->del_sess_list);
+        INIT_DELAYED_WORK(&tgt->sess_del_work,
+                (void (*)(struct work_struct *))qlt_del_sess_work_fn);
+        spin_lock_init(&tgt->sess_work_lock);
+        INIT_WORK(&tgt->sess_work, qlt_sess_work_fn);
+        INIT_LIST_HEAD(&tgt->sess_works_list);
+        spin_lock_init(&tgt->srr_lock);
+        INIT_LIST_HEAD(&tgt->srr_ctio_list);
+        INIT_LIST_HEAD(&tgt->srr_imm_list);
+        INIT_WORK(&tgt->srr_work, qlt_handle_srr_work);
+        atomic_set(&tgt->tgt_global_resets_count, 0);
+
+        ha->tgt.qla_tgt = tgt;
+
+        ql_dbg(ql_dbg_tgt, base_vha, 0xe067,
+                "qla_target(%d): using 64 Bit PCI addressing",
+                base_vha->vp_idx);
+        tgt->tgt_enable_64bit_addr = 1;
+        /* 3 is reserved */
+        tgt->sg_tablesize = QLA_TGT_MAX_SG_24XX(base_vha->req->length - 3);
+        tgt->datasegs_per_cmd = QLA_TGT_DATASEGS_PER_CMD_24XX;
+        tgt->datasegs_per_cont = QLA_TGT_DATASEGS_PER_CONT_24XX;
+
+        mutex_lock(&qla_tgt_mutex);
+        list_add_tail(&tgt->tgt_list_entry, &qla_tgt_glist);
+        mutex_unlock(&qla_tgt_mutex);
+
+        return 0;
+}
+
+/* Must be called under tgt_host_action_mutex */
+int qlt_remove_target(struct qla_hw_data *ha, struct scsi_qla_host *vha)
+{
+        if (!ha->tgt.qla_tgt)
+                return 0;
+
+        mutex_lock(&qla_tgt_mutex);
+        list_del(&ha->tgt.qla_tgt->tgt_list_entry);
+        mutex_unlock(&qla_tgt_mutex);
+
+        ql_dbg(ql_dbg_tgt, vha, 0xe03c, "Unregistering target for host %ld(%p)",
+            vha->host_no, ha);
+        qlt_release(ha->tgt.qla_tgt);
+
+        return 0;
+}
+
+static void qlt_lport_dump(struct scsi_qla_host *vha, u64 wwpn,
+        unsigned char *b)
+{
+        int i;
+
+        pr_debug("qla2xxx HW vha->node_name: ");
+        for (i = 0; i < WWN_SIZE; i++)
+                pr_debug("%02x ", vha->node_name[i]);
+        pr_debug("\n");
+        pr_debug("qla2xxx HW vha->port_name: ");
+        for (i = 0; i < WWN_SIZE; i++)
+                pr_debug("%02x ", vha->port_name[i]);
+        pr_debug("\n");
+
+        pr_debug("qla2xxx passed configfs WWPN: ");
+        put_unaligned_be64(wwpn, b);
+        for (i = 0; i < WWN_SIZE; i++)
+                pr_debug("%02x ", b[i]);
+        pr_debug("\n");
+}
+
+/**
+ * qla_tgt_lport_register - register lport with external module
+ *
+ * @qla_tgt_ops: Pointer for tcm_qla2xxx qla_tgt_ops
+ * @wwpn: Passwd FC target WWPN
+ * @callback:  lport initialization callback for tcm_qla2xxx code
+ * @target_lport_ptr: pointer for tcm_qla2xxx specific lport data
+ */
+int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn,
+        int (*callback)(struct scsi_qla_host *), void *target_lport_ptr)
+{
+        struct qla_tgt *tgt;
+        struct scsi_qla_host *vha;
+        struct qla_hw_data *ha;
+        struct Scsi_Host *host;
+        unsigned long flags;
+        int rc;
+        u8 b[WWN_SIZE];
+
+        mutex_lock(&qla_tgt_mutex);
+        list_for_each_entry(tgt, &qla_tgt_glist, tgt_list_entry) {
+                vha = tgt->vha;
+                ha = vha->hw;
+
+                host = vha->host;
+                if (!host)
+                        continue;
+
+                if (ha->tgt.tgt_ops != NULL)
+                        continue;
+
+                if (!(host->hostt->supported_mode & MODE_TARGET))
+                        continue;
+
+                spin_lock_irqsave(&ha->hardware_lock, flags);
+                if (host->active_mode & MODE_TARGET) {
+                        pr_debug("MODE_TARGET already active on qla2xxx(%d)\n",
+                            host->host_no);
+                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+                        continue;
+                }
+                spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+                if (!scsi_host_get(host)) {
+                        ql_dbg(ql_dbg_tgt, vha, 0xe068,
+                            "Unable to scsi_host_get() for"
+                            " qla2xxx scsi_host\n");
+                        continue;
+                }
+                qlt_lport_dump(vha, wwpn, b);
+
+                if (memcmp(vha->port_name, b, WWN_SIZE)) {
+                        scsi_host_put(host);
+                        continue;
+                }
+                /*
+                 * Setup passed parameters ahead of invoking callback
+                 */
+                ha->tgt.tgt_ops = qla_tgt_ops;
+                ha->tgt.target_lport_ptr = target_lport_ptr;
+                rc = (*callback)(vha);
+                if (rc != 0) {
+                        ha->tgt.tgt_ops = NULL;
+                        ha->tgt.target_lport_ptr = NULL;
+                }
+                mutex_unlock(&qla_tgt_mutex);
+                return rc;
+        }
+        mutex_unlock(&qla_tgt_mutex);
+
+        return -ENODEV;
+}
+EXPORT_SYMBOL(qlt_lport_register);
+
+/**
+ * qla_tgt_lport_deregister - Degister lport
+ *
+ * @vha:  Registered scsi_qla_host pointer
+ */
+void qlt_lport_deregister(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct Scsi_Host *sh = vha->host;
+        /*
+         * Clear the target_lport_ptr qla_target_template pointer in qla_hw_data
+         */
+        ha->tgt.target_lport_ptr = NULL;
+        ha->tgt.tgt_ops = NULL;
+        /*
+         * Release the Scsi_Host reference for the underlying qla2xxx host
+         */
+        scsi_host_put(sh);
+}
+EXPORT_SYMBOL(qlt_lport_deregister);
+
+/* Must be called under HW lock */
+void qlt_set_mode(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        switch (ql2x_ini_mode) {
+        case QLA2XXX_INI_MODE_DISABLED:
+        case QLA2XXX_INI_MODE_EXCLUSIVE:
+                vha->host->active_mode = MODE_TARGET;
+                break;
+        case QLA2XXX_INI_MODE_ENABLED:
+                vha->host->active_mode |= MODE_TARGET;
+                break;
+        default:
+                break;
+        }
+
+        if (ha->tgt.ini_mode_force_reverse)
+                qla_reverse_ini_mode(vha);
+}
+
+/* Must be called under HW lock */
+void qlt_clear_mode(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        switch (ql2x_ini_mode) {
+        case QLA2XXX_INI_MODE_DISABLED:
+                vha->host->active_mode = MODE_UNKNOWN;
+                break;
+        case QLA2XXX_INI_MODE_EXCLUSIVE:
+                vha->host->active_mode = MODE_INITIATOR;
+                break;
+        case QLA2XXX_INI_MODE_ENABLED:
+                vha->host->active_mode &= ~MODE_TARGET;
+                break;
+        default:
+                break;
+        }
+
+        if (ha->tgt.ini_mode_force_reverse)
+                qla_reverse_ini_mode(vha);
+}
+
+/*
+ * qla_tgt_enable_vha - NO LOCK HELD
+ *
+ * host_reset, bring up w/ Target Mode Enabled
+ */
+void
+qlt_enable_vha(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        unsigned long flags;
+
+        if (!tgt) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe069,
+                    "Unable to locate qla_tgt pointer from"
+                    " struct qla_hw_data\n");
+                dump_stack();
+                return;
+        }
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        tgt->tgt_stopped = 0;
+        qlt_set_mode(vha);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+        qla2xxx_wake_dpc(vha);
+        qla2x00_wait_for_hba_online(vha);
+}
+EXPORT_SYMBOL(qlt_enable_vha);
+
+/*
+ * qla_tgt_disable_vha - NO LOCK HELD
+ *
+ * Disable Target Mode and reset the adapter
+ */
+void
+qlt_disable_vha(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct qla_tgt *tgt = ha->tgt.qla_tgt;
+        unsigned long flags;
+
+        if (!tgt) {
+                ql_dbg(ql_dbg_tgt, vha, 0xe06a,
+                    "Unable to locate qla_tgt pointer from"
+                    " struct qla_hw_data\n");
+                dump_stack();
+                return;
+        }
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        qlt_clear_mode(vha);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
+        set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+        qla2xxx_wake_dpc(vha);
+        qla2x00_wait_for_hba_online(vha);
+}
+
+/*
+ * Called from qla_init.c:qla24xx_vport_create() contex to setup
+ * the target mode specific struct scsi_qla_host and struct qla_hw_data
+ * members.
+ */
+void
+qlt_vport_create(struct scsi_qla_host *vha, struct qla_hw_data *ha)
+{
+        if (!qla_tgt_mode_enabled(vha))
+                return;
+
+        mutex_init(&ha->tgt.tgt_mutex);
+        mutex_init(&ha->tgt.tgt_host_action_mutex);
+
+        qlt_clear_mode(vha);
+
+        /*
+         * NOTE: Currently the value is kept the same for <24xx and
+         * >=24xx ISPs. If it is necessary to change it,
+         * the check should be added for specific ISPs,
+         * assigning the value appropriately.
+         */
+        ha->tgt.atio_q_length = ATIO_ENTRY_CNT_24XX;
+}
+
+void
+qlt_rff_id(struct scsi_qla_host *vha, struct ct_sns_req *ct_req)
+{
+        /*
+         * FC-4 Feature bit 0 indicates target functionality to the name server.
+         */
+        if (qla_tgt_mode_enabled(vha)) {
+                if (qla_ini_mode_enabled(vha))
+                        ct_req->req.rff_id.fc4_feature = BIT_0 | BIT_1;
+                else
+                        ct_req->req.rff_id.fc4_feature = BIT_0;
+        } else if (qla_ini_mode_enabled(vha)) {
+                ct_req->req.rff_id.fc4_feature = BIT_1;
+        }
+}
+
+/*
+ * qlt_init_atio_q_entries() - Initializes ATIO queue entries.
+ * @ha: HA context
+ *
+ * Beginning of ATIO ring has initialization control block already built
+ * by nvram config routine.
+ *
+ * Returns 0 on success.
+ */
+void
+qlt_init_atio_q_entries(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        uint16_t cnt;
+        struct atio_from_isp *pkt = (struct atio_from_isp *)ha->tgt.atio_ring;
+
+        if (!qla_tgt_mode_enabled(vha))
+                return;
+
+        for (cnt = 0; cnt < ha->tgt.atio_q_length; cnt++) {
+                pkt->u.raw.signature = ATIO_PROCESSED;
+                pkt++;
+        }
+
+}
+
+/*
+ * qlt_24xx_process_atio_queue() - Process ATIO queue entries.
+ * @ha: SCSI driver HA context
+ */
+void
+qlt_24xx_process_atio_queue(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
+        struct atio_from_isp *pkt;
+        int cnt, i;
+
+        if (!vha->flags.online)
+                return;
+
+        while (ha->tgt.atio_ring_ptr->signature != ATIO_PROCESSED) {
+                pkt = (struct atio_from_isp *)ha->tgt.atio_ring_ptr;
+                cnt = pkt->u.raw.entry_count;
+
+                qlt_24xx_atio_pkt_all_vps(vha, (struct atio_from_isp *)pkt);
+
+                for (i = 0; i < cnt; i++) {
+                        ha->tgt.atio_ring_index++;
+                        if (ha->tgt.atio_ring_index == ha->tgt.atio_q_length) {
+                                ha->tgt.atio_ring_index = 0;
+                                ha->tgt.atio_ring_ptr = ha->tgt.atio_ring;
+                        } else
+                                ha->tgt.atio_ring_ptr++;
+
+                        pkt->u.raw.signature = ATIO_PROCESSED;
+                        pkt = (struct atio_from_isp *)ha->tgt.atio_ring_ptr;
+                }
+                wmb();
+        }
+
+        /* Adjust ring index */
+        WRT_REG_DWORD(&reg->atio_q_out, ha->tgt.atio_ring_index);
+}
+
+void
+qlt_24xx_config_rings(struct scsi_qla_host *vha, device_reg_t __iomem *reg)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+/* FIXME: atio_q in/out for ha->mqenable=1..? */
+        if (ha->mqenable) {
+#if 0
+                WRT_REG_DWORD(&reg->isp25mq.atio_q_in, 0);
+                WRT_REG_DWORD(&reg->isp25mq.atio_q_out, 0);
+                RD_REG_DWORD(&reg->isp25mq.atio_q_out);
+#endif
+        } else {
+                /* Setup APTIO registers for target mode */
+                WRT_REG_DWORD(&reg->isp24.atio_q_in, 0);
+                WRT_REG_DWORD(&reg->isp24.atio_q_out, 0);
+                RD_REG_DWORD(&reg->isp24.atio_q_out);
+        }
+}
+
+void
+qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        if (qla_tgt_mode_enabled(vha)) {
+                if (!ha->tgt.saved_set) {
+                        /* We save only once */
+                        ha->tgt.saved_exchange_count = nv->exchange_count;
+                        ha->tgt.saved_firmware_options_1 =
+                            nv->firmware_options_1;
+                        ha->tgt.saved_firmware_options_2 =
+                            nv->firmware_options_2;
+                        ha->tgt.saved_firmware_options_3 =
+                            nv->firmware_options_3;
+                        ha->tgt.saved_set = 1;
+                }
+
+                nv->exchange_count = __constant_cpu_to_le16(0xFFFF);
+
+                /* Enable target mode */
+                nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_4);
+
+                /* Disable ini mode, if requested */
+                if (!qla_ini_mode_enabled(vha))
+                        nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_5);
+
+                /* Disable Full Login after LIP */
+                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
+                /* Enable initial LIP */
+                nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_9);
+                /* Enable FC tapes support */
+                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);
+                /* Disable Full Login after LIP */
+                nv->host_p &= __constant_cpu_to_le32(~BIT_10);
+                /* Enable target PRLI control */
+                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_14);
+        } else {
+                if (ha->tgt.saved_set) {
+                        nv->exchange_count = ha->tgt.saved_exchange_count;
+                        nv->firmware_options_1 =
+                            ha->tgt.saved_firmware_options_1;
+                        nv->firmware_options_2 =
+                            ha->tgt.saved_firmware_options_2;
+                        nv->firmware_options_3 =
+                            ha->tgt.saved_firmware_options_3;
+                }
+                return;
+        }
+
+        /* out-of-order frames reassembly */
+        nv->firmware_options_3 |= BIT_6|BIT_9;
+
+        if (ha->tgt.enable_class_2) {
+                if (vha->flags.init_done)
+                        fc_host_supported_classes(vha->host) =
+                                FC_COS_CLASS2 | FC_COS_CLASS3;
+
+                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_8);
+        } else {
+                if (vha->flags.init_done)
+                        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
+
+                nv->firmware_options_2 &= ~__constant_cpu_to_le32(BIT_8);
+        }
+}
+
+void
+qlt_24xx_config_nvram_stage2(struct scsi_qla_host *vha,
+        struct init_cb_24xx *icb)
+{
+        struct qla_hw_data *ha = vha->hw;
+
+        if (ha->tgt.node_name_set) {
+                memcpy(icb->node_name, ha->tgt.tgt_node_name, WWN_SIZE);
+                icb->firmware_options_1 |= __constant_cpu_to_le32(BIT_14);
+        }
+}
+
+int
+qlt_24xx_process_response_error(struct scsi_qla_host *vha,
+        struct sts_entry_24xx *pkt)
+{
+        switch (pkt->entry_type) {
+        case ABTS_RECV_24XX:
+        case ABTS_RESP_24XX:
+        case CTIO_TYPE7:
+        case NOTIFY_ACK_TYPE:
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+void
+qlt_modify_vp_config(struct scsi_qla_host *vha,
+        struct vp_config_entry_24xx *vpmod)
+{
+        if (qla_tgt_mode_enabled(vha))
+                vpmod->options_idx1 &= ~BIT_5;
+        /* Disable ini mode, if requested */
+        if (!qla_ini_mode_enabled(vha))
+                vpmod->options_idx1 &= ~BIT_4;
+}
+
+void
+qlt_probe_one_stage1(struct scsi_qla_host *base_vha, struct qla_hw_data *ha)
+{
+        if (!QLA_TGT_MODE_ENABLED())
+                return;
+
+        mutex_init(&ha->tgt.tgt_mutex);
+        mutex_init(&ha->tgt.tgt_host_action_mutex);
+        qlt_clear_mode(base_vha);
+}
+
+int
+qlt_mem_alloc(struct qla_hw_data *ha)
+{
+        if (!QLA_TGT_MODE_ENABLED())
+                return 0;
+
+        ha->tgt.tgt_vp_map = kzalloc(sizeof(struct qla_tgt_vp_map) *
+            MAX_MULTI_ID_FABRIC, GFP_KERNEL);
+        if (!ha->tgt.tgt_vp_map)
+                return -ENOMEM;
+
+        ha->tgt.atio_ring = dma_alloc_coherent(&ha->pdev->dev,
+            (ha->tgt.atio_q_length + 1) * sizeof(struct atio_from_isp),
+            &ha->tgt.atio_dma, GFP_KERNEL);
+        if (!ha->tgt.atio_ring) {
+                kfree(ha->tgt.tgt_vp_map);
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+void
+qlt_mem_free(struct qla_hw_data *ha)
+{
+        if (!QLA_TGT_MODE_ENABLED())
+                return;
+
+        if (ha->tgt.atio_ring) {
+                dma_free_coherent(&ha->pdev->dev, (ha->tgt.atio_q_length + 1) *
+                    sizeof(struct atio_from_isp), ha->tgt.atio_ring,
+                    ha->tgt.atio_dma);
+        }
+        kfree(ha->tgt.tgt_vp_map);
+}
+
+/* vport_slock to be held by the caller */
+void
+qlt_update_vp_map(struct scsi_qla_host *vha, int cmd)
+{
+        if (!QLA_TGT_MODE_ENABLED())
+                return;
+
+        switch (cmd) {
+        case SET_VP_IDX:
+                vha->hw->tgt.tgt_vp_map[vha->vp_idx].vha = vha;
+                break;
+        case SET_AL_PA:
+                vha->hw->tgt.tgt_vp_map[vha->d_id.b.al_pa].idx = vha->vp_idx;
+                break;
+        case RESET_VP_IDX:
+                vha->hw->tgt.tgt_vp_map[vha->vp_idx].vha = NULL;
+                break;
+        case RESET_AL_PA:
+                vha->hw->tgt.tgt_vp_map[vha->d_id.b.al_pa].idx = 0;
+                break;
+        }
+}
+
+static int __init qlt_parse_ini_mode(void)
+{
+        if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_EXCLUSIVE) == 0)
+                ql2x_ini_mode = QLA2XXX_INI_MODE_EXCLUSIVE;
+        else if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_DISABLED) == 0)
+                ql2x_ini_mode = QLA2XXX_INI_MODE_DISABLED;
+        else if (strcasecmp(qlini_mode, QLA2XXX_INI_MODE_STR_ENABLED) == 0)
+                ql2x_ini_mode = QLA2XXX_INI_MODE_ENABLED;
+        else
+                return false;
+
+        return true;
+}
+
+int __init qlt_init(void)
+{
+        int ret;
+
+        if (!qlt_parse_ini_mode()) {
+                ql_log(ql_log_fatal, NULL, 0xe06b,
+                    "qlt_parse_ini_mode() failed\n");
+                return -EINVAL;
+        }
+
+        if (!QLA_TGT_MODE_ENABLED())
+                return 0;
+
+        qla_tgt_cmd_cachep = kmem_cache_create("qla_tgt_cmd_cachep",
+            sizeof(struct qla_tgt_cmd), __alignof__(struct qla_tgt_cmd), 0,
+            NULL);
+        if (!qla_tgt_cmd_cachep) {
+                ql_log(ql_log_fatal, NULL, 0xe06c,
+                    "kmem_cache_create for qla_tgt_cmd_cachep failed\n");
+                return -ENOMEM;
+        }
+
+        qla_tgt_mgmt_cmd_cachep = kmem_cache_create("qla_tgt_mgmt_cmd_cachep",
+            sizeof(struct qla_tgt_mgmt_cmd), __alignof__(struct
+            qla_tgt_mgmt_cmd), 0, NULL);
+        if (!qla_tgt_mgmt_cmd_cachep) {
+                ql_log(ql_log_fatal, NULL, 0xe06d,
+                    "kmem_cache_create for qla_tgt_mgmt_cmd_cachep failed\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        qla_tgt_mgmt_cmd_mempool = mempool_create(25, mempool_alloc_slab,
+            mempool_free_slab, qla_tgt_mgmt_cmd_cachep);
+        if (!qla_tgt_mgmt_cmd_mempool) {
+                ql_log(ql_log_fatal, NULL, 0xe06e,
+                    "mempool_create for qla_tgt_mgmt_cmd_mempool failed\n");
+                ret = -ENOMEM;
+                goto out_mgmt_cmd_cachep;
+        }
+
+        qla_tgt_wq = alloc_workqueue("qla_tgt_wq", 0, 0);
+        if (!qla_tgt_wq) {
+                ql_log(ql_log_fatal, NULL, 0xe06f,
+                    "alloc_workqueue for qla_tgt_wq failed\n");
+                ret = -ENOMEM;
+                goto out_cmd_mempool;
+        }
+        /*
+         * Return 1 to signal that initiator-mode is being disabled
+         */
+        return (ql2x_ini_mode == QLA2XXX_INI_MODE_DISABLED) ? 1 : 0;
+
+out_cmd_mempool:
+        mempool_destroy(qla_tgt_mgmt_cmd_mempool);
+out_mgmt_cmd_cachep:
+        kmem_cache_destroy(qla_tgt_mgmt_cmd_cachep);
+out:
+        kmem_cache_destroy(qla_tgt_cmd_cachep);
+        return ret;
+}
+
+void qlt_exit(void)
+{
+        if (!QLA_TGT_MODE_ENABLED())
+                return;
+
+        destroy_workqueue(qla_tgt_wq);
+        mempool_destroy(qla_tgt_mgmt_cmd_mempool);
+        kmem_cache_destroy(qla_tgt_mgmt_cmd_cachep);
+        kmem_cache_destroy(qla_tgt_cmd_cachep);
+}
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
new file mode 100644
index 000000000000..9f9ef1644fd9
--- /dev/null
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -0,0 +1,1004 @@
+/*
+ *  Copyright (C) 2004 - 2010 Vladislav Bolkhovitin <vst@vlnb.net>
+ *  Copyright (C) 2004 - 2005 Leonid Stoljar
+ *  Copyright (C) 2006 Nathaniel Clark <nate@misrule.us>
+ *  Copyright (C) 2007 - 2010 ID7 Ltd.
+ *
+ *  Forward port and refactoring to modern qla2xxx and target/configfs
+ *
+ *  Copyright (C) 2010-2011 Nicholas A. Bellinger <nab@kernel.org>
+ *
+ *  Additional file for the target driver support.
+ *
+ *  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.
+ */
+/*
+ * This is the global def file that is useful for including from the
+ * target portion.
+ */
+
+#ifndef __QLA_TARGET_H
+#define __QLA_TARGET_H
+
+#include "qla_def.h"
+
+/*
+ * Must be changed on any change in any initiator visible interfaces or
+ * data in the target add-on
+ */
+#define QLA2XXX_TARGET_MAGIC    269
+
+/*
+ * Must be changed on any change in any target visible interfaces or
+ * data in the initiator
+ */
+#define QLA2XXX_INITIATOR_MAGIC   57222
+
+#define QLA2XXX_INI_MODE_STR_EXCLUSIVE  "exclusive"
+#define QLA2XXX_INI_MODE_STR_DISABLED   "disabled"
+#define QLA2XXX_INI_MODE_STR_ENABLED    "enabled"
+
+#define QLA2XXX_INI_MODE_EXCLUSIVE      0
+#define QLA2XXX_INI_MODE_DISABLED       1
+#define QLA2XXX_INI_MODE_ENABLED        2
+
+#define QLA2XXX_COMMAND_COUNT_INIT      250
+#define QLA2XXX_IMMED_NOTIFY_COUNT_INIT 250
+
+/*
+ * Used to mark which completion handles (for RIO Status's) are for CTIO's
+ * vs. regular (non-target) info. This is checked for in
+ * qla2x00_process_response_queue() to see if a handle coming back in a
+ * multi-complete should come to the tgt driver or be handled there by qla2xxx
+ */
+#define CTIO_COMPLETION_HANDLE_MARK     BIT_29
+#if (CTIO_COMPLETION_HANDLE_MARK <= MAX_OUTSTANDING_COMMANDS)
+#error "CTIO_COMPLETION_HANDLE_MARK not larger than MAX_OUTSTANDING_COMMANDS"
+#endif
+#define HANDLE_IS_CTIO_COMP(h) (h & CTIO_COMPLETION_HANDLE_MARK)
+
+/* Used to mark CTIO as intermediate */
+#define CTIO_INTERMEDIATE_HANDLE_MARK   BIT_30
+
+#ifndef OF_SS_MODE_0
+/*
+ * ISP target entries - Flags bit definitions.
+ */
+#define OF_SS_MODE_0        0
+#define OF_SS_MODE_1        1
+#define OF_SS_MODE_2        2
+#define OF_SS_MODE_3        3
+
+#define OF_EXPL_CONF        BIT_5       /* Explicit Confirmation Requested */
+#define OF_DATA_IN          BIT_6       /* Data in to initiator */
+                                        /*  (data from target to initiator) */
+#define OF_DATA_OUT         BIT_7       /* Data out from initiator */
+                                        /*  (data from initiator to target) */
+#define OF_NO_DATA          (BIT_7 | BIT_6)
+#define OF_INC_RC           BIT_8       /* Increment command resource count */
+#define OF_FAST_POST        BIT_9       /* Enable mailbox fast posting. */
+#define OF_CONF_REQ         BIT_13      /* Confirmation Requested */
+#define OF_TERM_EXCH        BIT_14      /* Terminate exchange */
+#define OF_SSTS             BIT_15      /* Send SCSI status */
+#endif
+
+#ifndef QLA_TGT_DATASEGS_PER_CMD32
+#define QLA_TGT_DATASEGS_PER_CMD32      3
+#define QLA_TGT_DATASEGS_PER_CONT32     7
+#define QLA_TGT_MAX_SG32(ql) \
+        (((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD32 + \
+                QLA_TGT_DATASEGS_PER_CONT32*((ql) - 1)) : 0)
+
+#define QLA_TGT_DATASEGS_PER_CMD64      2
+#define QLA_TGT_DATASEGS_PER_CONT64     5
+#define QLA_TGT_MAX_SG64(ql) \
+        (((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD64 + \
+                QLA_TGT_DATASEGS_PER_CONT64*((ql) - 1)) : 0)
+#endif
+
+#ifndef QLA_TGT_DATASEGS_PER_CMD_24XX
+#define QLA_TGT_DATASEGS_PER_CMD_24XX   1
+#define QLA_TGT_DATASEGS_PER_CONT_24XX  5
+#define QLA_TGT_MAX_SG_24XX(ql) \
+        (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
+                QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
+#endif
+#endif
+
+#define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha))                 \
+                         ? le16_to_cpu((iocb)->u.isp2x.target.extended) \
+                         : (uint16_t)(iocb)->u.isp2x.target.id.standard)
+
+#ifndef IMMED_NOTIFY_TYPE
+#define IMMED_NOTIFY_TYPE 0x0D          /* Immediate notify entry. */
+/*
+ * ISP queue -  immediate notify entry structure definition.
+ *              This is sent by the ISP to the Target driver.
+ *              This IOCB would have report of events sent by the
+ *              initiator, that needs to be handled by the target
+ *              driver immediately.
+ */
+struct imm_ntfy_from_isp {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        union {
+                struct {
+                        uint32_t sys_define_2; /* System defined. */
+                        target_id_t target;
+                        uint16_t lun;
+                        uint8_t  target_id;
+                        uint8_t  reserved_1;
+                        uint16_t status_modifier;
+                        uint16_t status;
+                        uint16_t task_flags;
+                        uint16_t seq_id;
+                        uint16_t srr_rx_id;
+                        uint32_t srr_rel_offs;
+                        uint16_t srr_ui;
+#define SRR_IU_DATA_IN  0x1
+#define SRR_IU_DATA_OUT 0x5
+#define SRR_IU_STATUS   0x7
+                        uint16_t srr_ox_id;
+                        uint8_t reserved_2[28];
+                } isp2x;
+                struct {
+                        uint32_t reserved;
+                        uint16_t nport_handle;
+                        uint16_t reserved_2;
+                        uint16_t flags;
+#define NOTIFY24XX_FLAGS_GLOBAL_TPRLO   BIT_1
+#define NOTIFY24XX_FLAGS_PUREX_IOCB     BIT_0
+                        uint16_t srr_rx_id;
+                        uint16_t status;
+                        uint8_t  status_subcode;
+                        uint8_t  reserved_3;
+                        uint32_t exchange_address;
+                        uint32_t srr_rel_offs;
+                        uint16_t srr_ui;
+                        uint16_t srr_ox_id;
+                        uint8_t  reserved_4[19];
+                        uint8_t  vp_index;
+                        uint32_t reserved_5;
+                        uint8_t  port_id[3];
+                        uint8_t  reserved_6;
+                } isp24;
+        } u;
+        uint16_t reserved_7;
+        uint16_t ox_id;
+} __packed;
+#endif
+
+#ifndef NOTIFY_ACK_TYPE
+#define NOTIFY_ACK_TYPE 0x0E      /* Notify acknowledge entry. */
+/*
+ * ISP queue -  notify acknowledge entry structure definition.
+ *              This is sent to the ISP from the target driver.
+ */
+struct nack_to_isp {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        union {
+                struct {
+                        uint32_t sys_define_2; /* System defined. */
+                        target_id_t target;
+                        uint8_t  target_id;
+                        uint8_t  reserved_1;
+                        uint16_t flags;
+                        uint16_t resp_code;
+                        uint16_t status;
+                        uint16_t task_flags;
+                        uint16_t seq_id;
+                        uint16_t srr_rx_id;
+                        uint32_t srr_rel_offs;
+                        uint16_t srr_ui;
+                        uint16_t srr_flags;
+                        uint16_t srr_reject_code;
+                        uint8_t  srr_reject_vendor_uniq;
+                        uint8_t  srr_reject_code_expl;
+                        uint8_t  reserved_2[24];
+                } isp2x;
+                struct {
+                        uint32_t handle;
+                        uint16_t nport_handle;
+                        uint16_t reserved_1;
+                        uint16_t flags;
+                        uint16_t srr_rx_id;
+                        uint16_t status;
+                        uint8_t  status_subcode;
+                        uint8_t  reserved_3;
+                        uint32_t exchange_address;
+                        uint32_t srr_rel_offs;
+                        uint16_t srr_ui;
+                        uint16_t srr_flags;
+                        uint8_t  reserved_4[19];
+                        uint8_t  vp_index;
+                        uint8_t  srr_reject_vendor_uniq;
+                        uint8_t  srr_reject_code_expl;
+                        uint8_t  srr_reject_code;
+                        uint8_t  reserved_5[5];
+                } isp24;
+        } u;
+        uint8_t  reserved[2];
+        uint16_t ox_id;
+} __packed;
+#define NOTIFY_ACK_SRR_FLAGS_ACCEPT     0
+#define NOTIFY_ACK_SRR_FLAGS_REJECT     1
+
+#define NOTIFY_ACK_SRR_REJECT_REASON_UNABLE_TO_PERFORM  0x9
+
+#define NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_NO_EXPL                0
+#define NOTIFY_ACK_SRR_FLAGS_REJECT_EXPL_UNABLE_TO_SUPPLY_DATA  0x2a
+
+#define NOTIFY_ACK_SUCCESS      0x01
+#endif
+
+#ifndef ACCEPT_TGT_IO_TYPE
+#define ACCEPT_TGT_IO_TYPE 0x16 /* Accept target I/O entry. */
+#endif
+
+#ifndef CONTINUE_TGT_IO_TYPE
+#define CONTINUE_TGT_IO_TYPE 0x17
+/*
+ * ISP queue -  Continue Target I/O (CTIO) entry for status mode 0 structure.
+ *              This structure is sent to the ISP 2xxx from target driver.
+ */
+struct ctio_to_2xxx {
+        uint8_t  entry_type;            /* Entry type. */
+        uint8_t  entry_count;           /* Entry count. */
+        uint8_t  sys_define;            /* System defined. */
+        uint8_t  entry_status;          /* Entry Status. */
+        uint32_t handle;                /* System defined handle */
+        target_id_t target;
+        uint16_t rx_id;
+        uint16_t flags;
+        uint16_t status;
+        uint16_t timeout;               /* 0 = 30 seconds, 0xFFFF = disable */
+        uint16_t dseg_count;            /* Data segment count. */
+        uint32_t relative_offset;
+        uint32_t residual;
+        uint16_t reserved_1[3];
+        uint16_t scsi_status;
+        uint32_t transfer_length;
+        uint32_t dseg_0_address;        /* Data segment 0 address. */
+        uint32_t dseg_0_length;         /* Data segment 0 length. */
+        uint32_t dseg_1_address;        /* Data segment 1 address. */
+        uint32_t dseg_1_length;         /* Data segment 1 length. */
+        uint32_t dseg_2_address;        /* Data segment 2 address. */
+        uint32_t dseg_2_length;         /* Data segment 2 length. */
+} __packed;
+#define ATIO_PATH_INVALID       0x07
+#define ATIO_CANT_PROV_CAP      0x16
+#define ATIO_CDB_VALID          0x3D
+
+#define ATIO_EXEC_READ          BIT_1
+#define ATIO_EXEC_WRITE         BIT_0
+#endif
+
+#ifndef CTIO_A64_TYPE
+#define CTIO_A64_TYPE 0x1F
+#define CTIO_SUCCESS                    0x01
+#define CTIO_ABORTED                    0x02
+#define CTIO_INVALID_RX_ID              0x08
+#define CTIO_TIMEOUT                    0x0B
+#define CTIO_LIP_RESET                  0x0E
+#define CTIO_TARGET_RESET               0x17
+#define CTIO_PORT_UNAVAILABLE           0x28
+#define CTIO_PORT_LOGGED_OUT            0x29
+#define CTIO_PORT_CONF_CHANGED          0x2A
+#define CTIO_SRR_RECEIVED               0x45
+#endif
+
+#ifndef CTIO_RET_TYPE
+#define CTIO_RET_TYPE   0x17            /* CTIO return entry */
+#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
+
+struct fcp_hdr {
+        uint8_t  r_ctl;
+        uint8_t  d_id[3];
+        uint8_t  cs_ctl;
+        uint8_t  s_id[3];
+        uint8_t  type;
+        uint8_t  f_ctl[3];
+        uint8_t  seq_id;
+        uint8_t  df_ctl;
+        uint16_t seq_cnt;
+        uint16_t ox_id;
+        uint16_t rx_id;
+        uint32_t parameter;
+} __packed;
+
+struct fcp_hdr_le {
+        uint8_t  d_id[3];
+        uint8_t  r_ctl;
+        uint8_t  s_id[3];
+        uint8_t  cs_ctl;
+        uint8_t  f_ctl[3];
+        uint8_t  type;
+        uint16_t seq_cnt;
+        uint8_t  df_ctl;
+        uint8_t  seq_id;
+        uint16_t rx_id;
+        uint16_t ox_id;
+        uint32_t parameter;
+} __packed;
+
+#define F_CTL_EXCH_CONTEXT_RESP BIT_23
+#define F_CTL_SEQ_CONTEXT_RESIP BIT_22
+#define F_CTL_LAST_SEQ          BIT_20
+#define F_CTL_END_SEQ           BIT_19
+#define F_CTL_SEQ_INITIATIVE    BIT_16
+
+#define R_CTL_BASIC_LINK_SERV   0x80
+#define R_CTL_B_ACC             0x4
+#define R_CTL_B_RJT             0x5
+
+struct atio7_fcp_cmnd {
+        uint64_t lun;
+        uint8_t  cmnd_ref;
+        uint8_t  task_attr:3;
+        uint8_t  reserved:5;
+        uint8_t  task_mgmt_flags;
+#define FCP_CMND_TASK_MGMT_CLEAR_ACA            6
+#define FCP_CMND_TASK_MGMT_TARGET_RESET         5
+#define FCP_CMND_TASK_MGMT_LU_RESET             4
+#define FCP_CMND_TASK_MGMT_CLEAR_TASK_SET       2
+#define FCP_CMND_TASK_MGMT_ABORT_TASK_SET       1
+        uint8_t  wrdata:1;
+        uint8_t  rddata:1;
+        uint8_t  add_cdb_len:6;
+        uint8_t  cdb[16];
+        /*
+         * add_cdb is optional and can absent from struct atio7_fcp_cmnd. Size 4
+         * only to make sizeof(struct atio7_fcp_cmnd) be as expected by
+         * BUILD_BUG_ON in qlt_init().
+         */
+        uint8_t  add_cdb[4];
+        /* uint32_t data_length; */
+} __packed;
+
+/*
+ * ISP queue -  Accept Target I/O (ATIO) type entry IOCB structure.
+ *              This is sent from the ISP to the target driver.
+ */
+struct atio_from_isp {
+        union {
+                struct {
+                        uint16_t entry_hdr;
+                        uint8_t  sys_define;   /* System defined. */
+                        uint8_t  entry_status; /* Entry Status.   */
+                        uint32_t sys_define_2; /* System defined. */
+                        target_id_t target;
+                        uint16_t rx_id;
+                        uint16_t flags;
+                        uint16_t status;
+                        uint8_t  command_ref;
+                        uint8_t  task_codes;
+                        uint8_t  task_flags;
+                        uint8_t  execution_codes;
+                        uint8_t  cdb[MAX_CMDSZ];
+                        uint32_t data_length;
+                        uint16_t lun;
+                        uint8_t  initiator_port_name[WWN_SIZE]; /* on qla23xx */
+                        uint16_t reserved_32[6];
+                        uint16_t ox_id;
+                } isp2x;
+                struct {
+                        uint16_t entry_hdr;
+                        uint8_t  fcp_cmnd_len_low;
+                        uint8_t  fcp_cmnd_len_high:4;
+                        uint8_t  attr:4;
+                        uint32_t exchange_addr;
+#define ATIO_EXCHANGE_ADDRESS_UNKNOWN   0xFFFFFFFF
+                        struct fcp_hdr fcp_hdr;
+                        struct atio7_fcp_cmnd fcp_cmnd;
+                } isp24;
+                struct {
+                        uint8_t  entry_type;    /* Entry type. */
+                        uint8_t  entry_count;   /* Entry count. */
+                        uint8_t  data[58];
+                        uint32_t signature;
+#define ATIO_PROCESSED 0xDEADDEAD               /* Signature */
+                } raw;
+        } u;
+} __packed;
+
+#define CTIO_TYPE7 0x12 /* Continue target I/O entry (for 24xx) */
+
+/*
+ * ISP queue -  Continue Target I/O (ATIO) type 7 entry (for 24xx) structure.
+ *              This structure is sent to the ISP 24xx from the target driver.
+ */
+
+struct ctio7_to_24xx {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        uint32_t handle;                    /* System defined handle */
+        uint16_t nport_handle;
+#define CTIO7_NHANDLE_UNRECOGNIZED      0xFFFF
+        uint16_t timeout;
+        uint16_t dseg_count;                /* Data segment count. */
+        uint8_t  vp_index;
+        uint8_t  add_flags;
+        uint8_t  initiator_id[3];
+        uint8_t  reserved;
+        uint32_t exchange_addr;
+        union {
+                struct {
+                        uint16_t reserved1;
+                        uint16_t flags;
+                        uint32_t residual;
+                        uint16_t ox_id;
+                        uint16_t scsi_status;
+                        uint32_t relative_offset;
+                        uint32_t reserved2;
+                        uint32_t transfer_length;
+                        uint32_t reserved3;
+                        /* Data segment 0 address. */
+                        uint32_t dseg_0_address[2];
+                        /* Data segment 0 length. */
+                        uint32_t dseg_0_length;
+                } status0;
+                struct {
+                        uint16_t sense_length;
+                        uint16_t flags;
+                        uint32_t residual;
+                        uint16_t ox_id;
+                        uint16_t scsi_status;
+                        uint16_t response_len;
+                        uint16_t reserved;
+                        uint8_t sense_data[24];
+                } status1;
+        } u;
+} __packed;
+
+/*
+ * ISP queue - CTIO type 7 from ISP 24xx to target driver
+ * returned entry structure.
+ */
+struct ctio7_from_24xx {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        uint32_t handle;                    /* System defined handle */
+        uint16_t status;
+        uint16_t timeout;
+        uint16_t dseg_count;                /* Data segment count. */
+        uint8_t  vp_index;
+        uint8_t  reserved1[5];
+        uint32_t exchange_address;
+        uint16_t reserved2;
+        uint16_t flags;
+        uint32_t residual;
+        uint16_t ox_id;
+        uint16_t reserved3;
+        uint32_t relative_offset;
+        uint8_t  reserved4[24];
+} __packed;
+
+/* CTIO7 flags values */
+#define CTIO7_FLAGS_SEND_STATUS         BIT_15
+#define CTIO7_FLAGS_TERMINATE           BIT_14
+#define CTIO7_FLAGS_CONFORM_REQ         BIT_13
+#define CTIO7_FLAGS_DONT_RET_CTIO       BIT_8
+#define CTIO7_FLAGS_STATUS_MODE_0       0
+#define CTIO7_FLAGS_STATUS_MODE_1       BIT_6
+#define CTIO7_FLAGS_EXPLICIT_CONFORM    BIT_5
+#define CTIO7_FLAGS_CONFIRM_SATISF      BIT_4
+#define CTIO7_FLAGS_DSD_PTR             BIT_2
+#define CTIO7_FLAGS_DATA_IN             BIT_1
+#define CTIO7_FLAGS_DATA_OUT            BIT_0
+
+#define ELS_PLOGI                       0x3
+#define ELS_FLOGI                       0x4
+#define ELS_LOGO                        0x5
+#define ELS_PRLI                        0x20
+#define ELS_PRLO                        0x21
+#define ELS_TPRLO                       0x24
+#define ELS_PDISC                       0x50
+#define ELS_ADISC                       0x52
+
+/*
+ * ISP queue - ABTS received/response entries structure definition for 24xx.
+ */
+#define ABTS_RECV_24XX          0x54 /* ABTS received (for 24xx) */
+#define ABTS_RESP_24XX          0x55 /* ABTS responce (for 24xx) */
+
+/*
+ * ISP queue -  ABTS received IOCB entry structure definition for 24xx.
+ *              The ABTS BLS received from the wire is sent to the
+ *              target driver by the ISP 24xx.
+ *              The IOCB is placed on the response queue.
+ */
+struct abts_recv_from_24xx {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        uint8_t  reserved_1[6];
+        uint16_t nport_handle;
+        uint8_t  reserved_2[2];
+        uint8_t  vp_index;
+        uint8_t  reserved_3:4;
+        uint8_t  sof_type:4;
+        uint32_t exchange_address;
+        struct fcp_hdr_le fcp_hdr_le;
+        uint8_t  reserved_4[16];
+        uint32_t exchange_addr_to_abort;
+} __packed;
+
+#define ABTS_PARAM_ABORT_SEQ            BIT_0
+
+struct ba_acc_le {
+        uint16_t reserved;
+        uint8_t  seq_id_last;
+        uint8_t  seq_id_valid;
+#define SEQ_ID_VALID    0x80
+#define SEQ_ID_INVALID  0x00
+        uint16_t rx_id;
+        uint16_t ox_id;
+        uint16_t high_seq_cnt;
+        uint16_t low_seq_cnt;
+} __packed;
+
+struct ba_rjt_le {
+        uint8_t vendor_uniq;
+        uint8_t reason_expl;
+        uint8_t reason_code;
+#define BA_RJT_REASON_CODE_INVALID_COMMAND      0x1
+#define BA_RJT_REASON_CODE_UNABLE_TO_PERFORM    0x9
+        uint8_t reserved;
+} __packed;
+
+/*
+ * ISP queue -  ABTS Response IOCB entry structure definition for 24xx.
+ *              The ABTS response to the ABTS received is sent by the
+ *              target driver to the ISP 24xx.
+ *              The IOCB is placed on the request queue.
+ */
+struct abts_resp_to_24xx {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        uint32_t handle;
+        uint16_t reserved_1;
+        uint16_t nport_handle;
+        uint16_t control_flags;
+#define ABTS_CONTR_FLG_TERM_EXCHG       BIT_0
+        uint8_t  vp_index;
+        uint8_t  reserved_3:4;
+        uint8_t  sof_type:4;
+        uint32_t exchange_address;
+        struct fcp_hdr_le fcp_hdr_le;
+        union {
+                struct ba_acc_le ba_acct;
+                struct ba_rjt_le ba_rjt;
+        } __packed payload;
+        uint32_t reserved_4;
+        uint32_t exchange_addr_to_abort;
+} __packed;
+
+/*
+ * ISP queue -  ABTS Response IOCB from ISP24xx Firmware entry structure.
+ *              The ABTS response with completion status to the ABTS response
+ *              (sent by the target driver to the ISP 24xx) is sent by the
+ *              ISP24xx firmware to the target driver.
+ *              The IOCB is placed on the response queue.
+ */
+struct abts_resp_from_24xx_fw {
+        uint8_t  entry_type;                /* Entry type. */
+        uint8_t  entry_count;               /* Entry count. */
+        uint8_t  sys_define;                /* System defined. */
+        uint8_t  entry_status;              /* Entry Status. */
+        uint32_t handle;
+        uint16_t compl_status;
+#define ABTS_RESP_COMPL_SUCCESS         0
+#define ABTS_RESP_COMPL_SUBCODE_ERROR   0x31
+        uint16_t nport_handle;
+        uint16_t reserved_1;
+        uint8_t  reserved_2;
+        uint8_t  reserved_3:4;
+        uint8_t  sof_type:4;
+        uint32_t exchange_address;
+        struct fcp_hdr_le fcp_hdr_le;
+        uint8_t reserved_4[8];
+        uint32_t error_subcode1;
+#define ABTS_RESP_SUBCODE_ERR_ABORTED_EXCH_NOT_TERM     0x1E
+        uint32_t error_subcode2;
+        uint32_t exchange_addr_to_abort;
+} __packed;
+
+/********************************************************************\
+ * Type Definitions used by initiator & target halves
+\********************************************************************/
+
+struct qla_tgt_mgmt_cmd;
+struct qla_tgt_sess;
+
+/*
+ * This structure provides a template of function calls that the
+ * target driver (from within qla_target.c) can issue to the
+ * target module (tcm_qla2xxx).
+ */
+struct qla_tgt_func_tmpl {
+
+        int (*handle_cmd)(struct scsi_qla_host *, struct qla_tgt_cmd *,
+                        unsigned char *, uint32_t, int, int, int);
+        int (*handle_data)(struct qla_tgt_cmd *);
+        int (*handle_tmr)(struct qla_tgt_mgmt_cmd *, uint32_t, uint8_t,
+                        uint32_t);
+        void (*free_cmd)(struct qla_tgt_cmd *);
+        void (*free_mcmd)(struct qla_tgt_mgmt_cmd *);
+        void (*free_session)(struct qla_tgt_sess *);
+
+        int (*check_initiator_node_acl)(struct scsi_qla_host *, unsigned char *,
+                                        void *, uint8_t *, uint16_t);
+        struct qla_tgt_sess *(*find_sess_by_loop_id)(struct scsi_qla_host *,
+                                                const uint16_t);
+        struct qla_tgt_sess *(*find_sess_by_s_id)(struct scsi_qla_host *,
+                                                const uint8_t *);
+        void (*clear_nacl_from_fcport_map)(struct qla_tgt_sess *);
+        void (*put_sess)(struct qla_tgt_sess *);
+        void (*shutdown_sess)(struct qla_tgt_sess *);
+};
+
+int qla2x00_wait_for_hba_online(struct scsi_qla_host *);
+
+#include <target/target_core_base.h>
+
+#define QLA_TGT_TIMEOUT                 10      /* in seconds */
+
+#define QLA_TGT_MAX_HW_PENDING_TIME     60 /* in seconds */
+
+/* Immediate notify status constants */
+#define IMM_NTFY_LIP_RESET          0x000E
+#define IMM_NTFY_LIP_LINK_REINIT    0x000F
+#define IMM_NTFY_IOCB_OVERFLOW      0x0016
+#define IMM_NTFY_ABORT_TASK         0x0020
+#define IMM_NTFY_PORT_LOGOUT        0x0029
+#define IMM_NTFY_PORT_CONFIG        0x002A
+#define IMM_NTFY_GLBL_TPRLO         0x002D
+#define IMM_NTFY_GLBL_LOGO          0x002E
+#define IMM_NTFY_RESOURCE           0x0034
+#define IMM_NTFY_MSG_RX             0x0036
+#define IMM_NTFY_SRR                0x0045
+#define IMM_NTFY_ELS                0x0046
+
+/* Immediate notify task flags */
+#define IMM_NTFY_TASK_MGMT_SHIFT    8
+
+#define QLA_TGT_CLEAR_ACA               0x40
+#define QLA_TGT_TARGET_RESET            0x20
+#define QLA_TGT_LUN_RESET               0x10
+#define QLA_TGT_CLEAR_TS                0x04
+#define QLA_TGT_ABORT_TS                0x02
+#define QLA_TGT_ABORT_ALL_SESS          0xFFFF
+#define QLA_TGT_ABORT_ALL               0xFFFE
+#define QLA_TGT_NEXUS_LOSS_SESS         0xFFFD
+#define QLA_TGT_NEXUS_LOSS              0xFFFC
+
+/* Notify Acknowledge flags */
+#define NOTIFY_ACK_RES_COUNT        BIT_8
+#define NOTIFY_ACK_CLEAR_LIP_RESET  BIT_5
+#define NOTIFY_ACK_TM_RESP_CODE_VALID BIT_4
+
+/* Command's states */
+#define QLA_TGT_STATE_NEW               0 /* New command + target processing */
+#define QLA_TGT_STATE_NEED_DATA         1 /* target needs data to continue */
+#define QLA_TGT_STATE_DATA_IN           2 /* Data arrived + target processing */
+#define QLA_TGT_STATE_PROCESSED         3 /* target done processing */
+#define QLA_TGT_STATE_ABORTED           4 /* Command aborted */
+
+/* Special handles */
+#define QLA_TGT_NULL_HANDLE     0
+#define QLA_TGT_SKIP_HANDLE     (0xFFFFFFFF & ~CTIO_COMPLETION_HANDLE_MARK)
+
+/* ATIO task_codes field */
+#define ATIO_SIMPLE_QUEUE           0
+#define ATIO_HEAD_OF_QUEUE          1
+#define ATIO_ORDERED_QUEUE          2
+#define ATIO_ACA_QUEUE              4
+#define ATIO_UNTAGGED               5
+
+/* TM failed response codes, see FCP (9.4.11 FCP_RSP_INFO) */
+#define FC_TM_SUCCESS               0
+#define FC_TM_BAD_FCP_DATA          1
+#define FC_TM_BAD_CMD               2
+#define FC_TM_FCP_DATA_MISMATCH     3
+#define FC_TM_REJECT                4
+#define FC_TM_FAILED                5
+
+/*
+ * Error code of qlt_pre_xmit_response() meaning that cmd's exchange was
+ * terminated, so no more actions is needed and success should be returned
+ * to target.
+ */
+#define QLA_TGT_PRE_XMIT_RESP_CMD_ABORTED       0x1717
+
+#if (BITS_PER_LONG > 32) || defined(CONFIG_HIGHMEM64G)
+#define pci_dma_lo32(a) (a & 0xffffffff)
+#define pci_dma_hi32(a) ((((a) >> 16)>>16) & 0xffffffff)
+#else
+#define pci_dma_lo32(a) (a & 0xffffffff)
+#define pci_dma_hi32(a) 0
+#endif
+
+#define QLA_TGT_SENSE_VALID(sense)  ((sense != NULL) && \
+                                (((const uint8_t *)(sense))[0] & 0x70) == 0x70)
+
+struct qla_port_24xx_data {
+        uint8_t port_name[WWN_SIZE];
+        uint16_t loop_id;
+        uint16_t reserved;
+};
+
+struct qla_tgt {
+        struct scsi_qla_host *vha;
+        struct qla_hw_data *ha;
+
+        /*
+         * To sync between IRQ handlers and qlt_target_release(). Needed,
+         * because req_pkt() can drop/reaquire HW lock inside. Protected by
+         * HW lock.
+         */
+        int irq_cmd_count;
+
+        int datasegs_per_cmd, datasegs_per_cont, sg_tablesize;
+
+        /* Target's flags, serialized by pha->hardware_lock */
+        unsigned int tgt_enable_64bit_addr:1; /* 64-bits PCI addr enabled */
+        unsigned int link_reinit_iocb_pending:1;
+
+        /*
+         * Protected by tgt_mutex AND hardware_lock for writing and tgt_mutex
+         * OR hardware_lock for reading.
+         */
+        int tgt_stop; /* the target mode driver is being stopped */
+        int tgt_stopped; /* the target mode driver has been stopped */
+
+        /* Count of sessions refering qla_tgt. Protected by hardware_lock. */
+        int sess_count;
+
+        /* Protected by hardware_lock. Addition also protected by tgt_mutex. */
+        struct list_head sess_list;
+
+        /* Protected by hardware_lock */
+        struct list_head del_sess_list;
+        struct delayed_work sess_del_work;
+
+        spinlock_t sess_work_lock;
+        struct list_head sess_works_list;
+        struct work_struct sess_work;
+
+        struct imm_ntfy_from_isp link_reinit_iocb;
+        wait_queue_head_t waitQ;
+        int notify_ack_expected;
+        int abts_resp_expected;
+        int modify_lun_expected;
+
+        int ctio_srr_id;
+        int imm_srr_id;
+        spinlock_t srr_lock;
+        struct list_head srr_ctio_list;
+        struct list_head srr_imm_list;
+        struct work_struct srr_work;
+
+        atomic_t tgt_global_resets_count;
+
+        struct list_head tgt_list_entry;
+};
+
+/*
+ * Equivilant to IT Nexus (Initiator-Target)
+ */
+struct qla_tgt_sess {
+        uint16_t loop_id;
+        port_id_t s_id;
+
+        unsigned int conf_compl_supported:1;
+        unsigned int deleted:1;
+        unsigned int local:1;
+        unsigned int tearing_down:1;
+
+        struct se_session *se_sess;
+        struct scsi_qla_host *vha;
+        struct qla_tgt *tgt;
+
+        struct list_head sess_list_entry;
+        unsigned long expires;
+        struct list_head del_list_entry;
+
+        uint8_t port_name[WWN_SIZE];
+        struct work_struct free_work;
+};
+
+struct qla_tgt_cmd {
+        struct qla_tgt_sess *sess;
+        int state;
+        struct se_cmd se_cmd;
+        struct work_struct free_work;
+        struct work_struct work;
+        /* Sense buffer that will be mapped into outgoing status */
+        unsigned char sense_buffer[TRANSPORT_SENSE_BUFFER];
+
+        /* to save extra sess dereferences */
+        unsigned int conf_compl_supported:1;
+        unsigned int sg_mapped:1;
+        unsigned int free_sg:1;
+        unsigned int aborted:1; /* Needed in case of SRR */
+        unsigned int write_data_transferred:1;
+
+        struct scatterlist *sg; /* cmd data buffer SG vector */
+        int sg_cnt;             /* SG segments count */
+        int bufflen;            /* cmd buffer length */
+        int offset;
+        uint32_t tag;
+        uint32_t unpacked_lun;
+        enum dma_data_direction dma_data_direction;
+
+        uint16_t loop_id;       /* to save extra sess dereferences */
+        struct qla_tgt *tgt;    /* to save extra sess dereferences */
+        struct scsi_qla_host *vha;
+        struct list_head cmd_list;
+
+        struct atio_from_isp atio;
+};
+
+struct qla_tgt_sess_work_param {
+        struct list_head sess_works_list_entry;
+
+#define QLA_TGT_SESS_WORK_ABORT 1
+#define QLA_TGT_SESS_WORK_TM    2
+        int type;
+
+        union {
+                struct abts_recv_from_24xx abts;
+                struct imm_ntfy_from_isp tm_iocb;
+                struct atio_from_isp tm_iocb2;
+        };
+};
+
+struct qla_tgt_mgmt_cmd {
+        uint8_t tmr_func;
+        uint8_t fc_tm_rsp;
+        struct qla_tgt_sess *sess;
+        struct se_cmd se_cmd;
+        struct work_struct free_work;
+        unsigned int flags;
+#define QLA24XX_MGMT_SEND_NACK  1
+        union {
+                struct atio_from_isp atio;
+                struct imm_ntfy_from_isp imm_ntfy;
+                struct abts_recv_from_24xx abts;
+        } __packed orig_iocb;
+};
+
+struct qla_tgt_prm {
+        struct qla_tgt_cmd *cmd;
+        struct qla_tgt *tgt;
+        void *pkt;
+        struct scatterlist *sg; /* cmd data buffer SG vector */
+        int seg_cnt;
+        int req_cnt;
+        uint16_t rq_result;
+        uint16_t scsi_status;
+        unsigned char *sense_buffer;
+        int sense_buffer_len;
+        int residual;
+        int add_status_pkt;
+};
+
+struct qla_tgt_srr_imm {
+        struct list_head srr_list_entry;
+        int srr_id;
+        struct imm_ntfy_from_isp imm_ntfy;
+};
+
+struct qla_tgt_srr_ctio {
+        struct list_head srr_list_entry;
+        int srr_id;
+        struct qla_tgt_cmd *cmd;
+};
+
+#define QLA_TGT_XMIT_DATA               1
+#define QLA_TGT_XMIT_STATUS             2
+#define QLA_TGT_XMIT_ALL                (QLA_TGT_XMIT_STATUS|QLA_TGT_XMIT_DATA)
+
+
+extern struct qla_tgt_data qla_target;
+/*
+ * Internal function prototypes
+ */
+void qlt_disable_vha(struct scsi_qla_host *);
+
+/*
+ * Function prototypes for qla_target.c logic used by qla2xxx LLD code.
+ */
+extern int qlt_add_target(struct qla_hw_data *, struct scsi_qla_host *);
+extern int qlt_remove_target(struct qla_hw_data *, struct scsi_qla_host *);
+extern int qlt_lport_register(struct qla_tgt_func_tmpl *, u64,
+                        int (*callback)(struct scsi_qla_host *), void *);
+extern void qlt_lport_deregister(struct scsi_qla_host *);
+extern void qlt_unreg_sess(struct qla_tgt_sess *);
+extern void qlt_fc_port_added(struct scsi_qla_host *, fc_port_t *);
+extern void qlt_fc_port_deleted(struct scsi_qla_host *, fc_port_t *);
+extern void qlt_set_mode(struct scsi_qla_host *ha);
+extern void qlt_clear_mode(struct scsi_qla_host *ha);
+extern int __init qlt_init(void);
+extern void qlt_exit(void);
+extern void qlt_update_vp_map(struct scsi_qla_host *, int);
+
+/*
+ * This macro is used during early initializations when host->active_mode
+ * is not set. Right now, ha value is ignored.
+ */
+#define QLA_TGT_MODE_ENABLED() (ql2x_ini_mode != QLA2XXX_INI_MODE_ENABLED)
+
+static inline bool qla_tgt_mode_enabled(struct scsi_qla_host *ha)
+{
+        return ha->host->active_mode & MODE_TARGET;
+}
+
+static inline bool qla_ini_mode_enabled(struct scsi_qla_host *ha)
+{
+        return ha->host->active_mode & MODE_INITIATOR;
+}
+
+static inline void qla_reverse_ini_mode(struct scsi_qla_host *ha)
+{
+        if (ha->host->active_mode & MODE_INITIATOR)
+                ha->host->active_mode &= ~MODE_INITIATOR;
+        else
+                ha->host->active_mode |= MODE_INITIATOR;
+}
+
+/*
+ * Exported symbols from qla_target.c LLD logic used by qla2xxx code..
+ */
+extern void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *,
+        struct atio_from_isp *);
+extern void qlt_response_pkt_all_vps(struct scsi_qla_host *, response_t *);
+extern int qlt_rdy_to_xfer(struct qla_tgt_cmd *);
+extern int qlt_xmit_response(struct qla_tgt_cmd *, int, uint8_t);
+extern void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *);
+extern void qlt_free_mcmd(struct qla_tgt_mgmt_cmd *);
+extern void qlt_free_cmd(struct qla_tgt_cmd *cmd);
+extern void qlt_ctio_completion(struct scsi_qla_host *, uint32_t);
+extern void qlt_async_event(uint16_t, struct scsi_qla_host *, uint16_t *);
+extern void qlt_enable_vha(struct scsi_qla_host *);
+extern void qlt_vport_create(struct scsi_qla_host *, struct qla_hw_data *);
+extern void qlt_rff_id(struct scsi_qla_host *, struct ct_sns_req *);
+extern void qlt_init_atio_q_entries(struct scsi_qla_host *);
+extern void qlt_24xx_process_atio_queue(struct scsi_qla_host *);
+extern void qlt_24xx_config_rings(struct scsi_qla_host *,
+        device_reg_t __iomem *);
+extern void qlt_24xx_config_nvram_stage1(struct scsi_qla_host *,
+        struct nvram_24xx *);
+extern void qlt_24xx_config_nvram_stage2(struct scsi_qla_host *,
+        struct init_cb_24xx *);
+extern int qlt_24xx_process_response_error(struct scsi_qla_host *,
+        struct sts_entry_24xx *);
+extern void qlt_modify_vp_config(struct scsi_qla_host *,
+        struct vp_config_entry_24xx *);
+extern void qlt_probe_one_stage1(struct scsi_qla_host *, struct qla_hw_data *);
+extern int qlt_mem_alloc(struct qla_hw_data *);
+extern void qlt_mem_free(struct qla_hw_data *);
+extern void qlt_stop_phase1(struct qla_tgt *);
+extern void qlt_stop_phase2(struct qla_tgt *);
+
+#endif /* __QLA_TARGET_H */
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
new file mode 100644
index 000000000000..6e64314dbbb3
--- /dev/null
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -0,0 +1,1919 @@
+/*******************************************************************************
+ * This file contains tcm implementation using v4 configfs fabric infrastructure
+ * for QLogic target mode HBAs
+ *
+ * ?? Copyright 2010-2011 RisingTide Systems LLC.
+ *
+ * Licensed to the Linux Foundation under the General Public License (GPL)
+ * version 2.
+ *
+ * Author: Nicholas A. Bellinger <nab@risingtidesystems.com>
+ *
+ * tcm_qla2xxx_parse_wwn() and tcm_qla2xxx_format_wwn() contains code from
+ * the TCM_FC / Open-FCoE.org fabric module.
+ *
+ * Copyright (c) 2010 Cisco Systems, Inc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 <generated/utsrelease.h>
+#include <linux/utsname.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/kthread.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/configfs.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <asm/unaligned.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <target/target_core_base.h>
+#include <target/target_core_fabric.h>
+#include <target/target_core_fabric_configfs.h>
+#include <target/target_core_configfs.h>
+#include <target/configfs_macros.h>
+
+#include "qla_def.h"
+#include "qla_target.h"
+#include "tcm_qla2xxx.h"
+
+struct workqueue_struct *tcm_qla2xxx_free_wq;
+struct workqueue_struct *tcm_qla2xxx_cmd_wq;
+
+static int tcm_qla2xxx_check_true(struct se_portal_group *se_tpg)
+{
+        return 1;
+}
+
+static int tcm_qla2xxx_check_false(struct se_portal_group *se_tpg)
+{
+        return 0;
+}
+
+/*
+ * Parse WWN.
+ * If strict, we require lower-case hex and colon separators to be sure
+ * the name is the same as what would be generated by ft_format_wwn()
+ * so the name and wwn are mapped one-to-one.
+ */
+static ssize_t tcm_qla2xxx_parse_wwn(const char *name, u64 *wwn, int strict)
+{
+        const char *cp;
+        char c;
+        u32 nibble;
+        u32 byte = 0;
+        u32 pos = 0;
+        u32 err;
+
+        *wwn = 0;
+        for (cp = name; cp < &name[TCM_QLA2XXX_NAMELEN - 1]; cp++) {
+                c = *cp;
+                if (c == '\n' && cp[1] == '\0')
+                        continue;
+                if (strict && pos++ == 2 && byte++ < 7) {
+                        pos = 0;
+                        if (c == ':')
+                                continue;
+                        err = 1;
+                        goto fail;
+                }
+                if (c == '\0') {
+                        err = 2;
+                        if (strict && byte != 8)
+                                goto fail;
+                        return cp - name;
+                }
+                err = 3;
+                if (isdigit(c))
+                        nibble = c - '0';
+                else if (isxdigit(c) && (islower(c) || !strict))
+                        nibble = tolower(c) - 'a' + 10;
+                else
+                        goto fail;
+                *wwn = (*wwn << 4) | nibble;
+        }
+        err = 4;
+fail:
+        pr_debug("err %u len %zu pos %u byte %u\n",
+                        err, cp - name, pos, byte);
+        return -1;
+}
+
+static ssize_t tcm_qla2xxx_format_wwn(char *buf, size_t len, u64 wwn)
+{
+        u8 b[8];
+
+        put_unaligned_be64(wwn, b);
+        return snprintf(buf, len,
+                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
+}
+
+static char *tcm_qla2xxx_get_fabric_name(void)
+{
+        return "qla2xxx";
+}
+
+/*
+ * From drivers/scsi/scsi_transport_fc.c:fc_parse_wwn
+ */
+static int tcm_qla2xxx_npiv_extract_wwn(const char *ns, u64 *nm)
+{
+        unsigned int i, j;
+        u8 wwn[8];
+
+        memset(wwn, 0, sizeof(wwn));
+
+        /* Validate and store the new name */
+        for (i = 0, j = 0; i < 16; i++) {
+                int value;
+
+                value = hex_to_bin(*ns++);
+                if (value >= 0)
+                        j = (j << 4) | value;
+                else
+                        return -EINVAL;
+
+                if (i % 2) {
+                        wwn[i/2] = j & 0xff;
+                        j = 0;
+                }
+        }
+
+        *nm = wwn_to_u64(wwn);
+        return 0;
+}
+
+/*
+ * This parsing logic follows drivers/scsi/scsi_transport_fc.c:
+ * store_fc_host_vport_create()
+ */
+static int tcm_qla2xxx_npiv_parse_wwn(
+        const char *name,
+        size_t count,
+        u64 *wwpn,
+        u64 *wwnn)
+{
+        unsigned int cnt = count;
+        int rc;
+
+        *wwpn = 0;
+        *wwnn = 0;
+
+        /* count may include a LF at end of string */
+        if (name[cnt-1] == '\n')
+                cnt--;
+
+        /* validate we have enough characters for WWPN */
+        if ((cnt != (16+1+16)) || (name[16] != ':'))
+                return -EINVAL;
+
+        rc = tcm_qla2xxx_npiv_extract_wwn(&name[0], wwpn);
+        if (rc != 0)
+                return rc;
+
+        rc = tcm_qla2xxx_npiv_extract_wwn(&name[17], wwnn);
+        if (rc != 0)
+                return rc;
+
+        return 0;
+}
+
+static ssize_t tcm_qla2xxx_npiv_format_wwn(char *buf, size_t len,
+                                        u64 wwpn, u64 wwnn)
+{
+        u8 b[8], b2[8];
+
+        put_unaligned_be64(wwpn, b);
+        put_unaligned_be64(wwnn, b2);
+        return snprintf(buf, len,
+                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x,"
+                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7],
+                b2[0], b2[1], b2[2], b2[3], b2[4], b2[5], b2[6], b2[7]);
+}
+
+static char *tcm_qla2xxx_npiv_get_fabric_name(void)
+{
+        return "qla2xxx_npiv";
+}
+
+static u8 tcm_qla2xxx_get_fabric_proto_ident(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+        u8 proto_id;
+
+        switch (lport->lport_proto_id) {
+        case SCSI_PROTOCOL_FCP:
+        default:
+                proto_id = fc_get_fabric_proto_ident(se_tpg);
+                break;
+        }
+
+        return proto_id;
+}
+
+static char *tcm_qla2xxx_get_fabric_wwn(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+
+        return &lport->lport_name[0];
+}
+
+static char *tcm_qla2xxx_npiv_get_fabric_wwn(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+
+        return &lport->lport_npiv_name[0];
+}
+
+static u16 tcm_qla2xxx_get_tag(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        return tpg->lport_tpgt;
+}
+
+static u32 tcm_qla2xxx_get_default_depth(struct se_portal_group *se_tpg)
+{
+        return 1;
+}
+
+static u32 tcm_qla2xxx_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)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+        int ret = 0;
+
+        switch (lport->lport_proto_id) {
+        case SCSI_PROTOCOL_FCP:
+        default:
+                ret = fc_get_pr_transport_id(se_tpg, se_nacl, pr_reg,
+                                        format_code, buf);
+                break;
+        }
+
+        return ret;
+}
+
+static u32 tcm_qla2xxx_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)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+        int ret = 0;
+
+        switch (lport->lport_proto_id) {
+        case SCSI_PROTOCOL_FCP:
+        default:
+                ret = fc_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,
+                                        format_code);
+                break;
+        }
+
+        return ret;
+}
+
+static char *tcm_qla2xxx_parse_pr_out_transport_id(
+        struct se_portal_group *se_tpg,
+        const char *buf,
+        u32 *out_tid_len,
+        char **port_nexus_ptr)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+        char *tid = NULL;
+
+        switch (lport->lport_proto_id) {
+        case SCSI_PROTOCOL_FCP:
+        default:
+                tid = fc_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,
+                                        port_nexus_ptr);
+                break;
+        }
+
+        return tid;
+}
+
+static int tcm_qla2xxx_check_demo_mode(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return QLA_TPG_ATTRIB(tpg)->generate_node_acls;
+}
+
+static int tcm_qla2xxx_check_demo_mode_cache(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls;
+}
+
+static int tcm_qla2xxx_check_demo_write_protect(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect;
+}
+
+static int tcm_qla2xxx_check_prod_write_protect(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return QLA_TPG_ATTRIB(tpg)->prod_mode_write_protect;
+}
+
+static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
+        struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_nacl *nacl;
+
+        nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL);
+        if (!nacl) {
+                pr_err("Unable to alocate struct tcm_qla2xxx_nacl\n");
+                return NULL;
+        }
+
+        return &nacl->se_node_acl;
+}
+
+static void tcm_qla2xxx_release_fabric_acl(
+        struct se_portal_group *se_tpg,
+        struct se_node_acl *se_nacl)
+{
+        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
+                        struct tcm_qla2xxx_nacl, se_node_acl);
+        kfree(nacl);
+}
+
+static u32 tcm_qla2xxx_tpg_get_inst_index(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                                struct tcm_qla2xxx_tpg, se_tpg);
+
+        return tpg->lport_tpgt;
+}
+
+static void tcm_qla2xxx_complete_mcmd(struct work_struct *work)
+{
+        struct qla_tgt_mgmt_cmd *mcmd = container_of(work,
+                        struct qla_tgt_mgmt_cmd, free_work);
+
+        transport_generic_free_cmd(&mcmd->se_cmd, 0);
+}
+
+/*
+ * Called from qla_target_template->free_mcmd(), and will call
+ * tcm_qla2xxx_release_cmd() via normal struct target_core_fabric_ops
+ * release callback.  qla_hw_data->hardware_lock is expected to be held
+ */
+static void tcm_qla2xxx_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)
+{
+        INIT_WORK(&mcmd->free_work, tcm_qla2xxx_complete_mcmd);
+        queue_work(tcm_qla2xxx_free_wq, &mcmd->free_work);
+}
+
+static void tcm_qla2xxx_complete_free(struct work_struct *work)
+{
+        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
+
+        transport_generic_free_cmd(&cmd->se_cmd, 0);
+}
+
+/*
+ * Called from qla_target_template->free_cmd(), and will call
+ * tcm_qla2xxx_release_cmd via normal struct target_core_fabric_ops
+ * release callback.  qla_hw_data->hardware_lock is expected to be held
+ */
+static void tcm_qla2xxx_free_cmd(struct qla_tgt_cmd *cmd)
+{
+        INIT_WORK(&cmd->work, tcm_qla2xxx_complete_free);
+        queue_work(tcm_qla2xxx_free_wq, &cmd->work);
+}
+
+/*
+ * Called from struct target_core_fabric_ops->check_stop_free() context
+ */
+static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd)
+{
+        return target_put_sess_cmd(se_cmd->se_sess, se_cmd);
+}
+
+/* tcm_qla2xxx_release_cmd - Callback from TCM Core to release underlying
+ * fabric descriptor @se_cmd command to release
+ */
+static void tcm_qla2xxx_release_cmd(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd;
+
+        if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB) {
+                struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd,
+                                struct qla_tgt_mgmt_cmd, se_cmd);
+                qlt_free_mcmd(mcmd);
+                return;
+        }
+
+        cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
+        qlt_free_cmd(cmd);
+}
+
+static int tcm_qla2xxx_shutdown_session(struct se_session *se_sess)
+{
+        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
+        struct scsi_qla_host *vha;
+        unsigned long flags;
+
+        BUG_ON(!sess);
+        vha = sess->vha;
+
+        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
+        sess->tearing_down = 1;
+        target_splice_sess_cmd_list(se_sess);
+        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
+
+        return 1;
+}
+
+static void tcm_qla2xxx_close_session(struct se_session *se_sess)
+{
+        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
+        struct scsi_qla_host *vha;
+        unsigned long flags;
+
+        BUG_ON(!sess);
+        vha = sess->vha;
+
+        spin_lock_irqsave(&vha->hw->hardware_lock, flags);
+        qlt_unreg_sess(sess);
+        spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
+}
+
+static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
+{
+        return 0;
+}
+
+/*
+ * The LIO target core uses DMA_TO_DEVICE to mean that data is going
+ * to the target (eg handling a WRITE) and DMA_FROM_DEVICE to mean
+ * that data is coming from the target (eg handling a READ).  However,
+ * this is just the opposite of what we have to tell the DMA mapping
+ * layer -- eg when handling a READ, the HBA will have to DMA the data
+ * out of memory so it can send it to the initiator, which means we
+ * need to use DMA_TO_DEVICE when we map the data.
+ */
+static enum dma_data_direction tcm_qla2xxx_mapping_dir(struct se_cmd *se_cmd)
+{
+        if (se_cmd->se_cmd_flags & SCF_BIDI)
+                return DMA_BIDIRECTIONAL;
+
+        switch (se_cmd->data_direction) {
+        case DMA_TO_DEVICE:
+                return DMA_FROM_DEVICE;
+        case DMA_FROM_DEVICE:
+                return DMA_TO_DEVICE;
+        case DMA_NONE:
+        default:
+                return DMA_NONE;
+        }
+}
+
+static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd = container_of(se_cmd,
+                                struct qla_tgt_cmd, se_cmd);
+
+        cmd->bufflen = se_cmd->data_length;
+        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
+
+        cmd->sg_cnt = se_cmd->t_data_nents;
+        cmd->sg = se_cmd->t_data_sg;
+
+        /*
+         * qla_target.c:qlt_rdy_to_xfer() will call pci_map_sg() to setup
+         * the SGL mappings into PCIe memory for incoming FCP WRITE data.
+         */
+        return qlt_rdy_to_xfer(cmd);
+}
+
+static int tcm_qla2xxx_write_pending_status(struct se_cmd *se_cmd)
+{
+        unsigned long flags;
+        /*
+         * Check for WRITE_PENDING status to determine if we need to wait for
+         * CTIO aborts to be posted via hardware in tcm_qla2xxx_handle_data().
+         */
+        spin_lock_irqsave(&se_cmd->t_state_lock, flags);
+        if (se_cmd->t_state == TRANSPORT_WRITE_PENDING ||
+            se_cmd->t_state == TRANSPORT_COMPLETE_QF_WP) {
+                spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
+                wait_for_completion_timeout(&se_cmd->t_transport_stop_comp,
+                                                3000);
+                return 0;
+        }
+        spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
+
+        return 0;
+}
+
+static void tcm_qla2xxx_set_default_node_attrs(struct se_node_acl *nacl)
+{
+        return;
+}
+
+static u32 tcm_qla2xxx_get_task_tag(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd = container_of(se_cmd,
+                                struct qla_tgt_cmd, se_cmd);
+
+        return cmd->tag;
+}
+
+static int tcm_qla2xxx_get_cmd_state(struct se_cmd *se_cmd)
+{
+        return 0;
+}
+
+/*
+ * Called from process context in qla_target.c:qlt_do_work() code
+ */
+static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,
+        unsigned char *cdb, uint32_t data_length, int fcp_task_attr,
+        int data_dir, int bidi)
+{
+        struct se_cmd *se_cmd = &cmd->se_cmd;
+        struct se_session *se_sess;
+        struct qla_tgt_sess *sess;
+        int flags = TARGET_SCF_ACK_KREF;
+
+        if (bidi)
+                flags |= TARGET_SCF_BIDI_OP;
+
+        sess = cmd->sess;
+        if (!sess) {
+                pr_err("Unable to locate struct qla_tgt_sess from qla_tgt_cmd\n");
+                return -EINVAL;
+        }
+
+        se_sess = sess->se_sess;
+        if (!se_sess) {
+                pr_err("Unable to locate active struct se_session\n");
+                return -EINVAL;
+        }
+
+        target_submit_cmd(se_cmd, se_sess, cdb, &cmd->sense_buffer[0],
+                                cmd->unpacked_lun, data_length, fcp_task_attr,
+                                data_dir, flags);
+        return 0;
+}
+
+static void tcm_qla2xxx_do_rsp(struct work_struct *work)
+{
+        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
+        /*
+         * Dispatch ->queue_status from workqueue process context
+         */
+        transport_generic_request_failure(&cmd->se_cmd);
+}
+
+/*
+ * Called from qla_target.c:qlt_do_ctio_completion()
+ */
+static int tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd)
+{
+        struct se_cmd *se_cmd = &cmd->se_cmd;
+        unsigned long flags;
+        /*
+         * Ensure that the complete FCP WRITE payload has been received.
+         * Otherwise return an exception via CHECK_CONDITION status.
+         */
+        if (!cmd->write_data_transferred) {
+                /*
+                 * Check if se_cmd has already been aborted via LUN_RESET, and
+                 * waiting upon completion in tcm_qla2xxx_write_pending_status()
+                 */
+                spin_lock_irqsave(&se_cmd->t_state_lock, flags);
+                if (se_cmd->transport_state & CMD_T_ABORTED) {
+                        spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
+                        complete(&se_cmd->t_transport_stop_comp);
+                        return 0;
+                }
+                spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
+
+                se_cmd->scsi_sense_reason = TCM_CHECK_CONDITION_ABORT_CMD;
+                INIT_WORK(&cmd->work, tcm_qla2xxx_do_rsp);
+                queue_work(tcm_qla2xxx_free_wq, &cmd->work);
+                return 0;
+        }
+        /*
+         * We now tell TCM to queue this WRITE CDB with TRANSPORT_PROCESS_WRITE
+         * status to the backstore processing thread.
+         */
+        return transport_generic_handle_data(&cmd->se_cmd);
+}
+
+/*
+ * Called from qla_target.c:qlt_issue_task_mgmt()
+ */
+static int tcm_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, uint32_t lun,
+        uint8_t tmr_func, uint32_t tag)
+{
+        struct qla_tgt_sess *sess = mcmd->sess;
+        struct se_cmd *se_cmd = &mcmd->se_cmd;
+
+        return target_submit_tmr(se_cmd, sess->se_sess, NULL, lun, mcmd,
+                        tmr_func, GFP_ATOMIC, tag, TARGET_SCF_ACK_KREF);
+}
+
+static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd = container_of(se_cmd,
+                                struct qla_tgt_cmd, se_cmd);
+
+        cmd->bufflen = se_cmd->data_length;
+        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
+        cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
+
+        cmd->sg_cnt = se_cmd->t_data_nents;
+        cmd->sg = se_cmd->t_data_sg;
+        cmd->offset = 0;
+
+        /*
+         * Now queue completed DATA_IN the qla2xxx LLD and response ring
+         */
+        return qlt_xmit_response(cmd, QLA_TGT_XMIT_DATA|QLA_TGT_XMIT_STATUS,
+                                se_cmd->scsi_status);
+}
+
+static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd)
+{
+        struct qla_tgt_cmd *cmd = container_of(se_cmd,
+                                struct qla_tgt_cmd, se_cmd);
+        int xmit_type = QLA_TGT_XMIT_STATUS;
+
+        cmd->bufflen = se_cmd->data_length;
+        cmd->sg = NULL;
+        cmd->sg_cnt = 0;
+        cmd->offset = 0;
+        cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
+        cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
+
+        if (se_cmd->data_direction == DMA_FROM_DEVICE) {
+                /*
+                 * For FCP_READ with CHECK_CONDITION status, clear cmd->bufflen
+                 * for qla_tgt_xmit_response LLD code
+                 */
+                se_cmd->se_cmd_flags |= SCF_UNDERFLOW_BIT;
+                se_cmd->residual_count = se_cmd->data_length;
+
+                cmd->bufflen = 0;
+        }
+        /*
+         * Now queue status response to qla2xxx LLD code and response ring
+         */
+        return qlt_xmit_response(cmd, xmit_type, se_cmd->scsi_status);
+}
+
+static int tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd)
+{
+        struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;
+        struct qla_tgt_mgmt_cmd *mcmd = container_of(se_cmd,
+                                struct qla_tgt_mgmt_cmd, se_cmd);
+
+        pr_debug("queue_tm_rsp: mcmd: %p func: 0x%02x response: 0x%02x\n",
+                        mcmd, se_tmr->function, se_tmr->response);
+        /*
+         * Do translation between TCM TM response codes and
+         * QLA2xxx FC TM response codes.
+         */
+        switch (se_tmr->response) {
+        case TMR_FUNCTION_COMPLETE:
+                mcmd->fc_tm_rsp = FC_TM_SUCCESS;
+                break;
+        case TMR_TASK_DOES_NOT_EXIST:
+                mcmd->fc_tm_rsp = FC_TM_BAD_CMD;
+                break;
+        case TMR_FUNCTION_REJECTED:
+                mcmd->fc_tm_rsp = FC_TM_REJECT;
+                break;
+        case TMR_LUN_DOES_NOT_EXIST:
+        default:
+                mcmd->fc_tm_rsp = FC_TM_FAILED;
+                break;
+        }
+        /*
+         * Queue the TM response to QLA2xxx LLD to build a
+         * CTIO response packet.
+         */
+        qlt_xmit_tm_rsp(mcmd);
+
+        return 0;
+}
+
+static u16 tcm_qla2xxx_get_fabric_sense_len(void)
+{
+        return 0;
+}
+
+static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd,
+                                        u32 sense_length)
+{
+        return 0;
+}
+
+/* Local pointer to allocated TCM configfs fabric module */
+struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
+struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
+
+static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,
+                        struct tcm_qla2xxx_nacl *, struct qla_tgt_sess *);
+/*
+ * Expected to be called with struct qla_hw_data->hardware_lock held
+ */
+static void tcm_qla2xxx_clear_nacl_from_fcport_map(struct qla_tgt_sess *sess)
+{
+        struct se_node_acl *se_nacl = sess->se_sess->se_node_acl;
+        struct se_portal_group *se_tpg = se_nacl->se_tpg;
+        struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;
+        struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
+                                struct tcm_qla2xxx_lport, lport_wwn);
+        struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl,
+                                struct tcm_qla2xxx_nacl, se_node_acl);
+        void *node;
+
+        pr_debug("fc_rport domain: port_id 0x%06x\n", nacl->nport_id);
+
+        node = btree_remove32(&lport->lport_fcport_map, nacl->nport_id);
+        WARN_ON(node && (node != se_nacl));
+
+        pr_debug("Removed from fcport_map: %p for WWNN: 0x%016LX, port_id: 0x%06x\n",
+            se_nacl, nacl->nport_wwnn, nacl->nport_id);
+        /*
+         * Now clear the se_nacl and session pointers from our HW lport lookup
+         * table mapping for this initiator's fabric S_ID and LOOP_ID entries.
+         *
+         * This is done ahead of callbacks into tcm_qla2xxx_free_session() ->
+         * target_wait_for_sess_cmds() before the session waits for outstanding
+         * I/O to complete, to avoid a race between session shutdown execution
+         * and incoming ATIOs or TMRs picking up a stale se_node_act reference.
+         */
+        tcm_qla2xxx_clear_sess_lookup(lport, nacl, sess);
+}
+
+static void tcm_qla2xxx_release_session(struct kref *kref)
+{
+        struct se_session *se_sess = container_of(kref,
+                        struct se_session, sess_kref);
+
+        qlt_unreg_sess(se_sess->fabric_sess_ptr);
+}
+
+static void tcm_qla2xxx_put_session(struct se_session *se_sess)
+{
+        struct qla_tgt_sess *sess = se_sess->fabric_sess_ptr;
+        struct qla_hw_data *ha = sess->vha->hw;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        kref_put(&se_sess->sess_kref, tcm_qla2xxx_release_session);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+}
+
+static void tcm_qla2xxx_put_sess(struct qla_tgt_sess *sess)
+{
+        tcm_qla2xxx_put_session(sess->se_sess);
+}
+
+static void tcm_qla2xxx_shutdown_sess(struct qla_tgt_sess *sess)
+{
+        tcm_qla2xxx_shutdown_session(sess->se_sess);
+}
+
+static struct se_node_acl *tcm_qla2xxx_make_nodeacl(
+        struct se_portal_group *se_tpg,
+        struct config_group *group,
+        const char *name)
+{
+        struct se_node_acl *se_nacl, *se_nacl_new;
+        struct tcm_qla2xxx_nacl *nacl;
+        u64 wwnn;
+        u32 qla2xxx_nexus_depth;
+
+        if (tcm_qla2xxx_parse_wwn(name, &wwnn, 1) < 0)
+                return ERR_PTR(-EINVAL);
+
+        se_nacl_new = tcm_qla2xxx_alloc_fabric_acl(se_tpg);
+        if (!se_nacl_new)
+                return ERR_PTR(-ENOMEM);
+/* #warning FIXME: Hardcoded qla2xxx_nexus depth in tcm_qla2xxx_make_nodeacl */
+        qla2xxx_nexus_depth = 1;
+
+        /*
+         * se_nacl_new may be released by core_tpg_add_initiator_node_acl()
+         * when converting a NodeACL from demo mode -> explict
+         */
+        se_nacl = core_tpg_add_initiator_node_acl(se_tpg, se_nacl_new,
+                                name, qla2xxx_nexus_depth);
+        if (IS_ERR(se_nacl)) {
+                tcm_qla2xxx_release_fabric_acl(se_tpg, se_nacl_new);
+                return se_nacl;
+        }
+        /*
+         * Locate our struct tcm_qla2xxx_nacl and set the FC Nport WWPN
+         */
+        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
+        nacl->nport_wwnn = wwnn;
+        tcm_qla2xxx_format_wwn(&nacl->nport_name[0], TCM_QLA2XXX_NAMELEN, wwnn);
+
+        return se_nacl;
+}
+
+static void tcm_qla2xxx_drop_nodeacl(struct se_node_acl *se_acl)
+{
+        struct se_portal_group *se_tpg = se_acl->se_tpg;
+        struct tcm_qla2xxx_nacl *nacl = container_of(se_acl,
+                                struct tcm_qla2xxx_nacl, se_node_acl);
+
+        core_tpg_del_initiator_node_acl(se_tpg, se_acl, 1);
+        kfree(nacl);
+}
+
+/* Start items for tcm_qla2xxx_tpg_attrib_cit */
+
+#define DEF_QLA_TPG_ATTRIB(name)                                        \
+                                                                        \
+static ssize_t tcm_qla2xxx_tpg_attrib_show_##name(                      \
+        struct se_portal_group *se_tpg,                                 \
+        char *page)                                                     \
+{                                                                       \
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,              \
+                        struct tcm_qla2xxx_tpg, se_tpg);                \
+                                                                        \
+        return sprintf(page, "%u\n", QLA_TPG_ATTRIB(tpg)->name);        \
+}                                                                       \
+                                                                        \
+static ssize_t tcm_qla2xxx_tpg_attrib_store_##name(                     \
+        struct se_portal_group *se_tpg,                                 \
+        const char *page,                                               \
+        size_t count)                                                   \
+{                                                                       \
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,              \
+                        struct tcm_qla2xxx_tpg, se_tpg);                \
+        unsigned long val;                                              \
+        int ret;                                                        \
+                                                                        \
+        ret = kstrtoul(page, 0, &val);                                  \
+        if (ret < 0) {                                                  \
+                pr_err("kstrtoul() failed with"                         \
+                                " ret: %d\n", ret);                     \
+                return -EINVAL;                                         \
+        }                                                               \
+        ret = tcm_qla2xxx_set_attrib_##name(tpg, val);                  \
+                                                                        \
+        return (!ret) ? count : -EINVAL;                                \
+}
+
+#define DEF_QLA_TPG_ATTR_BOOL(_name)                                    \
+                                                                        \
+static int tcm_qla2xxx_set_attrib_##_name(                              \
+        struct tcm_qla2xxx_tpg *tpg,                                    \
+        unsigned long val)                                              \
+{                                                                       \
+        struct tcm_qla2xxx_tpg_attrib *a = &tpg->tpg_attrib;            \
+                                                                        \
+        if ((val != 0) && (val != 1)) {                                 \
+                pr_err("Illegal boolean value %lu\n", val);             \
+                return -EINVAL;                                         \
+        }                                                               \
+                                                                        \
+        a->_name = val;                                                 \
+        return 0;                                                       \
+}
+
+#define QLA_TPG_ATTR(_name, _mode) \
+        TF_TPG_ATTRIB_ATTR(tcm_qla2xxx, _name, _mode);
+
+/*
+ * Define tcm_qla2xxx_tpg_attrib_s_generate_node_acls
+ */
+DEF_QLA_TPG_ATTR_BOOL(generate_node_acls);
+DEF_QLA_TPG_ATTRIB(generate_node_acls);
+QLA_TPG_ATTR(generate_node_acls, S_IRUGO | S_IWUSR);
+
+/*
+ Define tcm_qla2xxx_attrib_s_cache_dynamic_acls
+ */
+DEF_QLA_TPG_ATTR_BOOL(cache_dynamic_acls);
+DEF_QLA_TPG_ATTRIB(cache_dynamic_acls);
+QLA_TPG_ATTR(cache_dynamic_acls, S_IRUGO | S_IWUSR);
+
+/*
+ * Define tcm_qla2xxx_tpg_attrib_s_demo_mode_write_protect
+ */
+DEF_QLA_TPG_ATTR_BOOL(demo_mode_write_protect);
+DEF_QLA_TPG_ATTRIB(demo_mode_write_protect);
+QLA_TPG_ATTR(demo_mode_write_protect, S_IRUGO | S_IWUSR);
+
+/*
+ * Define tcm_qla2xxx_tpg_attrib_s_prod_mode_write_protect
+ */
+DEF_QLA_TPG_ATTR_BOOL(prod_mode_write_protect);
+DEF_QLA_TPG_ATTRIB(prod_mode_write_protect);
+QLA_TPG_ATTR(prod_mode_write_protect, S_IRUGO | S_IWUSR);
+
+static struct configfs_attribute *tcm_qla2xxx_tpg_attrib_attrs[] = {
+        &tcm_qla2xxx_tpg_attrib_generate_node_acls.attr,
+        &tcm_qla2xxx_tpg_attrib_cache_dynamic_acls.attr,
+        &tcm_qla2xxx_tpg_attrib_demo_mode_write_protect.attr,
+        &tcm_qla2xxx_tpg_attrib_prod_mode_write_protect.attr,
+        NULL,
+};
+
+/* End items for tcm_qla2xxx_tpg_attrib_cit */
+
+static ssize_t tcm_qla2xxx_tpg_show_enable(
+        struct se_portal_group *se_tpg,
+        char *page)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                        struct tcm_qla2xxx_tpg, se_tpg);
+
+        return snprintf(page, PAGE_SIZE, "%d\n",
+                        atomic_read(&tpg->lport_tpg_enabled));
+}
+
+static ssize_t tcm_qla2xxx_tpg_store_enable(
+        struct se_portal_group *se_tpg,
+        const char *page,
+        size_t count)
+{
+        struct se_wwn *se_wwn = se_tpg->se_tpg_wwn;
+        struct tcm_qla2xxx_lport *lport = container_of(se_wwn,
+                        struct tcm_qla2xxx_lport, lport_wwn);
+        struct scsi_qla_host *vha = lport->qla_vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                        struct tcm_qla2xxx_tpg, se_tpg);
+        unsigned long op;
+        int rc;
+
+        rc = kstrtoul(page, 0, &op);
+        if (rc < 0) {
+                pr_err("kstrtoul() returned %d\n", rc);
+                return -EINVAL;
+        }
+        if ((op != 1) && (op != 0)) {
+                pr_err("Illegal value for tpg_enable: %lu\n", op);
+                return -EINVAL;
+        }
+
+        if (op) {
+                atomic_set(&tpg->lport_tpg_enabled, 1);
+                qlt_enable_vha(vha);
+        } else {
+                if (!ha->tgt.qla_tgt) {
+                        pr_err("truct qla_hw_data *ha->tgt.qla_tgt is NULL\n");
+                        return -ENODEV;
+                }
+                atomic_set(&tpg->lport_tpg_enabled, 0);
+                qlt_stop_phase1(ha->tgt.qla_tgt);
+        }
+
+        return count;
+}
+
+TF_TPG_BASE_ATTR(tcm_qla2xxx, enable, S_IRUGO | S_IWUSR);
+
+static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = {
+        &tcm_qla2xxx_tpg_enable.attr,
+        NULL,
+};
+
+static struct se_portal_group *tcm_qla2xxx_make_tpg(
+        struct se_wwn *wwn,
+        struct config_group *group,
+        const char *name)
+{
+        struct tcm_qla2xxx_lport *lport = container_of(wwn,
+                        struct tcm_qla2xxx_lport, lport_wwn);
+        struct tcm_qla2xxx_tpg *tpg;
+        unsigned long tpgt;
+        int ret;
+
+        if (strstr(name, "tpgt_") != name)
+                return ERR_PTR(-EINVAL);
+        if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
+                return ERR_PTR(-EINVAL);
+
+        if (!lport->qla_npiv_vp && (tpgt != 1)) {
+                pr_err("In non NPIV mode, a single TPG=1 is used for HW port mappings\n");
+                return ERR_PTR(-ENOSYS);
+        }
+
+        tpg = kzalloc(sizeof(struct tcm_qla2xxx_tpg), GFP_KERNEL);
+        if (!tpg) {
+                pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        tpg->lport = lport;
+        tpg->lport_tpgt = tpgt;
+        /*
+         * By default allow READ-ONLY TPG demo-mode access w/ cached dynamic
+         * NodeACLs
+         */
+        QLA_TPG_ATTRIB(tpg)->generate_node_acls = 1;
+        QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect = 1;
+        QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls = 1;
+
+        ret = core_tpg_register(&tcm_qla2xxx_fabric_configfs->tf_ops, wwn,
+                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        if (ret < 0) {
+                kfree(tpg);
+                return NULL;
+        }
+        /*
+         * Setup local TPG=1 pointer for non NPIV mode.
+         */
+        if (lport->qla_npiv_vp == NULL)
+                lport->tpg_1 = tpg;
+
+        return &tpg->se_tpg;
+}
+
+static void tcm_qla2xxx_drop_tpg(struct se_portal_group *se_tpg)
+{
+        struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
+                        struct tcm_qla2xxx_tpg, se_tpg);
+        struct tcm_qla2xxx_lport *lport = tpg->lport;
+        struct scsi_qla_host *vha = lport->qla_vha;
+        struct qla_hw_data *ha = vha->hw;
+        /*
+         * Call into qla2x_target.c LLD logic to shutdown the active
+         * FC Nexuses and disable target mode operation for this qla_hw_data
+         */
+        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stop)
+                qlt_stop_phase1(ha->tgt.qla_tgt);
+
+        core_tpg_deregister(se_tpg);
+        /*
+         * Clear local TPG=1 pointer for non NPIV mode.
+         */
+        if (lport->qla_npiv_vp == NULL)
+                lport->tpg_1 = NULL;
+
+        kfree(tpg);
+}
+
+static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
+        struct se_wwn *wwn,
+        struct config_group *group,
+        const char *name)
+{
+        struct tcm_qla2xxx_lport *lport = container_of(wwn,
+                        struct tcm_qla2xxx_lport, lport_wwn);
+        struct tcm_qla2xxx_tpg *tpg;
+        unsigned long tpgt;
+        int ret;
+
+        if (strstr(name, "tpgt_") != name)
+                return ERR_PTR(-EINVAL);
+        if (kstrtoul(name + 5, 10, &tpgt) || tpgt > USHRT_MAX)
+                return ERR_PTR(-EINVAL);
+
+        tpg = kzalloc(sizeof(struct tcm_qla2xxx_tpg), GFP_KERNEL);
+        if (!tpg) {
+                pr_err("Unable to allocate struct tcm_qla2xxx_tpg\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        tpg->lport = lport;
+        tpg->lport_tpgt = tpgt;
+
+        ret = core_tpg_register(&tcm_qla2xxx_npiv_fabric_configfs->tf_ops, wwn,
+                                &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        if (ret < 0) {
+                kfree(tpg);
+                return NULL;
+        }
+        return &tpg->se_tpg;
+}
+
+/*
+ * Expected to be called with struct qla_hw_data->hardware_lock held
+ */
+static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_s_id(
+        scsi_qla_host_t *vha,
+        const uint8_t *s_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct tcm_qla2xxx_lport *lport;
+        struct se_node_acl *se_nacl;
+        struct tcm_qla2xxx_nacl *nacl;
+        u32 key;
+
+        lport = ha->tgt.target_lport_ptr;
+        if (!lport) {
+                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
+                dump_stack();
+                return NULL;
+        }
+
+        key = (((unsigned long)s_id[0] << 16) |
+               ((unsigned long)s_id[1] << 8) |
+               (unsigned long)s_id[2]);
+        pr_debug("find_sess_by_s_id: 0x%06x\n", key);
+
+        se_nacl = btree_lookup32(&lport->lport_fcport_map, key);
+        if (!se_nacl) {
+                pr_debug("Unable to locate s_id: 0x%06x\n", key);
+                return NULL;
+        }
+        pr_debug("find_sess_by_s_id: located se_nacl: %p, initiatorname: %s\n",
+            se_nacl, se_nacl->initiatorname);
+
+        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
+        if (!nacl->qla_tgt_sess) {
+                pr_err("Unable to locate struct qla_tgt_sess\n");
+                return NULL;
+        }
+
+        return nacl->qla_tgt_sess;
+}
+
+/*
+ * Expected to be called with struct qla_hw_data->hardware_lock held
+ */
+static void tcm_qla2xxx_set_sess_by_s_id(
+        struct tcm_qla2xxx_lport *lport,
+        struct se_node_acl *new_se_nacl,
+        struct tcm_qla2xxx_nacl *nacl,
+        struct se_session *se_sess,
+        struct qla_tgt_sess *qla_tgt_sess,
+        uint8_t *s_id)
+{
+        u32 key;
+        void *slot;
+        int rc;
+
+        key = (((unsigned long)s_id[0] << 16) |
+               ((unsigned long)s_id[1] << 8) |
+               (unsigned long)s_id[2]);
+        pr_debug("set_sess_by_s_id: %06x\n", key);
+
+        slot = btree_lookup32(&lport->lport_fcport_map, key);
+        if (!slot) {
+                if (new_se_nacl) {
+                        pr_debug("Setting up new fc_port entry to new_se_nacl\n");
+                        nacl->nport_id = key;
+                        rc = btree_insert32(&lport->lport_fcport_map, key,
+                                        new_se_nacl, GFP_ATOMIC);
+                        if (rc)
+                                printk(KERN_ERR "Unable to insert s_id into fcport_map: %06x\n",
+                                    (int)key);
+                } else {
+                        pr_debug("Wiping nonexisting fc_port entry\n");
+                }
+
+                qla_tgt_sess->se_sess = se_sess;
+                nacl->qla_tgt_sess = qla_tgt_sess;
+                return;
+        }
+
+        if (nacl->qla_tgt_sess) {
+                if (new_se_nacl == NULL) {
+                        pr_debug("Clearing existing nacl->qla_tgt_sess and fc_port entry\n");
+                        btree_remove32(&lport->lport_fcport_map, key);
+                        nacl->qla_tgt_sess = NULL;
+                        return;
+                }
+                pr_debug("Replacing existing nacl->qla_tgt_sess and fc_port entry\n");
+                btree_update32(&lport->lport_fcport_map, key, new_se_nacl);
+                qla_tgt_sess->se_sess = se_sess;
+                nacl->qla_tgt_sess = qla_tgt_sess;
+                return;
+        }
+
+        if (new_se_nacl == NULL) {
+                pr_debug("Clearing existing fc_port entry\n");
+                btree_remove32(&lport->lport_fcport_map, key);
+                return;
+        }
+
+        pr_debug("Replacing existing fc_port entry w/o active nacl->qla_tgt_sess\n");
+        btree_update32(&lport->lport_fcport_map, key, new_se_nacl);
+        qla_tgt_sess->se_sess = se_sess;
+        nacl->qla_tgt_sess = qla_tgt_sess;
+
+        pr_debug("Setup nacl->qla_tgt_sess %p by s_id for se_nacl: %p, initiatorname: %s\n",
+            nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);
+}
+
+/*
+ * Expected to be called with struct qla_hw_data->hardware_lock held
+ */
+static struct qla_tgt_sess *tcm_qla2xxx_find_sess_by_loop_id(
+        scsi_qla_host_t *vha,
+        const uint16_t loop_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct tcm_qla2xxx_lport *lport;
+        struct se_node_acl *se_nacl;
+        struct tcm_qla2xxx_nacl *nacl;
+        struct tcm_qla2xxx_fc_loopid *fc_loopid;
+
+        lport = ha->tgt.target_lport_ptr;
+        if (!lport) {
+                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
+                dump_stack();
+                return NULL;
+        }
+
+        pr_debug("find_sess_by_loop_id: Using loop_id: 0x%04x\n", loop_id);
+
+        fc_loopid = lport->lport_loopid_map + loop_id;
+        se_nacl = fc_loopid->se_nacl;
+        if (!se_nacl) {
+                pr_debug("Unable to locate se_nacl by loop_id: 0x%04x\n",
+                    loop_id);
+                return NULL;
+        }
+
+        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
+
+        if (!nacl->qla_tgt_sess) {
+                pr_err("Unable to locate struct qla_tgt_sess\n");
+                return NULL;
+        }
+
+        return nacl->qla_tgt_sess;
+}
+
+/*
+ * Expected to be called with struct qla_hw_data->hardware_lock held
+ */
+static void tcm_qla2xxx_set_sess_by_loop_id(
+        struct tcm_qla2xxx_lport *lport,
+        struct se_node_acl *new_se_nacl,
+        struct tcm_qla2xxx_nacl *nacl,
+        struct se_session *se_sess,
+        struct qla_tgt_sess *qla_tgt_sess,
+        uint16_t loop_id)
+{
+        struct se_node_acl *saved_nacl;
+        struct tcm_qla2xxx_fc_loopid *fc_loopid;
+
+        pr_debug("set_sess_by_loop_id: Using loop_id: 0x%04x\n", loop_id);
+
+        fc_loopid = &((struct tcm_qla2xxx_fc_loopid *)
+                        lport->lport_loopid_map)[loop_id];
+
+        saved_nacl = fc_loopid->se_nacl;
+        if (!saved_nacl) {
+                pr_debug("Setting up new fc_loopid->se_nacl to new_se_nacl\n");
+                fc_loopid->se_nacl = new_se_nacl;
+                if (qla_tgt_sess->se_sess != se_sess)
+                        qla_tgt_sess->se_sess = se_sess;
+                if (nacl->qla_tgt_sess != qla_tgt_sess)
+                        nacl->qla_tgt_sess = qla_tgt_sess;
+                return;
+        }
+
+        if (nacl->qla_tgt_sess) {
+                if (new_se_nacl == NULL) {
+                        pr_debug("Clearing nacl->qla_tgt_sess and fc_loopid->se_nacl\n");
+                        fc_loopid->se_nacl = NULL;
+                        nacl->qla_tgt_sess = NULL;
+                        return;
+                }
+
+                pr_debug("Replacing existing nacl->qla_tgt_sess and fc_loopid->se_nacl\n");
+                fc_loopid->se_nacl = new_se_nacl;
+                if (qla_tgt_sess->se_sess != se_sess)
+                        qla_tgt_sess->se_sess = se_sess;
+                if (nacl->qla_tgt_sess != qla_tgt_sess)
+                        nacl->qla_tgt_sess = qla_tgt_sess;
+                return;
+        }
+
+        if (new_se_nacl == NULL) {
+                pr_debug("Clearing fc_loopid->se_nacl\n");
+                fc_loopid->se_nacl = NULL;
+                return;
+        }
+
+        pr_debug("Replacing existing fc_loopid->se_nacl w/o active nacl->qla_tgt_sess\n");
+        fc_loopid->se_nacl = new_se_nacl;
+        if (qla_tgt_sess->se_sess != se_sess)
+                qla_tgt_sess->se_sess = se_sess;
+        if (nacl->qla_tgt_sess != qla_tgt_sess)
+                nacl->qla_tgt_sess = qla_tgt_sess;
+
+        pr_debug("Setup nacl->qla_tgt_sess %p by loop_id for se_nacl: %p, initiatorname: %s\n",
+            nacl->qla_tgt_sess, new_se_nacl, new_se_nacl->initiatorname);
+}
+
+/*
+ * Should always be called with qla_hw_data->hardware_lock held.
+ */
+static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport,
+                struct tcm_qla2xxx_nacl *nacl, struct qla_tgt_sess *sess)
+{
+        struct se_session *se_sess = sess->se_sess;
+        unsigned char be_sid[3];
+
+        be_sid[0] = sess->s_id.b.domain;
+        be_sid[1] = sess->s_id.b.area;
+        be_sid[2] = sess->s_id.b.al_pa;
+
+        tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,
+                                sess, be_sid);
+        tcm_qla2xxx_set_sess_by_loop_id(lport, NULL, nacl, se_sess,
+                                sess, sess->loop_id);
+}
+
+static void tcm_qla2xxx_free_session(struct qla_tgt_sess *sess)
+{
+        struct qla_tgt *tgt = sess->tgt;
+        struct qla_hw_data *ha = tgt->ha;
+        struct se_session *se_sess;
+        struct se_node_acl *se_nacl;
+        struct tcm_qla2xxx_lport *lport;
+        struct tcm_qla2xxx_nacl *nacl;
+
+        BUG_ON(in_interrupt());
+
+        se_sess = sess->se_sess;
+        if (!se_sess) {
+                pr_err("struct qla_tgt_sess->se_sess is NULL\n");
+                dump_stack();
+                return;
+        }
+        se_nacl = se_sess->se_node_acl;
+        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
+
+        lport = ha->tgt.target_lport_ptr;
+        if (!lport) {
+                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
+                dump_stack();
+                return;
+        }
+        target_wait_for_sess_cmds(se_sess, 0);
+
+        transport_deregister_session_configfs(sess->se_sess);
+        transport_deregister_session(sess->se_sess);
+}
+
+/*
+ * Called via qlt_create_sess():ha->qla2x_tmpl->check_initiator_node_acl()
+ * to locate struct se_node_acl
+ */
+static int tcm_qla2xxx_check_initiator_node_acl(
+        scsi_qla_host_t *vha,
+        unsigned char *fc_wwpn,
+        void *qla_tgt_sess,
+        uint8_t *s_id,
+        uint16_t loop_id)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct tcm_qla2xxx_lport *lport;
+        struct tcm_qla2xxx_tpg *tpg;
+        struct tcm_qla2xxx_nacl *nacl;
+        struct se_portal_group *se_tpg;
+        struct se_node_acl *se_nacl;
+        struct se_session *se_sess;
+        struct qla_tgt_sess *sess = qla_tgt_sess;
+        unsigned char port_name[36];
+        unsigned long flags;
+
+        lport = ha->tgt.target_lport_ptr;
+        if (!lport) {
+                pr_err("Unable to locate struct tcm_qla2xxx_lport\n");
+                dump_stack();
+                return -EINVAL;
+        }
+        /*
+         * Locate the TPG=1 reference..
+         */
+        tpg = lport->tpg_1;
+        if (!tpg) {
+                pr_err("Unable to lcoate struct tcm_qla2xxx_lport->tpg_1\n");
+                return -EINVAL;
+        }
+        se_tpg = &tpg->se_tpg;
+
+        se_sess = transport_init_session();
+        if (IS_ERR(se_sess)) {
+                pr_err("Unable to initialize struct se_session\n");
+                return PTR_ERR(se_sess);
+        }
+        /*
+         * Format the FCP Initiator port_name into colon seperated values to
+         * match the format by tcm_qla2xxx explict ConfigFS NodeACLs.
+         */
+        memset(&port_name, 0, 36);
+        snprintf(port_name, 36, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
+                fc_wwpn[0], fc_wwpn[1], fc_wwpn[2], fc_wwpn[3], fc_wwpn[4],
+                fc_wwpn[5], fc_wwpn[6], fc_wwpn[7]);
+        /*
+         * Locate our struct se_node_acl either from an explict NodeACL created
+         * via ConfigFS, or via running in TPG demo mode.
+         */
+        se_sess->se_node_acl = core_tpg_check_initiator_node_acl(se_tpg,
+                                        port_name);
+        if (!se_sess->se_node_acl) {
+                transport_free_session(se_sess);
+                return -EINVAL;
+        }
+        se_nacl = se_sess->se_node_acl;
+        nacl = container_of(se_nacl, struct tcm_qla2xxx_nacl, se_node_acl);
+        /*
+         * And now setup the new se_nacl and session pointers into our HW lport
+         * mappings for fabric S_ID and LOOP_ID.
+         */
+        spin_lock_irqsave(&ha->hardware_lock, flags);
+        tcm_qla2xxx_set_sess_by_s_id(lport, se_nacl, nacl, se_sess,
+                        qla_tgt_sess, s_id);
+        tcm_qla2xxx_set_sess_by_loop_id(lport, se_nacl, nacl, se_sess,
+                        qla_tgt_sess, loop_id);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
+        /*
+         * Finally register the new FC Nexus with TCM
+         */
+        __transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
+
+        return 0;
+}
+
+/*
+ * Calls into tcm_qla2xxx used by qla2xxx LLD I/O path.
+ */
+static struct qla_tgt_func_tmpl tcm_qla2xxx_template = {
+        .handle_cmd             = tcm_qla2xxx_handle_cmd,
+        .handle_data            = tcm_qla2xxx_handle_data,
+        .handle_tmr             = tcm_qla2xxx_handle_tmr,
+        .free_cmd               = tcm_qla2xxx_free_cmd,
+        .free_mcmd              = tcm_qla2xxx_free_mcmd,
+        .free_session           = tcm_qla2xxx_free_session,
+        .check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl,
+        .find_sess_by_s_id      = tcm_qla2xxx_find_sess_by_s_id,
+        .find_sess_by_loop_id   = tcm_qla2xxx_find_sess_by_loop_id,
+        .clear_nacl_from_fcport_map = tcm_qla2xxx_clear_nacl_from_fcport_map,
+        .put_sess               = tcm_qla2xxx_put_sess,
+        .shutdown_sess          = tcm_qla2xxx_shutdown_sess,
+};
+
+static int tcm_qla2xxx_init_lport(struct tcm_qla2xxx_lport *lport)
+{
+        int rc;
+
+        rc = btree_init32(&lport->lport_fcport_map);
+        if (rc) {
+                pr_err("Unable to initialize lport->lport_fcport_map btree\n");
+                return rc;
+        }
+
+        lport->lport_loopid_map = vmalloc(sizeof(struct tcm_qla2xxx_fc_loopid) *
+                                65536);
+        if (!lport->lport_loopid_map) {
+                pr_err("Unable to allocate lport->lport_loopid_map of %zu bytes\n",
+                    sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
+                btree_destroy32(&lport->lport_fcport_map);
+                return -ENOMEM;
+        }
+        memset(lport->lport_loopid_map, 0, sizeof(struct tcm_qla2xxx_fc_loopid)
+               * 65536);
+        pr_debug("qla2xxx: Allocated lport_loopid_map of %zu bytes\n",
+               sizeof(struct tcm_qla2xxx_fc_loopid) * 65536);
+        return 0;
+}
+
+static int tcm_qla2xxx_lport_register_cb(struct scsi_qla_host *vha)
+{
+        struct qla_hw_data *ha = vha->hw;
+        struct tcm_qla2xxx_lport *lport;
+        /*
+         * Setup local pointer to vha, NPIV VP pointer (if present) and
+         * vha->tcm_lport pointer
+         */
+        lport = (struct tcm_qla2xxx_lport *)ha->tgt.target_lport_ptr;
+        lport->qla_vha = vha;
+
+        return 0;
+}
+
+static struct se_wwn *tcm_qla2xxx_make_lport(
+        struct target_fabric_configfs *tf,
+        struct config_group *group,
+        const char *name)
+{
+        struct tcm_qla2xxx_lport *lport;
+        u64 wwpn;
+        int ret = -ENODEV;
+
+        if (tcm_qla2xxx_parse_wwn(name, &wwpn, 1) < 0)
+                return ERR_PTR(-EINVAL);
+
+        lport = kzalloc(sizeof(struct tcm_qla2xxx_lport), GFP_KERNEL);
+        if (!lport) {
+                pr_err("Unable to allocate struct tcm_qla2xxx_lport\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        lport->lport_wwpn = wwpn;
+        tcm_qla2xxx_format_wwn(&lport->lport_name[0], TCM_QLA2XXX_NAMELEN,
+                                wwpn);
+
+        ret = tcm_qla2xxx_init_lport(lport);
+        if (ret != 0)
+                goto out;
+
+        ret = qlt_lport_register(&tcm_qla2xxx_template, wwpn,
+                                tcm_qla2xxx_lport_register_cb, lport);
+        if (ret != 0)
+                goto out_lport;
+
+        return &lport->lport_wwn;
+out_lport:
+        vfree(lport->lport_loopid_map);
+        btree_destroy32(&lport->lport_fcport_map);
+out:
+        kfree(lport);
+        return ERR_PTR(ret);
+}
+
+static void tcm_qla2xxx_drop_lport(struct se_wwn *wwn)
+{
+        struct tcm_qla2xxx_lport *lport = container_of(wwn,
+                        struct tcm_qla2xxx_lport, lport_wwn);
+        struct scsi_qla_host *vha = lport->qla_vha;
+        struct qla_hw_data *ha = vha->hw;
+        struct se_node_acl *node;
+        u32 key = 0;
+
+        /*
+         * Call into qla2x_target.c LLD logic to complete the
+         * shutdown of struct qla_tgt after the call to
+         * qlt_stop_phase1() from tcm_qla2xxx_drop_tpg() above..
+         */
+        if (ha->tgt.qla_tgt && !ha->tgt.qla_tgt->tgt_stopped)
+                qlt_stop_phase2(ha->tgt.qla_tgt);
+
+        qlt_lport_deregister(vha);
+
+        vfree(lport->lport_loopid_map);
+        btree_for_each_safe32(&lport->lport_fcport_map, key, node)
+                btree_remove32(&lport->lport_fcport_map, key);
+        btree_destroy32(&lport->lport_fcport_map);
+        kfree(lport);
+}
+
+static struct se_wwn *tcm_qla2xxx_npiv_make_lport(
+        struct target_fabric_configfs *tf,
+        struct config_group *group,
+        const char *name)
+{
+        struct tcm_qla2xxx_lport *lport;
+        u64 npiv_wwpn, npiv_wwnn;
+        int ret;
+
+        if (tcm_qla2xxx_npiv_parse_wwn(name, strlen(name)+1,
+                                &npiv_wwpn, &npiv_wwnn) < 0)
+                return ERR_PTR(-EINVAL);
+
+        lport = kzalloc(sizeof(struct tcm_qla2xxx_lport), GFP_KERNEL);
+        if (!lport) {
+                pr_err("Unable to allocate struct tcm_qla2xxx_lport for NPIV\n");
+                return ERR_PTR(-ENOMEM);
+        }
+        lport->lport_npiv_wwpn = npiv_wwpn;
+        lport->lport_npiv_wwnn = npiv_wwnn;
+        tcm_qla2xxx_npiv_format_wwn(&lport->lport_npiv_name[0],
+                        TCM_QLA2XXX_NAMELEN, npiv_wwpn, npiv_wwnn);
+
+/* FIXME: tcm_qla2xxx_npiv_make_lport */
+        ret = -ENOSYS;
+        if (ret != 0)
+                goto out;
+
+        return &lport->lport_wwn;
+out:
+        kfree(lport);
+        return ERR_PTR(ret);
+}
+
+static void tcm_qla2xxx_npiv_drop_lport(struct se_wwn *wwn)
+{
+        struct tcm_qla2xxx_lport *lport = container_of(wwn,
+                        struct tcm_qla2xxx_lport, lport_wwn);
+        struct scsi_qla_host *vha = lport->qla_vha;
+        struct Scsi_Host *sh = vha->host;
+        /*
+         * Notify libfc that we want to release the lport->npiv_vport
+         */
+        fc_vport_terminate(lport->npiv_vport);
+
+        scsi_host_put(sh);
+        kfree(lport);
+}
+
+
+static ssize_t tcm_qla2xxx_wwn_show_attr_version(
+        struct target_fabric_configfs *tf,
+        char *page)
+{
+        return sprintf(page,
+            "TCM QLOGIC QLA2XXX NPIV capable fabric module %s on %s/%s on "
+            UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
+            utsname()->machine);
+}
+
+TF_WWN_ATTR_RO(tcm_qla2xxx, version);
+
+static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = {
+        &tcm_qla2xxx_wwn_version.attr,
+        NULL,
+};
+
+static struct target_core_fabric_ops tcm_qla2xxx_ops = {
+        .get_fabric_name                = tcm_qla2xxx_get_fabric_name,
+        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
+        .tpg_get_wwn                    = tcm_qla2xxx_get_fabric_wwn,
+        .tpg_get_tag                    = tcm_qla2xxx_get_tag,
+        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
+        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
+        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
+        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
+        .tpg_check_demo_mode            = tcm_qla2xxx_check_demo_mode,
+        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_demo_mode_cache,
+        .tpg_check_demo_mode_write_protect =
+                                        tcm_qla2xxx_check_demo_write_protect,
+        .tpg_check_prod_mode_write_protect =
+                                        tcm_qla2xxx_check_prod_write_protect,
+        .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_true,
+        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
+        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
+        .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
+        .new_cmd_map                    = NULL,
+        .check_stop_free                = tcm_qla2xxx_check_stop_free,
+        .release_cmd                    = tcm_qla2xxx_release_cmd,
+        .put_session                    = tcm_qla2xxx_put_session,
+        .shutdown_session               = tcm_qla2xxx_shutdown_session,
+        .close_session                  = tcm_qla2xxx_close_session,
+        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
+        .sess_get_initiator_sid         = NULL,
+        .write_pending                  = tcm_qla2xxx_write_pending,
+        .write_pending_status           = tcm_qla2xxx_write_pending_status,
+        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
+        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
+        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
+        .queue_data_in                  = tcm_qla2xxx_queue_data_in,
+        .queue_status                   = tcm_qla2xxx_queue_status,
+        .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
+        .get_fabric_sense_len           = tcm_qla2xxx_get_fabric_sense_len,
+        .set_fabric_sense_len           = tcm_qla2xxx_set_fabric_sense_len,
+        /*
+         * Setup function pointers for generic logic in
+         * target_core_fabric_configfs.c
+         */
+        .fabric_make_wwn                = tcm_qla2xxx_make_lport,
+        .fabric_drop_wwn                = tcm_qla2xxx_drop_lport,
+        .fabric_make_tpg                = tcm_qla2xxx_make_tpg,
+        .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
+        .fabric_post_link               = NULL,
+        .fabric_pre_unlink              = NULL,
+        .fabric_make_np                 = NULL,
+        .fabric_drop_np                 = NULL,
+        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
+        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+};
+
+static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
+        .get_fabric_name                = tcm_qla2xxx_npiv_get_fabric_name,
+        .get_fabric_proto_ident         = tcm_qla2xxx_get_fabric_proto_ident,
+        .tpg_get_wwn                    = tcm_qla2xxx_npiv_get_fabric_wwn,
+        .tpg_get_tag                    = tcm_qla2xxx_get_tag,
+        .tpg_get_default_depth          = tcm_qla2xxx_get_default_depth,
+        .tpg_get_pr_transport_id        = tcm_qla2xxx_get_pr_transport_id,
+        .tpg_get_pr_transport_id_len    = tcm_qla2xxx_get_pr_transport_id_len,
+        .tpg_parse_pr_out_transport_id  = tcm_qla2xxx_parse_pr_out_transport_id,
+        .tpg_check_demo_mode            = tcm_qla2xxx_check_false,
+        .tpg_check_demo_mode_cache      = tcm_qla2xxx_check_true,
+        .tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_true,
+        .tpg_check_prod_mode_write_protect = tcm_qla2xxx_check_false,
+        .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_true,
+        .tpg_alloc_fabric_acl           = tcm_qla2xxx_alloc_fabric_acl,
+        .tpg_release_fabric_acl         = tcm_qla2xxx_release_fabric_acl,
+        .tpg_get_inst_index             = tcm_qla2xxx_tpg_get_inst_index,
+        .release_cmd                    = tcm_qla2xxx_release_cmd,
+        .put_session                    = tcm_qla2xxx_put_session,
+        .shutdown_session               = tcm_qla2xxx_shutdown_session,
+        .close_session                  = tcm_qla2xxx_close_session,
+        .sess_get_index                 = tcm_qla2xxx_sess_get_index,
+        .sess_get_initiator_sid         = NULL,
+        .write_pending                  = tcm_qla2xxx_write_pending,
+        .write_pending_status           = tcm_qla2xxx_write_pending_status,
+        .set_default_node_attributes    = tcm_qla2xxx_set_default_node_attrs,
+        .get_task_tag                   = tcm_qla2xxx_get_task_tag,
+        .get_cmd_state                  = tcm_qla2xxx_get_cmd_state,
+        .queue_data_in                  = tcm_qla2xxx_queue_data_in,
+        .queue_status                   = tcm_qla2xxx_queue_status,
+        .queue_tm_rsp                   = tcm_qla2xxx_queue_tm_rsp,
+        .get_fabric_sense_len           = tcm_qla2xxx_get_fabric_sense_len,
+        .set_fabric_sense_len           = tcm_qla2xxx_set_fabric_sense_len,
+        /*
+         * Setup function pointers for generic logic in
+         * target_core_fabric_configfs.c
+         */
+        .fabric_make_wwn                = tcm_qla2xxx_npiv_make_lport,
+        .fabric_drop_wwn                = tcm_qla2xxx_npiv_drop_lport,
+        .fabric_make_tpg                = tcm_qla2xxx_npiv_make_tpg,
+        .fabric_drop_tpg                = tcm_qla2xxx_drop_tpg,
+        .fabric_post_link               = NULL,
+        .fabric_pre_unlink              = NULL,
+        .fabric_make_np                 = NULL,
+        .fabric_drop_np                 = NULL,
+        .fabric_make_nodeacl            = tcm_qla2xxx_make_nodeacl,
+        .fabric_drop_nodeacl            = tcm_qla2xxx_drop_nodeacl,
+};
+
+static int tcm_qla2xxx_register_configfs(void)
+{
+        struct target_fabric_configfs *fabric, *npiv_fabric;
+        int ret;
+
+        pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on "
+            UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
+            utsname()->machine);
+        /*
+         * Register the top level struct config_item_type with TCM core
+         */
+        fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx");
+        if (IS_ERR(fabric)) {
+                pr_err("target_fabric_configfs_init() failed\n");
+                return PTR_ERR(fabric);
+        }
+        /*
+         * Setup fabric->tf_ops from our local tcm_qla2xxx_ops
+         */
+        fabric->tf_ops = tcm_qla2xxx_ops;
+        /*
+         * Setup default attribute lists for various fabric->tf_cit_tmpl
+         */
+        TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
+        TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;
+        TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs =
+                                                tcm_qla2xxx_tpg_attrib_attrs;
+        TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;
+        /*
+         * Register the fabric for use within TCM
+         */
+        ret = target_fabric_configfs_register(fabric);
+        if (ret < 0) {
+                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
+                return ret;
+        }
+        /*
+         * Setup our local pointer to *fabric
+         */
+        tcm_qla2xxx_fabric_configfs = fabric;
+        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_fabric_configfs\n");
+
+        /*
+         * Register the top level struct config_item_type for NPIV with TCM core
+         */
+        npiv_fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx_npiv");
+        if (IS_ERR(npiv_fabric)) {
+                pr_err("target_fabric_configfs_init() failed\n");
+                ret = PTR_ERR(npiv_fabric);
+                goto out_fabric;
+        }
+        /*
+         * Setup fabric->tf_ops from our local tcm_qla2xxx_npiv_ops
+         */
+        npiv_fabric->tf_ops = tcm_qla2xxx_npiv_ops;
+        /*
+         * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
+         */
+        TF_CIT_TMPL(npiv_fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_base_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_param_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
+        TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;
+        /*
+         * Register the npiv_fabric for use within TCM
+         */
+        ret = target_fabric_configfs_register(npiv_fabric);
+        if (ret < 0) {
+                pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
+                goto out_fabric;
+        }
+        /*
+         * Setup our local pointer to *npiv_fabric
+         */
+        tcm_qla2xxx_npiv_fabric_configfs = npiv_fabric;
+        pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_npiv_fabric_configfs\n");
+
+        tcm_qla2xxx_free_wq = alloc_workqueue("tcm_qla2xxx_free",
+                                                WQ_MEM_RECLAIM, 0);
+        if (!tcm_qla2xxx_free_wq) {
+                ret = -ENOMEM;
+                goto out_fabric_npiv;
+        }
+
+        tcm_qla2xxx_cmd_wq = alloc_workqueue("tcm_qla2xxx_cmd", 0, 0);
+        if (!tcm_qla2xxx_cmd_wq) {
+                ret = -ENOMEM;
+                goto out_free_wq;
+        }
+
+        return 0;
+
+out_free_wq:
+        destroy_workqueue(tcm_qla2xxx_free_wq);
+out_fabric_npiv:
+        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
+out_fabric:
+        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
+        return ret;
+}
+
+static void tcm_qla2xxx_deregister_configfs(void)
+{
+        destroy_workqueue(tcm_qla2xxx_cmd_wq);
+        destroy_workqueue(tcm_qla2xxx_free_wq);
+
+        target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs);
+        tcm_qla2xxx_fabric_configfs = NULL;
+        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_fabric_configfs\n");
+
+        target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
+        tcm_qla2xxx_npiv_fabric_configfs = NULL;
+        pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_npiv_fabric_configfs\n");
+}
+
+static int __init tcm_qla2xxx_init(void)
+{
+        int ret;
+
+        ret = tcm_qla2xxx_register_configfs();
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static void __exit tcm_qla2xxx_exit(void)
+{
+        tcm_qla2xxx_deregister_configfs();
+}
+
+MODULE_DESCRIPTION("TCM QLA2XXX series NPIV enabled fabric driver");
+MODULE_LICENSE("GPL");
+module_init(tcm_qla2xxx_init);
+module_exit(tcm_qla2xxx_exit);
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
new file mode 100644
index 000000000000..825498103352
--- /dev/null
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -0,0 +1,82 @@
+#include <target/target_core_base.h>
+#include <linux/btree.h>
+
+#define TCM_QLA2XXX_VERSION     "v0.1"
+/* length of ASCII WWPNs including pad */
+#define TCM_QLA2XXX_NAMELEN     32
+/* lenth of ASCII NPIV 'WWPN+WWNN' including pad */
+#define TCM_QLA2XXX_NPIV_NAMELEN 66
+
+#include "qla_target.h"
+
+struct tcm_qla2xxx_nacl {
+        /* From libfc struct fc_rport->port_id */
+        u32 nport_id;
+        /* Binary World Wide unique Node Name for remote FC Initiator Nport */
+        u64 nport_wwnn;
+        /* ASCII formatted WWPN for FC Initiator Nport */
+        char nport_name[TCM_QLA2XXX_NAMELEN];
+        /* Pointer to qla_tgt_sess */
+        struct qla_tgt_sess *qla_tgt_sess;
+        /* Pointer to TCM FC nexus */
+        struct se_session *nport_nexus;
+        /* Returned by tcm_qla2xxx_make_nodeacl() */
+        struct se_node_acl se_node_acl;
+};
+
+struct tcm_qla2xxx_tpg_attrib {
+        int generate_node_acls;
+        int cache_dynamic_acls;
+        int demo_mode_write_protect;
+        int prod_mode_write_protect;
+};
+
+struct tcm_qla2xxx_tpg {
+        /* FC lport target portal group tag for TCM */
+        u16 lport_tpgt;
+        /* Atomic bit to determine TPG active status */
+        atomic_t lport_tpg_enabled;
+        /* Pointer back to tcm_qla2xxx_lport */
+        struct tcm_qla2xxx_lport *lport;
+        /* Used by tcm_qla2xxx_tpg_attrib_cit */
+        struct tcm_qla2xxx_tpg_attrib tpg_attrib;
+        /* Returned by tcm_qla2xxx_make_tpg() */
+        struct se_portal_group se_tpg;
+};
+
+#define QLA_TPG_ATTRIB(tpg)     (&(tpg)->tpg_attrib)
+
+struct tcm_qla2xxx_fc_loopid {
+        struct se_node_acl *se_nacl;
+};
+
+struct tcm_qla2xxx_lport {
+        /* SCSI protocol the lport is providing */
+        u8 lport_proto_id;
+        /* Binary World Wide unique Port Name for FC Target Lport */
+        u64 lport_wwpn;
+        /* Binary World Wide unique Port Name for FC NPIV Target Lport */
+        u64 lport_npiv_wwpn;
+        /* Binary World Wide unique Node Name for FC NPIV Target Lport */
+        u64 lport_npiv_wwnn;
+        /* ASCII formatted WWPN for FC Target Lport */
+        char lport_name[TCM_QLA2XXX_NAMELEN];
+        /* ASCII formatted WWPN+WWNN for NPIV FC Target Lport */
+        char lport_npiv_name[TCM_QLA2XXX_NPIV_NAMELEN];
+        /* map for fc_port pointers in 24-bit FC Port ID space */
+        struct btree_head32 lport_fcport_map;
+        /* vmalloc-ed memory for fc_port pointers for 16-bit FC loop ID */
+        struct tcm_qla2xxx_fc_loopid *lport_loopid_map;
+        /* Pointer to struct scsi_qla_host from qla2xxx LLD */
+        struct scsi_qla_host *qla_vha;
+        /* Pointer to struct scsi_qla_host for NPIV VP from qla2xxx LLD */
+        struct scsi_qla_host *qla_npiv_vp;
+        /* Pointer to struct qla_tgt pointer */
+        struct qla_tgt lport_qla_tgt;
+        /* Pointer to struct fc_vport for NPIV vport from libfc */
+        struct fc_vport *npiv_vport;
+        /* Pointer to TPG=1 for non NPIV mode */
+        struct tcm_qla2xxx_tpg *tpg_1;
+        /* Returned by tcm_qla2xxx_make_lport() */
+        struct se_wwn lport_wwn;
+};
diff --git a/drivers/scsi/qla4xxx/ql4_attr.c b/drivers/scsi/qla4xxx/ql4_attr.c
index 0b0a7d42137d..c681b2a355e1 100644
--- a/drivers/scsi/qla4xxx/ql4_attr.c
+++ b/drivers/scsi/qla4xxx/ql4_attr.c
@@ -9,6 +9,140 @@
 #include "ql4_glbl.h"
 #include "ql4_dbg.h"
 
+static ssize_t
+qla4_8xxx_sysfs_read_fw_dump(struct file *filep, struct kobject *kobj,
+                             struct bin_attribute *ba, char *buf, loff_t off,
+                             size_t count)
+{
+        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+                                               struct device, kobj)));
+
+        if (!is_qla8022(ha))
+                return -EINVAL;
+
+        if (!test_bit(AF_82XX_DUMP_READING, &ha->flags))
+                return 0;
+
+        return memory_read_from_buffer(buf, count, &off, ha->fw_dump,
+                                       ha->fw_dump_size);
+}
+
+static ssize_t
+qla4_8xxx_sysfs_write_fw_dump(struct file *filep, struct kobject *kobj,
+                              struct bin_attribute *ba, char *buf, loff_t off,
+                              size_t count)
+{
+        struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
+                                               struct device, kobj)));
+        uint32_t dev_state;
+        long reading;
+        int ret = 0;
+
+        if (!is_qla8022(ha))
+                return -EINVAL;
+
+        if (off != 0)
+                return ret;
+
+        buf[1] = 0;
+        ret = kstrtol(buf, 10, &reading);
+        if (ret) {
+                ql4_printk(KERN_ERR, ha, "%s: Invalid input. Return err %d\n",
+                           __func__, ret);
+                return ret;
+        }
+
+        switch (reading) {
+        case 0:
+                /* clear dump collection flags */
+                if (test_and_clear_bit(AF_82XX_DUMP_READING, &ha->flags)) {
+                        clear_bit(AF_82XX_FW_DUMPED, &ha->flags);
+                        /* Reload minidump template */
+                        qla4xxx_alloc_fw_dump(ha);
+                        DEBUG2(ql4_printk(KERN_INFO, ha,
+                                          "Firmware template reloaded\n"));
+                }
+                break;
+        case 1:
+                /* Set flag to read dump */
+                if (test_bit(AF_82XX_FW_DUMPED, &ha->flags) &&
+                    !test_bit(AF_82XX_DUMP_READING, &ha->flags)) {
+                        set_bit(AF_82XX_DUMP_READING, &ha->flags);
+                        DEBUG2(ql4_printk(KERN_INFO, ha,
+                                          "Raw firmware dump ready for read on (%ld).\n",
+                                          ha->host_no));
+                }
+                break;
+        case 2:
+                /* Reset HBA */
+                qla4_8xxx_idc_lock(ha);
+                dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+                if (dev_state == QLA82XX_DEV_READY) {
+                        ql4_printk(KERN_INFO, ha,
+                                   "%s: Setting Need reset, reset_owner is 0x%x.\n",
+                                   __func__, ha->func_num);
+                        qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
+                                        QLA82XX_DEV_NEED_RESET);
+                        set_bit(AF_82XX_RST_OWNER, &ha->flags);
+                } else
+                        ql4_printk(KERN_INFO, ha,
+                                   "%s: Reset not performed as device state is 0x%x\n",
+                                   __func__, dev_state);
+
+                qla4_8xxx_idc_unlock(ha);
+                break;
+        default:
+                /* do nothing */
+                break;
+        }
+
+        return count;
+}
+
+static struct bin_attribute sysfs_fw_dump_attr = {
+        .attr = {
+                .name = "fw_dump",
+                .mode = S_IRUSR | S_IWUSR,
+        },
+        .size = 0,
+        .read = qla4_8xxx_sysfs_read_fw_dump,
+        .write = qla4_8xxx_sysfs_write_fw_dump,
+};
+
+static struct sysfs_entry {
+        char *name;
+        struct bin_attribute *attr;
+} bin_file_entries[] = {
+        { "fw_dump", &sysfs_fw_dump_attr },
+        { NULL },
+};
+
+void qla4_8xxx_alloc_sysfs_attr(struct scsi_qla_host *ha)
+{
+        struct Scsi_Host *host = ha->host;
+        struct sysfs_entry *iter;
+        int ret;
+
+        for (iter = bin_file_entries; iter->name; iter++) {
+                ret = sysfs_create_bin_file(&host->shost_gendev.kobj,
+                                            iter->attr);
+                if (ret)
+                        ql4_printk(KERN_ERR, ha,
+                                   "Unable to create sysfs %s binary attribute (%d).\n",
+                                   iter->name, ret);
+        }
+}
+
+void qla4_8xxx_free_sysfs_attr(struct scsi_qla_host *ha)
+{
+        struct Scsi_Host *host = ha->host;
+        struct sysfs_entry *iter;
+
+        for (iter = bin_file_entries; iter->name; iter++)
+                sysfs_remove_bin_file(&host->shost_gendev.kobj,
+                                      iter->attr);
+}
+
 /* Scsi_Host attributes. */
 static ssize_t
 qla4xxx_fw_version_show(struct device *dev,
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 7f2492e88be7..96a5616a8fda 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -398,6 +398,16 @@ struct isp_operations {
         int (*get_sys_info) (struct scsi_qla_host *);
 };
 
+struct ql4_mdump_size_table {
+        uint32_t size;
+        uint32_t size_cmask_02;
+        uint32_t size_cmask_04;
+        uint32_t size_cmask_08;
+        uint32_t size_cmask_10;
+        uint32_t size_cmask_FF;
+        uint32_t version;
+};
+
 /*qla4xxx ipaddress configuration details */
 struct ipaddress_config {
         uint16_t ipv4_options;
@@ -485,6 +495,10 @@ struct scsi_qla_host {
 #define AF_EEH_BUSY                     20 /* 0x00100000 */
 #define AF_PCI_CHANNEL_IO_PERM_FAILURE  21 /* 0x00200000 */
 #define AF_BUILD_DDB_LIST               22 /* 0x00400000 */
+#define AF_82XX_FW_DUMPED               24 /* 0x01000000 */
+#define AF_82XX_RST_OWNER               25 /* 0x02000000 */
+#define AF_82XX_DUMP_READING            26 /* 0x04000000 */
+
         unsigned long dpc_flags;
 
 #define DPC_RESET_HA                    1 /* 0x00000002 */
@@ -662,6 +676,11 @@ struct scsi_qla_host {
 
         uint32_t nx_dev_init_timeout;
         uint32_t nx_reset_timeout;
+        void *fw_dump;
+        uint32_t fw_dump_size;
+        uint32_t fw_dump_capture_mask;
+        void *fw_dump_tmplt_hdr;
+        uint32_t fw_dump_tmplt_size;
 
         struct completion mbx_intr_comp;
 
@@ -936,4 +955,7 @@ static inline int ql4xxx_reset_active(struct scsi_qla_host *ha)
 #define PROCESS_ALL_AENS         0
 #define FLUSH_DDB_CHANGED_AENS   1
 
+/* Defines for udev events */
+#define QL4_UEVENT_CODE_FW_DUMP         0
+
 #endif  /*_QLA4XXX_H */
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 210cd1d64475..7240948fb929 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -385,6 +385,11 @@ struct qla_flt_region {
 #define MBOX_CMD_GET_IP_ADDR_STATE              0x0091
 #define MBOX_CMD_SEND_IPV6_ROUTER_SOL           0x0092
 #define MBOX_CMD_GET_DB_ENTRY_CURRENT_IP_ADDR   0x0093
+#define MBOX_CMD_MINIDUMP                       0x0129
+
+/* Minidump subcommand */
+#define MINIDUMP_GET_SIZE_SUBCOMMAND            0x00
+#define MINIDUMP_GET_TMPLT_SUBCOMMAND           0x01
 
 /* Mailbox 1 */
 #define FW_STATE_READY                          0x0000
@@ -1190,4 +1195,27 @@ struct ql_iscsi_stats {
         uint8_t reserved2[264]; /* 0x0308 - 0x040F */
 };
 
+#define QLA82XX_DBG_STATE_ARRAY_LEN             16
+#define QLA82XX_DBG_CAP_SIZE_ARRAY_LEN          8
+#define QLA82XX_DBG_RSVD_ARRAY_LEN              8
+
+struct qla4_8xxx_minidump_template_hdr {
+        uint32_t entry_type;
+        uint32_t first_entry_offset;
+        uint32_t size_of_template;
+        uint32_t capture_debug_level;
+        uint32_t num_of_entries;
+        uint32_t version;
+        uint32_t driver_timestamp;
+        uint32_t checksum;
+
+        uint32_t driver_capture_mask;
+        uint32_t driver_info_word2;
+        uint32_t driver_info_word3;
+        uint32_t driver_info_word4;
+
+        uint32_t saved_state_array[QLA82XX_DBG_STATE_ARRAY_LEN];
+        uint32_t capture_size_array[QLA82XX_DBG_CAP_SIZE_ARRAY_LEN];
+};
+
 #endif /*  _QLA4X_FW_H */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 910536667cf5..20b49d019043 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -196,10 +196,18 @@ int qla4xxx_bsg_request(struct bsg_job *bsg_job);
 int qla4xxx_process_vendor_specific(struct bsg_job *bsg_job);
 
 void qla4xxx_arm_relogin_timer(struct ddb_entry *ddb_entry);
+int qla4xxx_get_minidump_template(struct scsi_qla_host *ha,
+                                  dma_addr_t phys_addr);
+int qla4xxx_req_template_size(struct scsi_qla_host *ha);
+void qla4_8xxx_alloc_sysfs_attr(struct scsi_qla_host *ha);
+void qla4_8xxx_free_sysfs_attr(struct scsi_qla_host *ha);
+void qla4xxx_alloc_fw_dump(struct scsi_qla_host *ha);
 
 extern int ql4xextended_error_logging;
 extern int ql4xdontresethba;
 extern int ql4xenablemsix;
+extern int ql4xmdcapmask;
+extern int ql4xenablemd;
 
 extern struct device_attribute *qla4xxx_host_attrs[];
 #endif /* _QLA4x_GBL_H */
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 90ee5d8fa731..bf36723b84e1 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -277,6 +277,94 @@ qla4xxx_wait_for_ip_config(struct scsi_qla_host *ha)
         return ipv4_wait|ipv6_wait;
 }
 
+/**
+ * qla4xxx_alloc_fw_dump - Allocate memory for minidump data.
+ * @ha: pointer to host adapter structure.
+ **/
+void qla4xxx_alloc_fw_dump(struct scsi_qla_host *ha)
+{
+        int status;
+        uint32_t capture_debug_level;
+        int hdr_entry_bit, k;
+        void *md_tmp;
+        dma_addr_t md_tmp_dma;
+        struct qla4_8xxx_minidump_template_hdr *md_hdr;
+
+        if (ha->fw_dump) {
+                ql4_printk(KERN_WARNING, ha,
+                           "Firmware dump previously allocated.\n");
+                return;
+        }
+
+        status = qla4xxx_req_template_size(ha);
+        if (status != QLA_SUCCESS) {
+                ql4_printk(KERN_INFO, ha,
+                           "scsi%ld: Failed to get template size\n",
+                           ha->host_no);
+                return;
+        }
+
+        clear_bit(AF_82XX_FW_DUMPED, &ha->flags);
+
+        /* Allocate memory for saving the template */
+        md_tmp = dma_alloc_coherent(&ha->pdev->dev, ha->fw_dump_tmplt_size,
+                                    &md_tmp_dma, GFP_KERNEL);
+
+        /* Request template */
+        status =  qla4xxx_get_minidump_template(ha, md_tmp_dma);
+        if (status != QLA_SUCCESS) {
+                ql4_printk(KERN_INFO, ha,
+                           "scsi%ld: Failed to get minidump template\n",
+                           ha->host_no);
+                goto alloc_cleanup;
+        }
+
+        md_hdr = (struct qla4_8xxx_minidump_template_hdr *)md_tmp;
+
+        capture_debug_level = md_hdr->capture_debug_level;
+
+        /* Get capture mask based on module loadtime setting. */
+        if (ql4xmdcapmask >= 0x3 && ql4xmdcapmask <= 0x7F)
+                ha->fw_dump_capture_mask = ql4xmdcapmask;
+        else
+                ha->fw_dump_capture_mask = capture_debug_level;
+
+        md_hdr->driver_capture_mask = ha->fw_dump_capture_mask;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Minimum num of entries = %d\n",
+                          md_hdr->num_of_entries));
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Dump template size  = %d\n",
+                          ha->fw_dump_tmplt_size));
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Selected Capture mask =0x%x\n",
+                          ha->fw_dump_capture_mask));
+
+        /* Calculate fw_dump_size */
+        for (hdr_entry_bit = 0x2, k = 1; (hdr_entry_bit & 0xFF);
+             hdr_entry_bit <<= 1, k++) {
+                if (hdr_entry_bit & ha->fw_dump_capture_mask)
+                        ha->fw_dump_size += md_hdr->capture_size_array[k];
+        }
+
+        /* Total firmware dump size including command header */
+        ha->fw_dump_size += ha->fw_dump_tmplt_size;
+        ha->fw_dump = vmalloc(ha->fw_dump_size);
+        if (!ha->fw_dump)
+                goto alloc_cleanup;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "Minidump Tempalate Size = 0x%x KB\n",
+                          ha->fw_dump_tmplt_size));
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "Total Minidump size = 0x%x KB\n", ha->fw_dump_size));
+
+        memcpy(ha->fw_dump, md_tmp, ha->fw_dump_tmplt_size);
+        ha->fw_dump_tmplt_hdr = ha->fw_dump;
+
+alloc_cleanup:
+        dma_free_coherent(&ha->pdev->dev, ha->fw_dump_tmplt_size,
+                          md_tmp, md_tmp_dma);
+}
+
 static int qla4xxx_fw_ready(struct scsi_qla_host *ha)
 {
         uint32_t timeout_count;
@@ -445,9 +533,13 @@ static int qla4xxx_init_firmware(struct scsi_qla_host *ha)
                               "control block\n", ha->host_no, __func__));
                 return status;
         }
+
         if (!qla4xxx_fw_ready(ha))
                 return status;
 
+        if (is_qla8022(ha) && !test_bit(AF_INIT_DONE, &ha->flags))
+                qla4xxx_alloc_fw_dump(ha);
+
         return qla4xxx_get_firmware_status(ha);
 }
 
@@ -884,8 +976,8 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
                 switch (state) {
                 case DDB_DS_SESSION_ACTIVE:
                 case DDB_DS_DISCOVERY:
-                        ddb_entry->unblock_sess(ddb_entry->sess);
                         qla4xxx_update_session_conn_param(ha, ddb_entry);
+                        ddb_entry->unblock_sess(ddb_entry->sess);
                         status = QLA_SUCCESS;
                         break;
                 case DDB_DS_SESSION_FAILED:
@@ -897,6 +989,7 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
                 }
                 break;
         case DDB_DS_SESSION_ACTIVE:
+        case DDB_DS_DISCOVERY:
                 switch (state) {
                 case DDB_DS_SESSION_FAILED:
                         /*
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index 7ac21dabbf22..cab8f665a41f 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -51,25 +51,6 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
                 }
         }
 
-        if (is_qla8022(ha)) {
-                if (test_bit(AF_FW_RECOVERY, &ha->flags)) {
-                        DEBUG2(ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: "
-                            "prematurely completing mbx cmd as firmware "
-                            "recovery detected\n", ha->host_no, __func__));
-                        return status;
-                }
-                /* Do not send any mbx cmd if h/w is in failed state*/
-                qla4_8xxx_idc_lock(ha);
-                dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-                qla4_8xxx_idc_unlock(ha);
-                if (dev_state == QLA82XX_DEV_FAILED) {
-                        ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: H/W is in "
-                            "failed state, do not send any mailbox commands\n",
-                            ha->host_no, __func__);
-                        return status;
-                }
-        }
-
         if ((is_aer_supported(ha)) &&
             (test_bit(AF_PCI_CHANNEL_IO_PERM_FAILURE, &ha->flags))) {
                 DEBUG2(printk(KERN_WARNING "scsi%ld: %s: Perm failure on EEH, "
@@ -96,6 +77,25 @@ int qla4xxx_mailbox_command(struct scsi_qla_host *ha, uint8_t inCount,
                 msleep(10);
         }
 
+        if (is_qla8022(ha)) {
+                if (test_bit(AF_FW_RECOVERY, &ha->flags)) {
+                        DEBUG2(ql4_printk(KERN_WARNING, ha,
+                                          "scsi%ld: %s: prematurely completing mbx cmd as firmware recovery detected\n",
+                                          ha->host_no, __func__));
+                        goto mbox_exit;
+                }
+                /* Do not send any mbx cmd if h/w is in failed state*/
+                qla4_8xxx_idc_lock(ha);
+                dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
+                qla4_8xxx_idc_unlock(ha);
+                if (dev_state == QLA82XX_DEV_FAILED) {
+                        ql4_printk(KERN_WARNING, ha,
+                                   "scsi%ld: %s: H/W is in failed state, do not send any mailbox commands\n",
+                                   ha->host_no, __func__);
+                        goto mbox_exit;
+                }
+        }
+
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
         ha->mbox_status_count = outCount;
@@ -270,6 +270,79 @@ mbox_exit:
         return status;
 }
 
+/**
+ * qla4xxx_get_minidump_template - Get the firmware template
+ * @ha: Pointer to host adapter structure.
+ * @phys_addr: dma address for template
+ *
+ * Obtain the minidump template from firmware during initialization
+ * as it may not be available when minidump is desired.
+ **/
+int qla4xxx_get_minidump_template(struct scsi_qla_host *ha,
+                                  dma_addr_t phys_addr)
+{
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int status;
+
+        memset(&mbox_cmd, 0, sizeof(mbox_cmd));
+        memset(&mbox_sts, 0, sizeof(mbox_sts));
+
+        mbox_cmd[0] = MBOX_CMD_MINIDUMP;
+        mbox_cmd[1] = MINIDUMP_GET_TMPLT_SUBCOMMAND;
+        mbox_cmd[2] = LSDW(phys_addr);
+        mbox_cmd[3] = MSDW(phys_addr);
+        mbox_cmd[4] = ha->fw_dump_tmplt_size;
+        mbox_cmd[5] = 0;
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 2, &mbox_cmd[0],
+                                         &mbox_sts[0]);
+        if (status != QLA_SUCCESS) {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "scsi%ld: %s: Cmd = %08X, mbx[0] = 0x%04x, mbx[1] = 0x%04x\n",
+                                  ha->host_no, __func__, mbox_cmd[0],
+                                  mbox_sts[0], mbox_sts[1]));
+        }
+        return status;
+}
+
+/**
+ * qla4xxx_req_template_size - Get minidump template size from firmware.
+ * @ha: Pointer to host adapter structure.
+ **/
+int qla4xxx_req_template_size(struct scsi_qla_host *ha)
+{
+        uint32_t mbox_cmd[MBOX_REG_COUNT];
+        uint32_t mbox_sts[MBOX_REG_COUNT];
+        int status;
+
+        memset(&mbox_cmd, 0, sizeof(mbox_cmd));
+        memset(&mbox_sts, 0, sizeof(mbox_sts));
+
+        mbox_cmd[0] = MBOX_CMD_MINIDUMP;
+        mbox_cmd[1] = MINIDUMP_GET_SIZE_SUBCOMMAND;
+
+        status = qla4xxx_mailbox_command(ha, MBOX_REG_COUNT, 8, &mbox_cmd[0],
+                                         &mbox_sts[0]);
+        if (status == QLA_SUCCESS) {
+                ha->fw_dump_tmplt_size = mbox_sts[1];
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "%s: sts[0]=0x%04x, template  size=0x%04x, size_cm_02=0x%04x, size_cm_04=0x%04x, size_cm_08=0x%04x, size_cm_10=0x%04x, size_cm_FF=0x%04x, version=0x%04x\n",
+                                  __func__, mbox_sts[0], mbox_sts[1],
+                                  mbox_sts[2], mbox_sts[3], mbox_sts[4],
+                                  mbox_sts[5], mbox_sts[6], mbox_sts[7]));
+                if (ha->fw_dump_tmplt_size == 0)
+                        status = QLA_ERROR;
+        } else {
+                ql4_printk(KERN_WARNING, ha,
+                           "%s: Error sts[0]=0x%04x, mbx[1]=0x%04x\n",
+                           __func__, mbox_sts[0], mbox_sts[1]);
+                status = QLA_ERROR;
+        }
+
+        return status;
+}
+
 void qla4xxx_mailbox_premature_completion(struct scsi_qla_host *ha)
 {
         set_bit(AF_FW_RECOVERY, &ha->flags);
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index e1e46b6dac75..228b67020d2c 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/pci.h>
+#include <linux/ratelimit.h>
 #include "ql4_def.h"
 #include "ql4_glbl.h"
 
@@ -420,6 +421,38 @@ qla4_8xxx_rd_32(struct scsi_qla_host *ha, ulong off)
         return data;
 }
 
+/* Minidump related functions */
+static int qla4_8xxx_md_rw_32(struct scsi_qla_host *ha, uint32_t off,
+                              u32 data, uint8_t flag)
+{
+        uint32_t win_read, off_value, rval = QLA_SUCCESS;
+
+        off_value  = off & 0xFFFF0000;
+        writel(off_value, (void __iomem *)(CRB_WINDOW_2M + ha->nx_pcibase));
+
+        /* Read back value to make sure write has gone through before trying
+         * to use it.
+         */
+        win_read = readl((void __iomem *)(CRB_WINDOW_2M + ha->nx_pcibase));
+        if (win_read != off_value) {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "%s: Written (0x%x) != Read (0x%x), off=0x%x\n",
+                                   __func__, off_value, win_read, off));
+                return QLA_ERROR;
+        }
+
+        off_value  = off & 0x0000FFFF;
+
+        if (flag)
+                writel(data, (void __iomem *)(off_value + CRB_INDIRECT_2M +
+                                              ha->nx_pcibase));
+        else
+                rval = readl((void __iomem *)(off_value + CRB_INDIRECT_2M +
+                                              ha->nx_pcibase));
+
+        return rval;
+}
+
 #define CRB_WIN_LOCK_TIMEOUT 100000000
 
 int qla4_8xxx_crb_win_lock(struct scsi_qla_host *ha)
@@ -1252,9 +1285,9 @@ qla4_8xxx_pci_mem_read_2M(struct scsi_qla_host *ha,
                 }
 
                 if (j >= MAX_CTL_CHECK) {
-                        if (printk_ratelimit())
-                                ql4_printk(KERN_ERR, ha,
-                                    "failed to read through agent\n");
+                        printk_ratelimited(KERN_ERR
+                                           "%s: failed to read through agent\n",
+                                           __func__);
                         break;
                 }
 
@@ -1390,7 +1423,8 @@ qla4_8xxx_pci_mem_write_2M(struct scsi_qla_host *ha,
                 if (j >= MAX_CTL_CHECK) {
                         if (printk_ratelimit())
                                 ql4_printk(KERN_ERR, ha,
-                                    "failed to write through agent\n");
+                                           "%s: failed to read through agent\n",
+                                           __func__);
                         ret = -1;
                         break;
                 }
@@ -1462,6 +1496,8 @@ qla4_8xxx_set_drv_active(struct scsi_qla_host *ha)
 
         drv_active = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
         drv_active |= (1 << (ha->func_num * 4));
+        ql4_printk(KERN_INFO, ha, "%s(%ld): drv_active: 0x%08x\n",
+                   __func__, ha->host_no, drv_active);
         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_ACTIVE, drv_active);
 }
 
@@ -1472,6 +1508,8 @@ qla4_8xxx_clear_drv_active(struct scsi_qla_host *ha)
 
         drv_active = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
         drv_active &= ~(1 << (ha->func_num * 4));
+        ql4_printk(KERN_INFO, ha, "%s(%ld): drv_active: 0x%08x\n",
+                   __func__, ha->host_no, drv_active);
         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_ACTIVE, drv_active);
 }
 
@@ -1497,6 +1535,8 @@ qla4_8xxx_set_rst_ready(struct scsi_qla_host *ha)
 
         drv_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
         drv_state |= (1 << (ha->func_num * 4));
+        ql4_printk(KERN_INFO, ha, "%s(%ld): drv_state: 0x%08x\n",
+                   __func__, ha->host_no, drv_state);
         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_STATE, drv_state);
 }
 
@@ -1507,6 +1547,8 @@ qla4_8xxx_clear_rst_ready(struct scsi_qla_host *ha)
 
         drv_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DRV_STATE);
         drv_state &= ~(1 << (ha->func_num * 4));
+        ql4_printk(KERN_INFO, ha, "%s(%ld): drv_state: 0x%08x\n",
+                   __func__, ha->host_no, drv_state);
         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_STATE, drv_state);
 }
 
@@ -1601,6 +1643,629 @@ static void qla4_8xxx_rom_lock_recovery(struct scsi_qla_host *ha)
         qla4_8xxx_rom_unlock(ha);
 }
 
+static void qla4_8xxx_minidump_process_rdcrb(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t r_addr, r_stride, loop_cnt, i, r_value;
+        struct qla82xx_minidump_entry_crb *crb_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        crb_hdr = (struct qla82xx_minidump_entry_crb *)entry_hdr;
+        r_addr = crb_hdr->addr;
+        r_stride = crb_hdr->crb_strd.addr_stride;
+        loop_cnt = crb_hdr->op_count;
+
+        for (i = 0; i < loop_cnt; i++) {
+                r_value = qla4_8xxx_md_rw_32(ha, r_addr, 0, 0);
+                *data_ptr++ = cpu_to_le32(r_addr);
+                *data_ptr++ = cpu_to_le32(r_value);
+                r_addr += r_stride;
+        }
+        *d_ptr = data_ptr;
+}
+
+static int qla4_8xxx_minidump_process_l2tag(struct scsi_qla_host *ha,
+                                 struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                 uint32_t **d_ptr)
+{
+        uint32_t addr, r_addr, c_addr, t_r_addr;
+        uint32_t i, k, loop_count, t_value, r_cnt, r_value;
+        unsigned long p_wait, w_time, p_mask;
+        uint32_t c_value_w, c_value_r;
+        struct qla82xx_minidump_entry_cache *cache_hdr;
+        int rval = QLA_ERROR;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        cache_hdr = (struct qla82xx_minidump_entry_cache *)entry_hdr;
+
+        loop_count = cache_hdr->op_count;
+        r_addr = cache_hdr->read_addr;
+        c_addr = cache_hdr->control_addr;
+        c_value_w = cache_hdr->cache_ctrl.write_value;
+
+        t_r_addr = cache_hdr->tag_reg_addr;
+        t_value = cache_hdr->addr_ctrl.init_tag_value;
+        r_cnt = cache_hdr->read_ctrl.read_addr_cnt;
+        p_wait = cache_hdr->cache_ctrl.poll_wait;
+        p_mask = cache_hdr->cache_ctrl.poll_mask;
+
+        for (i = 0; i < loop_count; i++) {
+                qla4_8xxx_md_rw_32(ha, t_r_addr, t_value, 1);
+
+                if (c_value_w)
+                        qla4_8xxx_md_rw_32(ha, c_addr, c_value_w, 1);
+
+                if (p_mask) {
+                        w_time = jiffies + p_wait;
+                        do {
+                                c_value_r = qla4_8xxx_md_rw_32(ha, c_addr,
+                                                                0, 0);
+                                if ((c_value_r & p_mask) == 0) {
+                                        break;
+                                } else if (time_after_eq(jiffies, w_time)) {
+                                        /* capturing dump failed */
+                                        return rval;
+                                }
+                        } while (1);
+                }
+
+                addr = r_addr;
+                for (k = 0; k < r_cnt; k++) {
+                        r_value = qla4_8xxx_md_rw_32(ha, addr, 0, 0);
+                        *data_ptr++ = cpu_to_le32(r_value);
+                        addr += cache_hdr->read_ctrl.read_addr_stride;
+                }
+
+                t_value += cache_hdr->addr_ctrl.tag_value_stride;
+        }
+        *d_ptr = data_ptr;
+        return QLA_SUCCESS;
+}
+
+static int qla4_8xxx_minidump_process_control(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr)
+{
+        struct qla82xx_minidump_entry_crb *crb_entry;
+        uint32_t read_value, opcode, poll_time, addr, index, rval = QLA_SUCCESS;
+        uint32_t crb_addr;
+        unsigned long wtime;
+        struct qla4_8xxx_minidump_template_hdr *tmplt_hdr;
+        int i;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        tmplt_hdr = (struct qla4_8xxx_minidump_template_hdr *)
+                                                ha->fw_dump_tmplt_hdr;
+        crb_entry = (struct qla82xx_minidump_entry_crb *)entry_hdr;
+
+        crb_addr = crb_entry->addr;
+        for (i = 0; i < crb_entry->op_count; i++) {
+                opcode = crb_entry->crb_ctrl.opcode;
+                if (opcode & QLA82XX_DBG_OPCODE_WR) {
+                        qla4_8xxx_md_rw_32(ha, crb_addr,
+                                           crb_entry->value_1, 1);
+                        opcode &= ~QLA82XX_DBG_OPCODE_WR;
+                }
+                if (opcode & QLA82XX_DBG_OPCODE_RW) {
+                        read_value = qla4_8xxx_md_rw_32(ha, crb_addr, 0, 0);
+                        qla4_8xxx_md_rw_32(ha, crb_addr, read_value, 1);
+                        opcode &= ~QLA82XX_DBG_OPCODE_RW;
+                }
+                if (opcode & QLA82XX_DBG_OPCODE_AND) {
+                        read_value = qla4_8xxx_md_rw_32(ha, crb_addr, 0, 0);
+                        read_value &= crb_entry->value_2;
+                        opcode &= ~QLA82XX_DBG_OPCODE_AND;
+                        if (opcode & QLA82XX_DBG_OPCODE_OR) {
+                                read_value |= crb_entry->value_3;
+                                opcode &= ~QLA82XX_DBG_OPCODE_OR;
+                        }
+                        qla4_8xxx_md_rw_32(ha, crb_addr, read_value, 1);
+                }
+                if (opcode & QLA82XX_DBG_OPCODE_OR) {
+                        read_value = qla4_8xxx_md_rw_32(ha, crb_addr, 0, 0);
+                        read_value |= crb_entry->value_3;
+                        qla4_8xxx_md_rw_32(ha, crb_addr, read_value, 1);
+                        opcode &= ~QLA82XX_DBG_OPCODE_OR;
+                }
+                if (opcode & QLA82XX_DBG_OPCODE_POLL) {
+                        poll_time = crb_entry->crb_strd.poll_timeout;
+                        wtime = jiffies + poll_time;
+                        read_value = qla4_8xxx_md_rw_32(ha, crb_addr, 0, 0);
+
+                        do {
+                                if ((read_value & crb_entry->value_2) ==
+                                    crb_entry->value_1)
+                                        break;
+                                else if (time_after_eq(jiffies, wtime)) {
+                                        /* capturing dump failed */
+                                        rval = QLA_ERROR;
+                                        break;
+                                } else
+                                        read_value = qla4_8xxx_md_rw_32(ha,
+                                                                crb_addr, 0, 0);
+                        } while (1);
+                        opcode &= ~QLA82XX_DBG_OPCODE_POLL;
+                }
+
+                if (opcode & QLA82XX_DBG_OPCODE_RDSTATE) {
+                        if (crb_entry->crb_strd.state_index_a) {
+                                index = crb_entry->crb_strd.state_index_a;
+                                addr = tmplt_hdr->saved_state_array[index];
+                        } else {
+                                addr = crb_addr;
+                        }
+
+                        read_value = qla4_8xxx_md_rw_32(ha, addr, 0, 0);
+                        index = crb_entry->crb_ctrl.state_index_v;
+                        tmplt_hdr->saved_state_array[index] = read_value;
+                        opcode &= ~QLA82XX_DBG_OPCODE_RDSTATE;
+                }
+
+                if (opcode & QLA82XX_DBG_OPCODE_WRSTATE) {
+                        if (crb_entry->crb_strd.state_index_a) {
+                                index = crb_entry->crb_strd.state_index_a;
+                                addr = tmplt_hdr->saved_state_array[index];
+                        } else {
+                                addr = crb_addr;
+                        }
+
+                        if (crb_entry->crb_ctrl.state_index_v) {
+                                index = crb_entry->crb_ctrl.state_index_v;
+                                read_value =
+                                        tmplt_hdr->saved_state_array[index];
+                        } else {
+                                read_value = crb_entry->value_1;
+                        }
+
+                        qla4_8xxx_md_rw_32(ha, addr, read_value, 1);
+                        opcode &= ~QLA82XX_DBG_OPCODE_WRSTATE;
+                }
+
+                if (opcode & QLA82XX_DBG_OPCODE_MDSTATE) {
+                        index = crb_entry->crb_ctrl.state_index_v;
+                        read_value = tmplt_hdr->saved_state_array[index];
+                        read_value <<= crb_entry->crb_ctrl.shl;
+                        read_value >>= crb_entry->crb_ctrl.shr;
+                        if (crb_entry->value_2)
+                                read_value &= crb_entry->value_2;
+                        read_value |= crb_entry->value_3;
+                        read_value += crb_entry->value_1;
+                        tmplt_hdr->saved_state_array[index] = read_value;
+                        opcode &= ~QLA82XX_DBG_OPCODE_MDSTATE;
+                }
+                crb_addr += crb_entry->crb_strd.addr_stride;
+        }
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Leaving fn: %s\n", __func__));
+        return rval;
+}
+
+static void qla4_8xxx_minidump_process_rdocm(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t r_addr, r_stride, loop_cnt, i, r_value;
+        struct qla82xx_minidump_entry_rdocm *ocm_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        ocm_hdr = (struct qla82xx_minidump_entry_rdocm *)entry_hdr;
+        r_addr = ocm_hdr->read_addr;
+        r_stride = ocm_hdr->read_addr_stride;
+        loop_cnt = ocm_hdr->op_count;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "[%s]: r_addr: 0x%x, r_stride: 0x%x, loop_cnt: 0x%x\n",
+                          __func__, r_addr, r_stride, loop_cnt));
+
+        for (i = 0; i < loop_cnt; i++) {
+                r_value = readl((void __iomem *)(r_addr + ha->nx_pcibase));
+                *data_ptr++ = cpu_to_le32(r_value);
+                r_addr += r_stride;
+        }
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Leaving fn: %s datacount: 0x%lx\n",
+                          __func__, (loop_cnt * sizeof(uint32_t))));
+        *d_ptr = data_ptr;
+}
+
+static void qla4_8xxx_minidump_process_rdmux(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t r_addr, s_stride, s_addr, s_value, loop_cnt, i, r_value;
+        struct qla82xx_minidump_entry_mux *mux_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        mux_hdr = (struct qla82xx_minidump_entry_mux *)entry_hdr;
+        r_addr = mux_hdr->read_addr;
+        s_addr = mux_hdr->select_addr;
+        s_stride = mux_hdr->select_value_stride;
+        s_value = mux_hdr->select_value;
+        loop_cnt = mux_hdr->op_count;
+
+        for (i = 0; i < loop_cnt; i++) {
+                qla4_8xxx_md_rw_32(ha, s_addr, s_value, 1);
+                r_value = qla4_8xxx_md_rw_32(ha, r_addr, 0, 0);
+                *data_ptr++ = cpu_to_le32(s_value);
+                *data_ptr++ = cpu_to_le32(r_value);
+                s_value += s_stride;
+        }
+        *d_ptr = data_ptr;
+}
+
+static void qla4_8xxx_minidump_process_l1cache(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t addr, r_addr, c_addr, t_r_addr;
+        uint32_t i, k, loop_count, t_value, r_cnt, r_value;
+        uint32_t c_value_w;
+        struct qla82xx_minidump_entry_cache *cache_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        cache_hdr = (struct qla82xx_minidump_entry_cache *)entry_hdr;
+        loop_count = cache_hdr->op_count;
+        r_addr = cache_hdr->read_addr;
+        c_addr = cache_hdr->control_addr;
+        c_value_w = cache_hdr->cache_ctrl.write_value;
+
+        t_r_addr = cache_hdr->tag_reg_addr;
+        t_value = cache_hdr->addr_ctrl.init_tag_value;
+        r_cnt = cache_hdr->read_ctrl.read_addr_cnt;
+
+        for (i = 0; i < loop_count; i++) {
+                qla4_8xxx_md_rw_32(ha, t_r_addr, t_value, 1);
+                qla4_8xxx_md_rw_32(ha, c_addr, c_value_w, 1);
+                addr = r_addr;
+                for (k = 0; k < r_cnt; k++) {
+                        r_value = qla4_8xxx_md_rw_32(ha, addr, 0, 0);
+                        *data_ptr++ = cpu_to_le32(r_value);
+                        addr += cache_hdr->read_ctrl.read_addr_stride;
+                }
+                t_value += cache_hdr->addr_ctrl.tag_value_stride;
+        }
+        *d_ptr = data_ptr;
+}
+
+static void qla4_8xxx_minidump_process_queue(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t s_addr, r_addr;
+        uint32_t r_stride, r_value, r_cnt, qid = 0;
+        uint32_t i, k, loop_cnt;
+        struct qla82xx_minidump_entry_queue *q_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        q_hdr = (struct qla82xx_minidump_entry_queue *)entry_hdr;
+        s_addr = q_hdr->select_addr;
+        r_cnt = q_hdr->rd_strd.read_addr_cnt;
+        r_stride = q_hdr->rd_strd.read_addr_stride;
+        loop_cnt = q_hdr->op_count;
+
+        for (i = 0; i < loop_cnt; i++) {
+                qla4_8xxx_md_rw_32(ha, s_addr, qid, 1);
+                r_addr = q_hdr->read_addr;
+                for (k = 0; k < r_cnt; k++) {
+                        r_value = qla4_8xxx_md_rw_32(ha, r_addr, 0, 0);
+                        *data_ptr++ = cpu_to_le32(r_value);
+                        r_addr += r_stride;
+                }
+                qid += q_hdr->q_strd.queue_id_stride;
+        }
+        *d_ptr = data_ptr;
+}
+
+#define MD_DIRECT_ROM_WINDOW            0x42110030
+#define MD_DIRECT_ROM_READ_BASE         0x42150000
+
+static void qla4_8xxx_minidump_process_rdrom(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t r_addr, r_value;
+        uint32_t i, loop_cnt;
+        struct qla82xx_minidump_entry_rdrom *rom_hdr;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        rom_hdr = (struct qla82xx_minidump_entry_rdrom *)entry_hdr;
+        r_addr = rom_hdr->read_addr;
+        loop_cnt = rom_hdr->read_data_size/sizeof(uint32_t);
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "[%s]: flash_addr: 0x%x, read_data_size: 0x%x\n",
+                           __func__, r_addr, loop_cnt));
+
+        for (i = 0; i < loop_cnt; i++) {
+                qla4_8xxx_md_rw_32(ha, MD_DIRECT_ROM_WINDOW,
+                                   (r_addr & 0xFFFF0000), 1);
+                r_value = qla4_8xxx_md_rw_32(ha,
+                                             MD_DIRECT_ROM_READ_BASE +
+                                             (r_addr & 0x0000FFFF), 0, 0);
+                *data_ptr++ = cpu_to_le32(r_value);
+                r_addr += sizeof(uint32_t);
+        }
+        *d_ptr = data_ptr;
+}
+
+#define MD_MIU_TEST_AGT_CTRL            0x41000090
+#define MD_MIU_TEST_AGT_ADDR_LO         0x41000094
+#define MD_MIU_TEST_AGT_ADDR_HI         0x41000098
+
+static int qla4_8xxx_minidump_process_rdmem(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                uint32_t **d_ptr)
+{
+        uint32_t r_addr, r_value, r_data;
+        uint32_t i, j, loop_cnt;
+        struct qla82xx_minidump_entry_rdmem *m_hdr;
+        unsigned long flags;
+        uint32_t *data_ptr = *d_ptr;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Entering fn: %s\n", __func__));
+        m_hdr = (struct qla82xx_minidump_entry_rdmem *)entry_hdr;
+        r_addr = m_hdr->read_addr;
+        loop_cnt = m_hdr->read_data_size/16;
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "[%s]: Read addr: 0x%x, read_data_size: 0x%x\n",
+                          __func__, r_addr, m_hdr->read_data_size));
+
+        if (r_addr & 0xf) {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "[%s]: Read addr 0x%x not 16 bytes alligned\n",
+                                  __func__, r_addr));
+                return QLA_ERROR;
+        }
+
+        if (m_hdr->read_data_size % 16) {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "[%s]: Read data[0x%x] not multiple of 16 bytes\n",
+                                  __func__, m_hdr->read_data_size));
+                return QLA_ERROR;
+        }
+
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "[%s]: rdmem_addr: 0x%x, read_data_size: 0x%x, loop_cnt: 0x%x\n",
+                          __func__, r_addr, m_hdr->read_data_size, loop_cnt));
+
+        write_lock_irqsave(&ha->hw_lock, flags);
+        for (i = 0; i < loop_cnt; i++) {
+                qla4_8xxx_md_rw_32(ha, MD_MIU_TEST_AGT_ADDR_LO, r_addr, 1);
+                r_value = 0;
+                qla4_8xxx_md_rw_32(ha, MD_MIU_TEST_AGT_ADDR_HI, r_value, 1);
+                r_value = MIU_TA_CTL_ENABLE;
+                qla4_8xxx_md_rw_32(ha, MD_MIU_TEST_AGT_CTRL, r_value, 1);
+                r_value = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE;
+                qla4_8xxx_md_rw_32(ha, MD_MIU_TEST_AGT_CTRL, r_value, 1);
+
+                for (j = 0; j < MAX_CTL_CHECK; j++) {
+                        r_value = qla4_8xxx_md_rw_32(ha, MD_MIU_TEST_AGT_CTRL,
+                                                     0, 0);
+                        if ((r_value & MIU_TA_CTL_BUSY) == 0)
+                                break;
+                }
+
+                if (j >= MAX_CTL_CHECK) {
+                        printk_ratelimited(KERN_ERR
+                                           "%s: failed to read through agent\n",
+                                            __func__);
+                        write_unlock_irqrestore(&ha->hw_lock, flags);
+                        return QLA_SUCCESS;
+                }
+
+                for (j = 0; j < 4; j++) {
+                        r_data = qla4_8xxx_md_rw_32(ha,
+                                                    MD_MIU_TEST_AGT_RDDATA[j],
+                                                    0, 0);
+                        *data_ptr++ = cpu_to_le32(r_data);
+                }
+
+                r_addr += 16;
+        }
+        write_unlock_irqrestore(&ha->hw_lock, flags);
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Leaving fn: %s datacount: 0x%x\n",
+                          __func__, (loop_cnt * 16)));
+
+        *d_ptr = data_ptr;
+        return QLA_SUCCESS;
+}
+
+static void ql4_8xxx_mark_entry_skipped(struct scsi_qla_host *ha,
+                                struct qla82xx_minidump_entry_hdr *entry_hdr,
+                                int index)
+{
+        entry_hdr->d_ctrl.driver_flags |= QLA82XX_DBG_SKIPPED_FLAG;
+        DEBUG2(ql4_printk(KERN_INFO, ha,
+                          "scsi(%ld): Skipping entry[%d]: ETYPE[0x%x]-ELEVEL[0x%x]\n",
+                          ha->host_no, index, entry_hdr->entry_type,
+                          entry_hdr->d_ctrl.entry_capture_mask));
+}
+
+/**
+ * qla82xx_collect_md_data - Retrieve firmware minidump data.
+ * @ha: pointer to adapter structure
+ **/
+static int qla4_8xxx_collect_md_data(struct scsi_qla_host *ha)
+{
+        int num_entry_hdr = 0;
+        struct qla82xx_minidump_entry_hdr *entry_hdr;
+        struct qla4_8xxx_minidump_template_hdr *tmplt_hdr;
+        uint32_t *data_ptr;
+        uint32_t data_collected = 0;
+        int i, rval = QLA_ERROR;
+        uint64_t now;
+        uint32_t timestamp;
+
+        if (!ha->fw_dump) {
+                ql4_printk(KERN_INFO, ha, "%s(%ld) No buffer to dump\n",
+                           __func__, ha->host_no);
+                return rval;
+        }
+
+        tmplt_hdr = (struct qla4_8xxx_minidump_template_hdr *)
+                                                ha->fw_dump_tmplt_hdr;
+        data_ptr = (uint32_t *)((uint8_t *)ha->fw_dump +
+                                                ha->fw_dump_tmplt_size);
+        data_collected += ha->fw_dump_tmplt_size;
+
+        num_entry_hdr = tmplt_hdr->num_of_entries;
+        ql4_printk(KERN_INFO, ha, "[%s]: starting data ptr: %p\n",
+                   __func__, data_ptr);
+        ql4_printk(KERN_INFO, ha,
+                   "[%s]: no of entry headers in Template: 0x%x\n",
+                   __func__, num_entry_hdr);
+        ql4_printk(KERN_INFO, ha, "[%s]: Capture Mask obtained: 0x%x\n",
+                   __func__, ha->fw_dump_capture_mask);
+        ql4_printk(KERN_INFO, ha, "[%s]: Total_data_size 0x%x, %d obtained\n",
+                   __func__, ha->fw_dump_size, ha->fw_dump_size);
+
+        /* Update current timestamp before taking dump */
+        now = get_jiffies_64();
+        timestamp = (u32)(jiffies_to_msecs(now) / 1000);
+        tmplt_hdr->driver_timestamp = timestamp;
+
+        entry_hdr = (struct qla82xx_minidump_entry_hdr *)
+                                        (((uint8_t *)ha->fw_dump_tmplt_hdr) +
+                                         tmplt_hdr->first_entry_offset);
+
+        /* Walk through the entry headers - validate/perform required action */
+        for (i = 0; i < num_entry_hdr; i++) {
+                if (data_collected >= ha->fw_dump_size) {
+                        ql4_printk(KERN_INFO, ha,
+                                   "Data collected: [0x%x], Total Dump size: [0x%x]\n",
+                                   data_collected, ha->fw_dump_size);
+                        return rval;
+                }
+
+                if (!(entry_hdr->d_ctrl.entry_capture_mask &
+                      ha->fw_dump_capture_mask)) {
+                        entry_hdr->d_ctrl.driver_flags |=
+                                                QLA82XX_DBG_SKIPPED_FLAG;
+                        goto skip_nxt_entry;
+                }
+
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "Data collected: [0x%x], Dump size left:[0x%x]\n",
+                                  data_collected,
+                                  (ha->fw_dump_size - data_collected)));
+
+                /* Decode the entry type and take required action to capture
+                 * debug data
+                 */
+                switch (entry_hdr->entry_type) {
+                case QLA82XX_RDEND:
+                        ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i);
+                        break;
+                case QLA82XX_CNTRL:
+                        rval = qla4_8xxx_minidump_process_control(ha,
+                                                                  entry_hdr);
+                        if (rval != QLA_SUCCESS) {
+                                ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i);
+                                goto md_failed;
+                        }
+                        break;
+                case QLA82XX_RDCRB:
+                        qla4_8xxx_minidump_process_rdcrb(ha, entry_hdr,
+                                                         &data_ptr);
+                        break;
+                case QLA82XX_RDMEM:
+                        rval = qla4_8xxx_minidump_process_rdmem(ha, entry_hdr,
+                                                                &data_ptr);
+                        if (rval != QLA_SUCCESS) {
+                                ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i);
+                                goto md_failed;
+                        }
+                        break;
+                case QLA82XX_BOARD:
+                case QLA82XX_RDROM:
+                        qla4_8xxx_minidump_process_rdrom(ha, entry_hdr,
+                                                         &data_ptr);
+                        break;
+                case QLA82XX_L2DTG:
+                case QLA82XX_L2ITG:
+                case QLA82XX_L2DAT:
+                case QLA82XX_L2INS:
+                        rval = qla4_8xxx_minidump_process_l2tag(ha, entry_hdr,
+                                                                &data_ptr);
+                        if (rval != QLA_SUCCESS) {
+                                ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i);
+                                goto md_failed;
+                        }
+                        break;
+                case QLA82XX_L1DAT:
+                case QLA82XX_L1INS:
+                        qla4_8xxx_minidump_process_l1cache(ha, entry_hdr,
+                                                           &data_ptr);
+                        break;
+                case QLA82XX_RDOCM:
+                        qla4_8xxx_minidump_process_rdocm(ha, entry_hdr,
+                                                         &data_ptr);
+                        break;
+                case QLA82XX_RDMUX:
+                        qla4_8xxx_minidump_process_rdmux(ha, entry_hdr,
+                                                         &data_ptr);
+                        break;
+                case QLA82XX_QUEUE:
+                        qla4_8xxx_minidump_process_queue(ha, entry_hdr,
+                                                         &data_ptr);
+                        break;
+                case QLA82XX_RDNOP:
+                default:
+                        ql4_8xxx_mark_entry_skipped(ha, entry_hdr, i);
+                        break;
+                }
+
+                data_collected = (uint8_t *)data_ptr -
+                                 ((uint8_t *)((uint8_t *)ha->fw_dump +
+                                                ha->fw_dump_tmplt_size));
+skip_nxt_entry:
+                /*  next entry in the template */
+                entry_hdr = (struct qla82xx_minidump_entry_hdr *)
+                                (((uint8_t *)entry_hdr) +
+                                 entry_hdr->entry_size);
+        }
+
+        if ((data_collected + ha->fw_dump_tmplt_size) != ha->fw_dump_size) {
+                ql4_printk(KERN_INFO, ha,
+                           "Dump data mismatch: Data collected: [0x%x], total_data_size:[0x%x]\n",
+                           data_collected, ha->fw_dump_size);
+                goto md_failed;
+        }
+
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Leaving fn: %s Last entry: 0x%x\n",
+                          __func__, i));
+md_failed:
+        return rval;
+}
+
+/**
+ * qla4_8xxx_uevent_emit - Send uevent when the firmware dump is ready.
+ * @ha: pointer to adapter structure
+ **/
+static void qla4_8xxx_uevent_emit(struct scsi_qla_host *ha, u32 code)
+{
+        char event_string[40];
+        char *envp[] = { event_string, NULL };
+
+        switch (code) {
+        case QL4_UEVENT_CODE_FW_DUMP:
+                snprintf(event_string, sizeof(event_string), "FW_DUMP=%ld",
+                         ha->host_no);
+                break;
+        default:
+                /*do nothing*/
+                break;
+        }
+
+        kobject_uevent_env(&(&ha->pdev->dev)->kobj, KOBJ_CHANGE, envp);
+}
+
 /**
  * qla4_8xxx_device_bootstrap - Initialize device, set DEV_READY, start fw
  * @ha: pointer to adapter structure
@@ -1659,6 +2324,15 @@ dev_initialize:
         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DRV_IDC_VERSION, QLA82XX_IDC_VERSION);
 
         qla4_8xxx_idc_unlock(ha);
+        if (ql4xenablemd && test_bit(AF_FW_RECOVERY, &ha->flags) &&
+            !test_and_set_bit(AF_82XX_FW_DUMPED, &ha->flags)) {
+                if (!qla4_8xxx_collect_md_data(ha)) {
+                        qla4_8xxx_uevent_emit(ha, QL4_UEVENT_CODE_FW_DUMP);
+                } else {
+                        ql4_printk(KERN_INFO, ha, "Unable to collect minidump\n");
+                        clear_bit(AF_82XX_FW_DUMPED, &ha->flags);
+                }
+        }
         rval = qla4_8xxx_try_start_fw(ha);
         qla4_8xxx_idc_lock(ha);
 
@@ -1686,6 +2360,7 @@ static void
 qla4_8xxx_need_reset_handler(struct scsi_qla_host *ha)
 {
         uint32_t dev_state, drv_state, drv_active;
+        uint32_t active_mask = 0xFFFFFFFF;
         unsigned long reset_timeout;
 
         ql4_printk(KERN_INFO, ha,
@@ -1697,7 +2372,14 @@ qla4_8xxx_need_reset_handler(struct scsi_qla_host *ha)
                 qla4_8xxx_idc_lock(ha);
         }
 
-        qla4_8xxx_set_rst_ready(ha);
+        if (!test_bit(AF_82XX_RST_OWNER, &ha->flags)) {
+                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                  "%s(%ld): reset acknowledged\n",
+                                  __func__, ha->host_no));
+                qla4_8xxx_set_rst_ready(ha);
+        } else {
+                active_mask = (~(1 << (ha->func_num * 4)));
+        }
 
         /* wait for 10 seconds for reset ack from all functions */
         reset_timeout = jiffies + (ha->nx_reset_timeout * HZ);
@@ -1709,12 +2391,24 @@ qla4_8xxx_need_reset_handler(struct scsi_qla_host *ha)
                 "%s(%ld): drv_state = 0x%x, drv_active = 0x%x\n",
                 __func__, ha->host_no, drv_state, drv_active);
 
-        while (drv_state != drv_active) {
+        while (drv_state != (drv_active & active_mask)) {
                 if (time_after_eq(jiffies, reset_timeout)) {
-                        printk("%s: RESET TIMEOUT!\n", DRIVER_NAME);
+                        ql4_printk(KERN_INFO, ha,
+                                   "%s: RESET TIMEOUT! drv_state: 0x%08x, drv_active: 0x%08x\n",
+                                   DRIVER_NAME, drv_state, drv_active);
                         break;
                 }
 
+                /*
+                 * When reset_owner times out, check which functions
+                 * acked/did not ack
+                 */
+                if (test_bit(AF_82XX_RST_OWNER, &ha->flags)) {
+                        ql4_printk(KERN_INFO, ha,
+                                   "%s(%ld): drv_state = 0x%x, drv_active = 0x%x\n",
+                                   __func__, ha->host_no, drv_state,
+                                   drv_active);
+                }
                 qla4_8xxx_idc_unlock(ha);
                 msleep(1000);
                 qla4_8xxx_idc_lock(ha);
@@ -1723,14 +2417,18 @@ qla4_8xxx_need_reset_handler(struct scsi_qla_host *ha)
                 drv_active = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DRV_ACTIVE);
         }
 
+        /* Clear RESET OWNER as we are not going to use it any further */
+        clear_bit(AF_82XX_RST_OWNER, &ha->flags);
+
         dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-        ql4_printk(KERN_INFO, ha, "3:Device state is 0x%x = %s\n", dev_state,
-                dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
+        ql4_printk(KERN_INFO, ha, "Device state is 0x%x = %s\n", dev_state,
+                   dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
 
         /* Force to DEV_COLD unless someone else is starting a reset */
         if (dev_state != QLA82XX_DEV_INITIALIZING) {
                 ql4_printk(KERN_INFO, ha, "HW State: COLD/RE-INIT\n");
                 qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE, QLA82XX_DEV_COLD);
+                qla4_8xxx_set_rst_ready(ha);
         }
 }
 
@@ -1765,8 +2463,9 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)
         }
 
         dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-        ql4_printk(KERN_INFO, ha, "1:Device state is 0x%x = %s\n", dev_state,
-                dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
+        DEBUG2(ql4_printk(KERN_INFO, ha, "Device state is 0x%x = %s\n",
+                          dev_state, dev_state < MAX_STATES ?
+                          qdev_state[dev_state] : "Unknown"));
 
         /* wait for 30 seconds for device to go ready */
         dev_init_timeout = jiffies + (ha->nx_dev_init_timeout * HZ);
@@ -1775,15 +2474,19 @@ int qla4_8xxx_device_state_handler(struct scsi_qla_host *ha)
         while (1) {
 
                 if (time_after_eq(jiffies, dev_init_timeout)) {
-                        ql4_printk(KERN_WARNING, ha, "Device init failed!\n");
+                        ql4_printk(KERN_WARNING, ha,
+                                   "%s: Device Init Failed 0x%x = %s\n",
+                                   DRIVER_NAME,
+                                   dev_state, dev_state < MAX_STATES ?
+                                   qdev_state[dev_state] : "Unknown");
                         qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
                                 QLA82XX_DEV_FAILED);
                 }
 
                 dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE);
-                ql4_printk(KERN_INFO, ha,
-                    "2:Device state is 0x%x = %s\n", dev_state,
-                    dev_state < MAX_STATES ? qdev_state[dev_state] : "Unknown");
+                ql4_printk(KERN_INFO, ha, "Device state is 0x%x = %s\n",
+                           dev_state, dev_state < MAX_STATES ?
+                           qdev_state[dev_state] : "Unknown");
 
                 /* NOTE: Make sure idc unlocked upon exit of switch statement */
                 switch (dev_state) {
@@ -2184,6 +2887,7 @@ qla4_8xxx_isp_reset(struct scsi_qla_host *ha)
                 ql4_printk(KERN_INFO, ha, "HW State: NEED RESET\n");
                 qla4_8xxx_wr_32(ha, QLA82XX_CRB_DEV_STATE,
                     QLA82XX_DEV_NEED_RESET);
+                set_bit(AF_82XX_RST_OWNER, &ha->flags);
         } else
                 ql4_printk(KERN_INFO, ha, "HW State: DEVICE INITIALIZING\n");
 
@@ -2195,8 +2899,10 @@ qla4_8xxx_isp_reset(struct scsi_qla_host *ha)
         qla4_8xxx_clear_rst_ready(ha);
         qla4_8xxx_idc_unlock(ha);
 
-        if (rval == QLA_SUCCESS)
+        if (rval == QLA_SUCCESS) {
+                ql4_printk(KERN_INFO, ha, "Clearing AF_RECOVERY in qla4_8xxx_isp_reset\n");
                 clear_bit(AF_FW_RECOVERY, &ha->flags);
+        }
 
         return rval;
 }
diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h
index dc7500e47b8b..30258479f100 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.h
+++ b/drivers/scsi/qla4xxx/ql4_nx.h
@@ -792,4 +792,196 @@ struct crb_addr_pair {
 #define MIU_TEST_AGT_WRDATA_UPPER_LO    (0x0b0)
 #define MIU_TEST_AGT_WRDATA_UPPER_HI    (0x0b4)
 
+/* Minidump related */
+
+/* Entry Type Defines */
+#define QLA82XX_RDNOP   0
+#define QLA82XX_RDCRB   1
+#define QLA82XX_RDMUX   2
+#define QLA82XX_QUEUE   3
+#define QLA82XX_BOARD   4
+#define QLA82XX_RDOCM   6
+#define QLA82XX_PREGS   7
+#define QLA82XX_L1DTG   8
+#define QLA82XX_L1ITG   9
+#define QLA82XX_L1DAT   11
+#define QLA82XX_L1INS   12
+#define QLA82XX_L2DTG   21
+#define QLA82XX_L2ITG   22
+#define QLA82XX_L2DAT   23
+#define QLA82XX_L2INS   24
+#define QLA82XX_RDROM   71
+#define QLA82XX_RDMEM   72
+#define QLA82XX_CNTRL   98
+#define QLA82XX_RDEND   255
+
+/* Opcodes for Control Entries.
+ * These Flags are bit fields.
+ */
+#define QLA82XX_DBG_OPCODE_WR           0x01
+#define QLA82XX_DBG_OPCODE_RW           0x02
+#define QLA82XX_DBG_OPCODE_AND          0x04
+#define QLA82XX_DBG_OPCODE_OR           0x08
+#define QLA82XX_DBG_OPCODE_POLL         0x10
+#define QLA82XX_DBG_OPCODE_RDSTATE      0x20
+#define QLA82XX_DBG_OPCODE_WRSTATE      0x40
+#define QLA82XX_DBG_OPCODE_MDSTATE      0x80
+
+/* Driver Flags */
+#define QLA82XX_DBG_SKIPPED_FLAG        0x80 /* driver skipped this entry  */
+#define QLA82XX_DBG_SIZE_ERR_FLAG       0x40 /* Entry vs Capture size
+                                              * mismatch */
+
+/* Driver_code is for driver to write some info about the entry
+ * currently not used.
+ */
+struct qla82xx_minidump_entry_hdr {
+        uint32_t entry_type;
+        uint32_t entry_size;
+        uint32_t entry_capture_size;
+        struct {
+                uint8_t entry_capture_mask;
+                uint8_t entry_code;
+                uint8_t driver_code;
+                uint8_t driver_flags;
+        } d_ctrl;
+};
+
+/*  Read CRB entry header */
+struct qla82xx_minidump_entry_crb {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t addr;
+        struct {
+                uint8_t addr_stride;
+                uint8_t state_index_a;
+                uint16_t poll_timeout;
+        } crb_strd;
+        uint32_t data_size;
+        uint32_t op_count;
+
+        struct {
+                uint8_t opcode;
+                uint8_t state_index_v;
+                uint8_t shl;
+                uint8_t shr;
+        } crb_ctrl;
+
+        uint32_t value_1;
+        uint32_t value_2;
+        uint32_t value_3;
+};
+
+struct qla82xx_minidump_entry_cache {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t tag_reg_addr;
+        struct {
+                uint16_t tag_value_stride;
+                uint16_t init_tag_value;
+        } addr_ctrl;
+        uint32_t data_size;
+        uint32_t op_count;
+        uint32_t control_addr;
+        struct {
+                uint16_t write_value;
+                uint8_t poll_mask;
+                uint8_t poll_wait;
+        } cache_ctrl;
+        uint32_t read_addr;
+        struct {
+                uint8_t read_addr_stride;
+                uint8_t read_addr_cnt;
+                uint16_t rsvd_1;
+        } read_ctrl;
+};
+
+/* Read OCM */
+struct qla82xx_minidump_entry_rdocm {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t rsvd_0;
+        uint32_t rsvd_1;
+        uint32_t data_size;
+        uint32_t op_count;
+        uint32_t rsvd_2;
+        uint32_t rsvd_3;
+        uint32_t read_addr;
+        uint32_t read_addr_stride;
+};
+
+/* Read Memory */
+struct qla82xx_minidump_entry_rdmem {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t rsvd[6];
+        uint32_t read_addr;
+        uint32_t read_data_size;
+};
+
+/* Read ROM */
+struct qla82xx_minidump_entry_rdrom {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t rsvd[6];
+        uint32_t read_addr;
+        uint32_t read_data_size;
+};
+
+/* Mux entry */
+struct qla82xx_minidump_entry_mux {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t select_addr;
+        uint32_t rsvd_0;
+        uint32_t data_size;
+        uint32_t op_count;
+        uint32_t select_value;
+        uint32_t select_value_stride;
+        uint32_t read_addr;
+        uint32_t rsvd_1;
+};
+
+/* Queue entry */
+struct qla82xx_minidump_entry_queue {
+        struct qla82xx_minidump_entry_hdr h;
+        uint32_t select_addr;
+        struct {
+                uint16_t queue_id_stride;
+                uint16_t rsvd_0;
+        } q_strd;
+        uint32_t data_size;
+        uint32_t op_count;
+        uint32_t rsvd_1;
+        uint32_t rsvd_2;
+        uint32_t read_addr;
+        struct {
+                uint8_t read_addr_stride;
+                uint8_t read_addr_cnt;
+                uint16_t rsvd_3;
+        } rd_strd;
+};
+
+#define QLA82XX_MINIDUMP_OCM0_SIZE              (256 * 1024)
+#define QLA82XX_MINIDUMP_L1C_SIZE               (256 * 1024)
+#define QLA82XX_MINIDUMP_L2C_SIZE               1572864
+#define QLA82XX_MINIDUMP_COMMON_STR_SIZE        0
+#define QLA82XX_MINIDUMP_FCOE_STR_SIZE          0
+#define QLA82XX_MINIDUMP_MEM_SIZE               0
+#define QLA82XX_MAX_ENTRY_HDR                   4
+
+struct qla82xx_minidump {
+        uint32_t md_ocm0_data[QLA82XX_MINIDUMP_OCM0_SIZE];
+        uint32_t md_l1c_data[QLA82XX_MINIDUMP_L1C_SIZE];
+        uint32_t md_l2c_data[QLA82XX_MINIDUMP_L2C_SIZE];
+        uint32_t md_cs_data[QLA82XX_MINIDUMP_COMMON_STR_SIZE];
+        uint32_t md_fcoes_data[QLA82XX_MINIDUMP_FCOE_STR_SIZE];
+        uint32_t md_mem_data[QLA82XX_MINIDUMP_MEM_SIZE];
+};
+
+#define MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE        0x129
+#define RQST_TMPLT_SIZE                         0x0
+#define RQST_TMPLT                              0x1
+#define MD_DIRECT_ROM_WINDOW                    0x42110030
+#define MD_DIRECT_ROM_READ_BASE                 0x42150000
+#define MD_MIU_TEST_AGT_CTRL                    0x41000090
+#define MD_MIU_TEST_AGT_ADDR_LO                 0x41000094
+#define MD_MIU_TEST_AGT_ADDR_HI                 0x41000098
+
+static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8,
+                                0x410000AC, 0x410000B8, 0x410000BC };
 #endif
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index ee47820c30a6..cd15678f9ada 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -68,12 +68,34 @@ MODULE_PARM_DESC(ql4xmaxqdepth,
                  " Maximum queue depth to report for target devices.\n"
                  "\t\t  Default: 32.");
 
+static int ql4xqfulltracking = 1;
+module_param(ql4xqfulltracking, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ql4xqfulltracking,
+                 " Enable or disable dynamic tracking and adjustment of\n"
+                 "\t\t scsi device queue depth.\n"
+                 "\t\t  0 - Disable.\n"
+                 "\t\t  1 - Enable. (Default)");
+
 static int ql4xsess_recovery_tmo = QL4_SESS_RECOVERY_TMO;
 module_param(ql4xsess_recovery_tmo, int, S_IRUGO);
 MODULE_PARM_DESC(ql4xsess_recovery_tmo,
                 " Target Session Recovery Timeout.\n"
                 "\t\t  Default: 120 sec.");
 
+int ql4xmdcapmask = 0x1F;
+module_param(ql4xmdcapmask, int, S_IRUGO);
+MODULE_PARM_DESC(ql4xmdcapmask,
+                 " Set the Minidump driver capture mask level.\n"
+                 "\t\t  Default is 0x1F.\n"
+                 "\t\t  Can be set to 0x3, 0x7, 0xF, 0x1F, 0x3F, 0x7F");
+
+int ql4xenablemd = 1;
+module_param(ql4xenablemd, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ql4xenablemd,
+                 " Set to enable minidump.\n"
+                 "\t\t  0 - disable minidump\n"
+                 "\t\t  1 - enable minidump (Default)");
+
 static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha);
 /*
  * SCSI host template entry points
@@ -140,6 +162,8 @@ static int qla4xxx_slave_configure(struct scsi_device *device);
 static void qla4xxx_slave_destroy(struct scsi_device *sdev);
 static umode_t ql4_attr_is_visible(int param_type, int param);
 static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type);
+static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
+                                      int reason);
 
 static struct qla4_8xxx_legacy_intr_set legacy_intr[] =
     QLA82XX_LEGACY_INTR_CONFIG;
@@ -159,6 +183,7 @@ static struct scsi_host_template qla4xxx_driver_template = {
         .slave_configure        = qla4xxx_slave_configure,
         .slave_alloc            = qla4xxx_slave_alloc,
         .slave_destroy          = qla4xxx_slave_destroy,
+        .change_queue_depth     = qla4xxx_change_queue_depth,
 
         .this_id                = -1,
         .cmd_per_lun            = 3,
@@ -1555,19 +1580,53 @@ static void qla4xxx_session_destroy(struct iscsi_cls_session *cls_sess)
         struct iscsi_session *sess;
         struct ddb_entry *ddb_entry;
         struct scsi_qla_host *ha;
-        unsigned long flags;
+        unsigned long flags, wtime;
+        struct dev_db_entry *fw_ddb_entry = NULL;
+        dma_addr_t fw_ddb_entry_dma;
+        uint32_t ddb_state;
+        int ret;
 
         DEBUG2(printk(KERN_INFO "Func: %s\n", __func__));
         sess = cls_sess->dd_data;
         ddb_entry = sess->dd_data;
         ha = ddb_entry->ha;
 
+        fw_ddb_entry = dma_alloc_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
+                                          &fw_ddb_entry_dma, GFP_KERNEL);
+        if (!fw_ddb_entry) {
+                ql4_printk(KERN_ERR, ha,
+                           "%s: Unable to allocate dma buffer\n", __func__);
+                goto destroy_session;
+        }
+
+        wtime = jiffies + (HZ * LOGOUT_TOV);
+        do {
+                ret = qla4xxx_get_fwddb_entry(ha, ddb_entry->fw_ddb_index,
+                                              fw_ddb_entry, fw_ddb_entry_dma,
+                                              NULL, NULL, &ddb_state, NULL,
+                                              NULL, NULL);
+                if (ret == QLA_ERROR)
+                        goto destroy_session;
+
+                if ((ddb_state == DDB_DS_NO_CONNECTION_ACTIVE) ||
+                    (ddb_state == DDB_DS_SESSION_FAILED))
+                        goto destroy_session;
+
+                schedule_timeout_uninterruptible(HZ);
+        } while ((time_after(wtime, jiffies)));
+
+destroy_session:
         qla4xxx_clear_ddb_entry(ha, ddb_entry->fw_ddb_index);
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
         qla4xxx_free_ddb(ha, ddb_entry);
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
+
         iscsi_session_teardown(cls_sess);
+
+        if (fw_ddb_entry)
+                dma_free_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
+                                  fw_ddb_entry, fw_ddb_entry_dma);
 }
 
 static struct iscsi_cls_conn *
@@ -2220,6 +2279,9 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha)
                 dma_free_coherent(&ha->pdev->dev, ha->queues_len, ha->queues,
                                   ha->queues_dma);
 
+         if (ha->fw_dump)
+                vfree(ha->fw_dump);
+
         ha->queues_len = 0;
         ha->queues = NULL;
         ha->queues_dma = 0;
@@ -2229,6 +2291,8 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha)
         ha->response_dma = 0;
         ha->shadow_regs = NULL;
         ha->shadow_regs_dma = 0;
+        ha->fw_dump = NULL;
+        ha->fw_dump_size = 0;
 
         /* Free srb pool. */
         if (ha->srb_mempool)
@@ -5023,6 +5087,8 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev,
 
         set_bit(AF_INIT_DONE, &ha->flags);
 
+        qla4_8xxx_alloc_sysfs_attr(ha);
+
         printk(KERN_INFO
                " QLogic iSCSI HBA Driver version: %s\n"
                "  QLogic ISP%04x @ %s, host#=%ld, fw=%02d.%02d.%02d.%02d\n",
@@ -5149,6 +5215,7 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
                 iscsi_boot_destroy_kset(ha->boot_kset);
 
         qla4xxx_destroy_fw_ddb_session(ha);
+        qla4_8xxx_free_sysfs_attr(ha);
 
         scsi_remove_host(ha->host);
 
@@ -5217,6 +5284,15 @@ static void qla4xxx_slave_destroy(struct scsi_device *sdev)
         scsi_deactivate_tcq(sdev, 1);
 }
 
+static int qla4xxx_change_queue_depth(struct scsi_device *sdev, int qdepth,
+                                      int reason)
+{
+        if (!ql4xqfulltracking)
+                return -EOPNOTSUPP;
+
+        return iscsi_change_queue_depth(sdev, qdepth, reason);
+}
+
 /**
  * qla4xxx_del_from_active_array - returns an active srb
  * @ha: Pointer to host adapter structure.
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index 97b30c108e36..cc1cc3518b87 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,4 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#define QLA4XXX_DRIVER_VERSION  "5.02.00-k16"
+#define QLA4XXX_DRIVER_VERSION  "5.02.00-k17"
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 61c82a345f82..bbbc9c918d4c 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -90,11 +90,9 @@ unsigned int scsi_logging_level;
 EXPORT_SYMBOL(scsi_logging_level);
 #endif
 
-#if IS_ENABLED(CONFIG_PM) || IS_ENABLED(CONFIG_BLK_DEV_SD)
-/* sd and scsi_pm need to coordinate flushing async actions */
+/* sd, scsi core and power management need to coordinate flushing async actions */
 LIST_HEAD(scsi_sd_probe_domain);
 EXPORT_SYMBOL(scsi_sd_probe_domain);
-#endif
 
 /* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
  * You may not alter any existing entry (although adding new ones is
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 62ddfd31d4ce..6dfb9785d345 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1378,16 +1378,19 @@ static int scsi_lld_busy(struct request_queue *q)
 {
         struct scsi_device *sdev = q->queuedata;
         struct Scsi_Host *shost;
-        struct scsi_target *starget;
 
         if (!sdev)
                 return 0;
 
         shost = sdev->host;
-        starget = scsi_target(sdev);
 
-        if (scsi_host_in_recovery(shost) || scsi_host_is_busy(shost) ||
-            scsi_target_is_busy(starget) || scsi_device_is_busy(sdev))
+        /*
+         * Ignore host/starget busy state.
+         * Since block layer does not have a concept of fairness across
+         * multiple queues, congestion of host/starget needs to be handled
+         * in SCSI layer.
+         */
+        if (scsi_host_in_recovery(shost) || scsi_device_is_busy(sdev))
                 return 1;
 
         return 0;
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index f661a41fa4c6..d4201ded3b22 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -24,8 +24,11 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg)
         err = scsi_device_quiesce(to_scsi_device(dev));
         if (err == 0) {
                 drv = dev->driver;
-                if (drv && drv->suspend)
+                if (drv && drv->suspend) {
                         err = drv->suspend(dev, msg);
+                        if (err)
+                                scsi_device_resume(to_scsi_device(dev));
+                }
         }
         dev_dbg(dev, "scsi suspend: %d\n", err);
         return err;
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 01b03744f1f9..2e5fe584aad3 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -147,7 +147,7 @@ int scsi_complete_async_scans(void)
 
         do {
                 if (list_empty(&scanning_hosts))
-                        return 0;
+                        goto out;
                 /* If we can't get memory immediately, that's OK.  Just
                  * sleep a little.  Even if we never get memory, the async
                  * scans will finish eventually.
@@ -179,8 +179,11 @@ int scsi_complete_async_scans(void)
         }
  done:
         spin_unlock(&async_scan_lock);
-
         kfree(data);
+
+ out:
+        async_synchronize_full_domain(&scsi_sd_probe_domain);
+
         return 0;
 }
 
diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c
index 74708fcaf82f..ae7814874618 100644
--- a/drivers/scsi/scsi_wait_scan.c
+++ b/drivers/scsi/scsi_wait_scan.c
@@ -12,7 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/device.h>
-#include <scsi/scsi_scan.h>
+#include "scsi_priv.h"
 
 static int __init wait_scan_init(void)
 {
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 4e010b727818..6a4fd00117ca 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1836,7 +1836,7 @@ ufshcd_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         err = pci_request_regions(pdev, UFSHCD);
         if (err < 0) {
                 dev_err(&pdev->dev, "request regions failed\n");
-                goto out_disable;
+                goto out_host_put;
         }
 
         hba->mmio_base = pci_ioremap_bar(pdev, 0);
@@ -1925,8 +1925,9 @@ out_iounmap:
         iounmap(hba->mmio_base);
 out_release_regions:
         pci_release_regions(pdev);
-out_disable:
+out_host_put:
         scsi_host_put(host);
+out_disable:
         pci_clear_master(pdev);
         pci_disable_device(pdev);
 out_error:
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 46ef5fe51db5..0c73dd4f43a0 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -801,7 +801,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
         mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
         if (!cs) {
-                cs = devm_kzalloc(&spi->dev , sizeof *cs, GFP_KERNEL);
+                cs = kzalloc(sizeof *cs, GFP_KERNEL);
                 if (!cs)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
@@ -842,6 +842,7 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
                 cs = spi->controller_state;
                 list_del(&cs->node);
 
+                kfree(cs);
         }
 
         if (spi->chip_select < spi->master->num_chipselect) {
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 1c3d6386ea36..aeac1caba3f9 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -30,6 +30,7 @@
 #include <linux/pci.h>
 #include <linux/usb.h>
 #include <linux/errno.h>
+#include <linux/kconfig.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/fcntl.h>
@@ -981,6 +982,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
 }
 EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);
 
+#if IS_ENABLED(CONFIG_USB)
+
 static int comedi_old_usb_auto_config(struct usb_interface *intf,
                                       struct comedi_driver *driver)
 {
@@ -1043,3 +1046,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver,
         comedi_driver_unregister(comedi_driver);
 }
 EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister);
+
+#endif
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 292af0f7f451..51665132c61b 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -104,7 +104,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
 
 void netlink_exit(struct sock *sock)
 {
-        sock_release(sock->sk_socket);
+        netlink_kernel_release(sock);
 }
 
 int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
diff --git a/drivers/staging/iio/Documentation/device.txt b/drivers/staging/iio/Documentation/device.txt
index 0338c7cd0a8b..f03fbd3bb454 100644
--- a/drivers/staging/iio/Documentation/device.txt
+++ b/drivers/staging/iio/Documentation/device.txt
@@ -29,8 +29,6 @@ Then fill in the following:
         * info->driver_module:
                 Set to THIS_MODULE. Used to ensure correct ownership
                 of various resources allocate by the core.
-        * info->num_interrupt_lines:
-                Number of event triggering hardware lines the device has.
         * info->event_attrs:
                 Attributes used to enable / disable hardware events.
         * info->attrs:
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 2490dd25093b..8f1b3af02f29 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -13,6 +13,7 @@ config AD7291
 config AD7298
         tristate "Analog Devices AD7298 ADC driver"
         depends on SPI
+        select IIO_KFIFO_BUF if IIO_BUFFER
         help
           Say yes here to build support for Analog Devices AD7298
           8 Channel ADC with temperature sensor.
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index 10ab6dc823b9..a13afff2dfe6 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -235,7 +235,8 @@ static const struct attribute_group ad7606_attribute_group_range = {
                 .indexed = 1,                                   \
                 .channel = num,                                 \
                 .address = num,                                 \
-                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,    \
+                .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |   \
+                                IIO_CHAN_INFO_SCALE_SHARED_BIT, \
                 .scan_index = num,                              \
                 .scan_type = IIO_ST('s', 16, 16, 0),            \
         }
diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c
index 11acd4c35ed2..8c6ed3b0c6f6 100644
--- a/drivers/staging/omapdrm/omap_fbdev.c
+++ b/drivers/staging/omapdrm/omap_fbdev.c
@@ -208,7 +208,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
          */
         ret = omap_gem_get_paddr(fbdev->bo, &paddr, true);
         if (ret) {
-                dev_err(dev->dev, "could not map (paddr)!\n");
+                dev_err(dev->dev,
+                        "could not map (paddr)!  Skipping framebuffer alloc\n");
                 ret = -ENOMEM;
                 goto fail;
         }
@@ -388,8 +389,11 @@ void omap_fbdev_free(struct drm_device *dev)
 
         fbi = helper->fbdev;
 
-        unregister_framebuffer(fbi);
-        framebuffer_release(fbi);
+        /* only cleanup framebuffer if it is present */
+        if (fbi) {
+                unregister_framebuffer(fbi);
+                framebuffer_release(fbi);
+        }
 
         drm_fb_helper_fini(helper);
 
diff --git a/drivers/staging/ramster/zcache-main.c b/drivers/staging/ramster/zcache-main.c
index 4e7ef0e6b79c..d46764b5aaba 100644
--- a/drivers/staging/ramster/zcache-main.c
+++ b/drivers/staging/ramster/zcache-main.c
@@ -3002,7 +3002,7 @@ static inline struct tmem_oid oswiz(unsigned type, u32 ind)
         return oid;
 }
 
-static int zcache_frontswap_put_page(unsigned type, pgoff_t offset,
+static int zcache_frontswap_store(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -3025,7 +3025,7 @@ static int zcache_frontswap_put_page(unsigned type, pgoff_t offset,
 
 /* returns 0 if the page was successfully gotten from frontswap, -1 if
  * was not present (should never happen!) */
-static int zcache_frontswap_get_page(unsigned type, pgoff_t offset,
+static int zcache_frontswap_load(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -3080,8 +3080,8 @@ static void zcache_frontswap_init(unsigned ignored)
 }
 
 static struct frontswap_ops zcache_frontswap_ops = {
-        .put_page = zcache_frontswap_put_page,
-        .get_page = zcache_frontswap_get_page,
+        .store = zcache_frontswap_store,
+        .load = zcache_frontswap_load,
         .invalidate_page = zcache_frontswap_flush_page,
         .invalidate_area = zcache_frontswap_flush_area,
         .init = zcache_frontswap_init
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 9bd18e2d0513..69f616c6964e 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -102,6 +102,8 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
         /* - */
         {USB_DEVICE(0x20F4, 0x646B)},
         {USB_DEVICE(0x083A, 0xC512)},
+        {USB_DEVICE(0x25D4, 0x4CA1)},
+        {USB_DEVICE(0x25D4, 0x4CAB)},
 
 /* RTL8191SU */
         /* Realtek */
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 2734dacacbaf..784c796b9848 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1835,7 +1835,7 @@ static int zcache_frontswap_poolid = -1;
  * Swizzling increases objects per swaptype, increasing tmem concurrency
  * for heavy swaploads.  Later, larger nr_cpus -> larger SWIZ_BITS
  * Setting SWIZ_BITS to 27 basically reconstructs the swap entry from
- * frontswap_get_page(), but has side-effects. Hence using 8.
+ * frontswap_load(), but has side-effects. Hence using 8.
  */
 #define SWIZ_BITS               8
 #define SWIZ_MASK               ((1 << SWIZ_BITS) - 1)
@@ -1849,7 +1849,7 @@ static inline struct tmem_oid oswiz(unsigned type, u32 ind)
         return oid;
 }
 
-static int zcache_frontswap_put_page(unsigned type, pgoff_t offset,
+static int zcache_frontswap_store(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -1870,7 +1870,7 @@ static int zcache_frontswap_put_page(unsigned type, pgoff_t offset,
 
 /* returns 0 if the page was successfully gotten from frontswap, -1 if
  * was not present (should never happen!) */
-static int zcache_frontswap_get_page(unsigned type, pgoff_t offset,
+static int zcache_frontswap_load(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -1919,8 +1919,8 @@ static void zcache_frontswap_init(unsigned ignored)
 }
 
 static struct frontswap_ops zcache_frontswap_ops = {
-        .put_page = zcache_frontswap_put_page,
-        .get_page = zcache_frontswap_get_page,
+        .store = zcache_frontswap_store,
+        .load = zcache_frontswap_load,
         .invalidate_page = zcache_frontswap_flush_page,
         .invalidate_area = zcache_frontswap_flush_area,
         .init = zcache_frontswap_init
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 37c609898f84..7e6136e2ce81 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -587,14 +587,14 @@ static void sbp_management_request_logout(
 {
         struct sbp_tport *tport = agent->tport;
         struct sbp_tpg *tpg = tport->tpg;
-        int login_id;
+        int id;
         struct sbp_login_descriptor *login;
 
-        login_id = LOGOUT_ORB_LOGIN_ID(be32_to_cpu(req->orb.misc));
+        id = LOGOUT_ORB_LOGIN_ID(be32_to_cpu(req->orb.misc));
 
-        login = sbp_login_find_by_id(tpg, login_id);
+        login = sbp_login_find_by_id(tpg, id);
         if (!login) {
-                pr_warn("cannot find login: %d\n", login_id);
+                pr_warn("cannot find login: %d\n", id);
 
                 req->status.status = cpu_to_be32(
                         STATUS_BLOCK_RESP(STATUS_RESP_REQUEST_COMPLETE) |
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index e624b836469c..91799973081a 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -374,8 +374,9 @@ int target_emulate_set_target_port_groups(struct se_cmd *cmd)
 
 out:
         transport_kunmap_data_sg(cmd);
-        target_complete_cmd(cmd, GOOD);
-        return 0;
+        if (!rc)
+                target_complete_cmd(cmd, GOOD);
+        return rc;
 }
 
 static inline int core_alua_state_nonoptimized(
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 686dba189f8e..9f99d0404908 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -133,16 +133,11 @@ static struct se_device *fd_create_virtdevice(
                 ret = PTR_ERR(dev_p);
                 goto fail;
         }
-
-        /* O_DIRECT too? */
-        flags = O_RDWR | O_CREAT | O_LARGEFILE;
-
         /*
-         * If fd_buffered_io=1 has not been set explicitly (the default),
-         * use O_SYNC to force FILEIO writes to disk.
+         * Use O_DSYNC by default instead of O_SYNC to forgo syncing
+         * of pure timestamp updates.
          */
-        if (!(fd_dev->fbd_flags & FDBD_USE_BUFFERED_IO))
-                flags |= O_SYNC;
+        flags = O_RDWR | O_CREAT | O_LARGEFILE | O_DSYNC;
 
         file = filp_open(dev_p, flags, 0600);
         if (IS_ERR(file)) {
@@ -380,23 +375,6 @@ static void fd_emulate_sync_cache(struct se_cmd *cmd)
         }
 }
 
-static void fd_emulate_write_fua(struct se_cmd *cmd)
-{
-        struct se_device *dev = cmd->se_dev;
-        struct fd_dev *fd_dev = dev->dev_ptr;
-        loff_t start = cmd->t_task_lba *
-                dev->se_sub_dev->se_dev_attrib.block_size;
-        loff_t end = start + cmd->data_length;
-        int ret;
-
-        pr_debug("FILEIO: FUA WRITE LBA: %llu, bytes: %u\n",
-                cmd->t_task_lba, cmd->data_length);
-
-        ret = vfs_fsync_range(fd_dev->fd_file, start, end, 1);
-        if (ret != 0)
-                pr_err("FILEIO: vfs_fsync_range() failed: %d\n", ret);
-}
-
 static int fd_execute_cmd(struct se_cmd *cmd, struct scatterlist *sgl,
                 u32 sgl_nents, enum dma_data_direction data_direction)
 {
@@ -411,19 +389,21 @@ static int fd_execute_cmd(struct se_cmd *cmd, struct scatterlist *sgl,
                 ret = fd_do_readv(cmd, sgl, sgl_nents);
         } else {
                 ret = fd_do_writev(cmd, sgl, sgl_nents);
-
+                /*
+                 * Perform implict vfs_fsync_range() for fd_do_writev() ops
+                 * for SCSI WRITEs with Forced Unit Access (FUA) set.
+                 * Allow this to happen independent of WCE=0 setting.
+                 */
                 if (ret > 0 &&
-                    dev->se_sub_dev->se_dev_attrib.emulate_write_cache > 0 &&
                     dev->se_sub_dev->se_dev_attrib.emulate_fua_write > 0 &&
                     (cmd->se_cmd_flags & SCF_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);
-                }
+                        struct fd_dev *fd_dev = dev->dev_ptr;
+                        loff_t start = cmd->t_task_lba *
+                                dev->se_sub_dev->se_dev_attrib.block_size;
+                        loff_t end = start + cmd->data_length;
 
+                        vfs_fsync_range(fd_dev->fd_file, start, end, 1);
+                }
         }
 
         if (ret < 0) {
@@ -442,7 +422,6 @@ enum {
 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_io=%d"},
         {Opt_err, NULL}
 };
 
@@ -454,7 +433,7 @@ static ssize_t fd_set_configfs_dev_params(
         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;
+        int ret = 0, token;
 
         opts = kstrdup(page, GFP_KERNEL);
         if (!opts)
@@ -498,19 +477,6 @@ static ssize_t fd_set_configfs_dev_params(
                                         " 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) {
-                                pr_err("bogus fd_buffered_io=%d value\n", arg);
-                                ret = -EINVAL;
-                                goto out;
-                        }
-
-                        pr_debug("FILEIO: Using buffered I/O"
-                                " operations for struct fd_dev\n");
-
-                        fd_dev->fbd_flags |= FDBD_USE_BUFFERED_IO;
-                        break;
                 default:
                         break;
                 }
@@ -542,10 +508,8 @@ static ssize_t fd_show_configfs_dev_params(
         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");
+        bl += sprintf(b + bl, "        File: %s  Size: %llu  Mode: O_DSYNC\n",
+                fd_dev->fd_dev_name, fd_dev->fd_dev_size);
         return bl;
 }
 
diff --git a/drivers/target/target_core_file.h b/drivers/target/target_core_file.h
index fbd59ef7d8be..70ce7fd7111d 100644
--- a/drivers/target/target_core_file.h
+++ b/drivers/target/target_core_file.h
@@ -14,7 +14,6 @@
 
 #define FBDF_HAS_PATH           0x01
 #define FBDF_HAS_SIZE           0x02
-#define FDBD_USE_BUFFERED_IO    0x04
 
 struct fd_dev {
         u32             fbd_flags;
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index b05fdc0c05d3..634d0f31a28c 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -315,7 +315,7 @@ void transport_register_session(
 }
 EXPORT_SYMBOL(transport_register_session);
 
-static void target_release_session(struct kref *kref)
+void target_release_session(struct kref *kref)
 {
         struct se_session *se_sess = container_of(kref,
                         struct se_session, sess_kref);
@@ -332,6 +332,12 @@ EXPORT_SYMBOL(target_get_session);
 
 void target_put_session(struct se_session *se_sess)
 {
+        struct se_portal_group *tpg = se_sess->se_tpg;
+
+        if (tpg->se_tpg_tfo->put_session != NULL) {
+                tpg->se_tpg_tfo->put_session(se_sess);
+                return;
+        }
         kref_put(&se_sess->sess_kref, target_release_session);
 }
 EXPORT_SYMBOL(target_put_session);
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 35819e312624..6cc4358f68c1 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1033,7 +1033,7 @@ static int get_serial_info(struct tty_struct *tty, struct serial_state *state,
         if (!retinfo)
                 return -EFAULT;
         memset(&tmp, 0, sizeof(tmp));
-        tty_lock(tty);
+        tty_lock();
         tmp.line = tty->index;
         tmp.port = state->port;
         tmp.flags = state->tport.flags;
@@ -1042,7 +1042,7 @@ static int get_serial_info(struct tty_struct *tty, struct serial_state *state,
         tmp.close_delay = state->tport.close_delay;
         tmp.closing_wait = state->tport.closing_wait;
         tmp.custom_divisor = state->custom_divisor;
-        tty_unlock(tty);
+        tty_unlock();
         if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
                 return -EFAULT;
         return 0;
@@ -1059,12 +1059,12 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
         if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
                 return -EFAULT;
 
-        tty_lock(tty);
+        tty_lock();
         change_spd = ((new_serial.flags ^ port->flags) & ASYNC_SPD_MASK) ||
                 new_serial.custom_divisor != state->custom_divisor;
         if (new_serial.irq || new_serial.port != state->port ||
                         new_serial.xmit_fifo_size != state->xmit_fifo_size) {
-                tty_unlock(tty);
+                tty_unlock();
                 return -EINVAL;
         }
   
@@ -1074,7 +1074,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
                     (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
                     ((new_serial.flags & ~ASYNC_USR_MASK) !=
                      (port->flags & ~ASYNC_USR_MASK))) {
-                        tty_unlock(tty);
+                        tty_unlock();
                         return -EPERM;
                 }
                 port->flags = ((port->flags & ~ASYNC_USR_MASK) |
@@ -1084,7 +1084,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
         }
 
         if (new_serial.baud_base < 9600) {
-                tty_unlock(tty);
+                tty_unlock();
                 return -EINVAL;
         }
 
@@ -1116,7 +1116,7 @@ check_and_exit:
                 }
         } else
                 retval = startup(tty, state);
-        tty_unlock(tty);
+        tty_unlock();
         return retval;
 }
 
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 6984e1a2686a..e61cabdd69df 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1599,7 +1599,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
          * If the port is the middle of closing, bail out now
          */
         if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(tty, info->port.close_wait,
+                wait_event_interruptible_tty(info->port.close_wait,
                                 !(info->port.flags & ASYNC_CLOSING));
                 return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index d3d91dae065c..944eaeb8e0cf 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -214,24 +214,24 @@ static int xen_hvm_console_init(void)
         /* already configured */
         if (info->intf != NULL)
                 return 0;
-
+        /*
+         * If the toolstack (or the hypervisor) hasn't set these values, the
+         * default value is 0. Even though mfn = 0 and evtchn = 0 are
+         * theoretically correct values, in practice they never are and they
+         * mean that a legacy toolstack hasn't initialized the pv console correctly.
+         */
         r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
-        if (r < 0) {
-                kfree(info);
-                return -ENODEV;
-        }
+        if (r < 0 || v == 0)
+                goto err;
         info->evtchn = v;
-        hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
-        if (r < 0) {
-                kfree(info);
-                return -ENODEV;
-        }
+        v = 0;
+        r = hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
+        if (r < 0 || v == 0)
+                goto err;
         mfn = v;
         info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);
-        if (info->intf == NULL) {
-                kfree(info);
-                return -ENODEV;
-        }
+        if (info->intf == NULL)
+                goto err;
         info->vtermno = HVC_COOKIE;
 
         spin_lock(&xencons_lock);
@@ -239,6 +239,9 @@ static int xen_hvm_console_init(void)
         spin_unlock(&xencons_lock);
 
         return 0;
+err:
+        kfree(info);
+        return -ENODEV;
 }
 
 static int xen_pv_console_init(void)
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 656ad93bbc96..5c6c31459a2f 100644
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -1065,8 +1065,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
 
         TRACE_L("read()");
 
-        /* FIXME: should use a private lock */
-        tty_lock(tty);
+        tty_lock();
 
         pClient = findClient(pInfo, task_pid(current));
         if (pClient) {
@@ -1078,7 +1077,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
                                 goto unlock;
                         }
                         /* block until there is a message: */
-                        wait_event_interruptible_tty(tty, pInfo->read_wait,
+                        wait_event_interruptible_tty(pInfo->read_wait,
                                         (pMsg = remove_msg(pInfo, pClient)));
                 }
 
@@ -1108,7 +1107,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
         }
         ret = -EPERM;
 unlock:
-        tty_unlock(tty);
+        tty_unlock();
         return ret;
 }
 
@@ -1157,7 +1156,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
         pHeader->locks = 0;
         pHeader->owner = NULL;
 
-        tty_lock(tty);
+        tty_lock();
 
         pClient = findClient(pInfo, task_pid(current));
         if (pClient) {
@@ -1176,7 +1175,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file,
         add_tx_queue(pInfo, pHeader);
         trigger_transmit(pInfo);
 
-        tty_unlock(tty);
+        tty_unlock();
 
         return 0;
 }
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 65c7c62c7aae..5505ffc91da4 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -47,7 +47,6 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
         wake_up_interruptible(&tty->read_wait);
         wake_up_interruptible(&tty->write_wait);
         tty->packet = 0;
-        /* Review - krefs on tty_link ?? */
         if (!tty->link)
                 return;
         tty->link->packet = 0;
@@ -63,9 +62,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
                         mutex_unlock(&devpts_mutex);
                 }
 #endif
-                tty_unlock(tty);
+                tty_unlock();
                 tty_vhangup(tty->link);
-                tty_lock(tty);
+                tty_lock();
         }
 }
 
@@ -623,27 +622,26 @@ static int ptmx_open(struct inode *inode, struct file *filp)
                 return retval;
 
         /* find a device that is not in use. */
-        mutex_lock(&devpts_mutex);
+        tty_lock();
         index = devpts_new_index(inode);
+        tty_unlock();
         if (index < 0) {
                 retval = index;
                 goto err_file;
         }
 
-        mutex_unlock(&devpts_mutex);
-
         mutex_lock(&tty_mutex);
+        mutex_lock(&devpts_mutex);
         tty = tty_init_dev(ptm_driver, index);
+        mutex_unlock(&devpts_mutex);
+        tty_lock();
+        mutex_unlock(&tty_mutex);
 
         if (IS_ERR(tty)) {
                 retval = PTR_ERR(tty);
                 goto out;
         }
 
-        /* The tty returned here is locked so we can safely
-           drop the mutex */
-        mutex_unlock(&tty_mutex);
-
         set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
 
         tty_add_file(tty, filp);
@@ -656,17 +654,16 @@ static int ptmx_open(struct inode *inode, struct file *filp)
         if (retval)
                 goto err_release;
 
-        tty_unlock(tty);
+        tty_unlock();
         return 0;
 err_release:
-        tty_unlock(tty);
+        tty_unlock();
         tty_release(inode, filp);
         return retval;
 out:
-        mutex_unlock(&tty_mutex);
         devpts_kill_index(inode, index);
+        tty_unlock();
 err_file:
-        mutex_unlock(&devpts_mutex);
         tty_free_file(filp);
         return retval;
 }
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 47d061b9ad4d..6e1958a325bd 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -3113,7 +3113,7 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *
 
 /**
  *      serial8250_register_8250_port - register a serial port
- *      @port: serial port template
+ *      @up: serial port template
  *
  *      Configure the serial port specified by the request. If the
  *      port exists and is in use, it is hung up and unregistered
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 4ad721fb8405..c17923ec6e95 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -133,6 +133,10 @@ struct pl011_dmatx_data {
 struct uart_amba_port {
         struct uart_port        port;
         struct clk              *clk;
+        /* Two optional pin states - default & sleep */
+        struct pinctrl          *pinctrl;
+        struct pinctrl_state    *pins_default;
+        struct pinctrl_state    *pins_sleep;
         const struct vendor_data *vendor;
         unsigned int            dmacr;          /* dma control reg */
         unsigned int            im;             /* interrupt mask */
@@ -1312,6 +1316,14 @@ static int pl011_startup(struct uart_port *port)
         unsigned int cr;
         int retval;
 
+        /* Optionaly enable pins to be muxed in and configured */
+        if (!IS_ERR(uap->pins_default)) {
+                retval = pinctrl_select_state(uap->pinctrl, uap->pins_default);
+                if (retval)
+                        dev_err(port->dev,
+                                "could not set default pins\n");
+        }
+
         retval = clk_prepare(uap->clk);
         if (retval)
                 goto out;
@@ -1420,6 +1432,7 @@ static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
         unsigned int cr;
+        int retval;
 
         /*
          * disable all interrupts
@@ -1462,6 +1475,14 @@ static void pl011_shutdown(struct uart_port *port)
          */
         clk_disable(uap->clk);
         clk_unprepare(uap->clk);
+        /* Optionally let pins go into sleep states */
+        if (!IS_ERR(uap->pins_sleep)) {
+                retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
+                if (retval)
+                        dev_err(port->dev,
+                                "could not set pins to sleep state\n");
+        }
+
 
         if (uap->port.dev->platform_data) {
                 struct amba_pl011_data *plat;
@@ -1792,6 +1813,14 @@ static int __init pl011_console_setup(struct console *co, char *options)
         if (!uap)
                 return -ENODEV;
 
+        /* Allow pins to be muxed in and configured */
+        if (!IS_ERR(uap->pins_default)) {
+                ret = pinctrl_select_state(uap->pinctrl, uap->pins_default);
+                if (ret)
+                        dev_err(uap->port.dev,
+                                "could not set default pins\n");
+        }
+
         ret = clk_prepare(uap->clk);
         if (ret)
                 return ret;
@@ -1844,7 +1873,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct uart_amba_port *uap;
         struct vendor_data *vendor = id->data;
-        struct pinctrl *pinctrl;
         void __iomem *base;
         int i, ret;
 
@@ -1869,11 +1897,20 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 goto free;
         }
 
-        pinctrl = devm_pinctrl_get_select_default(&dev->dev);
-        if (IS_ERR(pinctrl)) {
-                ret = PTR_ERR(pinctrl);
+        uap->pinctrl = devm_pinctrl_get(&dev->dev);
+        if (IS_ERR(uap->pinctrl)) {
+                ret = PTR_ERR(uap->pinctrl);
                 goto unmap;
         }
+        uap->pins_default = pinctrl_lookup_state(uap->pinctrl,
+                                                 PINCTRL_STATE_DEFAULT);
+        if (IS_ERR(uap->pins_default))
+                dev_err(&dev->dev, "could not get default pinstate\n");
+
+        uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl,
+                                               PINCTRL_STATE_SLEEP);
+        if (IS_ERR(uap->pins_sleep))
+                dev_dbg(&dev->dev, "could not get sleep pinstate\n");
 
         uap->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(uap->clk)) {
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 7264d4d26717..80b6b1b1f725 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -3976,7 +3976,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
          */
         if (tty_hung_up_p(filp) ||
             (info->flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(tty, info->close_wait,
+                wait_event_interruptible_tty(info->close_wait,
                         !(info->flags & ASYNC_CLOSING));
 #ifdef SERIAL_DO_RESTART
                 if (info->flags & ASYNC_HUP_NOTIFY)
@@ -4052,9 +4052,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
                 printk("block_til_ready blocking: ttyS%d, count = %d\n",
                        info->line, info->count);
 #endif
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
@@ -4115,7 +4115,7 @@ rs_open(struct tty_struct *tty, struct file * filp)
          */
         if (tty_hung_up_p(filp) ||
             (info->flags & ASYNC_CLOSING)) {
-                wait_event_interruptible_tty(tty, info->close_wait,
+                wait_event_interruptible_tty(info->close_wait,
                         !(info->flags & ASYNC_CLOSING));
 #ifdef SERIAL_DO_RESTART
                 return ((info->flags & ASYNC_HUP_NOTIFY) ?
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 34bd345da775..6ae2a58d62f2 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -466,7 +466,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL)
+#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
 /*
  *      Wait for transmitter & holding register to empty
  */
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 4604153b7954..1bd9163bc118 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2179,6 +2179,16 @@ static int __devinit sci_init_single(struct platform_device *dev,
         return 0;
 }
 
+static void sci_cleanup_single(struct sci_port *port)
+{
+        sci_free_gpios(port);
+
+        clk_put(port->iclk);
+        clk_put(port->fclk);
+
+        pm_runtime_disable(port->port.dev);
+}
+
 #ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
 static void serial_console_putchar(struct uart_port *port, int ch)
 {
@@ -2360,14 +2370,10 @@ static int sci_remove(struct platform_device *dev)
         cpufreq_unregister_notifier(&port->freq_transition,
                                     CPUFREQ_TRANSITION_NOTIFIER);
 
-        sci_free_gpios(port);
-
         uart_remove_one_port(&sci_uart_driver, &port->port);
 
-        clk_put(port->iclk);
-        clk_put(port->fclk);
+        sci_cleanup_single(port);
 
-        pm_runtime_disable(&dev->dev);
         return 0;
 }
 
@@ -2385,14 +2391,20 @@ static int __devinit sci_probe_single(struct platform_device *dev,
                            index+1, SCI_NPORTS);
                 dev_notice(&dev->dev, "Consider bumping "
                            "CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
-                return 0;
+                return -EINVAL;
         }
 
         ret = sci_init_single(dev, sciport, index, p);
         if (ret)
                 return ret;
 
-        return uart_add_one_port(&sci_uart_driver, &sciport->port);
+        ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
+        if (ret) {
+                sci_cleanup_single(sciport);
+                return ret;
+        }
+
+        return 0;
 }
 
 static int __devinit sci_probe(struct platform_device *dev)
@@ -2413,24 +2425,22 @@ static int __devinit sci_probe(struct platform_device *dev)
 
         ret = sci_probe_single(dev, dev->id, p, sp);
         if (ret)
-                goto err_unreg;
+                return ret;
 
         sp->freq_transition.notifier_call = sci_notifier;
 
         ret = cpufreq_register_notifier(&sp->freq_transition,
                                         CPUFREQ_TRANSITION_NOTIFIER);
-        if (unlikely(ret < 0))
-                goto err_unreg;
+        if (unlikely(ret < 0)) {
+                sci_cleanup_single(sp);
+                return ret;
+        }
 
 #ifdef CONFIG_SH_STANDARD_BIOS
         sh_bios_gdb_detach();
 #endif
 
         return 0;
-
-err_unreg:
-        sci_remove(dev);
-        return ret;
 }
 
 static int sci_suspend(struct device *dev)
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 5ed0daae6564..593d40ad0a6b 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3338,9 +3338,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                         printk("%s(%d):block_til_ready blocking on %s count=%d\n",
                                  __FILE__,__LINE__, tty->driver->name, port->count );
                                  
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         
         set_current_state(TASK_RUNNING);
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 45b43f11ca39..aa1debf97cc7 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3336,9 +3336,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 }
 
                 DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
 
         set_current_state(TASK_RUNNING);
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 4a1e4f07765b..a3dddc12d2fe 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3357,9 +3357,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                         printk("%s(%d):%s block_til_ready() count=%d\n",
                                  __FILE__,__LINE__, tty->driver->name, port->count );
 
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
 
         set_current_state(TASK_RUNNING);
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 9e930c009bf2..b425c79675ad 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -185,7 +185,6 @@ void free_tty_struct(struct tty_struct *tty)
                 put_device(tty->dev);
         kfree(tty->write_buf);
         tty_buffer_free_all(tty);
-        tty->magic = 0xDEADDEAD;
         kfree(tty);
 }
 
@@ -574,7 +573,7 @@ void __tty_hangup(struct tty_struct *tty)
         }
         spin_unlock(&redirect_lock);
 
-        tty_lock(tty);
+        tty_lock();
 
         /* some functions below drop BTM, so we need this bit */
         set_bit(TTY_HUPPING, &tty->flags);
@@ -667,7 +666,7 @@ void __tty_hangup(struct tty_struct *tty)
         clear_bit(TTY_HUPPING, &tty->flags);
         tty_ldisc_enable(tty);
 
-        tty_unlock(tty);
+        tty_unlock();
 
         if (f)
                 fput(f);
@@ -1104,12 +1103,12 @@ void tty_write_message(struct tty_struct *tty, char *msg)
 {
         if (tty) {
                 mutex_lock(&tty->atomic_write_lock);
-                tty_lock(tty);
+                tty_lock();
                 if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags)) {
-                        tty_unlock(tty);
+                        tty_unlock();
                         tty->ops->write(tty, msg, strlen(msg));
                 } else
-                        tty_unlock(tty);
+                        tty_unlock();
                 tty_write_unlock(tty);
         }
         return;
@@ -1404,7 +1403,6 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
         }
         initialize_tty_struct(tty, driver, idx);
 
-        tty_lock(tty);
         retval = tty_driver_install_tty(driver, tty);
         if (retval < 0)
                 goto err_deinit_tty;
@@ -1417,11 +1415,9 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
         retval = tty_ldisc_setup(tty, tty->link);
         if (retval)
                 goto err_release_tty;
-        /* Return the tty locked so that it cannot vanish under the caller */
         return tty;
 
 err_deinit_tty:
-        tty_unlock(tty);
         deinitialize_tty_struct(tty);
         free_tty_struct(tty);
 err_module_put:
@@ -1430,7 +1426,6 @@ err_module_put:
 
         /* call the tty release_tty routine to clean out this slot */
 err_release_tty:
-        tty_unlock(tty);
         printk_ratelimited(KERN_INFO "tty_init_dev: ldisc open failed, "
                                  "clearing slot %d\n", idx);
         release_tty(tty, idx);
@@ -1633,7 +1628,7 @@ int tty_release(struct inode *inode, struct file *filp)
         if (tty_paranoia_check(tty, inode, __func__))
                 return 0;
 
-        tty_lock(tty);
+        tty_lock();
         check_tty_count(tty, __func__);
 
         __tty_fasync(-1, filp, 0);
@@ -1642,11 +1637,10 @@ int tty_release(struct inode *inode, struct file *filp)
         pty_master = (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                       tty->driver->subtype == PTY_TYPE_MASTER);
         devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0;
-        /* Review: parallel close */
         o_tty = tty->link;
 
         if (tty_release_checks(tty, o_tty, idx)) {
-                tty_unlock(tty);
+                tty_unlock();
                 return 0;
         }
 
@@ -1658,7 +1652,7 @@ int tty_release(struct inode *inode, struct file *filp)
         if (tty->ops->close)
                 tty->ops->close(tty, filp);
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          * Sanity check: if tty->count is going to zero, there shouldn't be
          * any waiters on tty->read_wait or tty->write_wait.  We test the
@@ -1681,7 +1675,7 @@ int tty_release(struct inode *inode, struct file *filp)
                    opens on /dev/tty */
 
                 mutex_lock(&tty_mutex);
-                tty_lock_pair(tty, o_tty);
+                tty_lock();
                 tty_closing = tty->count <= 1;
                 o_tty_closing = o_tty &&
                         (o_tty->count <= (pty_master ? 1 : 0));
@@ -1712,7 +1706,7 @@ int tty_release(struct inode *inode, struct file *filp)
 
                 printk(KERN_WARNING "%s: %s: read/write wait queue active!\n",
                                 __func__, tty_name(tty, buf));
-                tty_unlock_pair(tty, o_tty);
+                tty_unlock();
                 mutex_unlock(&tty_mutex);
                 schedule();
         }
@@ -1775,7 +1769,7 @@ int tty_release(struct inode *inode, struct file *filp)
 
         /* check whether both sides are closing ... */
         if (!tty_closing || (o_tty && !o_tty_closing)) {
-                tty_unlock_pair(tty, o_tty);
+                tty_unlock();
                 return 0;
         }
 
@@ -1788,16 +1782,14 @@ int tty_release(struct inode *inode, struct file *filp)
         tty_ldisc_release(tty, o_tty);
         /*
          * The release_tty function takes care of the details of clearing
-         * the slots and preserving the termios structure. The tty_unlock_pair
-         * should be safe as we keep a kref while the tty is locked (so the
-         * unlock never unlocks a freed tty).
+         * the slots and preserving the termios structure.
          */
         release_tty(tty, idx);
-        tty_unlock_pair(tty, o_tty);
 
         /* Make this pty number available for reallocation */
         if (devpts)
                 devpts_kill_index(inode, idx);
+        tty_unlock();
         return 0;
 }
 
@@ -1901,9 +1893,6 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
  *      Locking: tty_mutex protects tty, tty_lookup_driver and tty_init_dev.
  *               tty->count should protect the rest.
  *               ->siglock protects ->signal/->sighand
- *
- *      Note: the tty_unlock/lock cases without a ref are only safe due to
- *      tty_mutex
  */
 
 static int tty_open(struct inode *inode, struct file *filp)
@@ -1927,7 +1916,8 @@ retry_open:
         retval = 0;
 
         mutex_lock(&tty_mutex);
-        /* This is protected by the tty_mutex */
+        tty_lock();
+
         tty = tty_open_current_tty(device, filp);
         if (IS_ERR(tty)) {
                 retval = PTR_ERR(tty);
@@ -1948,19 +1938,17 @@ retry_open:
         }
 
         if (tty) {
-                tty_lock(tty);
                 retval = tty_reopen(tty);
-                if (retval < 0) {
-                        tty_unlock(tty);
+                if (retval)
                         tty = ERR_PTR(retval);
-                }
-        } else  /* Returns with the tty_lock held for now */
+        } else
                 tty = tty_init_dev(driver, index);
 
         mutex_unlock(&tty_mutex);
         if (driver)
                 tty_driver_kref_put(driver);
         if (IS_ERR(tty)) {
+                tty_unlock();
                 retval = PTR_ERR(tty);
                 goto err_file;
         }
@@ -1989,7 +1977,7 @@ retry_open:
                 printk(KERN_DEBUG "%s: error %d in opening %s...\n", __func__,
                                 retval, tty->name);
 #endif
-                tty_unlock(tty); /* need to call tty_release without BTM */
+                tty_unlock(); /* need to call tty_release without BTM */
                 tty_release(inode, filp);
                 if (retval != -ERESTARTSYS)
                         return retval;
@@ -2001,15 +1989,17 @@ retry_open:
                 /*
                  * Need to reset f_op in case a hangup happened.
                  */
+                tty_lock();
                 if (filp->f_op == &hung_up_tty_fops)
                         filp->f_op = &tty_fops;
+                tty_unlock();
                 goto retry_open;
         }
-        tty_unlock(tty);
+        tty_unlock();
 
 
         mutex_lock(&tty_mutex);
-        tty_lock(tty);
+        tty_lock();
         spin_lock_irq(&current->sighand->siglock);
         if (!noctty &&
             current->signal->leader &&
@@ -2017,10 +2007,11 @@ retry_open:
             tty->session == NULL)
                 __proc_set_tty(current, tty);
         spin_unlock_irq(&current->sighand->siglock);
-        tty_unlock(tty);
+        tty_unlock();
         mutex_unlock(&tty_mutex);
         return 0;
 err_unlock:
+        tty_unlock();
         mutex_unlock(&tty_mutex);
         /* after locks to avoid deadlock */
         if (!IS_ERR_OR_NULL(driver))
@@ -2103,13 +2094,10 @@ out:
 
 static int tty_fasync(int fd, struct file *filp, int on)
 {
-        struct tty_struct *tty = file_tty(filp);
         int retval;
-
-        tty_lock(tty);
+        tty_lock();
         retval = __tty_fasync(fd, filp, on);
-        tty_unlock(tty);
-
+        tty_unlock();
         return retval;
 }
 
@@ -2946,7 +2934,6 @@ void initialize_tty_struct(struct tty_struct *tty,
         tty->pgrp = NULL;
         tty->overrun_time = jiffies;
         tty_buffer_init(tty);
-        mutex_init(&tty->legacy_mutex);
         mutex_init(&tty->termios_mutex);
         mutex_init(&tty->ldisc_mutex);
         init_waitqueue_head(&tty->write_wait);
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index ba8be396a621..9911eb6b34cd 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -568,7 +568,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
         if (IS_ERR(new_ldisc))
                 return PTR_ERR(new_ldisc);
 
-        tty_lock(tty);
+        tty_lock();
         /*
          *      We need to look at the tty locking here for pty/tty pairs
          *      when both sides try to change in parallel.
@@ -582,12 +582,12 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
          */
 
         if (tty->ldisc->ops->num == ldisc) {
-                tty_unlock(tty);
+                tty_unlock();
                 tty_ldisc_put(new_ldisc);
                 return 0;
         }
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          *      Problem: What do we do if this blocks ?
          *      We could deadlock here
@@ -595,7 +595,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         tty_wait_until_sent(tty, 0);
 
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /*
@@ -605,10 +605,10 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         while (test_bit(TTY_LDISC_CHANGING, &tty->flags)) {
                 mutex_unlock(&tty->ldisc_mutex);
-                tty_unlock(tty);
+                tty_unlock();
                 wait_event(tty_ldisc_wait,
                         test_bit(TTY_LDISC_CHANGING, &tty->flags) == 0);
-                tty_lock(tty);
+                tty_lock();
                 mutex_lock(&tty->ldisc_mutex);
         }
 
@@ -623,7 +623,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         o_ldisc = tty->ldisc;
 
-        tty_unlock(tty);
+        tty_unlock();
         /*
          *      Make sure we don't change while someone holds a
          *      reference to the line discipline. The TTY_LDISC bit
@@ -650,7 +650,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 
         retval = tty_ldisc_wait_idle(tty, 5 * HZ);
 
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /* handle wait idle failure locked */
@@ -665,7 +665,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
                 clear_bit(TTY_LDISC_CHANGING, &tty->flags);
                 mutex_unlock(&tty->ldisc_mutex);
                 tty_ldisc_put(new_ldisc);
-                tty_unlock(tty);
+                tty_unlock();
                 return -EIO;
         }
 
@@ -708,7 +708,7 @@ enable:
         if (o_work)
                 schedule_work(&o_tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
-        tty_unlock(tty);
+        tty_unlock();
         return retval;
 }
 
@@ -816,11 +816,11 @@ void tty_ldisc_hangup(struct tty_struct *tty)
          * need to wait for another function taking the BTM
          */
         clear_bit(TTY_LDISC, &tty->flags);
-        tty_unlock(tty);
+        tty_unlock();
         cancel_work_sync(&tty->buf.work);
         mutex_unlock(&tty->ldisc_mutex);
 retry:
-        tty_lock(tty);
+        tty_lock();
         mutex_lock(&tty->ldisc_mutex);
 
         /* At this point we have a closed ldisc and we want to
@@ -831,7 +831,7 @@ retry:
                 if (atomic_read(&tty->ldisc->users) != 1) {
                         char cur_n[TASK_COMM_LEN], tty_n[64];
                         long timeout = 3 * HZ;
-                        tty_unlock(tty);
+                        tty_unlock();
 
                         while (tty_ldisc_wait_idle(tty, timeout) == -EBUSY) {
                                 timeout = MAX_SCHEDULE_TIMEOUT;
@@ -894,23 +894,6 @@ int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty)
         tty_ldisc_enable(tty);
         return 0;
 }
-
-static void tty_ldisc_kill(struct tty_struct *tty)
-{
-        mutex_lock(&tty->ldisc_mutex);
-        /*
-         * Now kill off the ldisc
-         */
-        tty_ldisc_close(tty, tty->ldisc);
-        tty_ldisc_put(tty->ldisc);
-        /* Force an oops if we mess this up */
-        tty->ldisc = NULL;
-
-        /* Ensure the next open requests the N_TTY ldisc */
-        tty_set_termios_ldisc(tty, N_TTY);
-        mutex_unlock(&tty->ldisc_mutex);
-}
-
 /**
  *      tty_ldisc_release               -       release line discipline
  *      @tty: tty being shut down
@@ -929,19 +912,27 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
          * race with the set_ldisc code path.
          */
 
-        tty_unlock_pair(tty, o_tty);
+        tty_unlock();
         tty_ldisc_halt(tty);
         tty_ldisc_flush_works(tty);
-        if (o_tty) {
-                tty_ldisc_halt(o_tty);
-                tty_ldisc_flush_works(o_tty);
-        }
-        tty_lock_pair(tty, o_tty);
+        tty_lock();
 
+        mutex_lock(&tty->ldisc_mutex);
+        /*
+         * Now kill off the ldisc
+         */
+        tty_ldisc_close(tty, tty->ldisc);
+        tty_ldisc_put(tty->ldisc);
+        /* Force an oops if we mess this up */
+        tty->ldisc = NULL;
+
+        /* Ensure the next open requests the N_TTY ldisc */
+        tty_set_termios_ldisc(tty, N_TTY);
+        mutex_unlock(&tty->ldisc_mutex);
 
-        tty_ldisc_kill(tty);
+        /* This will need doing differently if we need to lock */
         if (o_tty)
-                tty_ldisc_kill(o_tty);
+                tty_ldisc_release(o_tty, NULL);
 
         /* And the memory resources remaining (buffers, termios) will be
            disposed of when the kref hits zero */
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c
index 69adc80c98cd..9ff986c32a21 100644
--- a/drivers/tty/tty_mutex.c
+++ b/drivers/tty/tty_mutex.c
@@ -4,59 +4,29 @@
 #include <linux/semaphore.h>
 #include <linux/sched.h>
 
-/* Legacy tty mutex glue */
+/*
+ * The 'big tty mutex'
+ *
+ * This mutex is taken and released by tty_lock() and tty_unlock(),
+ * replacing the older big kernel lock.
+ * It can no longer be taken recursively, and does not get
+ * released implicitly while sleeping.
+ *
+ * Don't use in new code.
+ */
+static DEFINE_MUTEX(big_tty_mutex);
 
 /*
  * Getting the big tty mutex.
  */
-
-void __lockfunc tty_lock(struct tty_struct *tty)
+void __lockfunc tty_lock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                printk(KERN_ERR "L Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        tty_kref_get(tty);
-        mutex_lock(&tty->legacy_mutex);
+        mutex_lock(&big_tty_mutex);
 }
 EXPORT_SYMBOL(tty_lock);
 
-void __lockfunc tty_unlock(struct tty_struct *tty)
+void __lockfunc tty_unlock(void)
 {
-        if (tty->magic != TTY_MAGIC) {
-                printk(KERN_ERR "U Bad %p\n", tty);
-                WARN_ON(1);
-                return;
-        }
-        mutex_unlock(&tty->legacy_mutex);
-        tty_kref_put(tty);
+        mutex_unlock(&big_tty_mutex);
 }
 EXPORT_SYMBOL(tty_unlock);
-
-/*
- * Getting the big tty mutex for a pair of ttys with lock ordering
- * On a non pty/tty pair tty2 can be NULL which is just fine.
- */
-void __lockfunc tty_lock_pair(struct tty_struct *tty,
-                                        struct tty_struct *tty2)
-{
-        if (tty < tty2) {
-                tty_lock(tty);
-                tty_lock(tty2);
-        } else {
-                if (tty2 && tty2 != tty)
-                        tty_lock(tty2);
-                tty_lock(tty);
-        }
-}
-EXPORT_SYMBOL(tty_lock_pair);
-
-void __lockfunc tty_unlock_pair(struct tty_struct *tty,
-                                                struct tty_struct *tty2)
-{
-        tty_unlock(tty);
-        if (tty2 && tty2 != tty)
-                tty_unlock(tty2);
-}
-EXPORT_SYMBOL(tty_unlock_pair);
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index d9cca95a5452..bf6e238146ae 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -230,7 +230,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 
         /* block if port is in the process of being closed */
         if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                wait_event_interruptible_tty(tty, port->close_wait,
+                wait_event_interruptible_tty(port->close_wait,
                                 !(port->flags & ASYNC_CLOSING));
                 if (port->flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
@@ -296,9 +296,9 @@ int tty_port_block_til_ready(struct tty_port *port,
                         retval = -ERESTARTSYS;
                         break;
                 }
-                tty_unlock(tty);
+                tty_unlock();
                 schedule();
-                tty_lock(tty);
+                tty_lock();
         }
         finish_wait(&port->open_wait, &wait);
 
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index f2a120eea9d4..36a2a0b7b82c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -567,6 +567,14 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
 
         usb_autopm_put_interface(acm->control);
 
+        /*
+         * Unthrottle device in case the TTY was closed while throttled.
+         */
+        spin_lock_irq(&acm->read_lock);
+        acm->throttled = 0;
+        acm->throttle_req = 0;
+        spin_unlock_irq(&acm->read_lock);
+
         if (acm_submit_read_urbs(acm, GFP_KERNEL))
                 goto error_submit_read_urbs;
 
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ea8b304f0e85..8fd398dffced 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -55,6 +55,15 @@ static const struct usb_device_id wdm_ids[] = {
                 .bInterfaceSubClass = 1,
                 .bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */
         },
+        {
+                 /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */
+                .match_flags        = USB_DEVICE_ID_MATCH_VENDOR |
+                                      USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor           = HUAWEI_VENDOR_ID,
+                .bInterfaceClass    = USB_CLASS_VENDOR_SPEC,
+                .bInterfaceSubClass = 1,
+                .bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */
+        },
         { }
 };
 
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 57ed9e400c06..622b4a48e732 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -493,15 +493,6 @@ static int hcd_pci_suspend_noirq(struct device *dev)
 
         pci_save_state(pci_dev);
 
-        /*
-         * Some systems crash if an EHCI controller is in D3 during
-         * a sleep transition.  We have to leave such controllers in D0.
-         */
-        if (hcd->broken_pci_sleep) {
-                dev_dbg(dev, "Staying in PCI D0\n");
-                return retval;
-        }
-
         /* If the root hub is dead rather than suspended, disallow remote
          * wakeup.  usb_hc_died() should ensure that both hosts are marked as
          * dying, so we only need to check the primary roothub.
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 04fb834c3fa1..25a7422ee657 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3379,7 +3379,7 @@ int usb_disable_lpm(struct usb_device *udev)
                 return 0;
 
         udev->lpm_disable_count++;
-        if ((udev->u1_params.timeout == 0 && udev->u1_params.timeout == 0))
+        if ((udev->u1_params.timeout == 0 && udev->u2_params.timeout == 0))
                 return 0;
 
         /* If LPM is enabled, attempt to disable it. */
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index b548cf1dbc62..bdd1c6749d88 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1838,7 +1838,6 @@ free_interfaces:
                 intfc = cp->intf_cache[i];
                 intf->altsetting = intfc->altsetting;
                 intf->num_altsetting = intfc->num_altsetting;
-                intf->intf_assoc = find_iad(dev, cp, i);
                 kref_get(&intfc->ref);
 
                 alt = usb_altnum_to_altsetting(intf, 0);
@@ -1851,6 +1850,8 @@ free_interfaces:
                 if (!alt)
                         alt = &intf->altsetting[0];
 
+                intf->intf_assoc =
+                        find_iad(dev, cp, alt->desc.bInterfaceNumber);
                 intf->cur_altsetting = alt;
                 usb_enable_interface(dev, intf, true);
                 intf->dev.parent = &dev->dev;
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index e23bf7984aaf..9a9bced813ed 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -599,12 +599,6 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         spin_lock_irqsave(&ep->udc->lock, flags);
 
-        if (ep->ep.desc) {
-                spin_unlock_irqrestore(&ep->udc->lock, flags);
-                DBG(DBG_ERR, "ep%d already enabled\n", ep->index);
-                return -EBUSY;
-        }
-
         ep->ep.desc = desc;
         ep->ep.maxpacket = maxpacket;
 
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 51881f3bd07a..b09452d6f33a 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -1596,7 +1596,7 @@ static int qe_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct qe_ep, ep);
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc || _ep->name == ep_name[0] ||
+        if (!_ep || !desc || _ep->name == ep_name[0] ||
                         (desc->bDescriptorType != USB_DT_ENDPOINT))
                 return -EINVAL;
 
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 28316858208b..bc6f9bb9994a 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -567,7 +567,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct fsl_ep, ep);
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || (desc->bDescriptorType != USB_DT_ENDPOINT))
                 return -EINVAL;
 
@@ -2575,7 +2575,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
         /* for ep0: the desc defined here;
          * for other eps, gadget layer called ep_enable with defined desc
          */
-        udc_controller->eps[0].desc = &fsl_ep0_desc;
+        udc_controller->eps[0].ep.desc = &fsl_ep0_desc;
         udc_controller->eps[0].ep.maxpacket = USB_MAX_CTRL_PAYLOAD;
 
         /* setup the udc->eps[] for non-control endpoints and link
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 5cd7b7e7ddb4..f61a967f7082 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -568,10 +568,10 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
 /*
  * ### internal used help routines.
  */
-#define ep_index(EP)            ((EP)->desc->bEndpointAddress&0xF)
+#define ep_index(EP)            ((EP)->ep.desc->bEndpointAddress&0xF)
 #define ep_maxpacket(EP)        ((EP)->ep.maxpacket)
 #define ep_is_in(EP)    ( (ep_index(EP) == 0) ? (EP->udc->ep0_dir == \
-                        USB_DIR_IN ):((EP)->desc->bEndpointAddress \
+                        USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \
                         & USB_DIR_IN)==USB_DIR_IN)
 #define get_ep_by_pipe(udc, pipe)       ((pipe == 1)? &udc->eps[0]: \
                                         &udc->eps[pipe])
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index b241e6c6a7f2..3d28fb976c78 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -102,7 +102,7 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
         unsigned long   flags;
 
         ep = container_of(_ep, struct goku_ep, ep);
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
         dev = ep->dev;
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index dbcd1329495e..117a4bba1b8c 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -464,7 +464,7 @@ static int mv_ep_enable(struct usb_ep *_ep,
         ep = container_of(_ep, struct mv_ep, ep);
         udc = ep->udc;
 
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
 
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 7ba32469c5bd..a460e8c204f4 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -153,7 +153,7 @@ static int omap_ep_enable(struct usb_ep *_ep,
         u16             maxp;
 
         /* catch various bogus parameters */
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
                         || ep->maxpacket < usb_endpoint_maxp(desc)) {
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index d7c8cb3bf759..f7ff9e8e746a 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -218,7 +218,7 @@ static int pxa25x_ep_enable (struct usb_ep *_ep,
         struct pxa25x_udc       *dev;
 
         ep = container_of (_ep, struct pxa25x_ep, ep);
-        if (!_ep || !desc || ep->ep.desc || _ep->name == ep0name
+        if (!_ep || !desc || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
                         || ep->fifo_size < usb_endpoint_maxp (desc)) {
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 36c6836eeb0f..236b271871a0 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -760,7 +760,7 @@ static int s3c_hsudc_ep_enable(struct usb_ep *_ep,
         u32 ecr = 0;
 
         hsep = our_ep(_ep);
-        if (!_ep || !desc || hsep->ep.desc || _ep->name == ep0name
+        if (!_ep || !desc || _ep->name == ep0name
                 || desc->bDescriptorType != USB_DT_ENDPOINT
                 || hsep->bEndpointAddress != desc->bEndpointAddress
                 || ep_maxpacket(hsep) < usb_endpoint_maxp(desc))
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 3de71d37d75e..f2e51f50e528 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1062,7 +1062,7 @@ static int s3c2410_udc_ep_enable(struct usb_ep *_ep,
 
         ep = to_s3c2410_ep(_ep);
 
-        if (!_ep || !desc || ep->ep.desc
+        if (!_ep || !desc
                         || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT)
                 return -EINVAL;
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index b100f5f9f4b6..800be38c78b4 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -671,7 +671,9 @@ static int ehci_init(struct usb_hcd *hcd)
         hw = ehci->async->hw;
         hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
         hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
+#if defined(CONFIG_PPC_PS3)
         hw->hw_info1 |= cpu_to_hc32(ehci, (1 << 7));    /* I = 1 */
+#endif
         hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
         hw->hw_qtd_next = EHCI_LIST_END(ehci);
         ehci->async->qh_state = QH_STATE_LINKED;
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index a44294d13494..17cfb8a1131c 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -43,6 +43,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/gpio.h>
+#include <linux/clk.h>
 
 /* EHCI Register Set */
 #define EHCI_INSNREG04                                  (0xA0)
@@ -55,6 +56,15 @@
 #define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT             8
 #define EHCI_INSNREG05_ULPI_WRDATA_SHIFT                0
 
+/* Errata i693 */
+static struct clk       *utmi_p1_fck;
+static struct clk       *utmi_p2_fck;
+static struct clk       *xclk60mhsp1_ck;
+static struct clk       *xclk60mhsp2_ck;
+static struct clk       *usbhost_p1_fck;
+static struct clk       *usbhost_p2_fck;
+static struct clk       *init_60m_fclk;
+
 /*-------------------------------------------------------------------------*/
 
 static const struct hc_driver ehci_omap_hc_driver;
@@ -70,6 +80,41 @@ static inline u32 ehci_read(void __iomem *base, u32 reg)
         return __raw_readl(base + reg);
 }
 
+/* Erratum i693 workaround sequence */
+static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
+{
+        int ret = 0;
+
+        /* Switch to the internal 60 MHz clock */
+        ret = clk_set_parent(utmi_p1_fck, init_60m_fclk);
+        if (ret != 0)
+                ehci_err(ehci, "init_60m_fclk set parent"
+                        "failed error:%d\n", ret);
+
+        ret = clk_set_parent(utmi_p2_fck, init_60m_fclk);
+        if (ret != 0)
+                ehci_err(ehci, "init_60m_fclk set parent"
+                        "failed error:%d\n", ret);
+
+        clk_enable(usbhost_p1_fck);
+        clk_enable(usbhost_p2_fck);
+
+        /* Wait 1ms and switch back to the external clock */
+        mdelay(1);
+        ret = clk_set_parent(utmi_p1_fck, xclk60mhsp1_ck);
+        if (ret != 0)
+                ehci_err(ehci, "xclk60mhsp1_ck set parent"
+                        "failed error:%d\n", ret);
+
+        ret = clk_set_parent(utmi_p2_fck, xclk60mhsp2_ck);
+        if (ret != 0)
+                ehci_err(ehci, "xclk60mhsp2_ck set parent"
+                        "failed error:%d\n", ret);
+
+        clk_disable(usbhost_p1_fck);
+        clk_disable(usbhost_p2_fck);
+}
+
 static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
 {
         struct usb_hcd  *hcd = dev_get_drvdata(&pdev->dev);
@@ -100,6 +145,50 @@ static void omap_ehci_soft_phy_reset(struct platform_device *pdev, u8 port)
         }
 }
 
+static int omap_ehci_hub_control(
+        struct usb_hcd  *hcd,
+        u16             typeReq,
+        u16             wValue,
+        u16             wIndex,
+        char            *buf,
+        u16             wLength
+)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        u32 __iomem *status_reg = &ehci->regs->port_status[
+                                (wIndex & 0xff) - 1];
+        u32             temp;
+        unsigned long   flags;
+        int             retval = 0;
+
+        spin_lock_irqsave(&ehci->lock, flags);
+
+        if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
+                temp = ehci_readl(ehci, status_reg);
+                if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
+                        retval = -EPIPE;
+                        goto done;
+                }
+
+                temp &= ~PORT_WKCONN_E;
+                temp |= PORT_WKDISC_E | PORT_WKOC_E;
+                ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
+
+                omap_ehci_erratum_i693(ehci);
+
+                set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
+                goto done;
+        }
+
+        spin_unlock_irqrestore(&ehci->lock, flags);
+
+        /* Handle the hub control events here */
+        return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+done:
+        spin_unlock_irqrestore(&ehci->lock, flags);
+        return retval;
+}
+
 static void disable_put_regulator(
                 struct ehci_hcd_omap_platform_data *pdata)
 {
@@ -264,8 +353,76 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         /* root ports should always stay powered */
         ehci_port_power(omap_ehci, 1);
 
+        /* get clocks */
+        utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
+        if (IS_ERR(utmi_p1_fck)) {
+                ret = PTR_ERR(utmi_p1_fck);
+                dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
+                goto err_add_hcd;
+        }
+
+        xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
+        if (IS_ERR(xclk60mhsp1_ck)) {
+                ret = PTR_ERR(xclk60mhsp1_ck);
+                dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
+                goto err_utmi_p1_fck;
+        }
+
+        utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
+        if (IS_ERR(utmi_p2_fck)) {
+                ret = PTR_ERR(utmi_p2_fck);
+                dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
+                goto err_xclk60mhsp1_ck;
+        }
+
+        xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
+        if (IS_ERR(xclk60mhsp2_ck)) {
+                ret = PTR_ERR(xclk60mhsp2_ck);
+                dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
+                goto err_utmi_p2_fck;
+        }
+
+        usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
+        if (IS_ERR(usbhost_p1_fck)) {
+                ret = PTR_ERR(usbhost_p1_fck);
+                dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
+                goto err_xclk60mhsp2_ck;
+        }
+
+        usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
+        if (IS_ERR(usbhost_p2_fck)) {
+                ret = PTR_ERR(usbhost_p2_fck);
+                dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
+                goto err_usbhost_p1_fck;
+        }
+
+        init_60m_fclk = clk_get(dev, "init_60m_fclk");
+        if (IS_ERR(init_60m_fclk)) {
+                ret = PTR_ERR(init_60m_fclk);
+                dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
+                goto err_usbhost_p2_fck;
+        }
+
         return 0;
 
+err_usbhost_p2_fck:
+        clk_put(usbhost_p2_fck);
+
+err_usbhost_p1_fck:
+        clk_put(usbhost_p1_fck);
+
+err_xclk60mhsp2_ck:
+        clk_put(xclk60mhsp2_ck);
+
+err_utmi_p2_fck:
+        clk_put(utmi_p2_fck);
+
+err_xclk60mhsp1_ck:
+        clk_put(xclk60mhsp1_ck);
+
+err_utmi_p1_fck:
+        clk_put(utmi_p1_fck);
+
 err_add_hcd:
         disable_put_regulator(pdata);
         pm_runtime_put_sync(dev);
@@ -294,6 +451,15 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
         disable_put_regulator(dev->platform_data);
         iounmap(hcd->regs);
         usb_put_hcd(hcd);
+
+        clk_put(utmi_p1_fck);
+        clk_put(utmi_p2_fck);
+        clk_put(xclk60mhsp1_ck);
+        clk_put(xclk60mhsp2_ck);
+        clk_put(usbhost_p1_fck);
+        clk_put(usbhost_p2_fck);
+        clk_put(init_60m_fclk);
+
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
 
@@ -364,7 +530,7 @@ static const struct hc_driver ehci_omap_hc_driver = {
          * root hub support
          */
         .hub_status_data        = ehci_hub_status_data,
-        .hub_control            = ehci_hub_control,
+        .hub_control            = omap_ehci_hub_control,
         .bus_suspend            = ehci_bus_suspend,
         .bus_resume             = ehci_bus_resume,
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index bc94d7bf072d..123481793a47 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -144,14 +144,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         hcd->has_tt = 1;
                         tdi_reset(ehci);
                 }
-                if (pdev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK) {
-                        /* EHCI #1 or #2 on 6 Series/C200 Series chipset */
-                        if (pdev->device == 0x1c26 || pdev->device == 0x1c2d) {
-                                ehci_info(ehci, "broken D3 during system sleep on ASUS\n");
-                                hcd->broken_pci_sleep = 1;
-                                device_set_wakeup_capable(&pdev->dev, false);
-                        }
-                }
                 break;
         case PCI_VENDOR_ID_TDI:
                 if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) {
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index ca819cdd0c5e..e7cb3925abf8 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -126,8 +126,7 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
                 goto fail_create_hcd;
         }
 
-        if (pdev->dev.platform_data != NULL)
-                pdata = pdev->dev.platform_data;
+        pdata = pdev->dev.platform_data;
 
         /* initialize hcd */
         hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index 9c2cc4633894..e9713d589e30 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -270,14 +270,12 @@ static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
  *
  * Properly shutdown the hcd, call driver's shutdown routine.
  */
-static int ehci_hcd_xilinx_of_shutdown(struct platform_device *op)
+static void ehci_hcd_xilinx_of_shutdown(struct platform_device *op)
 {
         struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
-
-        return 0;
 }
 
 
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 836772dfabd3..2f3619eefefa 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -317,7 +317,7 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
 }
 
 /* Carry out the final steps of resuming the controller device */
-static void ohci_finish_controller_resume(struct usb_hcd *hcd)
+static void __maybe_unused ohci_finish_controller_resume(struct usb_hcd *hcd)
 {
         struct ohci_hcd         *ohci = hcd_to_ohci(hcd);
         int                     port;
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index ec4338eec826..77689bd64cac 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -793,10 +793,9 @@ static void xhci_free_tt_info(struct xhci_hcd *xhci,
                 struct xhci_virt_device *virt_dev,
                 int slot_id)
 {
-        struct list_head *tt;
         struct list_head *tt_list_head;
-        struct list_head *tt_next;
-        struct xhci_tt_bw_info *tt_info;
+        struct xhci_tt_bw_info *tt_info, *next;
+        bool slot_found = false;
 
         /* If the device never made it past the Set Address stage,
          * it may not have the real_port set correctly.
@@ -808,34 +807,16 @@ static void xhci_free_tt_info(struct xhci_hcd *xhci,
         }
 
         tt_list_head = &(xhci->rh_bw[virt_dev->real_port - 1].tts);
-        if (list_empty(tt_list_head))
-                return;
-
-        list_for_each(tt, tt_list_head) {
-                tt_info = list_entry(tt, struct xhci_tt_bw_info, tt_list);
-                if (tt_info->slot_id == slot_id)
+        list_for_each_entry_safe(tt_info, next, tt_list_head, tt_list) {
+                /* Multi-TT hubs will have more than one entry */
+                if (tt_info->slot_id == slot_id) {
+                        slot_found = true;
+                        list_del(&tt_info->tt_list);
+                        kfree(tt_info);
+                } else if (slot_found) {
                         break;
+                }
         }
-        /* Cautionary measure in case the hub was disconnected before we
-         * stored the TT information.
-         */
-        if (tt_info->slot_id != slot_id)
-                return;
-
-        tt_next = tt->next;
-        tt_info = list_entry(tt, struct xhci_tt_bw_info,
-                        tt_list);
-        /* Multi-TT hubs will have more than one entry */
-        do {
-                list_del(tt);
-                kfree(tt_info);
-                tt = tt_next;
-                if (list_empty(tt_list_head))
-                        break;
-                tt_next = tt->next;
-                tt_info = list_entry(tt, struct xhci_tt_bw_info,
-                                tt_list);
-        } while (tt_info->slot_id == slot_id);
 }
 
 int xhci_alloc_tt_info(struct xhci_hcd *xhci,
@@ -1791,17 +1772,9 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
 {
         struct pci_dev  *pdev = to_pci_dev(xhci_to_hcd(xhci)->self.controller);
         struct dev_info *dev_info, *next;
-        struct list_head *tt_list_head;
-        struct list_head *tt;
-        struct list_head *endpoints;
-        struct list_head *ep, *q;
-        struct xhci_tt_bw_info *tt_info;
-        struct xhci_interval_bw_table *bwt;
-        struct xhci_virt_ep *virt_ep;
-
         unsigned long   flags;
         int size;
-        int i;
+        int i, j, num_ports;
 
         /* Free the Event Ring Segment Table and the actual Event Ring */
         size = sizeof(struct xhci_erst_entry)*(xhci->erst.num_entries);
@@ -1860,21 +1833,22 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)
         }
         spin_unlock_irqrestore(&xhci->lock, flags);
 
-        bwt = &xhci->rh_bw->bw_table;
-        for (i = 0; i < XHCI_MAX_INTERVAL; i++) {
-                endpoints = &bwt->interval_bw[i].endpoints;
-                list_for_each_safe(ep, q, endpoints) {
-                        virt_ep = list_entry(ep, struct xhci_virt_ep, bw_endpoint_list);
-                        list_del(&virt_ep->bw_endpoint_list);
-                        kfree(virt_ep);
+        num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
+        for (i = 0; i < num_ports; i++) {
+                struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
+                for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
+                        struct list_head *ep = &bwt->interval_bw[j].endpoints;
+                        while (!list_empty(ep))
+                                list_del_init(ep->next);
                 }
         }
 
-        tt_list_head = &xhci->rh_bw->tts;
-        list_for_each_safe(tt, q, tt_list_head) {
-                tt_info = list_entry(tt, struct xhci_tt_bw_info, tt_list);
-                list_del(tt);
-                kfree(tt_info);
+        for (i = 0; i < num_ports; i++) {
+                struct xhci_tt_bw_info *tt, *n;
+                list_for_each_entry_safe(tt, n, &xhci->rh_bw[i].tts, tt_list) {
+                        list_del(&tt->tt_list);
+                        kfree(tt);
+                }
         }
 
         xhci->num_usb2_ports = 0;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index afdc73ee84a6..a979cd0dbe0f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -795,8 +795,8 @@ int xhci_suspend(struct xhci_hcd *xhci)
         command = xhci_readl(xhci, &xhci->op_regs->command);
         command |= CMD_CSS;
         xhci_writel(xhci, command, &xhci->op_regs->command);
-        if (handshake(xhci, &xhci->op_regs->status, STS_SAVE, 0, 10*100)) {
-                xhci_warn(xhci, "WARN: xHC CMD_CSS timeout\n");
+        if (handshake(xhci, &xhci->op_regs->status, STS_SAVE, 0, 10 * 1000)) {
+                xhci_warn(xhci, "WARN: xHC save state timeout\n");
                 spin_unlock_irq(&xhci->lock);
                 return -ETIMEDOUT;
         }
@@ -848,8 +848,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
                 command |= CMD_CRS;
                 xhci_writel(xhci, command, &xhci->op_regs->command);
                 if (handshake(xhci, &xhci->op_regs->status,
-                              STS_RESTORE, 0, 10*100)) {
-                        xhci_dbg(xhci, "WARN: xHC CMD_CSS timeout\n");
+                              STS_RESTORE, 0, 10 * 1000)) {
+                        xhci_warn(xhci, "WARN: xHC restore state timeout\n");
                         spin_unlock_irq(&xhci->lock);
                         return -ETIMEDOUT;
                 }
@@ -3906,7 +3906,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
         default:
                 dev_warn(&udev->dev, "%s: Can't get timeout for non-U1 or U2 state.\n",
                                 __func__);
-                return -EINVAL;
+                return USB3_LPM_DISABLED;
         }
 
         if (sel <= max_sel_pel && pel <= max_sel_pel)
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 768b4b55c816..9d63ba4d10d6 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -34,6 +34,7 @@
 #include <linux/dma-mapping.h>
 
 #include <mach/cputype.h>
+#include <mach/hardware.h>
 
 #include <asm/mach-types.h>
 
diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h
index 046c84433cad..371baa0ee509 100644
--- a/drivers/usb/musb/davinci.h
+++ b/drivers/usb/musb/davinci.h
@@ -15,7 +15,7 @@
  */
 
 /* Integrated highspeed/otg PHY */
-#define USBPHY_CTL_PADDR        (DAVINCI_SYSTEM_MODULE_BASE + 0x34)
+#define USBPHY_CTL_PADDR        0x01c40034
 #define USBPHY_DATAPOL          BIT(11) /* (dm355) switch D+/D- */
 #define USBPHY_PHYCLKGD         BIT(8)
 #define USBPHY_SESNDEN          BIT(7)  /* v(sess_end) comparator */
@@ -27,7 +27,7 @@
 #define USBPHY_OTGPDWN          BIT(1)
 #define USBPHY_PHYPDWN          BIT(0)
 
-#define DM355_DEEPSLEEP_PADDR   (DAVINCI_SYSTEM_MODULE_BASE + 0x48)
+#define DM355_DEEPSLEEP_PADDR   0x01c40048
 #define DRVVBUS_FORCE           BIT(2)
 #define DRVVBUS_OVERRIDE        BIT(1)
 
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index f42c29b11f71..95918dacc99a 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1232,6 +1232,7 @@ static int musb_gadget_disable(struct usb_ep *ep)
         }
 
         musb_ep->desc = NULL;
+        musb_ep->end_point.desc = NULL;
 
         /* abort all pending DMA and requests */
         nuke(musb_ep, -ESHUTDOWN);
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 1b1926200ba7..73d25cd8cba5 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -82,6 +82,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
         { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */
         { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
+        { USB_DEVICE(0x10C4, 0x80C4) }, /* Cygnal Integrated Products, Inc., Optris infrared thermometer */
         { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
         { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
         { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8c084ea34e26..bc912e5a3beb 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -737,6 +737,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
         { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) },
         { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) },
+        { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_RTS01_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) },
         { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f3c7c78ede33..5661c7e2d415 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -784,6 +784,7 @@
 #define RTSYSTEMS_VID                   0x2100  /* Vendor ID */
 #define RTSYSTEMS_SERIAL_VX7_PID        0x9e52  /* Serial converter for VX-7 Radios using FT232RL */
 #define RTSYSTEMS_CT29B_PID             0x9e54  /* CT29B Radio Cable */
+#define RTSYSTEMS_RTS01_PID             0x9e57  /* USB-RTS01 Radio Cable */
 
 
 /*
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 105a6d898ca4..9b026bf7afef 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -39,13 +39,6 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
 
 static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 
-/* we want to look at all devices, as the vendor/product id can change
- * depending on the command line argument */
-static const struct usb_device_id generic_serial_ids[] = {
-        {.driver_info = 42},
-        {}
-};
-
 /* All of the device info needed for the Generic Serial Converter */
 struct usb_serial_driver usb_serial_generic_device = {
         .driver = {
@@ -79,7 +72,8 @@ int usb_serial_generic_register(int _debug)
                 USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 
         /* register our generic driver with ourselves */
-        retval = usb_serial_register_drivers(serial_drivers, "usbserial_generic", generic_serial_ids);
+        retval = usb_serial_register_drivers(serial_drivers,
+                        "usbserial_generic", generic_device_ids);
 #endif
         return retval;
 }
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index d0ec1aa52719..a71fa0aa0406 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -309,13 +309,16 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,
                         MCT_U232_SET_REQUEST_TYPE,
                         0, 0, buf, MCT_U232_SET_MODEM_CTRL_SIZE,
                         WDR_TIMEOUT);
-        if (rc < 0)
-                dev_err(&serial->dev->dev,
-                        "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+        kfree(buf);
+
         dbg("set_modem_ctrl: state=0x%x ==> mcr=0x%x", control_state, mcr);
 
-        kfree(buf);
-        return rc;
+        if (rc < 0) {
+                dev_err(&serial->dev->dev,
+                        "Set MODEM CTRL 0x%x failed (error = %d)\n", mcr, rc);
+                return rc;
+        }
+        return 0;
 } /* mct_u232_set_modem_ctrl */
 
 static int mct_u232_get_modem_stat(struct usb_serial *serial,
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 29160f8b5101..57eca2448424 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -190,7 +190,7 @@
 
 static int device_type;
 
-static const struct usb_device_id id_table[] __devinitconst = {
+static const struct usb_device_id id_table[] = {
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
         {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7810)},
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 1aae9028cd0b..e668a2460bd4 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -47,6 +47,7 @@
 /* Function prototypes */
 static int  option_probe(struct usb_serial *serial,
                         const struct usb_device_id *id);
+static void option_release(struct usb_serial *serial);
 static int option_send_setup(struct usb_serial_port *port);
 static void option_instat_callback(struct urb *urb);
 
@@ -150,6 +151,7 @@ static void option_instat_callback(struct urb *urb);
 #define HUAWEI_PRODUCT_E14AC                    0x14AC
 #define HUAWEI_PRODUCT_K3806                    0x14AE
 #define HUAWEI_PRODUCT_K4605                    0x14C6
+#define HUAWEI_PRODUCT_K5005                    0x14C8
 #define HUAWEI_PRODUCT_K3770                    0x14C9
 #define HUAWEI_PRODUCT_K3771                    0x14CA
 #define HUAWEI_PRODUCT_K4510                    0x14CB
@@ -425,7 +427,7 @@ static void option_instat_callback(struct urb *urb);
 #define SAMSUNG_VENDOR_ID                       0x04e8
 #define SAMSUNG_PRODUCT_GT_B3730                0x6889
 
-/* YUGA products  www.yuga-info.com*/
+/* YUGA products  www.yuga-info.com gavin.kx@qq.com */
 #define YUGA_VENDOR_ID                          0x257A
 #define YUGA_PRODUCT_CEM600                     0x1601
 #define YUGA_PRODUCT_CEM610                     0x1602
@@ -442,6 +444,8 @@ static void option_instat_callback(struct urb *urb);
 #define YUGA_PRODUCT_CEU516                     0x160C
 #define YUGA_PRODUCT_CEU528                     0x160D
 #define YUGA_PRODUCT_CEU526                     0x160F
+#define YUGA_PRODUCT_CEU881                     0x161F
+#define YUGA_PRODUCT_CEU882                     0x162F
 
 #define YUGA_PRODUCT_CWM600                     0x2601
 #define YUGA_PRODUCT_CWM610                     0x2602
@@ -457,23 +461,26 @@ static void option_instat_callback(struct urb *urb);
 #define YUGA_PRODUCT_CWU518                     0x260B
 #define YUGA_PRODUCT_CWU516                     0x260C
 #define YUGA_PRODUCT_CWU528                     0x260D
+#define YUGA_PRODUCT_CWU581                     0x260E
 #define YUGA_PRODUCT_CWU526                     0x260F
-
-#define YUGA_PRODUCT_CLM600                     0x2601
-#define YUGA_PRODUCT_CLM610                     0x2602
-#define YUGA_PRODUCT_CLM500                     0x2603
-#define YUGA_PRODUCT_CLM510                     0x2604
-#define YUGA_PRODUCT_CLM800                     0x2605
-#define YUGA_PRODUCT_CLM900                     0x2606
-
-#define YUGA_PRODUCT_CLU718                     0x2607
-#define YUGA_PRODUCT_CLU716                     0x2608
-#define YUGA_PRODUCT_CLU728                     0x2609
-#define YUGA_PRODUCT_CLU726                     0x260A
-#define YUGA_PRODUCT_CLU518                     0x260B
-#define YUGA_PRODUCT_CLU516                     0x260C
-#define YUGA_PRODUCT_CLU528                     0x260D
-#define YUGA_PRODUCT_CLU526                     0x260F
+#define YUGA_PRODUCT_CWU582                     0x261F
+#define YUGA_PRODUCT_CWU583                     0x262F
+
+#define YUGA_PRODUCT_CLM600                     0x3601
+#define YUGA_PRODUCT_CLM610                     0x3602
+#define YUGA_PRODUCT_CLM500                     0x3603
+#define YUGA_PRODUCT_CLM510                     0x3604
+#define YUGA_PRODUCT_CLM800                     0x3605
+#define YUGA_PRODUCT_CLM900                     0x3606
+
+#define YUGA_PRODUCT_CLU718                     0x3607
+#define YUGA_PRODUCT_CLU716                     0x3608
+#define YUGA_PRODUCT_CLU728                     0x3609
+#define YUGA_PRODUCT_CLU726                     0x360A
+#define YUGA_PRODUCT_CLU518                     0x360B
+#define YUGA_PRODUCT_CLU516                     0x360C
+#define YUGA_PRODUCT_CLU528                     0x360D
+#define YUGA_PRODUCT_CLU526                     0x360F
 
 /* Viettel products */
 #define VIETTEL_VENDOR_ID                       0x2262
@@ -666,6 +673,11 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x31) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x32) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x31) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x32) },
+        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x33) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
@@ -1209,6 +1221,11 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU516) },
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU528) },
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU881) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEU882) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU581) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU582) },
+        { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CWU583) },
         { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
         { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
@@ -1245,7 +1262,7 @@ static struct usb_serial_driver option_1port_device = {
         .ioctl             = usb_wwan_ioctl,
         .attach            = usb_wwan_startup,
         .disconnect        = usb_wwan_disconnect,
-        .release           = usb_wwan_release,
+        .release           = option_release,
         .read_int_callback = option_instat_callback,
 #ifdef CONFIG_PM
         .suspend           = usb_wwan_suspend,
@@ -1259,35 +1276,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 static bool debug;
 
-/* per port private data */
-
-#define N_IN_URB 4
-#define N_OUT_URB 4
-#define IN_BUFLEN 4096
-#define OUT_BUFLEN 4096
-
-struct option_port_private {
-        /* Input endpoints and buffer for this port */
-        struct urb *in_urbs[N_IN_URB];
-        u8 *in_buffer[N_IN_URB];
-        /* Output endpoints and buffer for this port */
-        struct urb *out_urbs[N_OUT_URB];
-        u8 *out_buffer[N_OUT_URB];
-        unsigned long out_busy;         /* Bit vector of URBs in use */
-        int opened;
-        struct usb_anchor delayed;
-
-        /* Settings for the port */
-        int rts_state;  /* Handshaking pins (outputs) */
-        int dtr_state;
-        int cts_state;  /* Handshaking pins (inputs) */
-        int dsr_state;
-        int dcd_state;
-        int ri_state;
-
-        unsigned long tx_start_time[N_OUT_URB];
-};
-
 module_usb_serial_driver(serial_drivers, option_ids);
 
 static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,
@@ -1356,12 +1344,22 @@ static int option_probe(struct usb_serial *serial,
         return 0;
 }
 
+static void option_release(struct usb_serial *serial)
+{
+        struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
+
+        usb_wwan_release(serial);
+
+        kfree(priv);
+}
+
 static void option_instat_callback(struct urb *urb)
 {
         int err;
         int status = urb->status;
         struct usb_serial_port *port =  urb->context;
-        struct option_port_private *portdata = usb_get_serial_port_data(port);
+        struct usb_wwan_port_private *portdata =
+                                        usb_get_serial_port_data(port);
 
         dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
 
@@ -1421,7 +1419,7 @@ static int option_send_setup(struct usb_serial_port *port)
         struct usb_serial *serial = port->serial;
         struct usb_wwan_intf_private *intfdata =
                 (struct usb_wwan_intf_private *) serial->private;
-        struct option_port_private *portdata;
+        struct usb_wwan_port_private *portdata;
         int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
         int val = 0;
 
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 0d5fe59ebb9e..996015c5f1ac 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -105,7 +105,13 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x1410, 0xa021)},   /* Novatel Gobi 3000 Composite */
         {USB_DEVICE(0x413c, 0x8193)},   /* Dell Gobi 3000 QDL */
         {USB_DEVICE(0x413c, 0x8194)},   /* Dell Gobi 3000 Composite */
+        {USB_DEVICE(0x1199, 0x9010)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9012)},   /* Sierra Wireless Gobi 3000 QDL */
         {USB_DEVICE(0x1199, 0x9013)},   /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
+        {USB_DEVICE(0x1199, 0x9014)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9015)},   /* Sierra Wireless Gobi 3000 Modem device */
+        {USB_DEVICE(0x1199, 0x9018)},   /* Sierra Wireless Gobi 3000 QDL */
+        {USB_DEVICE(0x1199, 0x9019)},   /* Sierra Wireless Gobi 3000 Modem device */
         {USB_DEVICE(0x12D1, 0x14F0)},   /* Sony Gobi 3000 QDL */
         {USB_DEVICE(0x12D1, 0x14F1)},   /* Sony Gobi 3000 Composite */
         { }                             /* Terminating entry */
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ba54a0a8235c..d423d36acc04 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -294,6 +294,10 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x1199, 0x68A3),   /* Sierra Wireless Direct IP modems */
           .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
         },
+        /* AT&T Direct IP LTE modems */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),
+          .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
+        },
         { USB_DEVICE(0x0f3d, 0x68A3),   /* Airprime/Sierra Wireless Direct IP modems */
           .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
         },
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 6a1b609a0d94..27483f91a4a3 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -659,12 +659,14 @@ exit:
 static struct usb_serial_driver *search_serial_device(
                                         struct usb_interface *iface)
 {
-        const struct usb_device_id *id;
+        const struct usb_device_id *id = NULL;
         struct usb_serial_driver *drv;
+        struct usb_driver *driver = to_usb_driver(iface->dev.driver);
 
         /* Check if the usb id matches a known device */
         list_for_each_entry(drv, &usb_serial_driver_list, driver_list) {
-                id = get_iface_id(drv, iface);
+                if (drv->usb_driver == driver)
+                        id = get_iface_id(drv, iface);
                 if (id)
                         return drv;
         }
@@ -755,7 +757,7 @@ static int usb_serial_probe(struct usb_interface *interface,
 
                 if (retval) {
                         dbg("sub driver rejected device");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return retval;
                 }
@@ -827,7 +829,7 @@ static int usb_serial_probe(struct usb_interface *interface,
                  */
                 if (num_bulk_in == 0 || num_bulk_out == 0) {
                         dev_info(&interface->dev, "PL-2303 hack: descriptors matched but endpoints did not\n");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return -ENODEV;
                 }
@@ -841,7 +843,7 @@ static int usb_serial_probe(struct usb_interface *interface,
                 if (num_ports == 0) {
                         dev_err(&interface->dev,
                             "Generic device with no bulk out, not allowed.\n");
-                        kfree(serial);
+                        usb_serial_put(serial);
                         module_put(type->driver.owner);
                         return -EIO;
                 }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 1719886bb9be..caf22bf5f822 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1107,6 +1107,13 @@ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999,
                 USB_SC_RBC, USB_PR_BULK, NULL,
                 0 ),
 
+/* Feiya QDI U2 DISK, reported by Hans de Goede <hdegoede@redhat.com> */
+UNUSUAL_DEV( 0x090c, 0x1000, 0x0000, 0xffff,
+                "Feiya",
+                "QDI U2 DISK",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NO_READ_CAPACITY_16 ),
+
 /* aeb */
 UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff,
                 "Feiya",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a290be51a1f4..0217f7415ef5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2210,7 +2210,7 @@ config FB_XILINX
 
 config FB_COBALT
         tristate "Cobalt server LCD frame buffer support"
-        depends on FB && MIPS_COBALT
+        depends on FB && (MIPS_COBALT || MIPS_SEAD3)
 
 config FB_SH7760
         bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
@@ -2382,6 +2382,39 @@ config FB_BROADSHEET
           and could also have been called by other names when coupled with
           a bridge adapter.
 
+config FB_AUO_K190X
+        tristate "AUO-K190X EPD controller support"
+        depends on FB
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        select FB_DEFERRED_IO
+        help
+          Provides support for epaper controllers from the K190X series
+          of AUO. These controllers can be used to drive epaper displays
+          from Sipix.
+
+          This option enables the common support, shared by the individual
+          controller drivers. You will also have to enable the driver
+          for the controller type used in your device.
+
+config FB_AUO_K1900
+        tristate "AUO-K1900 EPD controller support"
+        depends on FB && FB_AUO_K190X
+        help
+          This driver implements support for the AUO K1900 epd-controller.
+          This controller can drive Sipix epaper displays but can only do
+          serial updates, reducing the number of possible frames per second.
+
+config FB_AUO_K1901
+        tristate "AUO-K1901 EPD controller support"
+        depends on FB && FB_AUO_K190X
+        help
+          This driver implements support for the AUO K1901 epd-controller.
+          This controller can drive Sipix epaper displays and supports
+          concurrent updates, making higher frames per second possible.
+
 config FB_JZ4740
         tristate "JZ4740 LCD framebuffer support"
         depends on FB && MACH_JZ4740
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9356add945b3..ee8dafb69e36 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -118,6 +118,9 @@ obj-$(CONFIG_FB_PMAGB_B)	  += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
 obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_BROADSHEET)       += broadsheetfb.o
+obj-$(CONFIG_FB_AUO_K190X)        += auo_k190x.o
+obj-$(CONFIG_FB_AUO_K1900)        += auo_k1900fb.o
+obj-$(CONFIG_FB_AUO_K1901)        += auo_k1901fb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_SH7760)           += sh7760fb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
diff --git a/drivers/video/auo_k1900fb.c b/drivers/video/auo_k1900fb.c
new file mode 100644
index 000000000000..c36cf961dcb2
--- /dev/null
+++ b/drivers/video/auo_k1900fb.c
@@ -0,0 +1,198 @@
+/*
+ * auok190xfb.c -- FB driver for AUO-K1900 controllers
+ *
+ * Copyright (C) 2011, 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on broadsheetfb.c
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver is written to be used with the AUO-K1900 display controller.
+ *
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions.
+ *
+ * The controller supports different update modes:
+ * mode0+1 16 step gray (4bit)
+ * mode2 4 step gray (2bit) - FIXME: add strange refresh
+ * mode3 2 step gray (1bit) - FIXME: add strange refresh
+ * mode4 handwriting mode (strange behaviour)
+ * mode5 automatic selection of update mode
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+/*
+ * AUO-K1900 specific commands
+ */
+
+#define AUOK1900_CMD_PARTIALDISP        0x1001
+#define AUOK1900_CMD_ROTATION           0x1006
+#define AUOK1900_CMD_LUT_STOP           0x1009
+
+#define AUOK1900_INIT_TEMP_AVERAGE      (1 << 13)
+#define AUOK1900_INIT_ROTATE(_x)        ((_x & 0x3) << 10)
+#define AUOK1900_INIT_RESOLUTION(_res)  ((_res & 0x7) << 2)
+
+static void auok1900_init(struct auok190xfb_par *par)
+{
+        struct auok190x_board *board = par->board;
+        u16 init_param = 0;
+
+        init_param |= AUOK1900_INIT_TEMP_AVERAGE;
+        init_param |= AUOK1900_INIT_ROTATE(par->rotation);
+        init_param |= AUOK190X_INIT_INVERSE_WHITE;
+        init_param |= AUOK190X_INIT_FORMAT0;
+        init_param |= AUOK1900_INIT_RESOLUTION(par->resolution);
+        init_param |= AUOK190X_INIT_SHIFT_RIGHT;
+
+        auok190x_send_cmdargs(par, AUOK190X_CMD_INIT, 1, &init_param);
+
+        /* let the controller finish */
+        board->wait_for_rdy(par);
+}
+
+static void auok1900_update_region(struct auok190xfb_par *par, int mode,
+                                                u16 y1, u16 y2)
+{
+        struct device *dev = par->info->device;
+        unsigned char *buf = (unsigned char *)par->info->screen_base;
+        int xres = par->info->var.xres;
+        u16 args[4];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        /* y1 and y2 must be a multiple of 2 so drop the lowest bit */
+        y1 &= 0xfffe;
+        y2 &= 0xfffe;
+
+        dev_dbg(dev, "update (x,y,w,h,mode)=(%d,%d,%d,%d,%d)\n",
+                1, y1+1, xres, y2-y1, mode);
+
+        /* to FIX handle different partial update modes */
+        args[0] = mode | 1;
+        args[1] = y1 + 1;
+        args[2] = xres;
+        args[3] = y2 - y1;
+        buf += y1 * xres;
+        auok190x_send_cmdargs_pixels(par, AUOK1900_CMD_PARTIALDISP, 4, args,
+                                     ((y2 - y1) * xres)/2, (u16 *) buf);
+        auok190x_send_command(par, AUOK190X_CMD_DATA_STOP);
+
+        par->update_cnt++;
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+static void auok1900fb_dpy_update_pages(struct auok190xfb_par *par,
+                                                u16 y1, u16 y2)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(1);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1900_update_region(par, mode, y1, y2);
+}
+
+static void auok1900fb_dpy_update(struct auok190xfb_par *par)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(0);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1900_update_region(par, mode, 0, par->info->var.yres);
+        par->update_cnt = 0;
+}
+
+static bool auok1900fb_need_refresh(struct auok190xfb_par *par)
+{
+        return (par->update_cnt > 10);
+}
+
+static int __devinit auok1900fb_probe(struct platform_device *pdev)
+{
+        struct auok190x_init_data init;
+        struct auok190x_board *board;
+
+        /* pick up board specific routines */
+        board = pdev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* fill temporary init struct for common init */
+        init.id = "auo_k1900fb";
+        init.board = board;
+        init.update_partial = auok1900fb_dpy_update_pages;
+        init.update_all = auok1900fb_dpy_update;
+        init.need_refresh = auok1900fb_need_refresh;
+        init.init = auok1900_init;
+
+        return auok190x_common_probe(pdev, &init);
+}
+
+static int __devexit auok1900fb_remove(struct platform_device *pdev)
+{
+        return auok190x_common_remove(pdev);
+}
+
+static struct platform_driver auok1900fb_driver = {
+        .probe  = auok1900fb_probe,
+        .remove = __devexit_p(auok1900fb_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "auo_k1900fb",
+                .pm = &auok190x_pm,
+        },
+};
+module_platform_driver(auok1900fb_driver);
+
+MODULE_DESCRIPTION("framebuffer driver for the AUO-K1900 EPD controller");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k1901fb.c b/drivers/video/auo_k1901fb.c
new file mode 100644
index 000000000000..1c054c18616e
--- /dev/null
+++ b/drivers/video/auo_k1901fb.c
@@ -0,0 +1,251 @@
+/*
+ * auok190xfb.c -- FB driver for AUO-K1901 controllers
+ *
+ * Copyright (C) 2011, 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on broadsheetfb.c
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver is written to be used with the AUO-K1901 display controller.
+ *
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions.
+ *
+ * The controller supports different update modes:
+ * mode0+1 16 step gray (4bit)
+ * mode2+3 4 step gray (2bit)
+ * mode4+5 2 step gray (1bit)
+ * - mode4 is described as "without LUT"
+ * mode7 automatic selection of update mode
+ *
+ * The most interesting difference to the K1900 is the ability to do screen
+ * updates in an asynchronous fashion. Where the K1900 needs to wait for the
+ * current update to complete, the K1901 can process later updates already.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+/*
+ * AUO-K1901 specific commands
+ */
+
+#define AUOK1901_CMD_LUT_INTERFACE      0x0005
+#define AUOK1901_CMD_DMA_START          0x1001
+#define AUOK1901_CMD_CURSOR_START       0x1007
+#define AUOK1901_CMD_CURSOR_STOP        AUOK190X_CMD_DATA_STOP
+#define AUOK1901_CMD_DDMA_START         0x1009
+
+#define AUOK1901_INIT_GATE_PULSE_LOW    (0 << 14)
+#define AUOK1901_INIT_GATE_PULSE_HIGH   (1 << 14)
+#define AUOK1901_INIT_SINGLE_GATE       (0 << 13)
+#define AUOK1901_INIT_DOUBLE_GATE       (1 << 13)
+
+/* Bits to pixels
+ *   Mode       15-12   11-8    7-4     3-0
+ *   format2    2       T       1       T
+ *   format3    1       T       2       T
+ *   format4    T       2       T       1
+ *   format5    T       1       T       2
+ *
+ *   halftone modes:
+ *   format6    2       2       1       1
+ *   format7    1       1       2       2
+ */
+#define AUOK1901_INIT_FORMAT2           (1 << 7)
+#define AUOK1901_INIT_FORMAT3           ((1 << 7) | (1 << 6))
+#define AUOK1901_INIT_FORMAT4           (1 << 8)
+#define AUOK1901_INIT_FORMAT5           ((1 << 8) | (1 << 6))
+#define AUOK1901_INIT_FORMAT6           ((1 << 8) | (1 << 7))
+#define AUOK1901_INIT_FORMAT7           ((1 << 8) | (1 << 7) | (1 << 6))
+
+/* res[4] to bit 10
+ * res[3-0] to bits 5-2
+ */
+#define AUOK1901_INIT_RESOLUTION(_res)  (((_res & (1 << 4)) << 6) \
+                                         | ((_res & 0xf) << 2))
+
+/*
+ * portrait / landscape orientation in AUOK1901_CMD_DMA_START
+ */
+#define AUOK1901_DMA_ROTATE90(_rot)             ((_rot & 1) << 13)
+
+/*
+ * equivalent to 1 << 11, needs the ~ to have same rotation like K1900
+ */
+#define AUOK1901_DDMA_ROTATE180(_rot)           ((~_rot & 2) << 10)
+
+static void auok1901_init(struct auok190xfb_par *par)
+{
+        struct auok190x_board *board = par->board;
+        u16 init_param = 0;
+
+        init_param |= AUOK190X_INIT_INVERSE_WHITE;
+        init_param |= AUOK190X_INIT_FORMAT0;
+        init_param |= AUOK1901_INIT_RESOLUTION(par->resolution);
+        init_param |= AUOK190X_INIT_SHIFT_LEFT;
+
+        auok190x_send_cmdargs(par, AUOK190X_CMD_INIT, 1, &init_param);
+
+        /* let the controller finish */
+        board->wait_for_rdy(par);
+}
+
+static void auok1901_update_region(struct auok190xfb_par *par, int mode,
+                                                u16 y1, u16 y2)
+{
+        struct device *dev = par->info->device;
+        unsigned char *buf = (unsigned char *)par->info->screen_base;
+        int xres = par->info->var.xres;
+        u16 args[5];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        /* y1 and y2 must be a multiple of 2 so drop the lowest bit */
+        y1 &= 0xfffe;
+        y2 &= 0xfffe;
+
+        dev_dbg(dev, "update (x,y,w,h,mode)=(%d,%d,%d,%d,%d)\n",
+                1, y1+1, xres, y2-y1, mode);
+
+        /* K1901: first transfer the region data */
+        args[0] = AUOK1901_DMA_ROTATE90(par->rotation) | 1;
+        args[1] = y1 + 1;
+        args[2] = xres;
+        args[3] = y2 - y1;
+        buf += y1 * xres;
+        auok190x_send_cmdargs_pixels_nowait(par, AUOK1901_CMD_DMA_START, 4,
+                                            args, ((y2 - y1) * xres)/2,
+                                            (u16 *) buf);
+        auok190x_send_command_nowait(par, AUOK190X_CMD_DATA_STOP);
+
+        /* K1901: second tell the controller to update the region with mode */
+        args[0] = mode | AUOK1901_DDMA_ROTATE180(par->rotation);
+        args[1] = 1;
+        args[2] = y1 + 1;
+        args[3] = xres;
+        args[4] = y2 - y1;
+        auok190x_send_cmdargs_nowait(par, AUOK1901_CMD_DDMA_START, 5, args);
+
+        par->update_cnt++;
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+static void auok1901fb_dpy_update_pages(struct auok190xfb_par *par,
+                                                u16 y1, u16 y2)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(1);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1901_update_region(par, mode, y1, y2);
+}
+
+static void auok1901fb_dpy_update(struct auok190xfb_par *par)
+{
+        int mode;
+
+        /* When doing full updates, wait for the controller to be ready
+         * This will hopefully catch some hangs of the K1901
+         */
+        par->board->wait_for_rdy(par);
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(0);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1901_update_region(par, mode, 0, par->info->var.yres);
+        par->update_cnt = 0;
+}
+
+static bool auok1901fb_need_refresh(struct auok190xfb_par *par)
+{
+        return (par->update_cnt > 10);
+}
+
+static int __devinit auok1901fb_probe(struct platform_device *pdev)
+{
+        struct auok190x_init_data init;
+        struct auok190x_board *board;
+
+        /* pick up board specific routines */
+        board = pdev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* fill temporary init struct for common init */
+        init.id = "auo_k1901fb";
+        init.board = board;
+        init.update_partial = auok1901fb_dpy_update_pages;
+        init.update_all = auok1901fb_dpy_update;
+        init.need_refresh = auok1901fb_need_refresh;
+        init.init = auok1901_init;
+
+        return auok190x_common_probe(pdev, &init);
+}
+
+static int __devexit auok1901fb_remove(struct platform_device *pdev)
+{
+        return auok190x_common_remove(pdev);
+}
+
+static struct platform_driver auok1901fb_driver = {
+        .probe  = auok1901fb_probe,
+        .remove = __devexit_p(auok1901fb_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "auo_k1901fb",
+                .pm = &auok190x_pm,
+        },
+};
+module_platform_driver(auok1901fb_driver);
+
+MODULE_DESCRIPTION("framebuffer driver for the AUO-K1901 EPD controller");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c
new file mode 100644
index 000000000000..77da6a2f43dc
--- /dev/null
+++ b/drivers/video/auo_k190x.c
@@ -0,0 +1,1046 @@
+/*
+ * Common code for AUO-K190X framebuffer drivers
+ *
+ * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+struct panel_info {
+        int w;
+        int h;
+};
+
+/* table of panel specific parameters to be indexed into by the board drivers */
+static struct panel_info panel_table[] = {
+        /* standard 6" */
+        [AUOK190X_RESOLUTION_800_600] = {
+                .w = 800,
+                .h = 600,
+        },
+        /* standard 9" */
+        [AUOK190X_RESOLUTION_1024_768] = {
+                .w = 1024,
+                .h = 768,
+        },
+};
+
+/*
+ * private I80 interface to the board driver
+ */
+
+static void auok190x_issue_data(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_WR, 0);
+        par->board->set_hdb(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_WR, 1);
+}
+
+static void auok190x_issue_cmd(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_DC, 0);
+        auok190x_issue_data(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_DC, 1);
+}
+
+static int auok190x_issue_pixels(struct auok190xfb_par *par, int size,
+                                 u16 *data)
+{
+        struct device *dev = par->info->device;
+        int i;
+        u16 tmp;
+
+        if (size & 3) {
+                dev_err(dev, "issue_pixels: size %d must be a multiple of 4\n",
+                        size);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < (size >> 1); i++) {
+                par->board->set_ctl(par, AUOK190X_I80_WR, 0);
+
+                /* simple reduction of 8bit staticgray to 4bit gray
+                 * combines 4 * 4bit pixel values into a 16bit value
+                 */
+                tmp  = (data[2*i] & 0xF0) >> 4;
+                tmp |= (data[2*i] & 0xF000) >> 8;
+                tmp |= (data[2*i+1] & 0xF0) << 4;
+                tmp |= (data[2*i+1] & 0xF000);
+
+                par->board->set_hdb(par, tmp);
+                par->board->set_ctl(par, AUOK190X_I80_WR, 1);
+        }
+
+        return 0;
+}
+
+static u16 auok190x_read_data(struct auok190xfb_par *par)
+{
+        u16 data;
+
+        par->board->set_ctl(par, AUOK190X_I80_OE, 0);
+        data = par->board->get_hdb(par);
+        par->board->set_ctl(par, AUOK190X_I80_OE, 1);
+
+        return data;
+}
+
+/*
+ * Command interface for the controller drivers
+ */
+
+void auok190x_send_command_nowait(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_command_nowait);
+
+void auok190x_send_cmdargs_nowait(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv)
+{
+        int i;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                auok190x_issue_data(par, argv[i]);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_nowait);
+
+int auok190x_send_command(struct auok190xfb_par *par, u16 data)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_command_nowait(par, data);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_command);
+
+int auok190x_send_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                           int argc, u16 *argv)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_cmdargs_nowait(par, cmd, argc, argv);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs);
+
+int auok190x_read_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                           int argc, u16 *argv)
+{
+        int i, ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                argv[i] = auok190x_read_data(par);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_read_cmdargs);
+
+void auok190x_send_cmdargs_pixels_nowait(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv, int size, u16 *data)
+{
+        int i;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                auok190x_issue_data(par, argv[i]);
+
+        auok190x_issue_pixels(par, size, data);
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_pixels_nowait);
+
+int auok190x_send_cmdargs_pixels(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv, int size, u16 *data)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_cmdargs_pixels_nowait(par, cmd, argc, argv, size, data);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_pixels);
+
+/*
+ * fbdefio callbacks - common on both controllers.
+ */
+
+static void auok190xfb_dpy_first_io(struct fb_info *info)
+{
+        /* tell runtime-pm that we wish to use the device in a short time */
+        pm_runtime_get(info->device);
+}
+
+/* this is called back from the deferred io workqueue */
+static void auok190xfb_dpy_deferred_io(struct fb_info *info,
+                                struct list_head *pagelist)
+{
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct auok190xfb_par *par = info->par;
+        u16 yres = info->var.yres;
+        u16 xres = info->var.xres;
+        u16 y1 = 0, h = 0;
+        int prev_index = -1;
+        struct page *cur;
+        int h_inc;
+        int threshold;
+
+        if (!list_empty(pagelist))
+                /* the device resume should've been requested through first_io,
+                 * if the resume did not finish until now, wait for it.
+                 */
+                pm_runtime_barrier(info->device);
+        else
+                /* We reached this via the fsync or some other way.
+                 * In either case the first_io function did not run,
+                 * so we runtime_resume the device here synchronously.
+                 */
+                pm_runtime_get_sync(info->device);
+
+        /* Do a full screen update every n updates to prevent
+         * excessive darkening of the Sipix display.
+         * If we do this, there is no need to walk the pages.
+         */
+        if (par->need_refresh(par)) {
+                par->update_all(par);
+                goto out;
+        }
+
+        /* height increment is fixed per page */
+        h_inc = DIV_ROUND_UP(PAGE_SIZE , xres);
+
+        /* calculate number of pages from pixel height */
+        threshold = par->consecutive_threshold / h_inc;
+        if (threshold < 1)
+                threshold = 1;
+
+        /* walk the written page list and swizzle the data */
+        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+                if (prev_index < 0) {
+                        /* just starting so assign first page */
+                        y1 = (cur->index << PAGE_SHIFT) / xres;
+                        h = h_inc;
+                } else if ((cur->index - prev_index) <= threshold) {
+                        /* page is within our threshold for single updates */
+                        h += h_inc * (cur->index - prev_index);
+                } else {
+                        /* page not consecutive, issue previous update first */
+                        par->update_partial(par, y1, y1 + h);
+
+                        /* start over with our non consecutive page */
+                        y1 = (cur->index << PAGE_SHIFT) / xres;
+                        h = h_inc;
+                }
+                prev_index = cur->index;
+        }
+
+        /* if we still have any pages to update we do so now */
+        if (h >= yres)
+                /* its a full screen update, just do it */
+                par->update_all(par);
+        else
+                par->update_partial(par, y1, min((u16) (y1 + h), yres));
+
+out:
+        pm_runtime_mark_last_busy(info->device);
+        pm_runtime_put_autosuspend(info->device);
+}
+
+/*
+ * framebuffer operations
+ */
+
+/*
+ * this is the slow path from userspace. they can seek and write to
+ * the fb. it's inefficient to do anything less than a full screen draw
+ */
+static ssize_t auok190xfb_write(struct fb_info *info, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        struct auok190xfb_par *par = info->par;
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->fix.smem_len;
+
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
+        }
+
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
+
+                count = total_size - p;
+        }
+
+        dst = (void *)(info->screen_base + p);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        par->update_all(par);
+
+        return (err) ? err : count;
+}
+
+static void auok190xfb_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_fillrect(info, rect);
+
+        par->update_all(par);
+}
+
+static void auok190xfb_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_copyarea(info, area);
+
+        par->update_all(par);
+}
+
+static void auok190xfb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_imageblit(info, image);
+
+        par->update_all(par);
+}
+
+static int auok190xfb_check_var(struct fb_var_screeninfo *var,
+                                   struct fb_info *info)
+{
+        if (info->var.xres != var->xres || info->var.yres != var->yres ||
+            info->var.xres_virtual != var->xres_virtual ||
+            info->var.yres_virtual != var->yres_virtual) {
+                pr_info("%s: Resolution not supported: X%u x Y%u\n",
+                         __func__, var->xres, var->yres);
+                return -EINVAL;
+        }
+
+        /*
+         *  Memory limit
+         */
+
+        if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
+                pr_info("%s: Memory Limit requested yres_virtual = %u\n",
+                         __func__, var->yres_virtual);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static struct fb_ops auok190xfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_read        = fb_sys_read,
+        .fb_write       = auok190xfb_write,
+        .fb_fillrect    = auok190xfb_fillrect,
+        .fb_copyarea    = auok190xfb_copyarea,
+        .fb_imageblit   = auok190xfb_imageblit,
+        .fb_check_var   = auok190xfb_check_var,
+};
+
+/*
+ * Controller-functions common to both K1900 and K1901
+ */
+
+static int auok190x_read_temperature(struct auok190xfb_par *par)
+{
+        struct device *dev = par->info->device;
+        u16 data[4];
+        int temp;
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        auok190x_read_cmdargs(par, AUOK190X_CMD_READ_VERSION, 4, data);
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+
+        /* sanitize and split of half-degrees for now */
+        temp = ((data[0] & AUOK190X_VERSION_TEMP_MASK) >> 1);
+
+        /* handle positive and negative temperatures */
+        if (temp >= 201)
+                return (255 - temp + 1) * (-1);
+        else
+                return temp;
+}
+
+static void auok190x_identify(struct auok190xfb_par *par)
+{
+        struct device *dev = par->info->device;
+        u16 data[4];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        auok190x_read_cmdargs(par, AUOK190X_CMD_READ_VERSION, 4, data);
+
+        mutex_unlock(&(par->io_lock));
+
+        par->epd_type = data[1] & AUOK190X_VERSION_TEMP_MASK;
+
+        par->panel_size_int = AUOK190X_VERSION_SIZE_INT(data[2]);
+        par->panel_size_float = AUOK190X_VERSION_SIZE_FLOAT(data[2]);
+        par->panel_model = AUOK190X_VERSION_MODEL(data[2]);
+
+        par->tcon_version = AUOK190X_VERSION_TCON(data[3]);
+        par->lut_version = AUOK190X_VERSION_LUT(data[3]);
+
+        dev_dbg(dev, "panel %d.%din, model 0x%x, EPD 0x%x TCON-rev 0x%x, LUT-rev 0x%x",
+                par->panel_size_int, par->panel_size_float, par->panel_model,
+                par->epd_type, par->tcon_version, par->lut_version);
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+/*
+ * Sysfs functions
+ */
+
+static ssize_t update_mode_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+
+        return sprintf(buf, "%d\n", par->update_mode);
+}
+
+static ssize_t update_mode_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int mode, ret;
+
+        ret = kstrtoint(buf, 10, &mode);
+        if (ret)
+                return ret;
+
+        par->update_mode = mode;
+
+        /* if we enter a better mode, do a full update */
+        if (par->last_mode > 1 && mode < par->last_mode)
+                par->update_all(par);
+
+        return count;
+}
+
+static ssize_t flash_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+
+        return sprintf(buf, "%d\n", par->flash);
+}
+
+static ssize_t flash_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int flash, ret;
+
+        ret = kstrtoint(buf, 10, &flash);
+        if (ret)
+                return ret;
+
+        if (flash > 0)
+                par->flash = 1;
+        else
+                par->flash = 0;
+
+        return count;
+}
+
+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int temp;
+
+        temp = auok190x_read_temperature(par);
+        return sprintf(buf, "%d\n", temp);
+}
+
+static DEVICE_ATTR(update_mode, 0644, update_mode_show, update_mode_store);
+static DEVICE_ATTR(flash, 0644, flash_show, flash_store);
+static DEVICE_ATTR(temp, 0644, temp_show, NULL);
+
+static struct attribute *auok190x_attributes[] = {
+        &dev_attr_update_mode.attr,
+        &dev_attr_flash.attr,
+        &dev_attr_temp.attr,
+        NULL
+};
+
+static const struct attribute_group auok190x_attr_group = {
+        .attrs          = auok190x_attributes,
+};
+
+static int auok190x_power(struct auok190xfb_par *par, bool on)
+{
+        struct auok190x_board *board = par->board;
+        int ret;
+
+        if (on) {
+                /* We should maintain POWER up for at least 80ms before set
+                 * RST_N and SLP_N to high (TCON spec 20100803_v35 p59)
+                 */
+                ret = regulator_enable(par->regulator);
+                if (ret)
+                        return ret;
+
+                msleep(200);
+                gpio_set_value(board->gpio_nrst, 1);
+                gpio_set_value(board->gpio_nsleep, 1);
+                msleep(200);
+        } else {
+                regulator_disable(par->regulator);
+                gpio_set_value(board->gpio_nrst, 0);
+                gpio_set_value(board->gpio_nsleep, 0);
+        }
+
+        return 0;
+}
+
+/*
+ * Recovery - powercycle the controller
+ */
+
+static void auok190x_recover(struct auok190xfb_par *par)
+{
+        auok190x_power(par, 0);
+        msleep(100);
+        auok190x_power(par, 1);
+
+        par->init(par);
+
+        /* wait for init to complete */
+        par->board->wait_for_rdy(par);
+}
+
+/*
+ * Power-management
+ */
+
+#ifdef CONFIG_PM
+static int auok190x_runtime_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+        u16 standby_param;
+
+        /* take and keep the lock until we are resumed, as the controller
+         * will never reach the non-busy state when in standby mode
+         */
+        mutex_lock(&(par->io_lock));
+
+        if (par->standby) {
+                dev_warn(dev, "already in standby, runtime-pm pairing mismatch\n");
+                mutex_unlock(&(par->io_lock));
+                return 0;
+        }
+
+        /* according to runtime_pm.txt runtime_suspend only means, that the
+         * device will not process data and will not communicate with the CPU
+         * As we hold the lock, this stays true even without standby
+         */
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "runtime suspend without standby\n");
+                goto finish;
+        } else if (board->quirks & AUOK190X_QUIRK_STANDBYPARAM) {
+                /* for some TCON versions STANDBY expects a parameter (0) but
+                 * it seems the real tcon version has to be determined yet.
+                 */
+                dev_dbg(dev, "runtime suspend with additional empty param\n");
+                standby_param = 0;
+                auok190x_send_cmdargs(par, AUOK190X_CMD_STANDBY, 1,
+                                      &standby_param);
+        } else {
+                dev_dbg(dev, "runtime suspend without param\n");
+                auok190x_send_command(par, AUOK190X_CMD_STANDBY);
+        }
+
+        msleep(64);
+
+finish:
+        par->standby = 1;
+
+        return 0;
+}
+
+static int auok190x_runtime_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        if (!par->standby) {
+                dev_warn(dev, "not in standby, runtime-pm pairing mismatch\n");
+                return 0;
+        }
+
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "runtime resume without standby\n");
+        } else {
+                /* when in standby, controller is always busy
+                 * and only accepts the wakeup command
+                 */
+                dev_dbg(dev, "runtime resume from standby\n");
+                auok190x_send_command_nowait(par, AUOK190X_CMD_WAKEUP);
+
+                msleep(160);
+
+                /* wait for the controller to be ready and release the lock */
+                board->wait_for_rdy(par);
+        }
+
+        par->standby = 0;
+
+        mutex_unlock(&(par->io_lock));
+
+        return 0;
+}
+
+static int auok190x_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+        int ret;
+
+        dev_dbg(dev, "suspend\n");
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                /* suspend via powering off the ic */
+                dev_dbg(dev, "suspend with broken standby\n");
+
+                auok190x_power(par, 0);
+        } else {
+                dev_dbg(dev, "suspend using sleep\n");
+
+                /* the sleep state can only be entered from the standby state.
+                 * pm_runtime_get_noresume gets called before the suspend call.
+                 * So the devices usage count is >0 but it is not necessarily
+                 * active.
+                 */
+                if (!pm_runtime_status_suspended(dev)) {
+                        ret = auok190x_runtime_suspend(dev);
+                        if (ret < 0) {
+                                dev_err(dev, "auok190x_runtime_suspend failed with %d\n",
+                                        ret);
+                                return ret;
+                        }
+                        par->manual_standby = 1;
+                }
+
+                gpio_direction_output(board->gpio_nsleep, 0);
+        }
+
+        msleep(100);
+
+        return 0;
+}
+
+static int auok190x_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        dev_dbg(dev, "resume\n");
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "resume with broken standby\n");
+
+                auok190x_power(par, 1);
+
+                par->init(par);
+        } else {
+                dev_dbg(dev, "resume from sleep\n");
+
+                /* device should be in runtime suspend when we were suspended
+                 * and pm_runtime_put_sync gets called after this function.
+                 * So there is no need to touch the standby mode here at all.
+                 */
+                gpio_direction_output(board->gpio_nsleep, 1);
+                msleep(100);
+
+                /* an additional init call seems to be necessary after sleep */
+                auok190x_runtime_resume(dev);
+                par->init(par);
+
+                /* if we were runtime-suspended before, suspend again*/
+                if (!par->manual_standby)
+                        auok190x_runtime_suspend(dev);
+                else
+                        par->manual_standby = 0;
+        }
+
+        return 0;
+}
+#endif
+
+const struct dev_pm_ops auok190x_pm = {
+        SET_RUNTIME_PM_OPS(auok190x_runtime_suspend, auok190x_runtime_resume,
+                           NULL)
+        SET_SYSTEM_SLEEP_PM_OPS(auok190x_suspend, auok190x_resume)
+};
+EXPORT_SYMBOL_GPL(auok190x_pm);
+
+/*
+ * Common probe and remove code
+ */
+
+int __devinit auok190x_common_probe(struct platform_device *pdev,
+                                    struct auok190x_init_data *init)
+{
+        struct auok190x_board *board = init->board;
+        struct auok190xfb_par *par;
+        struct fb_info *info;
+        struct panel_info *panel;
+        int videomemorysize, ret;
+        unsigned char *videomemory;
+
+        /* check board contents */
+        if (!board->init || !board->cleanup || !board->wait_for_rdy
+            || !board->set_ctl || !board->set_hdb || !board->get_hdb
+            || !board->setup_irq)
+                return -EINVAL;
+
+        info = framebuffer_alloc(sizeof(struct auok190xfb_par), &pdev->dev);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->info = info;
+        par->board = board;
+        par->recover = auok190x_recover;
+        par->update_partial = init->update_partial;
+        par->update_all = init->update_all;
+        par->need_refresh = init->need_refresh;
+        par->init = init->init;
+
+        /* init update modes */
+        par->update_cnt = 0;
+        par->update_mode = -1;
+        par->last_mode = -1;
+        par->flash = 0;
+
+        par->regulator = regulator_get(info->device, "vdd");
+        if (IS_ERR(par->regulator)) {
+                ret = PTR_ERR(par->regulator);
+                dev_err(info->device, "Failed to get regulator: %d\n", ret);
+                goto err_reg;
+        }
+
+        ret = board->init(par);
+        if (ret) {
+                dev_err(info->device, "board init failed, %d\n", ret);
+                goto err_board;
+        }
+
+        ret = gpio_request(board->gpio_nsleep, "AUOK190x sleep");
+        if (ret) {
+                dev_err(info->device, "could not request sleep gpio, %d\n",
+                        ret);
+                goto err_gpio1;
+        }
+
+        ret = gpio_direction_output(board->gpio_nsleep, 0);
+        if (ret) {
+                dev_err(info->device, "could not set sleep gpio, %d\n", ret);
+                goto err_gpio2;
+        }
+
+        ret = gpio_request(board->gpio_nrst, "AUOK190x reset");
+        if (ret) {
+                dev_err(info->device, "could not request reset gpio, %d\n",
+                        ret);
+                goto err_gpio2;
+        }
+
+        ret = gpio_direction_output(board->gpio_nrst, 0);
+        if (ret) {
+                dev_err(info->device, "could not set reset gpio, %d\n", ret);
+                goto err_gpio3;
+        }
+
+        ret = auok190x_power(par, 1);
+        if (ret) {
+                dev_err(info->device, "could not power on the device, %d\n",
+                        ret);
+                goto err_gpio3;
+        }
+
+        mutex_init(&par->io_lock);
+
+        init_waitqueue_head(&par->waitq);
+
+        ret = par->board->setup_irq(par->info);
+        if (ret) {
+                dev_err(info->device, "could not setup ready-irq, %d\n", ret);
+                goto err_irq;
+        }
+
+        /* wait for init to complete */
+        par->board->wait_for_rdy(par);
+
+        /*
+         * From here on the controller can talk to us
+         */
+
+        /* initialise fix, var, resolution and rotation */
+
+        strlcpy(info->fix.id, init->id, 16);
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
+        info->fix.xpanstep = 0;
+        info->fix.ypanstep = 0;
+        info->fix.ywrapstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+
+        info->var.bits_per_pixel = 8;
+        info->var.grayscale = 1;
+        info->var.red.length = 8;
+        info->var.green.length = 8;
+        info->var.blue.length = 8;
+
+        panel = &panel_table[board->resolution];
+
+        /* if 90 degree rotation, switch width and height */
+        if (board->rotation & 1) {
+                info->var.xres = panel->h;
+                info->var.yres = panel->w;
+                info->var.xres_virtual = panel->h;
+                info->var.yres_virtual = panel->w;
+                info->fix.line_length = panel->h;
+        } else {
+                info->var.xres = panel->w;
+                info->var.yres = panel->h;
+                info->var.xres_virtual = panel->w;
+                info->var.yres_virtual = panel->h;
+                info->fix.line_length = panel->w;
+        }
+
+        par->resolution = board->resolution;
+        par->rotation = board->rotation;
+
+        /* videomemory handling */
+
+        videomemorysize = roundup((panel->w * panel->h), PAGE_SIZE);
+        videomemory = vmalloc(videomemorysize);
+        if (!videomemory) {
+                ret = -ENOMEM;
+                goto err_irq;
+        }
+
+        memset(videomemory, 0, videomemorysize);
+        info->screen_base = (char *)videomemory;
+        info->fix.smem_len = videomemorysize;
+
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+        info->fbops = &auok190xfb_ops;
+
+        /* deferred io init */
+
+        info->fbdefio = devm_kzalloc(info->device,
+                                     sizeof(struct fb_deferred_io),
+                                     GFP_KERNEL);
+        if (!info->fbdefio) {
+                dev_err(info->device, "Failed to allocate memory\n");
+                ret = -ENOMEM;
+                goto err_defio;
+        }
+
+        dev_dbg(info->device, "targetting %d frames per second\n", board->fps);
+        info->fbdefio->delay = HZ / board->fps;
+        info->fbdefio->first_io = auok190xfb_dpy_first_io,
+        info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io,
+        fb_deferred_io_init(info);
+
+        /* color map */
+
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret < 0) {
+                dev_err(info->device, "Failed to allocate colormap\n");
+                goto err_cmap;
+        }
+
+        /* controller init */
+
+        par->consecutive_threshold = 100;
+        par->init(par);
+        auok190x_identify(par);
+
+        platform_set_drvdata(pdev, info);
+
+        ret = register_framebuffer(info);
+        if (ret < 0)
+                goto err_regfb;
+
+        ret = sysfs_create_group(&info->device->kobj, &auok190x_attr_group);
+        if (ret)
+                goto err_sysfs;
+
+        dev_info(info->device, "fb%d: %dx%d using %dK of video memory\n",
+                 info->node, info->var.xres, info->var.yres,
+                 videomemorysize >> 10);
+
+        /* increase autosuspend_delay when we use alternative methods
+         * for runtime_pm
+         */
+        par->autosuspend_delay = (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN)
+                                        ? 1000 : 200;
+
+        pm_runtime_set_active(info->device);
+        pm_runtime_enable(info->device);
+        pm_runtime_set_autosuspend_delay(info->device, par->autosuspend_delay);
+        pm_runtime_use_autosuspend(info->device);
+
+        return 0;
+
+err_sysfs:
+        unregister_framebuffer(info);
+err_regfb:
+        fb_dealloc_cmap(&info->cmap);
+err_cmap:
+        fb_deferred_io_cleanup(info);
+        kfree(info->fbdefio);
+err_defio:
+        vfree((void *)info->screen_base);
+err_irq:
+        auok190x_power(par, 0);
+err_gpio3:
+        gpio_free(board->gpio_nrst);
+err_gpio2:
+        gpio_free(board->gpio_nsleep);
+err_gpio1:
+        board->cleanup(par);
+err_board:
+        regulator_put(par->regulator);
+err_reg:
+        framebuffer_release(info);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(auok190x_common_probe);
+
+int  __devexit auok190x_common_remove(struct platform_device *pdev)
+{
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        pm_runtime_disable(info->device);
+
+        sysfs_remove_group(&info->device->kobj, &auok190x_attr_group);
+
+        unregister_framebuffer(info);
+
+        fb_dealloc_cmap(&info->cmap);
+
+        fb_deferred_io_cleanup(info);
+        kfree(info->fbdefio);
+
+        vfree((void *)info->screen_base);
+
+        auok190x_power(par, 0);
+
+        gpio_free(board->gpio_nrst);
+        gpio_free(board->gpio_nsleep);
+
+        board->cleanup(par);
+
+        regulator_put(par->regulator);
+
+        framebuffer_release(info);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_common_remove);
+
+MODULE_DESCRIPTION("Common code for AUO-K190X controllers");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k190x.h b/drivers/video/auo_k190x.h
new file mode 100644
index 000000000000..e35af1f51b28
--- /dev/null
+++ b/drivers/video/auo_k190x.h
@@ -0,0 +1,129 @@
+/*
+ * Private common definitions for AUO-K190X framebuffer drivers
+ *
+ * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ */
+
+/*
+ * I80 interface specific defines
+ */
+
+#define AUOK190X_I80_CS                 0x01
+#define AUOK190X_I80_DC                 0x02
+#define AUOK190X_I80_WR                 0x03
+#define AUOK190X_I80_OE                 0x04
+
+/*
+ * AUOK190x commands, common to both controllers
+ */
+
+#define AUOK190X_CMD_INIT               0x0000
+#define AUOK190X_CMD_STANDBY            0x0001
+#define AUOK190X_CMD_WAKEUP             0x0002
+#define AUOK190X_CMD_TCON_RESET         0x0003
+#define AUOK190X_CMD_DATA_STOP          0x1002
+#define AUOK190X_CMD_LUT_START          0x1003
+#define AUOK190X_CMD_DISP_REFRESH       0x1004
+#define AUOK190X_CMD_DISP_RESET         0x1005
+#define AUOK190X_CMD_PRE_DISPLAY_START  0x100D
+#define AUOK190X_CMD_PRE_DISPLAY_STOP   0x100F
+#define AUOK190X_CMD_FLASH_W            0x2000
+#define AUOK190X_CMD_FLASH_E            0x2001
+#define AUOK190X_CMD_FLASH_STS          0x2002
+#define AUOK190X_CMD_FRAMERATE          0x3000
+#define AUOK190X_CMD_READ_VERSION       0x4000
+#define AUOK190X_CMD_READ_STATUS        0x4001
+#define AUOK190X_CMD_READ_LUT           0x4003
+#define AUOK190X_CMD_DRIVERTIMING       0x5000
+#define AUOK190X_CMD_LBALANCE           0x5001
+#define AUOK190X_CMD_AGINGMODE          0x6000
+#define AUOK190X_CMD_AGINGEXIT          0x6001
+
+/*
+ * Common settings for AUOK190X_CMD_INIT
+ */
+
+#define AUOK190X_INIT_DATA_FILTER       (0 << 12)
+#define AUOK190X_INIT_DATA_BYPASS       (1 << 12)
+#define AUOK190X_INIT_INVERSE_WHITE     (0 << 9)
+#define AUOK190X_INIT_INVERSE_BLACK     (1 << 9)
+#define AUOK190X_INIT_SCAN_DOWN         (0 << 1)
+#define AUOK190X_INIT_SCAN_UP           (1 << 1)
+#define AUOK190X_INIT_SHIFT_LEFT        (0 << 0)
+#define AUOK190X_INIT_SHIFT_RIGHT       (1 << 0)
+
+/* Common bits to pixels
+ *   Mode       15-12   11-8    7-4     3-0
+ *   format0    4       3       2       1
+ *   format1    3       4       1       2
+ */
+
+#define AUOK190X_INIT_FORMAT0           0
+#define AUOK190X_INIT_FORMAT1           (1 << 6)
+
+/*
+ * settings for AUOK190X_CMD_RESET
+ */
+
+#define AUOK190X_RESET_TCON             (0 << 0)
+#define AUOK190X_RESET_NORMAL           (1 << 0)
+#define AUOK190X_RESET_PON              (1 << 1)
+
+/*
+ * AUOK190X_CMD_VERSION
+ */
+
+#define AUOK190X_VERSION_TEMP_MASK              (0x1ff)
+#define AUOK190X_VERSION_EPD_MASK               (0xff)
+#define AUOK190X_VERSION_SIZE_INT(_val)         ((_val & 0xfc00) >> 10)
+#define AUOK190X_VERSION_SIZE_FLOAT(_val)       ((_val & 0x3c0) >> 6)
+#define AUOK190X_VERSION_MODEL(_val)            (_val & 0x3f)
+#define AUOK190X_VERSION_LUT(_val)              (_val & 0xff)
+#define AUOK190X_VERSION_TCON(_val)             ((_val & 0xff00) >> 8)
+
+/*
+ * update modes for CMD_PARTIALDISP on K1900 and CMD_DDMA on K1901
+ */
+
+#define AUOK190X_UPDATE_MODE(_res)              ((_res & 0x7) << 12)
+#define AUOK190X_UPDATE_NONFLASH                (1 << 15)
+
+/*
+ * track panel specific parameters for common init
+ */
+
+struct auok190x_init_data {
+        char *id;
+        struct auok190x_board *board;
+
+        void (*update_partial)(struct auok190xfb_par *par, u16 y1, u16 y2);
+        void (*update_all)(struct auok190xfb_par *par);
+        bool (*need_refresh)(struct auok190xfb_par *par);
+        void (*init)(struct auok190xfb_par *par);
+};
+
+
+extern void auok190x_send_command_nowait(struct auok190xfb_par *par, u16 data);
+extern int auok190x_send_command(struct auok190xfb_par *par, u16 data);
+extern void auok190x_send_cmdargs_nowait(struct auok190xfb_par *par, u16 cmd,
+                                         int argc, u16 *argv);
+extern int auok190x_send_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv);
+extern void auok190x_send_cmdargs_pixels_nowait(struct auok190xfb_par *par,
+                                                u16 cmd, int argc, u16 *argv,
+                                                int size, u16 *data);
+extern int auok190x_send_cmdargs_pixels(struct auok190xfb_par *par, u16 cmd,
+                                        int argc, u16 *argv, int size,
+                                        u16 *data);
+extern int auok190x_read_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv);
+
+extern int auok190x_common_probe(struct platform_device *pdev,
+                                 struct auok190x_init_data *init);
+extern int auok190x_common_remove(struct platform_device *pdev);
+
+extern const struct dev_pm_ops auok190x_pm;
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index fa2b03750316..2979292650d6 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -88,7 +88,7 @@ config LCD_PLATFORM
 
 config LCD_TOSA
         tristate "Sharp SL-6000 LCD Driver"
-        depends on SPI && MACH_TOSA
+        depends on I2C && SPI && MACH_TOSA
         help
           If you have an Sharp SL-6000 Zaurus say Y to enable a driver
           for its LCD.
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 6c9399341bcf..9327cd1b3143 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -263,7 +263,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
 EXPORT_SYMBOL_GPL(ili9320_probe_spi);
 
-int __devexit ili9320_remove(struct ili9320 *ili)
+int ili9320_remove(struct ili9320 *ili)
 {
         ili9320_power(ili, FB_BLANK_POWERDOWN);
 
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 1a268a294478..9bdd4b0c18c8 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -353,18 +353,16 @@ adv7393_read_proc(char *page, char **start, off_t off,
 
 static int
 adv7393_write_proc(struct file *file, const char __user * buffer,
-                   unsigned long count, void *data)
+                   size_t count, void *data)
 {
         struct adv7393fb_device *fbdev = data;
-        char line[8];
         unsigned int val;
         int ret;
 
-        ret = copy_from_user(line, buffer, count);
+        ret = kstrtouint_from_user(buffer, count, 0, &val);
         if (ret)
                 return -EFAULT;
 
-        val = simple_strtoul(line, NULL, 0);
         adv7393_write(fbdev->client, val >> 8, val & 0xff);
 
         return count;
@@ -414,14 +412,14 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
                 if (ret) {
                         dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
                         ret = -EBUSY;
-                        goto out_8;
+                        goto free_fbdev;
                 }
         }
 
         if (peripheral_request_list(ppi_pins, DRIVER_NAME)) {
                 dev_err(&client->dev, "requesting PPI peripheral failed\n");
                 ret = -EFAULT;
-                goto out_8;
+                goto free_gpio;
         }
 
         fbdev->fb_mem =
@@ -432,7 +430,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
                 dev_err(&client->dev, "couldn't allocate dma buffer (%d bytes)\n",
                        (u32) fbdev->fb_len);
                 ret = -ENOMEM;
-                goto out_7;
+                goto free_ppi_pins;
         }
 
         fbdev->info.screen_base = (void *)fbdev->fb_mem;
@@ -464,27 +462,27 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
         if (!fbdev->info.pseudo_palette) {
                 dev_err(&client->dev, "failed to allocate pseudo_palette\n");
                 ret = -ENOMEM;
-                goto out_6;
+                goto free_fb_mem;
         }
 
         if (fb_alloc_cmap(&fbdev->info.cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
                 dev_err(&client->dev, "failed to allocate colormap (%d entries)\n",
                            BFIN_LCD_NBR_PALETTE_ENTRIES);
                 ret = -EFAULT;
-                goto out_5;
+                goto free_palette;
         }
 
         if (request_dma(CH_PPI, "BF5xx_PPI_DMA") < 0) {
                 dev_err(&client->dev, "unable to request PPI DMA\n");
                 ret = -EFAULT;
-                goto out_4;
+                goto free_cmap;
         }
 
         if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, 0,
                         "PPI ERROR", fbdev) < 0) {
                 dev_err(&client->dev, "unable to request PPI ERROR IRQ\n");
                 ret = -EFAULT;
-                goto out_3;
+                goto free_ch_ppi;
         }
 
         fbdev->open = 0;
@@ -494,14 +492,14 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
 
         if (ret) {
                 dev_err(&client->dev, "i2c attach: init error\n");
-                goto out_1;
+                goto free_irq_ppi;
         }
 
 
         if (register_framebuffer(&fbdev->info) < 0) {
                 dev_err(&client->dev, "unable to register framebuffer\n");
                 ret = -EFAULT;
-                goto out_1;
+                goto free_irq_ppi;
         }
 
         dev_info(&client->dev, "fb%d: %s frame buffer device\n",
@@ -512,7 +510,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
         if (!entry) {
                 dev_err(&client->dev, "unable to create /proc entry\n");
                 ret = -EFAULT;
-                goto out_0;
+                goto free_fb;
         }
 
         entry->read_proc = adv7393_read_proc;
@@ -521,22 +519,25 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
 
         return 0;
 
- out_0:
+free_fb:
         unregister_framebuffer(&fbdev->info);
- out_1:
+free_irq_ppi:
         free_irq(IRQ_PPI_ERROR, fbdev);
- out_3:
+free_ch_ppi:
         free_dma(CH_PPI);
- out_4:
-        dma_free_coherent(NULL, fbdev->fb_len, fbdev->fb_mem,
-                          fbdev->dma_handle);
- out_5:
+free_cmap:
         fb_dealloc_cmap(&fbdev->info.cmap);
- out_6:
+free_palette:
         kfree(fbdev->info.pseudo_palette);
- out_7:
+free_fb_mem:
+        dma_free_coherent(NULL, fbdev->fb_len, fbdev->fb_mem,
+                          fbdev->dma_handle);
+free_ppi_pins:
         peripheral_free_list(ppi_pins);
- out_8:
+free_gpio:
+        if (ANOMALY_05000400)
+                gpio_free(P_IDENT(P_PPI0_FS3));
+free_fbdev:
         kfree(fbdev);
 
         return ret;
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index 377dde3d5bfc..c95b417d0d41 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
 
 static struct platform_driver broadsheetfb_driver = {
         .probe  = broadsheetfb_probe,
-        .remove = broadsheetfb_remove,
+        .remove = __devexit_p(broadsheetfb_remove),
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "broadsheetfb",
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index f56699d8122a..eae46f6457e2 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -1,7 +1,8 @@
 /*
- *  Cobalt server LCD frame buffer driver.
+ *  Cobalt/SEAD3 LCD frame buffer driver.
  *
  *  Copyright (C) 2008  Yoichi Yuasa <yuasa@linux-mips.org>
+ *  Copyright (C) 2012  MIPS Technologies, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,6 +63,7 @@
 #define LCD_CUR_POS(x)          ((x) & LCD_CUR_POS_MASK)
 #define LCD_TEXT_POS(x)         ((x) | LCD_TEXT_MODE)
 
+#ifdef CONFIG_MIPS_COBALT
 static inline void lcd_write_control(struct fb_info *info, u8 control)
 {
         writel((u32)control << 24, info->screen_base);
@@ -81,6 +83,47 @@ static inline u8 lcd_read_data(struct fb_info *info)
 {
         return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24;
 }
+#else
+
+#define LCD_CTL                 0x00
+#define LCD_DATA                0x08
+#define CPLD_STATUS             0x10
+#define CPLD_DATA               0x18
+
+static inline void cpld_wait(struct fb_info *info)
+{
+        do {
+        } while (readl(info->screen_base + CPLD_STATUS) & 1);
+}
+
+static inline void lcd_write_control(struct fb_info *info, u8 control)
+{
+        cpld_wait(info);
+        writel(control, info->screen_base + LCD_CTL);
+}
+
+static inline u8 lcd_read_control(struct fb_info *info)
+{
+        cpld_wait(info);
+        readl(info->screen_base + LCD_CTL);
+        cpld_wait(info);
+        return readl(info->screen_base + CPLD_DATA) & 0xff;
+}
+
+static inline void lcd_write_data(struct fb_info *info, u8 data)
+{
+        cpld_wait(info);
+        writel(data, info->screen_base + LCD_DATA);
+}
+
+static inline u8 lcd_read_data(struct fb_info *info)
+{
+        cpld_wait(info);
+        readl(info->screen_base + LCD_DATA);
+        cpld_wait(info);
+        return readl(info->screen_base + CPLD_DATA) & 0xff;
+}
+#endif
 
 static int lcd_busy_wait(struct fb_info *info)
 {
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index c2d11fef114b..e2c96d01d8f5 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -224,5 +224,19 @@ config FONT_10x18
           big letters. It fits between the sun 12x22 and the normal 8x16 font.
           If other fonts are too big or too small for you, say Y, otherwise say N.
 
+config FONT_AUTOSELECT
+        def_bool y
+        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
+        depends on !FONT_8x8
+        depends on !FONT_6x11
+        depends on !FONT_7x14
+        depends on !FONT_PEARL_8x8
+        depends on !FONT_ACORN_8x8
+        depends on !FONT_MINI_4x6
+        depends on !FONT_SUN8x16
+        depends on !FONT_SUN12x22
+        depends on !FONT_10x18
+        select FONT_8x16
+
 endmenu
 
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index f8babbeee275..345d96230978 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -507,16 +507,16 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
 
         err = fb_alloc_cmap(&info->cmap, 256, 0);
         if (err)
-                goto failed;
+                goto failed_cmap;
 
         err = ep93xxfb_alloc_videomem(info);
         if (err)
-                goto failed;
+                goto failed_videomem;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 err = -ENXIO;
-                goto failed;
+                goto failed_resource;
         }
 
         /*
@@ -532,7 +532,7 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         fbi->mmio_base = ioremap(res->start, resource_size(res));
         if (!fbi->mmio_base) {
                 err = -ENXIO;
-                goto failed;
+                goto failed_resource;
         }
 
         strcpy(info->fix.id, pdev->name);
@@ -553,24 +553,24 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         if (err == 0) {
                 dev_err(info->dev, "No suitable video mode found\n");
                 err = -EINVAL;
-                goto failed;
+                goto failed_mode;
         }
 
         if (mach_info->setup) {
                 err = mach_info->setup(pdev);
                 if (err)
-                        return err;
+                        goto failed_mode;
         }
 
         err = ep93xxfb_check_var(&info->var, info);
         if (err)
-                goto failed;
+                goto failed_check;
 
         fbi->clk = clk_get(info->dev, NULL);
         if (IS_ERR(fbi->clk)) {
                 err = PTR_ERR(fbi->clk);
                 fbi->clk = NULL;
-                goto failed;
+                goto failed_check;
         }
 
         ep93xxfb_set_par(info);
@@ -585,15 +585,17 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         return 0;
 
 failed:
-        if (fbi->clk)
-                clk_put(fbi->clk);
-        if (fbi->mmio_base)
-                iounmap(fbi->mmio_base);
-        ep93xxfb_dealloc_videomem(info);
-        if (&info->cmap)
-                fb_dealloc_cmap(&info->cmap);
+        clk_put(fbi->clk);
+failed_check:
         if (fbi->mach_info->teardown)
                 fbi->mach_info->teardown(pdev);
+failed_mode:
+        iounmap(fbi->mmio_base);
+failed_resource:
+        ep93xxfb_dealloc_videomem(info);
+failed_videomem:
+        fb_dealloc_cmap(&info->cmap);
+failed_cmap:
         kfree(info);
         platform_set_drvdata(pdev, NULL);
 
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 2a4481cf260c..a36b2d28280e 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -21,14 +21,14 @@
 
 #include <video/exynos_dp.h>
 
-#include <plat/cpu.h>
-
 #include "exynos_dp_core.h"
 
 static int exynos_dp_init_dp(struct exynos_dp_device *dp)
 {
         exynos_dp_reset(dp);
 
+        exynos_dp_swreset(dp);
+
         /* SW defined function Normal operation */
         exynos_dp_enable_sw_function(dp);
 
@@ -478,7 +478,7 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
         int lane_count;
         u8 buf[5];
 
-        u8 *adjust_request;
+        u8 adjust_request[2];
         u8 voltage_swing;
         u8 pre_emphasis;
         u8 training_lane;
@@ -493,8 +493,8 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
                 /* set training pattern 2 for EQ */
                 exynos_dp_set_training_pattern(dp, TRAINING_PTN2);
 
-                adjust_request = link_status + (DPCD_ADDR_ADJUST_REQUEST_LANE0_1
-                                                - DPCD_ADDR_LANE0_1_STATUS);
+                adjust_request[0] = link_status[4];
+                adjust_request[1] = link_status[5];
 
                 exynos_dp_get_adjust_train(dp, adjust_request);
 
@@ -566,7 +566,7 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
         u8 buf[5];
         u32 reg;
 
-        u8 *adjust_request;
+        u8 adjust_request[2];
 
         udelay(400);
 
@@ -575,8 +575,8 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
         lane_count = dp->link_train.lane_count;
 
         if (exynos_dp_clock_recovery_ok(link_status, lane_count) == 0) {
-                adjust_request = link_status + (DPCD_ADDR_ADJUST_REQUEST_LANE0_1
-                                                - DPCD_ADDR_LANE0_1_STATUS);
+                adjust_request[0] = link_status[4];
+                adjust_request[1] = link_status[5];
 
                 if (exynos_dp_channel_eq_ok(link_status, lane_count) == 0) {
                         /* traing pattern Set to Normal */
@@ -770,7 +770,7 @@ static int exynos_dp_config_video(struct exynos_dp_device *dp,
                         return -ETIMEDOUT;
                 }
 
-                mdelay(100);
+                udelay(1);
         }
 
         /* Set to use the register calculated M/N video */
@@ -804,7 +804,7 @@ static int exynos_dp_config_video(struct exynos_dp_device *dp,
                         return -ETIMEDOUT;
                 }
 
-                mdelay(100);
+                mdelay(1);
         }
 
         if (retval != 0)
@@ -860,7 +860,8 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        dp = kzalloc(sizeof(struct exynos_dp_device), GFP_KERNEL);
+        dp = devm_kzalloc(&pdev->dev, sizeof(struct exynos_dp_device),
+                                GFP_KERNEL);
         if (!dp) {
                 dev_err(&pdev->dev, "no memory for device data\n");
                 return -ENOMEM;
@@ -871,8 +872,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         dp->clock = clk_get(&pdev->dev, "dp");
         if (IS_ERR(dp->clock)) {
                 dev_err(&pdev->dev, "failed to get clock\n");
-                ret = PTR_ERR(dp->clock);
-                goto err_dp;
+                return PTR_ERR(dp->clock);
         }
 
         clk_enable(dp->clock);
@@ -884,35 +884,25 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                 goto err_clock;
         }
 
-        res = request_mem_region(res->start, resource_size(res),
-                                dev_name(&pdev->dev));
-        if (!res) {
-                dev_err(&pdev->dev, "failed to request registers region\n");
-                ret = -EINVAL;
-                goto err_clock;
-        }
-
-        dp->res = res;
-
-        dp->reg_base = ioremap(res->start, resource_size(res));
+        dp->reg_base = devm_request_and_ioremap(&pdev->dev, res);
         if (!dp->reg_base) {
                 dev_err(&pdev->dev, "failed to ioremap\n");
                 ret = -ENOMEM;
-                goto err_req_region;
+                goto err_clock;
         }
 
         dp->irq = platform_get_irq(pdev, 0);
         if (!dp->irq) {
                 dev_err(&pdev->dev, "failed to get irq\n");
                 ret = -ENODEV;
-                goto err_ioremap;
+                goto err_clock;
         }
 
-        ret = request_irq(dp->irq, exynos_dp_irq_handler, 0,
-                        "exynos-dp", dp);
+        ret = devm_request_irq(&pdev->dev, dp->irq, exynos_dp_irq_handler, 0,
+                                "exynos-dp", dp);
         if (ret) {
                 dev_err(&pdev->dev, "failed to request irq\n");
-                goto err_ioremap;
+                goto err_clock;
         }
 
         dp->video_info = pdata->video_info;
@@ -924,7 +914,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         ret = exynos_dp_detect_hpd(dp);
         if (ret) {
                 dev_err(&pdev->dev, "unable to detect hpd\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         exynos_dp_handle_edid(dp);
@@ -933,7 +923,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                                 dp->video_info->link_rate);
         if (ret) {
                 dev_err(&pdev->dev, "unable to do link train\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         exynos_dp_enable_scramble(dp, 1);
@@ -947,23 +937,15 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         ret = exynos_dp_config_video(dp, dp->video_info);
         if (ret) {
                 dev_err(&pdev->dev, "unable to config video\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         platform_set_drvdata(pdev, dp);
 
         return 0;
 
-err_irq:
-        free_irq(dp->irq, dp);
-err_ioremap:
-        iounmap(dp->reg_base);
-err_req_region:
-        release_mem_region(res->start, resource_size(res));
 err_clock:
         clk_put(dp->clock);
-err_dp:
-        kfree(dp);
 
         return ret;
 }
@@ -976,16 +958,9 @@ static int __devexit exynos_dp_remove(struct platform_device *pdev)
         if (pdata && pdata->phy_exit)
                 pdata->phy_exit();
 
-        free_irq(dp->irq, dp);
-        iounmap(dp->reg_base);
-
         clk_disable(dp->clock);
         clk_put(dp->clock);
 
-        release_mem_region(dp->res->start, resource_size(dp->res));
-
-        kfree(dp);
-
         return 0;
 }
 
diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h
index 90ceaca0fa24..1e0f998e0c9f 100644
--- a/drivers/video/exynos/exynos_dp_core.h
+++ b/drivers/video/exynos/exynos_dp_core.h
@@ -26,7 +26,6 @@ struct link_train {
 
 struct exynos_dp_device {
         struct device           *dev;
-        struct resource         *res;
         struct clk              *clock;
         unsigned int            irq;
         void __iomem            *reg_base;
@@ -39,8 +38,10 @@ struct exynos_dp_device {
 void exynos_dp_enable_video_mute(struct exynos_dp_device *dp, bool enable);
 void exynos_dp_stop_video(struct exynos_dp_device *dp);
 void exynos_dp_lane_swap(struct exynos_dp_device *dp, bool enable);
+void exynos_dp_init_analog_param(struct exynos_dp_device *dp);
 void exynos_dp_init_interrupt(struct exynos_dp_device *dp);
 void exynos_dp_reset(struct exynos_dp_device *dp);
+void exynos_dp_swreset(struct exynos_dp_device *dp);
 void exynos_dp_config_interrupt(struct exynos_dp_device *dp);
 u32 exynos_dp_get_pll_lock_status(struct exynos_dp_device *dp);
 void exynos_dp_set_pll_power_down(struct exynos_dp_device *dp, bool enable);
diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c
index 6548afa0e3d2..6ce76d56c3a1 100644
--- a/drivers/video/exynos/exynos_dp_reg.c
+++ b/drivers/video/exynos/exynos_dp_reg.c
@@ -16,8 +16,6 @@
 
 #include <video/exynos_dp.h>
 
-#include <plat/cpu.h>
-
 #include "exynos_dp_core.h"
 #include "exynos_dp_reg.h"
 
@@ -65,6 +63,28 @@ void exynos_dp_lane_swap(struct exynos_dp_device *dp, bool enable)
         writel(reg, dp->reg_base + EXYNOS_DP_LANE_MAP);
 }
 
+void exynos_dp_init_analog_param(struct exynos_dp_device *dp)
+{
+        u32 reg;
+
+        reg = TX_TERMINAL_CTRL_50_OHM;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_1);
+
+        reg = SEL_24M | TX_DVDD_BIT_1_0625V;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_2);
+
+        reg = DRIVE_DVDD_BIT_1_0625V | VCO_BIT_600_MICRO;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_3);
+
+        reg = PD_RING_OSC | AUX_TERMINAL_CTRL_50_OHM |
+                TX_CUR1_2X | TX_CUR_8_MA;
+        writel(reg, dp->reg_base + EXYNOS_DP_PLL_FILTER_CTL_1);
+
+        reg = CH3_AMP_400_MV | CH2_AMP_400_MV |
+                CH1_AMP_400_MV | CH0_AMP_400_MV;
+        writel(reg, dp->reg_base + EXYNOS_DP_TX_AMP_TUNING_CTL);
+}
+
 void exynos_dp_init_interrupt(struct exynos_dp_device *dp)
 {
         /* Set interrupt pin assertion polarity as high */
@@ -89,8 +109,6 @@ void exynos_dp_reset(struct exynos_dp_device *dp)
 {
         u32 reg;
 
-        writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET);
-
         exynos_dp_stop_video(dp);
         exynos_dp_enable_video_mute(dp, 0);
 
@@ -131,9 +149,15 @@ void exynos_dp_reset(struct exynos_dp_device *dp)
 
         writel(0x00000101, dp->reg_base + EXYNOS_DP_SOC_GENERAL_CTL);
 
+        exynos_dp_init_analog_param(dp);
         exynos_dp_init_interrupt(dp);
 }
 
+void exynos_dp_swreset(struct exynos_dp_device *dp)
+{
+        writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET);
+}
+
 void exynos_dp_config_interrupt(struct exynos_dp_device *dp)
 {
         u32 reg;
@@ -271,6 +295,7 @@ void exynos_dp_set_analog_power_down(struct exynos_dp_device *dp,
 void exynos_dp_init_analog_func(struct exynos_dp_device *dp)
 {
         u32 reg;
+        int timeout_loop = 0;
 
         exynos_dp_set_analog_power_down(dp, POWER_ALL, 0);
 
@@ -282,9 +307,19 @@ void exynos_dp_init_analog_func(struct exynos_dp_device *dp)
         writel(reg, dp->reg_base + EXYNOS_DP_DEBUG_CTL);
 
         /* Power up PLL */
-        if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED)
+        if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
                 exynos_dp_set_pll_power_down(dp, 0);
 
+                while (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
+                        timeout_loop++;
+                        if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
+                                dev_err(dp->dev, "failed to get pll lock status\n");
+                                return;
+                        }
+                        usleep_range(10, 20);
+                }
+        }
+
         /* Enable Serdes FIFO function and Link symbol clock domain module */
         reg = readl(dp->reg_base + EXYNOS_DP_FUNC_EN_2);
         reg &= ~(SERDES_FIFO_FUNC_EN_N | LS_CLK_DOMAIN_FUNC_EN_N
diff --git a/drivers/video/exynos/exynos_dp_reg.h b/drivers/video/exynos/exynos_dp_reg.h
index 42f608e2a43e..125b27cd57ae 100644
--- a/drivers/video/exynos/exynos_dp_reg.h
+++ b/drivers/video/exynos/exynos_dp_reg.h
@@ -24,6 +24,12 @@
 
 #define EXYNOS_DP_LANE_MAP                      0x35C
 
+#define EXYNOS_DP_ANALOG_CTL_1                  0x370
+#define EXYNOS_DP_ANALOG_CTL_2                  0x374
+#define EXYNOS_DP_ANALOG_CTL_3                  0x378
+#define EXYNOS_DP_PLL_FILTER_CTL_1              0x37C
+#define EXYNOS_DP_TX_AMP_TUNING_CTL             0x380
+
 #define EXYNOS_DP_AUX_HW_RETRY_CTL              0x390
 
 #define EXYNOS_DP_COMMON_INT_STA_1              0x3C4
@@ -166,6 +172,29 @@
 #define LANE0_MAP_LOGIC_LANE_2                  (0x2 << 0)
 #define LANE0_MAP_LOGIC_LANE_3                  (0x3 << 0)
 
+/* EXYNOS_DP_ANALOG_CTL_1 */
+#define TX_TERMINAL_CTRL_50_OHM                 (0x1 << 4)
+
+/* EXYNOS_DP_ANALOG_CTL_2 */
+#define SEL_24M                                 (0x1 << 3)
+#define TX_DVDD_BIT_1_0625V                     (0x4 << 0)
+
+/* EXYNOS_DP_ANALOG_CTL_3 */
+#define DRIVE_DVDD_BIT_1_0625V                  (0x4 << 5)
+#define VCO_BIT_600_MICRO                       (0x5 << 0)
+
+/* EXYNOS_DP_PLL_FILTER_CTL_1 */
+#define PD_RING_OSC                             (0x1 << 6)
+#define AUX_TERMINAL_CTRL_50_OHM                (0x2 << 4)
+#define TX_CUR1_2X                              (0x1 << 2)
+#define TX_CUR_8_MA                             (0x2 << 0)
+
+/* EXYNOS_DP_TX_AMP_TUNING_CTL */
+#define CH3_AMP_400_MV                          (0x0 << 24)
+#define CH2_AMP_400_MV                          (0x0 << 16)
+#define CH1_AMP_400_MV                          (0x0 << 8)
+#define CH0_AMP_400_MV                          (0x0 << 0)
+
 /* EXYNOS_DP_AUX_HW_RETRY_CTL */
 #define AUX_BIT_PERIOD_EXPECTED_DELAY(x)        (((x) & 0x7) << 8)
 #define AUX_HW_RETRY_INTERVAL_MASK              (0x3 << 3)
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 557091dc0e97..6c1f5c314a42 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -58,7 +58,7 @@ static struct mipi_dsim_platform_data *to_dsim_plat(struct platform_device
 }
 
 static struct regulator_bulk_data supplies[] = {
-        { .supply = "vdd10", },
+        { .supply = "vdd11", },
         { .supply = "vdd18", },
 };
 
@@ -102,6 +102,8 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim)
         /* set display timing. */
         exynos_mipi_dsi_set_display_mode(dsim, dsim->dsim_config);
 
+        exynos_mipi_dsi_init_interrupt(dsim);
+
         /*
          * data from Display controller(FIMD) is transferred in video mode
          * but in case of command mode, all settigs is updated to registers.
@@ -413,27 +415,30 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
                 goto err_platform_get_irq;
         }
 
+        init_completion(&dsim_wr_comp);
+        init_completion(&dsim_rd_comp);
+        platform_set_drvdata(pdev, dsim);
+
         ret = request_irq(dsim->irq, exynos_mipi_dsi_interrupt_handler,
-                        IRQF_SHARED, pdev->name, dsim);
+                        IRQF_SHARED, dev_name(&pdev->dev), dsim);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to request dsim irq\n");
                 ret = -EINVAL;
                 goto err_bind;
         }
 
-        init_completion(&dsim_wr_comp);
-        init_completion(&dsim_rd_comp);
-
-        /* enable interrupt */
+        /* enable interrupts */
         exynos_mipi_dsi_init_interrupt(dsim);
 
         /* initialize mipi-dsi client(lcd panel). */
         if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->probe)
                 dsim_ddi->dsim_lcd_drv->probe(dsim_ddi->dsim_lcd_dev);
 
-        /* in case that mipi got enabled at bootloader. */
-        if (dsim_pd->enabled)
-                goto out;
+        /* in case mipi-dsi has been enabled by bootloader */
+        if (dsim_pd->enabled) {
+                exynos_mipi_regulator_enable(dsim);
+                goto done;
+        }
 
         /* lcd panel power on. */
         if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->power_on)
@@ -453,12 +458,11 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
 
         dsim->suspended = false;
 
-out:
+done:
         platform_set_drvdata(pdev, dsim);
 
-        dev_dbg(&pdev->dev, "mipi-dsi driver(%s mode) has been probed.\n",
-                (dsim_config->e_interface == DSIM_COMMAND) ?
-                        "CPU" : "RGB");
+        dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__,
+                dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");
 
         return 0;
 
@@ -515,10 +519,10 @@ static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int exynos_mipi_dsi_suspend(struct platform_device *pdev,
-                pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int exynos_mipi_dsi_suspend(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
         struct mipi_dsim_lcd_driver *client_drv = dsim->dsim_lcd_drv;
         struct mipi_dsim_lcd_device *client_dev = dsim->dsim_lcd_dev;
@@ -544,8 +548,9 @@ static int exynos_mipi_dsi_suspend(struct platform_device *pdev,
         return 0;
 }
 
-static int exynos_mipi_dsi_resume(struct platform_device *pdev)
+static int exynos_mipi_dsi_resume(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
         struct mipi_dsim_lcd_driver *client_drv = dsim->dsim_lcd_drv;
         struct mipi_dsim_lcd_device *client_dev = dsim->dsim_lcd_dev;
@@ -577,19 +582,19 @@ static int exynos_mipi_dsi_resume(struct platform_device *pdev)
 
         return 0;
 }
-#else
-#define exynos_mipi_dsi_suspend NULL
-#define exynos_mipi_dsi_resume NULL
 #endif
 
+static const struct dev_pm_ops exynos_mipi_dsi_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(exynos_mipi_dsi_suspend, exynos_mipi_dsi_resume)
+};
+
 static struct platform_driver exynos_mipi_dsi_driver = {
         .probe = exynos_mipi_dsi_probe,
         .remove = __devexit_p(exynos_mipi_dsi_remove),
-        .suspend = exynos_mipi_dsi_suspend,
-        .resume = exynos_mipi_dsi_resume,
         .driver = {
                    .name = "exynos-mipi-dsim",
                    .owner = THIS_MODULE,
+                   .pm = &exynos_mipi_dsi_pm_ops,
         },
 };
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 14909c1d3832..47b533a183be 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -76,33 +76,25 @@ static unsigned int dpll_table[15] = {
 
 irqreturn_t exynos_mipi_dsi_interrupt_handler(int irq, void *dev_id)
 {
-        unsigned int intsrc = 0;
-        unsigned int intmsk = 0;
-        struct mipi_dsim_device *dsim = NULL;
-
-        dsim = dev_id;
-        if (!dsim) {
-                dev_dbg(dsim->dev, KERN_ERR "%s:error: wrong parameter\n",
-                                                        __func__);
-                return IRQ_HANDLED;
+        struct mipi_dsim_device *dsim = dev_id;
+        unsigned int intsrc, intmsk;
+
+        if (dsim == NULL) {
+                dev_err(dsim->dev, "%s: wrong parameter\n", __func__);
+                return IRQ_NONE;
         }
 
         intsrc = exynos_mipi_dsi_read_interrupt(dsim);
         intmsk = exynos_mipi_dsi_read_interrupt_mask(dsim);
+        intmsk = ~intmsk & intsrc;
 
-        intmsk = ~(intmsk) & intsrc;
-
-        switch (intmsk) {
-        case INTMSK_RX_DONE:
+        if (intsrc & INTMSK_RX_DONE) {
                 complete(&dsim_rd_comp);
                 dev_dbg(dsim->dev, "MIPI INTMSK_RX_DONE\n");
-                break;
-        case INTMSK_FIFO_EMPTY:
+        }
+        if (intsrc & INTMSK_FIFO_EMPTY) {
                 complete(&dsim_wr_comp);
                 dev_dbg(dsim->dev, "MIPI INTMSK_FIFO_EMPTY\n");
-                break;
-        default:
-                break;
         }
 
         exynos_mipi_dsi_clear_interrupt(dsim, intmsk);
@@ -738,11 +730,11 @@ int exynos_mipi_dsi_set_display_mode(struct mipi_dsim_device *dsim,
                 if (dsim_config->auto_vertical_cnt == 0) {
                         exynos_mipi_dsi_set_main_disp_vporch(dsim,
                                 dsim_config->cmd_allow,
-                                timing->upper_margin,
-                                timing->lower_margin);
+                                timing->lower_margin,
+                                timing->upper_margin);
                         exynos_mipi_dsi_set_main_disp_hporch(dsim,
-                                timing->left_margin,
-                                timing->right_margin);
+                                timing->right_margin,
+                                timing->left_margin);
                         exynos_mipi_dsi_set_main_disp_sync_area(dsim,
                                 timing->vsync_len,
                                 timing->hsync_len);
diff --git a/drivers/video/exynos/s6e8ax0.c b/drivers/video/exynos/s6e8ax0.c
index 4aa9ac6218bf..05d080b63bc0 100644
--- a/drivers/video/exynos/s6e8ax0.c
+++ b/drivers/video/exynos/s6e8ax0.c
@@ -293,9 +293,20 @@ static void s6e8ax0_panel_cond(struct s6e8ax0 *lcd)
                 0x6e, 0x00, 0x00, 0x00, 0x02, 0x08, 0x08, 0x23, 0x23, 0xc0,
                 0xc8, 0x08, 0x48, 0xc1, 0x00, 0xc1, 0xff, 0xff, 0xc8
         };
+        static const unsigned char data_to_send_panel_reverse[] = {
+                0xf8, 0x19, 0x35, 0x00, 0x00, 0x00, 0x93, 0x00, 0x3c, 0x7d,
+                0x08, 0x27, 0x7d, 0x3f, 0x00, 0x00, 0x00, 0x20, 0x04, 0x08,
+                0x6e, 0x00, 0x00, 0x00, 0x02, 0x08, 0x08, 0x23, 0x23, 0xc0,
+                0xc1, 0x01, 0x41, 0xc1, 0x00, 0xc1, 0xf6, 0xf6, 0xc1
+        };
 
-        ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
-                data_to_send, ARRAY_SIZE(data_to_send));
+        if (lcd->dsim_dev->panel_reverse)
+                ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
+                                data_to_send_panel_reverse,
+                                ARRAY_SIZE(data_to_send_panel_reverse));
+        else
+                ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
+                                data_to_send, ARRAY_SIZE(data_to_send));
 }
 
 static void s6e8ax0_display_cond(struct s6e8ax0 *lcd)
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index c27e153d8882..1ddeb11659d4 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -23,7 +23,7 @@
 #include <linux/rmap.h>
 #include <linux/pagemap.h>
 
-struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
+static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
 {
         void *screen_base = (void __force *) info->screen_base;
         struct page *page;
@@ -107,6 +107,10 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
         /* protect against the workqueue changing the page list */
         mutex_lock(&fbdefio->lock);
 
+        /* first write in this cycle, notify the driver */
+        if (fbdefio->first_io && list_empty(&fbdefio->pagelist))
+                fbdefio->first_io(info);
+
         /*
          * We want the page to remain locked from ->page_mkwrite until
          * the PTE is marked dirty to avoid page_mkclean() being called
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 67afa9c2289d..a55e3669d135 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -80,6 +80,8 @@ EXPORT_SYMBOL(framebuffer_alloc);
  */
 void framebuffer_release(struct fb_info *info)
 {
+        if (!info)
+                return;
         kfree(info->apertures);
         kfree(info);
 }
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 6af3f16754f0..458c00664ade 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -834,7 +834,6 @@ static void update_lcdc(struct fb_info *info)
         diu_ops.set_pixel_clock(var->pixclock);
 
         out_be32(&hw->syn_pol, 0);      /* SYNC SIGNALS POLARITY */
-        out_be32(&hw->thresholds, 0x00037800); /* The Thresholds */
         out_be32(&hw->int_status, 0);   /* INTERRUPT STATUS */
         out_be32(&hw->plut, 0x01F5F666);
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 02fd2263610c..bdcbfbae2777 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -680,6 +680,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
                  + dinfo->fb.size);
         if (!dinfo->aperture.virtual) {
                 ERR_MSG("Cannot remap FB region.\n");
+                agp_backend_release(bridge);
                 cleanup(dinfo);
                 return -ENODEV;
         }
@@ -689,6 +690,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
                                               INTEL_REG_SIZE);
         if (!dinfo->mmio_base) {
                 ERR_MSG("Cannot remap MMIO region.\n");
+                agp_backend_release(bridge);
                 cleanup(dinfo);
                 return -ENODEV;
         }
diff --git a/drivers/video/mb862xx/mb862xx-i2c.c b/drivers/video/mb862xx/mb862xx-i2c.c
index 273769bb8deb..c87e17afb3e2 100644
--- a/drivers/video/mb862xx/mb862xx-i2c.c
+++ b/drivers/video/mb862xx/mb862xx-i2c.c
@@ -68,7 +68,7 @@ static int mb862xx_i2c_read_byte(struct i2c_adapter *adap, u8 *byte, int last)
         return 1;
 }
 
-void mb862xx_i2c_stop(struct i2c_adapter *adap)
+static void mb862xx_i2c_stop(struct i2c_adapter *adap)
 {
         struct mb862xxfb_par *par = adap->algo_data;
 
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index 11a7a333701d..00ce1f34b496 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -579,7 +579,7 @@ static ssize_t mb862xxfb_show_dispregs(struct device *dev,
 
 static DEVICE_ATTR(dispregs, 0444, mb862xxfb_show_dispregs, NULL);
 
-irqreturn_t mb862xx_intr(int irq, void *dev_id)
+static irqreturn_t mb862xx_intr(int irq, void *dev_id)
 {
         struct mb862xxfb_par *par = (struct mb862xxfb_par *) dev_id;
         unsigned long reg_ist, mask;
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 55bf6196b7a0..85e4f44bfa61 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -950,7 +950,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
 
         mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
                                              res_size(mfbi->fb_req));
-        if (!mfbi->reg_virt_addr) {
+        if (!mfbi->fb_virt_addr) {
                 dev_err(&dev->dev, "failed to ioremap frame buffer\n");
                 ret = -EINVAL;
                 goto err4;
@@ -1045,7 +1045,7 @@ static int __devexit mbxfb_remove(struct platform_device *dev)
 
 static struct platform_driver mbxfb_driver = {
         .probe = mbxfb_probe,
-        .remove = mbxfb_remove,
+        .remove = __devexit_p(mbxfb_remove),
         .suspend = mbxfb_suspend,
         .resume = mbxfb_resume,
         .driver = {
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 6c6bc578d0fc..abbe691047bd 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -889,6 +889,18 @@ static int __devexit mxsfb_remove(struct platform_device *pdev)
         return 0;
 }
 
+static void mxsfb_shutdown(struct platform_device *pdev)
+{
+        struct fb_info *fb_info = platform_get_drvdata(pdev);
+        struct mxsfb_info *host = to_imxfb_host(fb_info);
+
+        /*
+         * Force stop the LCD controller as keeping it running during reboot
+         * might interfere with the BootROM's boot mode pads sampling.
+         */
+        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_CLR);
+}
+
 static struct platform_device_id mxsfb_devtype[] = {
         {
                 .name = "imx23-fb",
@@ -905,6 +917,7 @@ MODULE_DEVICE_TABLE(platform, mxsfb_devtype);
 static struct platform_driver mxsfb_driver = {
         .probe = mxsfb_probe,
         .remove = __devexit_p(mxsfb_remove),
+        .shutdown = mxsfb_shutdown,
         .id_table = mxsfb_devtype,
         .driver = {
                    .name = DRIVER_NAME,
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 1e7536d9a8fc..b48f95f0dfe2 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -39,14 +39,6 @@ config FB_OMAP_LCD_MIPID
           the Mobile Industry Processor Interface DBI-C/DCS
           specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3)
 
-config FB_OMAP_BOOTLOADER_INIT
-        bool "Check bootloader initialization"
-        depends on FB_OMAP
-        help
-          Say Y here if you want to enable checking if the bootloader has
-          already initialized the display controller. In this case the
-          driver will skip the initialization.
-
 config FB_OMAP_CONSISTENT_DMA_SIZE
         int "Consistent DMA memory size (MB)"
         depends on FB_OMAP
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index 74e7cf078505..ad741c3d1ae1 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -739,12 +739,6 @@ static void acx_panel_set_timings(struct omap_dss_device *dssdev,
         }
 }
 
-static void acx_panel_get_timings(struct omap_dss_device *dssdev,
-                struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static int acx_panel_check_timings(struct omap_dss_device *dssdev,
                 struct omap_video_timings *timings)
 {
@@ -762,7 +756,6 @@ static struct omap_dss_driver acx_panel_driver = {
         .resume         = acx_panel_resume,
 
         .set_timings    = acx_panel_set_timings,
-        .get_timings    = acx_panel_get_timings,
         .check_timings  = acx_panel_check_timings,
 
         .get_recommended_bpp = acx_get_recommended_bpp,
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 30fe4dfeb227..e42f9dc22123 100644
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -386,6 +386,106 @@ static struct panel_config generic_dpi_panels[] = {
 
                 .name                   = "innolux_at080tn52",
         },
+
+        /* Mitsubishi AA084SB01 */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 600,
+                        .pixel_clock    = 40000,
+
+                        .hsw            = 1,
+                        .hfp            = 254,
+                        .hbp            = 1,
+
+                        .vsw            = 1,
+                        .vfp            = 26,
+                        .vbp            = 1,
+                },
+                .config                 = OMAP_DSS_LCD_TFT,
+                .name                   = "mitsubishi_aa084sb01",
+        },
+        /* EDT ET0500G0DH6 */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+                        .pixel_clock    = 33260,
+
+                        .hsw            = 128,
+                        .hfp            = 216,
+                        .hbp            = 40,
+
+                        .vsw            = 2,
+                        .vfp            = 35,
+                        .vbp            = 10,
+                },
+                .config                 = OMAP_DSS_LCD_TFT,
+                .name                   = "edt_et0500g0dh6",
+        },
+
+        /* Prime-View PD050VL1 */
+        {
+                {
+                        .x_res          = 640,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 25000,
+
+                        .hsw            = 96,
+                        .hfp            = 18,
+                        .hbp            = 46,
+
+                        .vsw            = 2,
+                        .vfp            = 10,
+                        .vbp            = 33,
+                },
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC,
+                .name                   = "primeview_pd050vl1",
+        },
+
+        /* Prime-View PM070WL4 */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 480,
+
+                        .pixel_clock    = 32000,
+
+                        .hsw            = 128,
+                        .hfp            = 42,
+                        .hbp            = 86,
+
+                        .vsw            = 2,
+                        .vfp            = 10,
+                        .vbp            = 33,
+                },
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC,
+                .name                   = "primeview_pm070wl4",
+        },
+
+        /* Prime-View PD104SLF */
+        {
+                {
+                        .x_res          = 800,
+                        .y_res          = 600,
+
+                        .pixel_clock    = 40000,
+
+                        .hsw            = 128,
+                        .hfp            = 42,
+                        .hbp            = 86,
+
+                        .vsw            = 4,
+                        .vfp            = 1,
+                        .vbp            = 23,
+                },
+                .config                 = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                          OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC,
+                .name                   = "primeview_pd104slf",
+        },
 };
 
 struct panel_drv_data {
@@ -549,12 +649,6 @@ static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
         dpi_set_timings(dssdev, timings);
 }
 
-static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
-                struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
                 struct omap_video_timings *timings)
 {
@@ -571,7 +665,6 @@ static struct omap_dss_driver dpi_driver = {
         .resume         = generic_dpi_panel_resume,
 
         .set_timings    = generic_dpi_panel_set_timings,
-        .get_timings    = generic_dpi_panel_get_timings,
         .check_timings  = generic_dpi_panel_check_timings,
 
         .driver         = {
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index dc9408dc93d1..4a34cdc1371b 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -610,12 +610,6 @@ static int n8x0_panel_resume(struct omap_dss_device *dssdev)
         return 0;
 }
 
-static void n8x0_panel_get_timings(struct omap_dss_device *dssdev,
-                struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres)
 {
@@ -678,8 +672,6 @@ static struct omap_dss_driver n8x0_panel_driver = {
         .get_resolution = n8x0_panel_get_resolution,
         .get_recommended_bpp = omapdss_default_get_recommended_bpp,
 
-        .get_timings    = n8x0_panel_get_timings,
-
         .driver         = {
                 .name   = "n8x0_panel",
                 .owner  = THIS_MODULE,
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index b2dd88b48420..901576eb5a84 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -30,7 +30,6 @@
 #include <linux/gpio.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
-#include <linux/regulator/consumer.h>
 #include <linux/mutex.h>
 
 #include <video/omapdss.h>
@@ -55,73 +54,6 @@ static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable);
 
 static int taal_panel_reset(struct omap_dss_device *dssdev);
 
-struct panel_regulator {
-        struct regulator *regulator;
-        const char *name;
-        int min_uV;
-        int max_uV;
-};
-
-static void free_regulators(struct panel_regulator *regulators, int n)
-{
-        int i;
-
-        for (i = 0; i < n; i++) {
-                /* disable/put in reverse order */
-                regulator_disable(regulators[n - i - 1].regulator);
-                regulator_put(regulators[n - i - 1].regulator);
-        }
-}
-
-static int init_regulators(struct omap_dss_device *dssdev,
-                        struct panel_regulator *regulators, int n)
-{
-        int r, i, v;
-
-        for (i = 0; i < n; i++) {
-                struct regulator *reg;
-
-                reg = regulator_get(&dssdev->dev, regulators[i].name);
-                if (IS_ERR(reg)) {
-                        dev_err(&dssdev->dev, "failed to get regulator %s\n",
-                                regulators[i].name);
-                        r = PTR_ERR(reg);
-                        goto err;
-                }
-
-                /* FIXME: better handling of fixed vs. variable regulators */
-                v = regulator_get_voltage(reg);
-                if (v < regulators[i].min_uV || v > regulators[i].max_uV) {
-                        r = regulator_set_voltage(reg, regulators[i].min_uV,
-                                                regulators[i].max_uV);
-                        if (r) {
-                                dev_err(&dssdev->dev,
-                                        "failed to set regulator %s voltage\n",
-                                        regulators[i].name);
-                                regulator_put(reg);
-                                goto err;
-                        }
-                }
-
-                r = regulator_enable(reg);
-                if (r) {
-                        dev_err(&dssdev->dev, "failed to enable regulator %s\n",
-                                regulators[i].name);
-                        regulator_put(reg);
-                        goto err;
-                }
-
-                regulators[i].regulator = reg;
-        }
-
-        return 0;
-
-err:
-        free_regulators(regulators, i);
-
-        return r;
-}
-
 /**
  * struct panel_config - panel configuration
  * @name: panel name
@@ -150,8 +82,6 @@ struct panel_config {
                 unsigned int low;
         } reset_sequence;
 
-        struct panel_regulator *regulators;
-        int num_regulators;
 };
 
 enum {
@@ -577,12 +507,6 @@ static const struct backlight_ops taal_bl_ops = {
         .update_status  = taal_bl_update_status,
 };
 
-static void taal_get_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static void taal_get_resolution(struct omap_dss_device *dssdev,
                 u16 *xres, u16 *yres)
 {
@@ -602,7 +526,7 @@ static ssize_t taal_num_errors_show(struct device *dev,
 {
         struct omap_dss_device *dssdev = to_dss_device(dev);
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        u8 errors;
+        u8 errors = 0;
         int r;
 
         mutex_lock(&td->lock);
@@ -977,11 +901,6 @@ static int taal_probe(struct omap_dss_device *dssdev)
 
         atomic_set(&td->do_update, 0);
 
-        r = init_regulators(dssdev, panel_config->regulators,
-                        panel_config->num_regulators);
-        if (r)
-                goto err_reg;
-
         td->workqueue = create_singlethread_workqueue("taal_esd");
         if (td->workqueue == NULL) {
                 dev_err(&dssdev->dev, "can't create ESD workqueue\n");
@@ -1087,8 +1006,6 @@ err_bl:
 err_rst_gpio:
         destroy_workqueue(td->workqueue);
 err_wq:
-        free_regulators(panel_config->regulators, panel_config->num_regulators);
-err_reg:
         kfree(td);
 err:
         return r;
@@ -1125,9 +1042,6 @@ static void __exit taal_remove(struct omap_dss_device *dssdev)
         /* reset, to be sure that the panel is in a valid state */
         taal_hw_reset(dssdev);
 
-        free_regulators(td->panel_config->regulators,
-                        td->panel_config->num_regulators);
-
         if (gpio_is_valid(panel_data->reset_gpio))
                 gpio_free(panel_data->reset_gpio);
 
@@ -1909,8 +1823,6 @@ static struct omap_dss_driver taal_driver = {
         .run_test       = taal_run_test,
         .memory_read    = taal_memory_read,
 
-        .get_timings    = taal_get_timings,
-
         .driver         = {
                 .name   = "taal",
                 .owner  = THIS_MODULE,
diff --git a/drivers/video/omap2/displays/panel-tfp410.c b/drivers/video/omap2/displays/panel-tfp410.c
index 52637fa8fda8..bff306e041ca 100644
--- a/drivers/video/omap2/displays/panel-tfp410.c
+++ b/drivers/video/omap2/displays/panel-tfp410.c
@@ -47,13 +47,9 @@ struct panel_drv_data {
         struct mutex lock;
 
         int pd_gpio;
-};
 
-static inline struct tfp410_platform_data
-*get_pdata(const struct omap_dss_device *dssdev)
-{
-        return dssdev->data;
-}
+        struct i2c_adapter *i2c_adapter;
+};
 
 static int tfp410_power_on(struct omap_dss_device *dssdev)
 {
@@ -68,7 +64,7 @@ static int tfp410_power_on(struct omap_dss_device *dssdev)
                 goto err0;
 
         if (gpio_is_valid(ddata->pd_gpio))
-                gpio_set_value(ddata->pd_gpio, 1);
+                gpio_set_value_cansleep(ddata->pd_gpio, 1);
 
         return 0;
 err0:
@@ -83,18 +79,18 @@ static void tfp410_power_off(struct omap_dss_device *dssdev)
                 return;
 
         if (gpio_is_valid(ddata->pd_gpio))
-                gpio_set_value(ddata->pd_gpio, 0);
+                gpio_set_value_cansleep(ddata->pd_gpio, 0);
 
         omapdss_dpi_display_disable(dssdev);
 }
 
 static int tfp410_probe(struct omap_dss_device *dssdev)
 {
-        struct tfp410_platform_data *pdata = get_pdata(dssdev);
         struct panel_drv_data *ddata;
         int r;
+        int i2c_bus_num;
 
-        ddata = kzalloc(sizeof(*ddata), GFP_KERNEL);
+        ddata = devm_kzalloc(&dssdev->dev, sizeof(*ddata), GFP_KERNEL);
         if (!ddata)
                 return -ENOMEM;
 
@@ -104,10 +100,15 @@ static int tfp410_probe(struct omap_dss_device *dssdev)
         ddata->dssdev = dssdev;
         mutex_init(&ddata->lock);
 
-        if (pdata)
+        if (dssdev->data) {
+                struct tfp410_platform_data *pdata = dssdev->data;
+
                 ddata->pd_gpio = pdata->power_down_gpio;
-        else
+                i2c_bus_num = pdata->i2c_bus_num;
+        } else {
                 ddata->pd_gpio = -1;
+                i2c_bus_num = -1;
+        }
 
         if (gpio_is_valid(ddata->pd_gpio)) {
                 r = gpio_request_one(ddata->pd_gpio, GPIOF_OUT_INIT_LOW,
@@ -115,13 +116,31 @@ static int tfp410_probe(struct omap_dss_device *dssdev)
                 if (r) {
                         dev_err(&dssdev->dev, "Failed to request PD GPIO %d\n",
                                         ddata->pd_gpio);
-                        ddata->pd_gpio = -1;
+                        return r;
                 }
         }
 
+        if (i2c_bus_num != -1) {
+                struct i2c_adapter *adapter;
+
+                adapter = i2c_get_adapter(i2c_bus_num);
+                if (!adapter) {
+                        dev_err(&dssdev->dev, "Failed to get I2C adapter, bus %d\n",
+                                        i2c_bus_num);
+                        r = -EINVAL;
+                        goto err_i2c;
+                }
+
+                ddata->i2c_adapter = adapter;
+        }
+
         dev_set_drvdata(&dssdev->dev, ddata);
 
         return 0;
+err_i2c:
+        if (gpio_is_valid(ddata->pd_gpio))
+                gpio_free(ddata->pd_gpio);
+        return r;
 }
 
 static void __exit tfp410_remove(struct omap_dss_device *dssdev)
@@ -130,14 +149,15 @@ static void __exit tfp410_remove(struct omap_dss_device *dssdev)
 
         mutex_lock(&ddata->lock);
 
+        if (ddata->i2c_adapter)
+                i2c_put_adapter(ddata->i2c_adapter);
+
         if (gpio_is_valid(ddata->pd_gpio))
                 gpio_free(ddata->pd_gpio);
 
         dev_set_drvdata(&dssdev->dev, NULL);
 
         mutex_unlock(&ddata->lock);
-
-        kfree(ddata);
 }
 
 static int tfp410_enable(struct omap_dss_device *dssdev)
@@ -269,27 +289,17 @@ static int tfp410_read_edid(struct omap_dss_device *dssdev,
                 u8 *edid, int len)
 {
         struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
-        struct tfp410_platform_data *pdata = get_pdata(dssdev);
-        struct i2c_adapter *adapter;
         int r, l, bytes_read;
 
         mutex_lock(&ddata->lock);
 
-        if (pdata->i2c_bus_num == 0) {
+        if (!ddata->i2c_adapter) {
                 r = -ENODEV;
                 goto err;
         }
 
-        adapter = i2c_get_adapter(pdata->i2c_bus_num);
-        if (!adapter) {
-                dev_err(&dssdev->dev, "Failed to get I2C adapter, bus %d\n",
-                                pdata->i2c_bus_num);
-                r = -EINVAL;
-                goto err;
-        }
-
         l = min(EDID_LENGTH, len);
-        r = tfp410_ddc_read(adapter, edid, l, 0);
+        r = tfp410_ddc_read(ddata->i2c_adapter, edid, l, 0);
         if (r)
                 goto err;
 
@@ -299,7 +309,7 @@ static int tfp410_read_edid(struct omap_dss_device *dssdev,
         if (len > EDID_LENGTH && edid[0x7e] > 0) {
                 l = min(EDID_LENGTH, len - EDID_LENGTH);
 
-                r = tfp410_ddc_read(adapter, edid + EDID_LENGTH,
+                r = tfp410_ddc_read(ddata->i2c_adapter, edid + EDID_LENGTH,
                                 l, EDID_LENGTH);
                 if (r)
                         goto err;
@@ -319,21 +329,15 @@ err:
 static bool tfp410_detect(struct omap_dss_device *dssdev)
 {
         struct panel_drv_data *ddata = dev_get_drvdata(&dssdev->dev);
-        struct tfp410_platform_data *pdata = get_pdata(dssdev);
-        struct i2c_adapter *adapter;
         unsigned char out;
         int r;
 
         mutex_lock(&ddata->lock);
 
-        if (pdata->i2c_bus_num == 0)
-                goto out;
-
-        adapter = i2c_get_adapter(pdata->i2c_bus_num);
-        if (!adapter)
+        if (!ddata->i2c_adapter)
                 goto out;
 
-        r = tfp410_ddc_read(adapter, &out, 1, 0);
+        r = tfp410_ddc_read(ddata->i2c_adapter, &out, 1, 0);
 
         mutex_unlock(&ddata->lock);
 
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index 32f3fcd7f0f0..4b6448b3c31f 100644
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -272,13 +272,16 @@ static const struct omap_video_timings tpo_td043_timings = {
 static int tpo_td043_power_on(struct tpo_td043_device *tpo_td043)
 {
         int nreset_gpio = tpo_td043->nreset_gpio;
+        int r;
 
         if (tpo_td043->powered_on)
                 return 0;
 
-        regulator_enable(tpo_td043->vcc_reg);
+        r = regulator_enable(tpo_td043->vcc_reg);
+        if (r != 0)
+                return r;
 
-        /* wait for regulator to stabilize */
+        /* wait for panel to stabilize */
         msleep(160);
 
         if (gpio_is_valid(nreset_gpio))
@@ -470,6 +473,18 @@ static void tpo_td043_remove(struct omap_dss_device *dssdev)
                 gpio_free(nreset_gpio);
 }
 
+static void tpo_td043_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        dpi_set_timings(dssdev, timings);
+}
+
+static int tpo_td043_check_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        return dpi_check_timings(dssdev, timings);
+}
+
 static struct omap_dss_driver tpo_td043_driver = {
         .probe          = tpo_td043_probe,
         .remove         = tpo_td043_remove,
@@ -481,6 +496,9 @@ static struct omap_dss_driver tpo_td043_driver = {
         .set_mirror     = tpo_td043_set_hmirror,
         .get_mirror     = tpo_td043_get_hmirror,
 
+        .set_timings    = tpo_td043_set_timings,
+        .check_timings  = tpo_td043_check_timings,
+
         .driver         = {
                 .name   = "tpo_td043mtea1_panel",
                 .owner  = THIS_MODULE,
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 7be7c06a249e..43324e5ed25f 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -68,6 +68,10 @@ config OMAP4_DSS_HDMI
           HDMI Interface. This adds the High Definition Multimedia Interface.
           See http://www.hdmi.org/ for HDMI specification.
 
+config OMAP4_DSS_HDMI_AUDIO
+        bool
+        depends on OMAP4_DSS_HDMI
+
 config OMAP2_DSS_SDI
         bool "SDI support"
         depends on ARCH_OMAP3
@@ -90,15 +94,6 @@ config OMAP2_DSS_DSI
 
           See http://www.mipi.org/ for DSI spesifications.
 
-config OMAP2_DSS_FAKE_VSYNC
-        bool "Fake VSYNC irq from manual update displays"
-        default n
-        help
-          If this is selected, DSI will generate a fake DISPC VSYNC interrupt
-          when DSI has sent a frame. This is only needed with DSI or RFBI
-          displays using manual mode, and you want VSYNC to, for example,
-          time animation.
-
 config OMAP2_DSS_MIN_FCK_PER_PCK
         int "Minimum FCK/PCK ratio (for scaling)"
         range 0 32
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c
index b10b3bc1931e..ab22cc224f3e 100644
--- a/drivers/video/omap2/dss/apply.c
+++ b/drivers/video/omap2/dss/apply.c
@@ -99,6 +99,11 @@ struct mgr_priv_data {
 
         /* If true, a display is enabled using this manager */
         bool enabled;
+
+        bool extra_info_dirty;
+        bool shadow_extra_info_dirty;
+
+        struct omap_video_timings timings;
 };
 
 static struct {
@@ -176,7 +181,7 @@ static bool mgr_manual_update(struct omap_overlay_manager *mgr)
 }
 
 static int dss_check_settings_low(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev, bool applying)
+                bool applying)
 {
         struct omap_overlay_info *oi;
         struct omap_overlay_manager_info *mi;
@@ -187,6 +192,9 @@ static int dss_check_settings_low(struct omap_overlay_manager *mgr,
 
         mp = get_mgr_priv(mgr);
 
+        if (!mp->enabled)
+                return 0;
+
         if (applying && mp->user_info_dirty)
                 mi = &mp->user_info;
         else
@@ -206,26 +214,24 @@ static int dss_check_settings_low(struct omap_overlay_manager *mgr,
                 ois[ovl->id] = oi;
         }
 
-        return dss_mgr_check(mgr, dssdev, mi, ois);
+        return dss_mgr_check(mgr, mi, &mp->timings, ois);
 }
 
 /*
  * check manager and overlay settings using overlay_info from data->info
  */
-static int dss_check_settings(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev)
+static int dss_check_settings(struct omap_overlay_manager *mgr)
 {
-        return dss_check_settings_low(mgr, dssdev, false);
+        return dss_check_settings_low(mgr, false);
 }
 
 /*
  * check manager and overlay settings using overlay_info from ovl->info if
  * dirty and from data->info otherwise
  */
-static int dss_check_settings_apply(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev)
+static int dss_check_settings_apply(struct omap_overlay_manager *mgr)
 {
-        return dss_check_settings_low(mgr, dssdev, true);
+        return dss_check_settings_low(mgr, true);
 }
 
 static bool need_isr(void)
@@ -261,6 +267,20 @@ static bool need_isr(void)
                         if (mp->shadow_info_dirty)
                                 return true;
 
+                        /*
+                         * NOTE: we don't check extra_info flags for disabled
+                         * managers, once the manager is enabled, the extra_info
+                         * related manager changes will be taken in by HW.
+                         */
+
+                        /* to write new values to registers */
+                        if (mp->extra_info_dirty)
+                                return true;
+
+                        /* to set GO bit */
+                        if (mp->shadow_extra_info_dirty)
+                                return true;
+
                         list_for_each_entry(ovl, &mgr->overlays, list) {
                                 struct ovl_priv_data *op;
 
@@ -305,7 +325,7 @@ static bool need_go(struct omap_overlay_manager *mgr)
 
         mp = get_mgr_priv(mgr);
 
-        if (mp->shadow_info_dirty)
+        if (mp->shadow_info_dirty || mp->shadow_extra_info_dirty)
                 return true;
 
         list_for_each_entry(ovl, &mgr->overlays, list) {
@@ -320,20 +340,16 @@ static bool need_go(struct omap_overlay_manager *mgr)
 /* returns true if an extra_info field is currently being updated */
 static bool extra_info_update_ongoing(void)
 {
-        const int num_ovls = omap_dss_get_num_overlays();
-        struct ovl_priv_data *op;
-        struct omap_overlay *ovl;
-        struct mgr_priv_data *mp;
+        const int num_mgrs = dss_feat_get_num_mgrs();
         int i;
 
-        for (i = 0; i < num_ovls; ++i) {
-                ovl = omap_dss_get_overlay(i);
-                op = get_ovl_priv(ovl);
-
-                if (!ovl->manager)
-                        continue;
+        for (i = 0; i < num_mgrs; ++i) {
+                struct omap_overlay_manager *mgr;
+                struct omap_overlay *ovl;
+                struct mgr_priv_data *mp;
 
-                mp = get_mgr_priv(ovl->manager);
+                mgr = omap_dss_get_overlay_manager(i);
+                mp = get_mgr_priv(mgr);
 
                 if (!mp->enabled)
                         continue;
@@ -341,8 +357,15 @@ static bool extra_info_update_ongoing(void)
                 if (!mp->updating)
                         continue;
 
-                if (op->extra_info_dirty || op->shadow_extra_info_dirty)
+                if (mp->extra_info_dirty || mp->shadow_extra_info_dirty)
                         return true;
+
+                list_for_each_entry(ovl, &mgr->overlays, list) {
+                        struct ovl_priv_data *op = get_ovl_priv(ovl);
+
+                        if (op->extra_info_dirty || op->shadow_extra_info_dirty)
+                                return true;
+                }
         }
 
         return false;
@@ -525,11 +548,13 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
 
         oi = &op->info;
 
+        mp = get_mgr_priv(ovl->manager);
+
         replication = dss_use_replication(ovl->manager->device, oi->color_mode);
 
         ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC;
 
-        r = dispc_ovl_setup(ovl->id, oi, ilace, replication);
+        r = dispc_ovl_setup(ovl->id, oi, ilace, replication, &mp->timings);
         if (r) {
                 /*
                  * We can't do much here, as this function can be called from
@@ -543,8 +568,6 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
                 return;
         }
 
-        mp = get_mgr_priv(ovl->manager);
-
         op->info_dirty = false;
         if (mp->updating)
                 op->shadow_info_dirty = true;
@@ -601,6 +624,22 @@ static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
         }
 }
 
+static void dss_mgr_write_regs_extra(struct omap_overlay_manager *mgr)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+
+        DSSDBGF("%d", mgr->id);
+
+        if (!mp->extra_info_dirty)
+                return;
+
+        dispc_mgr_set_timings(mgr->id, &mp->timings);
+
+        mp->extra_info_dirty = false;
+        if (mp->updating)
+                mp->shadow_extra_info_dirty = true;
+}
+
 static void dss_write_regs_common(void)
 {
         const int num_mgrs = omap_dss_get_num_overlay_managers();
@@ -646,7 +685,7 @@ static void dss_write_regs(void)
                 if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
                         continue;
 
-                r = dss_check_settings(mgr, mgr->device);
+                r = dss_check_settings(mgr);
                 if (r) {
                         DSSERR("cannot write registers for manager %s: "
                                         "illegal configuration\n", mgr->name);
@@ -654,6 +693,7 @@ static void dss_write_regs(void)
                 }
 
                 dss_mgr_write_regs(mgr);
+                dss_mgr_write_regs_extra(mgr);
         }
 }
 
@@ -693,6 +733,7 @@ static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr)
 
         mp = get_mgr_priv(mgr);
         mp->shadow_info_dirty = false;
+        mp->shadow_extra_info_dirty = false;
 
         list_for_each_entry(ovl, &mgr->overlays, list) {
                 op = get_ovl_priv(ovl);
@@ -711,7 +752,7 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr)
 
         WARN_ON(mp->updating);
 
-        r = dss_check_settings(mgr, mgr->device);
+        r = dss_check_settings(mgr);
         if (r) {
                 DSSERR("cannot start manual update: illegal configuration\n");
                 spin_unlock_irqrestore(&data_lock, flags);
@@ -719,6 +760,7 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr)
         }
 
         dss_mgr_write_regs(mgr);
+        dss_mgr_write_regs_extra(mgr);
 
         dss_write_regs_common();
 
@@ -857,7 +899,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
 
         spin_lock_irqsave(&data_lock, flags);
 
-        r = dss_check_settings_apply(mgr, mgr->device);
+        r = dss_check_settings_apply(mgr);
         if (r) {
                 spin_unlock_irqrestore(&data_lock, flags);
                 DSSERR("failed to apply settings: illegal configuration.\n");
@@ -918,16 +960,13 @@ static void dss_ovl_setup_fifo(struct omap_overlay *ovl,
                 bool use_fifo_merge)
 {
         struct ovl_priv_data *op = get_ovl_priv(ovl);
-        struct omap_dss_device *dssdev;
         u32 fifo_low, fifo_high;
 
         if (!op->enabled && !op->enabling)
                 return;
 
-        dssdev = ovl->manager->device;
-
         dispc_ovl_compute_fifo_thresholds(ovl->id, &fifo_low, &fifo_high,
-                        use_fifo_merge);
+                        use_fifo_merge, ovl_manual_update(ovl));
 
         dss_apply_ovl_fifo_thresholds(ovl, fifo_low, fifo_high);
 }
@@ -1050,7 +1089,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr)
 
         mp->enabled = true;
 
-        r = dss_check_settings(mgr, mgr->device);
+        r = dss_check_settings(mgr);
         if (r) {
                 DSSERR("failed to enable manager %d: check_settings failed\n",
                                 mgr->id);
@@ -1225,6 +1264,35 @@ err:
         return r;
 }
 
+static void dss_apply_mgr_timings(struct omap_overlay_manager *mgr,
+                struct omap_video_timings *timings)
+{
+        struct mgr_priv_data *mp = get_mgr_priv(mgr);
+
+        mp->timings = *timings;
+        mp->extra_info_dirty = true;
+}
+
+void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
+                struct omap_video_timings *timings)
+{
+        unsigned long flags;
+
+        mutex_lock(&apply_lock);
+
+        spin_lock_irqsave(&data_lock, flags);
+
+        dss_apply_mgr_timings(mgr, timings);
+
+        dss_write_regs();
+        dss_set_go_bits();
+
+        spin_unlock_irqrestore(&data_lock, flags);
+
+        wait_pending_extra_info_updates();
+
+        mutex_unlock(&apply_lock);
+}
 
 int dss_ovl_set_info(struct omap_overlay *ovl,
                 struct omap_overlay_info *info)
@@ -1393,7 +1461,7 @@ int dss_ovl_enable(struct omap_overlay *ovl)
 
         op->enabling = true;
 
-        r = dss_check_settings(ovl->manager, ovl->manager->device);
+        r = dss_check_settings(ovl->manager);
         if (r) {
                 DSSERR("failed to enable overlay %d: check_settings failed\n",
                                 ovl->id);
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index e8a120771ac6..5066eee10ccf 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -43,6 +43,8 @@ static struct {
 
         struct regulator *vdds_dsi_reg;
         struct regulator *vdds_sdi_reg;
+
+        const char *default_display_name;
 } core;
 
 static char *def_disp_name;
@@ -54,9 +56,6 @@ bool dss_debug;
 module_param_named(debug, dss_debug, bool, 0644);
 #endif
 
-static int omap_dss_register_device(struct omap_dss_device *);
-static void omap_dss_unregister_device(struct omap_dss_device *);
-
 /* REGULATORS */
 
 struct regulator *dss_get_vdds_dsi(void)
@@ -87,6 +86,51 @@ struct regulator *dss_get_vdds_sdi(void)
         return reg;
 }
 
+int dss_get_ctx_loss_count(struct device *dev)
+{
+        struct omap_dss_board_info *board_data = core.pdev->dev.platform_data;
+        int cnt;
+
+        if (!board_data->get_context_loss_count)
+                return -ENOENT;
+
+        cnt = board_data->get_context_loss_count(dev);
+
+        WARN_ONCE(cnt < 0, "get_context_loss_count failed: %d\n", cnt);
+
+        return cnt;
+}
+
+int dss_dsi_enable_pads(int dsi_id, unsigned lane_mask)
+{
+        struct omap_dss_board_info *board_data = core.pdev->dev.platform_data;
+
+        if (!board_data->dsi_enable_pads)
+                return -ENOENT;
+
+        return board_data->dsi_enable_pads(dsi_id, lane_mask);
+}
+
+void dss_dsi_disable_pads(int dsi_id, unsigned lane_mask)
+{
+        struct omap_dss_board_info *board_data = core.pdev->dev.platform_data;
+
+        if (!board_data->dsi_enable_pads)
+                return;
+
+        return board_data->dsi_disable_pads(dsi_id, lane_mask);
+}
+
+int dss_set_min_bus_tput(struct device *dev, unsigned long tput)
+{
+        struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
+
+        if (pdata->set_min_bus_tput)
+                return pdata->set_min_bus_tput(dev, tput);
+        else
+                return 0;
+}
+
 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
 static int dss_debug_show(struct seq_file *s, void *unused)
 {
@@ -121,34 +165,6 @@ static int dss_initialize_debugfs(void)
         debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir,
                         &dss_debug_dump_clocks, &dss_debug_fops);
 
-#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
-        debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir,
-                        &dispc_dump_irqs, &dss_debug_fops);
-#endif
-
-#if defined(CONFIG_OMAP2_DSS_DSI) && defined(CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS)
-        dsi_create_debugfs_files_irq(dss_debugfs_dir, &dss_debug_fops);
-#endif
-
-        debugfs_create_file("dss", S_IRUGO, dss_debugfs_dir,
-                        &dss_dump_regs, &dss_debug_fops);
-        debugfs_create_file("dispc", S_IRUGO, dss_debugfs_dir,
-                        &dispc_dump_regs, &dss_debug_fops);
-#ifdef CONFIG_OMAP2_DSS_RFBI
-        debugfs_create_file("rfbi", S_IRUGO, dss_debugfs_dir,
-                        &rfbi_dump_regs, &dss_debug_fops);
-#endif
-#ifdef CONFIG_OMAP2_DSS_DSI
-        dsi_create_debugfs_files_reg(dss_debugfs_dir, &dss_debug_fops);
-#endif
-#ifdef CONFIG_OMAP2_DSS_VENC
-        debugfs_create_file("venc", S_IRUGO, dss_debugfs_dir,
-                        &venc_dump_regs, &dss_debug_fops);
-#endif
-#ifdef CONFIG_OMAP4_DSS_HDMI
-        debugfs_create_file("hdmi", S_IRUGO, dss_debugfs_dir,
-                        &hdmi_dump_regs, &dss_debug_fops);
-#endif
         return 0;
 }
 
@@ -157,6 +173,19 @@ static void dss_uninitialize_debugfs(void)
         if (dss_debugfs_dir)
                 debugfs_remove_recursive(dss_debugfs_dir);
 }
+
+int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
+{
+        struct dentry *d;
+
+        d = debugfs_create_file(name, S_IRUGO, dss_debugfs_dir,
+                        write, &dss_debug_fops);
+
+        if (IS_ERR(d))
+                return PTR_ERR(d);
+
+        return 0;
+}
 #else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
 static inline int dss_initialize_debugfs(void)
 {
@@ -165,14 +194,17 @@ static inline int dss_initialize_debugfs(void)
 static inline void dss_uninitialize_debugfs(void)
 {
 }
+int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))
+{
+        return 0;
+}
 #endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
 
 /* PLATFORM DEVICE */
-static int omap_dss_probe(struct platform_device *pdev)
+static int __init omap_dss_probe(struct platform_device *pdev)
 {
         struct omap_dss_board_info *pdata = pdev->dev.platform_data;
         int r;
-        int i;
 
         core.pdev = pdev;
 
@@ -187,28 +219,13 @@ static int omap_dss_probe(struct platform_device *pdev)
         if (r)
                 goto err_debugfs;
 
-        for (i = 0; i < pdata->num_devices; ++i) {
-                struct omap_dss_device *dssdev = pdata->devices[i];
-
-                r = omap_dss_register_device(dssdev);
-                if (r) {
-                        DSSERR("device %d %s register failed %d\n", i,
-                                dssdev->name ?: "unnamed", r);
-
-                        while (--i >= 0)
-                                omap_dss_unregister_device(pdata->devices[i]);
-
-                        goto err_register;
-                }
-
-                if (def_disp_name && strcmp(def_disp_name, dssdev->name) == 0)
-                        pdata->default_device = dssdev;
-        }
+        if (def_disp_name)
+                core.default_display_name = def_disp_name;
+        else if (pdata->default_device)
+                core.default_display_name = pdata->default_device->name;
 
         return 0;
 
-err_register:
-        dss_uninitialize_debugfs();
 err_debugfs:
 
         return r;
@@ -216,17 +233,11 @@ err_debugfs:
 
 static int omap_dss_remove(struct platform_device *pdev)
 {
-        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
-        int i;
-
         dss_uninitialize_debugfs();
 
         dss_uninit_overlays(pdev);
         dss_uninit_overlay_managers(pdev);
 
-        for (i = 0; i < pdata->num_devices; ++i)
-                omap_dss_unregister_device(pdata->devices[i]);
-
         return 0;
 }
 
@@ -251,7 +262,6 @@ static int omap_dss_resume(struct platform_device *pdev)
 }
 
 static struct platform_driver omap_dss_driver = {
-        .probe          = omap_dss_probe,
         .remove         = omap_dss_remove,
         .shutdown       = omap_dss_shutdown,
         .suspend        = omap_dss_suspend,
@@ -326,7 +336,6 @@ static int dss_driver_probe(struct device *dev)
         int r;
         struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
         struct omap_dss_device *dssdev = to_dss_device(dev);
-        struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
         bool force;
 
         DSSDBG("driver_probe: dev %s/%s, drv %s\n",
@@ -335,7 +344,8 @@ static int dss_driver_probe(struct device *dev)
 
         dss_init_device(core.pdev, dssdev);
 
-        force = pdata->default_device == dssdev;
+        force = core.default_display_name &&
+                strcmp(core.default_display_name, dssdev->name) == 0;
         dss_recheck_connections(dssdev, force);
 
         r = dssdrv->probe(dssdev);
@@ -381,6 +391,8 @@ int omap_dss_register_driver(struct omap_dss_driver *dssdriver)
         if (dssdriver->get_recommended_bpp == NULL)
                 dssdriver->get_recommended_bpp =
                         omapdss_default_get_recommended_bpp;
+        if (dssdriver->get_timings == NULL)
+                dssdriver->get_timings = omapdss_default_get_timings;
 
         return driver_register(&dssdriver->driver);
 }
@@ -427,27 +439,38 @@ static void omap_dss_dev_release(struct device *dev)
         reset_device(dev, 0);
 }
 
-static int omap_dss_register_device(struct omap_dss_device *dssdev)
+int omap_dss_register_device(struct omap_dss_device *dssdev,
+                struct device *parent, int disp_num)
 {
-        static int dev_num;
-
         WARN_ON(!dssdev->driver_name);
 
         reset_device(&dssdev->dev, 1);
         dssdev->dev.bus = &dss_bus_type;
-        dssdev->dev.parent = &dss_bus;
+        dssdev->dev.parent = parent;
         dssdev->dev.release = omap_dss_dev_release;
-        dev_set_name(&dssdev->dev, "display%d", dev_num++);
+        dev_set_name(&dssdev->dev, "display%d", disp_num);
         return device_register(&dssdev->dev);
 }
 
-static void omap_dss_unregister_device(struct omap_dss_device *dssdev)
+void omap_dss_unregister_device(struct omap_dss_device *dssdev)
 {
         device_unregister(&dssdev->dev);
 }
 
+static int dss_unregister_dss_dev(struct device *dev, void *data)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        omap_dss_unregister_device(dssdev);
+        return 0;
+}
+
+void omap_dss_unregister_child_devices(struct device *parent)
+{
+        device_for_each_child(parent, NULL, dss_unregister_dss_dev);
+}
+
 /* BUS */
-static int omap_dss_bus_register(void)
+static int __init omap_dss_bus_register(void)
 {
         int r;
 
@@ -469,12 +492,56 @@ static int omap_dss_bus_register(void)
 }
 
 /* INIT */
+static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
+#ifdef CONFIG_OMAP2_DSS_DPI
+        dpi_init_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_SDI
+        sdi_init_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        rfbi_init_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_VENC
+        venc_init_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+        dsi_init_platform_driver,
+#endif
+#ifdef CONFIG_OMAP4_DSS_HDMI
+        hdmi_init_platform_driver,
+#endif
+};
+
+static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {
+#ifdef CONFIG_OMAP2_DSS_DPI
+        dpi_uninit_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_SDI
+        sdi_uninit_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        rfbi_uninit_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_VENC
+        venc_uninit_platform_driver,
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+        dsi_uninit_platform_driver,
+#endif
+#ifdef CONFIG_OMAP4_DSS_HDMI
+        hdmi_uninit_platform_driver,
+#endif
+};
+
+static bool dss_output_drv_loaded[ARRAY_SIZE(dss_output_drv_reg_funcs)];
 
 static int __init omap_dss_register_drivers(void)
 {
         int r;
+        int i;
 
-        r = platform_driver_register(&omap_dss_driver);
+        r = platform_driver_probe(&omap_dss_driver, omap_dss_probe);
         if (r)
                 return r;
 
@@ -490,40 +557,18 @@ static int __init omap_dss_register_drivers(void)
                 goto err_dispc;
         }
 
-        r = rfbi_init_platform_driver();
-        if (r) {
-                DSSERR("Failed to initialize rfbi platform driver\n");
-                goto err_rfbi;
-        }
-
-        r = venc_init_platform_driver();
-        if (r) {
-                DSSERR("Failed to initialize venc platform driver\n");
-                goto err_venc;
-        }
-
-        r = dsi_init_platform_driver();
-        if (r) {
-                DSSERR("Failed to initialize DSI platform driver\n");
-                goto err_dsi;
-        }
-
-        r = hdmi_init_platform_driver();
-        if (r) {
-                DSSERR("Failed to initialize hdmi\n");
-                goto err_hdmi;
+        /*
+         * It's ok if the output-driver register fails. It happens, for example,
+         * when there is no output-device (e.g. SDI for OMAP4).
+         */
+        for (i = 0; i < ARRAY_SIZE(dss_output_drv_reg_funcs); ++i) {
+                r = dss_output_drv_reg_funcs[i]();
+                if (r == 0)
+                        dss_output_drv_loaded[i] = true;
         }
 
         return 0;
 
-err_hdmi:
-        dsi_uninit_platform_driver();
-err_dsi:
-        venc_uninit_platform_driver();
-err_venc:
-        rfbi_uninit_platform_driver();
-err_rfbi:
-        dispc_uninit_platform_driver();
 err_dispc:
         dss_uninit_platform_driver();
 err_dss:
@@ -534,10 +579,13 @@ err_dss:
 
 static void __exit omap_dss_unregister_drivers(void)
 {
-        hdmi_uninit_platform_driver();
-        dsi_uninit_platform_driver();
-        venc_uninit_platform_driver();
-        rfbi_uninit_platform_driver();
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(dss_output_drv_unreg_funcs); ++i) {
+                if (dss_output_drv_loaded[i])
+                        dss_output_drv_unreg_funcs[i]();
+        }
+
         dispc_uninit_platform_driver();
         dss_uninit_platform_driver();
 
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index ee30937482e1..4749ac356469 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -131,23 +131,6 @@ static inline u32 dispc_read_reg(const u16 idx)
         return __raw_readl(dispc.base + idx);
 }
 
-static int dispc_get_ctx_loss_count(void)
-{
-        struct device *dev = &dispc.pdev->dev;
-        struct omap_display_platform_data *pdata = dev->platform_data;
-        struct omap_dss_board_info *board_data = pdata->board_data;
-        int cnt;
-
-        if (!board_data->get_context_loss_count)
-                return -ENOENT;
-
-        cnt = board_data->get_context_loss_count(dev);
-
-        WARN_ONCE(cnt < 0, "get_context_loss_count failed: %d\n", cnt);
-
-        return cnt;
-}
-
 #define SR(reg) \
         dispc.ctx[DISPC_##reg / sizeof(u32)] = dispc_read_reg(DISPC_##reg)
 #define RR(reg) \
@@ -251,7 +234,7 @@ static void dispc_save_context(void)
         if (dss_has_feature(FEAT_CORE_CLK_DIV))
                 SR(DIVISOR);
 
-        dispc.ctx_loss_cnt = dispc_get_ctx_loss_count();
+        dispc.ctx_loss_cnt = dss_get_ctx_loss_count(&dispc.pdev->dev);
         dispc.ctx_valid = true;
 
         DSSDBG("context saved, ctx_loss_count %d\n", dispc.ctx_loss_cnt);
@@ -266,7 +249,7 @@ static void dispc_restore_context(void)
         if (!dispc.ctx_valid)
                 return;
 
-        ctx = dispc_get_ctx_loss_count();
+        ctx = dss_get_ctx_loss_count(&dispc.pdev->dev);
 
         if (ctx >= 0 && ctx == dispc.ctx_loss_cnt)
                 return;
@@ -413,14 +396,6 @@ static inline bool dispc_mgr_is_lcd(enum omap_channel channel)
                 return false;
 }
 
-static struct omap_dss_device *dispc_mgr_get_device(enum omap_channel channel)
-{
-        struct omap_overlay_manager *mgr =
-                omap_dss_get_overlay_manager(channel);
-
-        return mgr ? mgr->device : NULL;
-}
-
 u32 dispc_mgr_get_vsync_irq(enum omap_channel channel)
 {
         switch (channel) {
@@ -432,6 +407,7 @@ u32 dispc_mgr_get_vsync_irq(enum omap_channel channel)
                 return DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -446,6 +422,7 @@ u32 dispc_mgr_get_framedone_irq(enum omap_channel channel)
                 return 0;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -764,7 +741,7 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane,
                 case OMAP_DSS_COLOR_XRGB16_1555:
                         m = 0xf; break;
                 default:
-                        BUG(); break;
+                        BUG(); return;
                 }
         } else {
                 switch (color_mode) {
@@ -801,13 +778,25 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane,
                 case OMAP_DSS_COLOR_XRGB16_1555:
                         m = 0xf; break;
                 default:
-                        BUG(); break;
+                        BUG(); return;
                 }
         }
 
         REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);
 }
 
+static void dispc_ovl_configure_burst_type(enum omap_plane plane,
+                enum omap_dss_rotation_type rotation_type)
+{
+        if (dss_has_feature(FEAT_BURST_2D) == 0)
+                return;
+
+        if (rotation_type == OMAP_DSS_ROT_TILER)
+                REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), 1, 29, 29);
+        else
+                REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), 0, 29, 29);
+}
+
 void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel)
 {
         int shift;
@@ -845,6 +834,7 @@ void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel)
                         break;
                 default:
                         BUG();
+                        return;
                 }
 
                 val = FLD_MOD(val, chan, shift, shift);
@@ -872,6 +862,7 @@ static enum omap_channel dispc_ovl_get_channel_out(enum omap_plane plane)
                 break;
         default:
                 BUG();
+                return 0;
         }
 
         val = dispc_read_reg(DISPC_OVL_ATTRIBUTES(plane));
@@ -983,20 +974,13 @@ static void dispc_ovl_enable_replication(enum omap_plane plane, bool enable)
         REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), enable, shift, shift);
 }
 
-void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height)
+static void dispc_mgr_set_size(enum omap_channel channel, u16 width,
+                u16 height)
 {
         u32 val;
-        BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
-        val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-        dispc_write_reg(DISPC_SIZE_MGR(channel), val);
-}
 
-void dispc_set_digit_size(u16 width, u16 height)
-{
-        u32 val;
-        BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
         val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
-        dispc_write_reg(DISPC_SIZE_MGR(OMAP_DSS_CHANNEL_DIGIT), val);
+        dispc_write_reg(DISPC_SIZE_MGR(channel), val);
 }
 
 static void dispc_read_plane_fifo_sizes(void)
@@ -1063,7 +1047,8 @@ void dispc_enable_fifomerge(bool enable)
 }
 
 void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
-                u32 *fifo_low, u32 *fifo_high, bool use_fifomerge)
+                u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,
+                bool manual_update)
 {
         /*
          * All sizes are in bytes. Both the buffer and burst are made of
@@ -1091,7 +1076,7 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
          * combined fifo size
          */
 
-        if (dss_has_feature(FEAT_OMAP3_DSI_FIFO_BUG)) {
+        if (manual_update && dss_has_feature(FEAT_OMAP3_DSI_FIFO_BUG)) {
                 *fifo_low = ovl_fifo_size - burst_size * 2;
                 *fifo_high = total_fifo_size - burst_size;
         } else {
@@ -1185,6 +1170,94 @@ static void dispc_ovl_set_scale_param(enum omap_plane plane,
         dispc_ovl_set_fir(plane, fir_hinc, fir_vinc, color_comp);
 }
 
+static void dispc_ovl_set_accu_uv(enum omap_plane plane,
+                u16 orig_width, u16 orig_height, u16 out_width, u16 out_height,
+                bool ilace, enum omap_color_mode color_mode, u8 rotation)
+{
+        int h_accu2_0, h_accu2_1;
+        int v_accu2_0, v_accu2_1;
+        int chroma_hinc, chroma_vinc;
+        int idx;
+
+        struct accu {
+                s8 h0_m, h0_n;
+                s8 h1_m, h1_n;
+                s8 v0_m, v0_n;
+                s8 v1_m, v1_n;
+        };
+
+        const struct accu *accu_table;
+        const struct accu *accu_val;
+
+        static const struct accu accu_nv12[4] = {
+                {  0, 1,  0, 1 , -1, 2, 0, 1 },
+                {  1, 2, -3, 4 ,  0, 1, 0, 1 },
+                { -1, 1,  0, 1 , -1, 2, 0, 1 },
+                { -1, 2, -1, 2 , -1, 1, 0, 1 },
+        };
+
+        static const struct accu accu_nv12_ilace[4] = {
+                {  0, 1,  0, 1 , -3, 4, -1, 4 },
+                { -1, 4, -3, 4 ,  0, 1,  0, 1 },
+                { -1, 1,  0, 1 , -1, 4, -3, 4 },
+                { -3, 4, -3, 4 , -1, 1,  0, 1 },
+        };
+
+        static const struct accu accu_yuv[4] = {
+                {  0, 1, 0, 1,  0, 1, 0, 1 },
+                {  0, 1, 0, 1,  0, 1, 0, 1 },
+                { -1, 1, 0, 1,  0, 1, 0, 1 },
+                {  0, 1, 0, 1, -1, 1, 0, 1 },
+        };
+
+        switch (rotation) {
+        case OMAP_DSS_ROT_0:
+                idx = 0;
+                break;
+        case OMAP_DSS_ROT_90:
+                idx = 1;
+                break;
+        case OMAP_DSS_ROT_180:
+                idx = 2;
+                break;
+        case OMAP_DSS_ROT_270:
+                idx = 3;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_NV12:
+                if (ilace)
+                        accu_table = accu_nv12_ilace;
+                else
+                        accu_table = accu_nv12;
+                break;
+        case OMAP_DSS_COLOR_YUV2:
+        case OMAP_DSS_COLOR_UYVY:
+                accu_table = accu_yuv;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        accu_val = &accu_table[idx];
+
+        chroma_hinc = 1024 * orig_width / out_width;
+        chroma_vinc = 1024 * orig_height / out_height;
+
+        h_accu2_0 = (accu_val->h0_m * chroma_hinc / accu_val->h0_n) % 1024;
+        h_accu2_1 = (accu_val->h1_m * chroma_hinc / accu_val->h1_n) % 1024;
+        v_accu2_0 = (accu_val->v0_m * chroma_vinc / accu_val->v0_n) % 1024;
+        v_accu2_1 = (accu_val->v1_m * chroma_vinc / accu_val->v1_n) % 1024;
+
+        dispc_ovl_set_vid_accu2_0(plane, h_accu2_0, v_accu2_0);
+        dispc_ovl_set_vid_accu2_1(plane, h_accu2_1, v_accu2_1);
+}
+
 static void dispc_ovl_set_scaling_common(enum omap_plane plane,
                 u16 orig_width, u16 orig_height,
                 u16 out_width, u16 out_height,
@@ -1258,6 +1331,10 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane,
                 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8);
                 return;
         }
+
+        dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width,
+                        out_height, ilace, color_mode, rotation);
+
         switch (color_mode) {
         case OMAP_DSS_COLOR_NV12:
                 /* UV is subsampled by 2 vertically*/
@@ -1280,6 +1357,7 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane,
                 break;
         default:
                 BUG();
+                return;
         }
 
         if (out_width != orig_width)
@@ -1297,9 +1375,6 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane,
         REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), scale_x ? 1 : 0, 5, 5);
         /* set V scaling */
         REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), scale_y ? 1 : 0, 6, 6);
-
-        dispc_ovl_set_vid_accu2_0(plane, 0x80, 0);
-        dispc_ovl_set_vid_accu2_1(plane, 0x80, 0);
 }
 
 static void dispc_ovl_set_scaling(enum omap_plane plane,
@@ -1410,6 +1485,7 @@ static int color_mode_to_bpp(enum omap_color_mode color_mode)
                 return 32;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -1423,6 +1499,7 @@ static s32 pixinc(int pixels, u8 ps)
                 return 1 - (-pixels + 1) * ps;
         else
                 BUG();
+                return 0;
 }
 
 static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
@@ -1431,7 +1508,7 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
                 enum omap_color_mode color_mode, bool fieldmode,
                 unsigned int field_offset,
                 unsigned *offset0, unsigned *offset1,
-                s32 *row_inc, s32 *pix_inc)
+                s32 *row_inc, s32 *pix_inc, int x_predecim, int y_predecim)
 {
         u8 ps;
 
@@ -1477,10 +1554,10 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
                 else
                         *offset0 = 0;
 
-                *row_inc = pixinc(1 + (screen_width - width) +
-                                (fieldmode ? screen_width : 0),
-                                ps);
-                *pix_inc = pixinc(1, ps);
+                *row_inc = pixinc(1 +
+                        (y_predecim * screen_width - x_predecim * width) +
+                        (fieldmode ? screen_width : 0), ps);
+                *pix_inc = pixinc(x_predecim, ps);
                 break;
 
         case OMAP_DSS_ROT_0 + 4:
@@ -1498,14 +1575,15 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = field_offset * screen_width * ps;
                 else
                         *offset0 = 0;
-                *row_inc = pixinc(1 - (screen_width + width) -
-                                (fieldmode ? screen_width : 0),
-                                ps);
-                *pix_inc = pixinc(1, ps);
+                *row_inc = pixinc(1 -
+                        (y_predecim * screen_width + x_predecim * width) -
+                        (fieldmode ? screen_width : 0), ps);
+                *pix_inc = pixinc(x_predecim, ps);
                 break;
 
         default:
                 BUG();
+                return;
         }
 }
 
@@ -1515,7 +1593,7 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                 enum omap_color_mode color_mode, bool fieldmode,
                 unsigned int field_offset,
                 unsigned *offset0, unsigned *offset1,
-                s32 *row_inc, s32 *pix_inc)
+                s32 *row_inc, s32 *pix_inc, int x_predecim, int y_predecim)
 {
         u8 ps;
         u16 fbw, fbh;
@@ -1557,10 +1635,14 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 + field_offset * screen_width * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(1 + (screen_width - fbw) +
-                                (fieldmode ? screen_width : 0),
-                                ps);
-                *pix_inc = pixinc(1, ps);
+                *row_inc = pixinc(1 +
+                        (y_predecim * screen_width - fbw * x_predecim) +
+                        (fieldmode ? screen_width : 0), ps);
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        *pix_inc = pixinc(x_predecim, 2 * ps);
+                else
+                        *pix_inc = pixinc(x_predecim, ps);
                 break;
         case OMAP_DSS_ROT_90:
                 *offset1 = screen_width * (fbh - 1) * ps;
@@ -1568,9 +1650,9 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 + field_offset * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(screen_width * (fbh - 1) + 1 +
-                                (fieldmode ? 1 : 0), ps);
-                *pix_inc = pixinc(-screen_width, ps);
+                *row_inc = pixinc(screen_width * (fbh * x_predecim - 1) +
+                                y_predecim + (fieldmode ? 1 : 0), ps);
+                *pix_inc = pixinc(-x_predecim * screen_width, ps);
                 break;
         case OMAP_DSS_ROT_180:
                 *offset1 = (screen_width * (fbh - 1) + fbw - 1) * ps;
@@ -1579,10 +1661,13 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                 else
                         *offset0 = *offset1;
                 *row_inc = pixinc(-1 -
-                                (screen_width - fbw) -
-                                (fieldmode ? screen_width : 0),
-                                ps);
-                *pix_inc = pixinc(-1, ps);
+                        (y_predecim * screen_width - fbw * x_predecim) -
+                        (fieldmode ? screen_width : 0), ps);
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        *pix_inc = pixinc(-x_predecim, 2 * ps);
+                else
+                        *pix_inc = pixinc(-x_predecim, ps);
                 break;
         case OMAP_DSS_ROT_270:
                 *offset1 = (fbw - 1) * ps;
@@ -1590,9 +1675,9 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 - field_offset * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(-screen_width * (fbh - 1) - 1 -
-                                (fieldmode ? 1 : 0), ps);
-                *pix_inc = pixinc(screen_width, ps);
+                *row_inc = pixinc(-screen_width * (fbh * x_predecim - 1) -
+                                y_predecim - (fieldmode ? 1 : 0), ps);
+                *pix_inc = pixinc(x_predecim * screen_width, ps);
                 break;
 
         /* mirroring */
@@ -1602,10 +1687,14 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 + field_offset * screen_width * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(screen_width * 2 - 1 +
+                *row_inc = pixinc(y_predecim * screen_width * 2 - 1 +
                                 (fieldmode ? screen_width : 0),
                                 ps);
-                *pix_inc = pixinc(-1, ps);
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        *pix_inc = pixinc(-x_predecim, 2 * ps);
+                else
+                        *pix_inc = pixinc(-x_predecim, ps);
                 break;
 
         case OMAP_DSS_ROT_90 + 4:
@@ -1614,10 +1703,10 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 + field_offset * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(-screen_width * (fbh - 1) + 1 +
-                                (fieldmode ? 1 : 0),
+                *row_inc = pixinc(-screen_width * (fbh * x_predecim - 1) +
+                                y_predecim + (fieldmode ? 1 : 0),
                                 ps);
-                *pix_inc = pixinc(screen_width, ps);
+                *pix_inc = pixinc(x_predecim * screen_width, ps);
                 break;
 
         case OMAP_DSS_ROT_180 + 4:
@@ -1626,10 +1715,14 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 - field_offset * screen_width * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(1 - screen_width * 2 -
+                *row_inc = pixinc(1 - y_predecim * screen_width * 2 -
                                 (fieldmode ? screen_width : 0),
                                 ps);
-                *pix_inc = pixinc(1, ps);
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        *pix_inc = pixinc(x_predecim, 2 * ps);
+                else
+                        *pix_inc = pixinc(x_predecim, ps);
                 break;
 
         case OMAP_DSS_ROT_270 + 4:
@@ -1638,34 +1731,130 @@ static void calc_dma_rotation_offset(u8 rotation, bool mirror,
                         *offset0 = *offset1 - field_offset * ps;
                 else
                         *offset0 = *offset1;
-                *row_inc = pixinc(screen_width * (fbh - 1) - 1 -
-                                (fieldmode ? 1 : 0),
+                *row_inc = pixinc(screen_width * (fbh * x_predecim - 1) -
+                                y_predecim - (fieldmode ? 1 : 0),
                                 ps);
-                *pix_inc = pixinc(-screen_width, ps);
+                *pix_inc = pixinc(-x_predecim * screen_width, ps);
                 break;
 
         default:
                 BUG();
+                return;
+        }
+}
+
+static void calc_tiler_rotation_offset(u16 screen_width, u16 width,
+                enum omap_color_mode color_mode, bool fieldmode,
+                unsigned int field_offset, unsigned *offset0, unsigned *offset1,
+                s32 *row_inc, s32 *pix_inc, int x_predecim, int y_predecim)
+{
+        u8 ps;
+
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_CLUT1:
+        case OMAP_DSS_COLOR_CLUT2:
+        case OMAP_DSS_COLOR_CLUT4:
+        case OMAP_DSS_COLOR_CLUT8:
+                BUG();
+                return;
+        default:
+                ps = color_mode_to_bpp(color_mode) / 8;
+                break;
         }
+
+        DSSDBG("scrw %d, width %d\n", screen_width, width);
+
+        /*
+         * field 0 = even field = bottom field
+         * field 1 = odd field = top field
+         */
+        *offset1 = 0;
+        if (field_offset)
+                *offset0 = *offset1 + field_offset * screen_width * ps;
+        else
+                *offset0 = *offset1;
+        *row_inc = pixinc(1 + (y_predecim * screen_width - width * x_predecim) +
+                        (fieldmode ? screen_width : 0), ps);
+        if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                color_mode == OMAP_DSS_COLOR_UYVY)
+                *pix_inc = pixinc(x_predecim, 2 * ps);
+        else
+                *pix_inc = pixinc(x_predecim, ps);
 }
 
-static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
+/*
+ * This function is used to avoid synclosts in OMAP3, because of some
+ * undocumented horizontal position and timing related limitations.
+ */
+static int check_horiz_timing_omap3(enum omap_channel channel,
+                const struct omap_video_timings *t, u16 pos_x,
+                u16 width, u16 height, u16 out_width, u16 out_height)
+{
+        int DS = DIV_ROUND_UP(height, out_height);
+        unsigned long nonactive, lclk, pclk;
+        static const u8 limits[3] = { 8, 10, 20 };
+        u64 val, blank;
+        int i;
+
+        nonactive = t->x_res + t->hfp + t->hsw + t->hbp - out_width;
+        pclk = dispc_mgr_pclk_rate(channel);
+        if (dispc_mgr_is_lcd(channel))
+                lclk = dispc_mgr_lclk_rate(channel);
+        else
+                lclk = dispc_fclk_rate();
+
+        i = 0;
+        if (out_height < height)
+                i++;
+        if (out_width < width)
+                i++;
+        blank = div_u64((u64)(t->hbp + t->hsw + t->hfp) * lclk, pclk);
+        DSSDBG("blanking period + ppl = %llu (limit = %u)\n", blank, limits[i]);
+        if (blank <= limits[i])
+                return -EINVAL;
+
+        /*
+         * Pixel data should be prepared before visible display point starts.
+         * So, atleast DS-2 lines must have already been fetched by DISPC
+         * during nonactive - pos_x period.
+         */
+        val = div_u64((u64)(nonactive - pos_x) * lclk, pclk);
+        DSSDBG("(nonactive - pos_x) * pcd = %llu max(0, DS - 2) * width = %d\n",
+                val, max(0, DS - 2) * width);
+        if (val < max(0, DS - 2) * width)
+                return -EINVAL;
+
+        /*
+         * All lines need to be refilled during the nonactive period of which
+         * only one line can be loaded during the active period. So, atleast
+         * DS - 1 lines should be loaded during nonactive period.
+         */
+        val =  div_u64((u64)nonactive * lclk, pclk);
+        DSSDBG("nonactive * pcd  = %llu, max(0, DS - 1) * width = %d\n",
+                val, max(0, DS - 1) * width);
+        if (val < max(0, DS - 1) * width)
+                return -EINVAL;
+
+        return 0;
+}
+
+static unsigned long calc_core_clk_five_taps(enum omap_channel channel,
+                const struct omap_video_timings *mgr_timings, u16 width,
                 u16 height, u16 out_width, u16 out_height,
                 enum omap_color_mode color_mode)
 {
-        u32 fclk = 0;
+        u32 core_clk = 0;
         u64 tmp, pclk = dispc_mgr_pclk_rate(channel);
 
         if (height <= out_height && width <= out_width)
                 return (unsigned long) pclk;
 
         if (height > out_height) {
-                struct omap_dss_device *dssdev = dispc_mgr_get_device(channel);
-                unsigned int ppl = dssdev->panel.timings.x_res;
+                unsigned int ppl = mgr_timings->x_res;
 
                 tmp = pclk * height * out_width;
                 do_div(tmp, 2 * out_height * ppl);
-                fclk = tmp;
+                core_clk = tmp;
 
                 if (height > 2 * out_height) {
                         if (ppl == out_width)
@@ -1673,23 +1862,23 @@ static unsigned long calc_fclk_five_taps(enum omap_channel channel, u16 width,
 
                         tmp = pclk * (height - 2 * out_height) * out_width;
                         do_div(tmp, 2 * out_height * (ppl - out_width));
-                        fclk = max(fclk, (u32) tmp);
+                        core_clk = max_t(u32, core_clk, tmp);
                 }
         }
 
         if (width > out_width) {
                 tmp = pclk * width;
                 do_div(tmp, out_width);
-                fclk = max(fclk, (u32) tmp);
+                core_clk = max_t(u32, core_clk, tmp);
 
                 if (color_mode == OMAP_DSS_COLOR_RGB24U)
-                        fclk <<= 1;
+                        core_clk <<= 1;
         }
 
-        return fclk;
+        return core_clk;
 }
 
-static unsigned long calc_fclk(enum omap_channel channel, u16 width,
+static unsigned long calc_core_clk(enum omap_channel channel, u16 width,
                 u16 height, u16 out_width, u16 out_height)
 {
         unsigned int hf, vf;
@@ -1730,15 +1919,20 @@ static unsigned long calc_fclk(enum omap_channel channel, u16 width,
 }
 
 static int dispc_ovl_calc_scaling(enum omap_plane plane,
-                enum omap_channel channel, u16 width, u16 height,
-                u16 out_width, u16 out_height,
-                enum omap_color_mode color_mode, bool *five_taps)
+                enum omap_channel channel,
+                const struct omap_video_timings *mgr_timings,
+                u16 width, u16 height, u16 out_width, u16 out_height,
+                enum omap_color_mode color_mode, bool *five_taps,
+                int *x_predecim, int *y_predecim, u16 pos_x)
 {
         struct omap_overlay *ovl = omap_dss_get_overlay(plane);
         const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE);
         const int maxsinglelinewidth =
                                 dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
-        unsigned long fclk = 0;
+        const int max_decim_limit = 16;
+        unsigned long core_clk = 0;
+        int decim_x, decim_y, error, min_factor;
+        u16 in_width, in_height, in_width_max = 0;
 
         if (width == out_width && height == out_height)
                 return 0;
@@ -1746,64 +1940,154 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
         if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0)
                 return -EINVAL;
 
-        if (out_width < width / maxdownscale ||
-                        out_width > width * 8)
+        *x_predecim = max_decim_limit;
+        *y_predecim = max_decim_limit;
+
+        if (color_mode == OMAP_DSS_COLOR_CLUT1 ||
+            color_mode == OMAP_DSS_COLOR_CLUT2 ||
+            color_mode == OMAP_DSS_COLOR_CLUT4 ||
+            color_mode == OMAP_DSS_COLOR_CLUT8) {
+                *x_predecim = 1;
+                *y_predecim = 1;
+                *five_taps = false;
+                return 0;
+        }
+
+        decim_x = DIV_ROUND_UP(DIV_ROUND_UP(width, out_width), maxdownscale);
+        decim_y = DIV_ROUND_UP(DIV_ROUND_UP(height, out_height), maxdownscale);
+
+        min_factor = min(decim_x, decim_y);
+
+        if (decim_x > *x_predecim || out_width > width * 8)
                 return -EINVAL;
 
-        if (out_height < height / maxdownscale ||
-                        out_height > height * 8)
+        if (decim_y > *y_predecim || out_height > height * 8)
                 return -EINVAL;
 
         if (cpu_is_omap24xx()) {
-                if (width > maxsinglelinewidth)
-                        DSSERR("Cannot scale max input width exceeded");
                 *five_taps = false;
-                fclk = calc_fclk(channel, width, height, out_width,
-                                                                out_height);
+
+                do {
+                        in_height = DIV_ROUND_UP(height, decim_y);
+                        in_width = DIV_ROUND_UP(width, decim_x);
+                        core_clk = calc_core_clk(channel, in_width, in_height,
+                                        out_width, out_height);
+                        error = (in_width > maxsinglelinewidth || !core_clk ||
+                                core_clk > dispc_core_clk_rate());
+                        if (error) {
+                                if (decim_x == decim_y) {
+                                        decim_x = min_factor;
+                                        decim_y++;
+                                } else {
+                                        swap(decim_x, decim_y);
+                                        if (decim_x < decim_y)
+                                                decim_x++;
+                                }
+                        }
+                } while (decim_x <= *x_predecim && decim_y <= *y_predecim &&
+                                error);
+
+                if (in_width > maxsinglelinewidth) {
+                        DSSERR("Cannot scale max input width exceeded");
+                        return -EINVAL;
+                }
         } else if (cpu_is_omap34xx()) {
-                if (width > (maxsinglelinewidth * 2)) {
+
+                do {
+                        in_height = DIV_ROUND_UP(height, decim_y);
+                        in_width = DIV_ROUND_UP(width, decim_x);
+                        core_clk = calc_core_clk_five_taps(channel, mgr_timings,
+                                in_width, in_height, out_width, out_height,
+                                color_mode);
+
+                        error = check_horiz_timing_omap3(channel, mgr_timings,
+                                pos_x, in_width, in_height, out_width,
+                                out_height);
+
+                        if (in_width > maxsinglelinewidth)
+                                if (in_height > out_height &&
+                                        in_height < out_height * 2)
+                                        *five_taps = false;
+                        if (!*five_taps)
+                                core_clk = calc_core_clk(channel, in_width,
+                                        in_height, out_width, out_height);
+                        error = (error || in_width > maxsinglelinewidth * 2 ||
+                                (in_width > maxsinglelinewidth && *five_taps) ||
+                                !core_clk || core_clk > dispc_core_clk_rate());
+                        if (error) {
+                                if (decim_x == decim_y) {
+                                        decim_x = min_factor;
+                                        decim_y++;
+                                } else {
+                                        swap(decim_x, decim_y);
+                                        if (decim_x < decim_y)
+                                                decim_x++;
+                                }
+                        }
+                } while (decim_x <= *x_predecim && decim_y <= *y_predecim
+                        && error);
+
+                if (check_horiz_timing_omap3(channel, mgr_timings, pos_x, width,
+                        height, out_width, out_height)){
+                                DSSERR("horizontal timing too tight\n");
+                                return -EINVAL;
+                }
+
+                if (in_width > (maxsinglelinewidth * 2)) {
                         DSSERR("Cannot setup scaling");
                         DSSERR("width exceeds maximum width possible");
                         return -EINVAL;
                 }
-                fclk = calc_fclk_five_taps(channel, width, height, out_width,
-                                                out_height, color_mode);
-                if (width > maxsinglelinewidth) {
-                        if (height > out_height && height < out_height * 2)
-                                *five_taps = false;
-                        else {
-                                DSSERR("cannot setup scaling with five taps");
-                                return -EINVAL;
-                        }
+
+                if (in_width > maxsinglelinewidth && *five_taps) {
+                        DSSERR("cannot setup scaling with five taps");
+                        return -EINVAL;
                 }
-                if (!*five_taps)
-                        fclk = calc_fclk(channel, width, height, out_width,
-                                        out_height);
         } else {
-                if (width > maxsinglelinewidth) {
+                int decim_x_min = decim_x;
+                in_height = DIV_ROUND_UP(height, decim_y);
+                in_width_max = dispc_core_clk_rate() /
+                                DIV_ROUND_UP(dispc_mgr_pclk_rate(channel),
+                                                out_width);
+                decim_x = DIV_ROUND_UP(width, in_width_max);
+
+                decim_x = decim_x > decim_x_min ? decim_x : decim_x_min;
+                if (decim_x > *x_predecim)
+                        return -EINVAL;
+
+                do {
+                        in_width = DIV_ROUND_UP(width, decim_x);
+                } while (decim_x <= *x_predecim &&
+                                in_width > maxsinglelinewidth && decim_x++);
+
+                if (in_width > maxsinglelinewidth) {
                         DSSERR("Cannot scale width exceeds max line width");
                         return -EINVAL;
                 }
-                fclk = calc_fclk(channel, width, height, out_width,
-                                out_height);
+
+                core_clk = calc_core_clk(channel, in_width, in_height,
+                                out_width, out_height);
         }
 
-        DSSDBG("required fclk rate = %lu Hz\n", fclk);
-        DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
+        DSSDBG("required core clk rate = %lu Hz\n", core_clk);
+        DSSDBG("current core clk rate = %lu Hz\n", dispc_core_clk_rate());
 
-        if (!fclk || fclk > dispc_fclk_rate()) {
+        if (!core_clk || core_clk > dispc_core_clk_rate()) {
                 DSSERR("failed to set up scaling, "
-                        "required fclk rate = %lu Hz, "
-                        "current fclk rate = %lu Hz\n",
-                        fclk, dispc_fclk_rate());
+                        "required core clk rate = %lu Hz, "
+                        "current core clk rate = %lu Hz\n",
+                        core_clk, dispc_core_clk_rate());
                 return -EINVAL;
         }
 
+        *x_predecim = decim_x;
+        *y_predecim = decim_y;
         return 0;
 }
 
 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-                bool ilace, bool replication)
+                bool ilace, bool replication,
+                const struct omap_video_timings *mgr_timings)
 {
         struct omap_overlay *ovl = omap_dss_get_overlay(plane);
         bool five_taps = true;
@@ -1814,8 +2098,11 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         s32 pix_inc;
         u16 frame_height = oi->height;
         unsigned int field_offset = 0;
-        u16 outw, outh;
+        u16 in_height = oi->height;
+        u16 in_width = oi->width;
+        u16 out_width, out_height;
         enum omap_channel channel;
+        int x_predecim = 1, y_predecim = 1;
 
         channel = dispc_ovl_get_channel_out(plane);
 
@@ -1829,32 +2116,35 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         if (oi->paddr == 0)
                 return -EINVAL;
 
-        outw = oi->out_width == 0 ? oi->width : oi->out_width;
-        outh = oi->out_height == 0 ? oi->height : oi->out_height;
+        out_width = oi->out_width == 0 ? oi->width : oi->out_width;
+        out_height = oi->out_height == 0 ? oi->height : oi->out_height;
 
-        if (ilace && oi->height == outh)
+        if (ilace && oi->height == out_height)
                 fieldmode = 1;
 
         if (ilace) {
                 if (fieldmode)
-                        oi->height /= 2;
+                        in_height /= 2;
                 oi->pos_y /= 2;
-                outh /= 2;
+                out_height /= 2;
 
                 DSSDBG("adjusting for ilace: height %d, pos_y %d, "
                                 "out_height %d\n",
-                                oi->height, oi->pos_y, outh);
+                                in_height, oi->pos_y, out_height);
         }
 
         if (!dss_feat_color_mode_supported(plane, oi->color_mode))
                 return -EINVAL;
 
-        r = dispc_ovl_calc_scaling(plane, channel, oi->width, oi->height,
-                        outw, outh, oi->color_mode,
-                        &five_taps);
+        r = dispc_ovl_calc_scaling(plane, channel, mgr_timings, in_width,
+                        in_height, out_width, out_height, oi->color_mode,
+                        &five_taps, &x_predecim, &y_predecim, oi->pos_x);
         if (r)
                 return r;
 
+        in_width = DIV_ROUND_UP(in_width, x_predecim);
+        in_height = DIV_ROUND_UP(in_height, y_predecim);
+
         if (oi->color_mode == OMAP_DSS_COLOR_YUV2 ||
                         oi->color_mode == OMAP_DSS_COLOR_UYVY ||
                         oi->color_mode == OMAP_DSS_COLOR_NV12)
@@ -1868,32 +2158,46 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
                  * so the integer part must be added to the base address of the
                  * bottom field.
                  */
-                if (!oi->height || oi->height == outh)
+                if (!in_height || in_height == out_height)
                         field_offset = 0;
                 else
-                        field_offset = oi->height / outh / 2;
+                        field_offset = in_height / out_height / 2;
         }
 
         /* Fields are independent but interleaved in memory. */
         if (fieldmode)
                 field_offset = 1;
 
-        if (oi->rotation_type == OMAP_DSS_ROT_DMA)
+        offset0 = 0;
+        offset1 = 0;
+        row_inc = 0;
+        pix_inc = 0;
+
+        if (oi->rotation_type == OMAP_DSS_ROT_TILER)
+                calc_tiler_rotation_offset(oi->screen_width, in_width,
+                                oi->color_mode, fieldmode, field_offset,
+                                &offset0, &offset1, &row_inc, &pix_inc,
+                                x_predecim, y_predecim);
+        else if (oi->rotation_type == OMAP_DSS_ROT_DMA)
                 calc_dma_rotation_offset(oi->rotation, oi->mirror,
-                                oi->screen_width, oi->width, frame_height,
+                                oi->screen_width, in_width, frame_height,
                                 oi->color_mode, fieldmode, field_offset,
-                                &offset0, &offset1, &row_inc, &pix_inc);
+                                &offset0, &offset1, &row_inc, &pix_inc,
+                                x_predecim, y_predecim);
         else
                 calc_vrfb_rotation_offset(oi->rotation, oi->mirror,
-                                oi->screen_width, oi->width, frame_height,
+                                oi->screen_width, in_width, frame_height,
                                 oi->color_mode, fieldmode, field_offset,
-                                &offset0, &offset1, &row_inc, &pix_inc);
+                                &offset0, &offset1, &row_inc, &pix_inc,
+                                x_predecim, y_predecim);
 
         DSSDBG("offset0 %u, offset1 %u, row_inc %d, pix_inc %d\n",
                         offset0, offset1, row_inc, pix_inc);
 
         dispc_ovl_set_color_mode(plane, oi->color_mode);
 
+        dispc_ovl_configure_burst_type(plane, oi->rotation_type);
+
         dispc_ovl_set_ba0(plane, oi->paddr + offset0);
         dispc_ovl_set_ba1(plane, oi->paddr + offset1);
 
@@ -1906,19 +2210,18 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
         dispc_ovl_set_row_inc(plane, row_inc);
         dispc_ovl_set_pix_inc(plane, pix_inc);
 
-        DSSDBG("%d,%d %dx%d -> %dx%d\n", oi->pos_x, oi->pos_y, oi->width,
-                        oi->height, outw, outh);
+        DSSDBG("%d,%d %dx%d -> %dx%d\n", oi->pos_x, oi->pos_y, in_width,
+                        in_height, out_width, out_height);
 
         dispc_ovl_set_pos(plane, oi->pos_x, oi->pos_y);
 
-        dispc_ovl_set_pic_size(plane, oi->width, oi->height);
+        dispc_ovl_set_pic_size(plane, in_width, in_height);
 
         if (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) {
-                dispc_ovl_set_scaling(plane, oi->width, oi->height,
-                                   outw, outh,
-                                   ilace, five_taps, fieldmode,
+                dispc_ovl_set_scaling(plane, in_width, in_height, out_width,
+                                   out_height, ilace, five_taps, fieldmode,
                                    oi->color_mode, oi->rotation);
-                dispc_ovl_set_vid_size(plane, outw, outh);
+                dispc_ovl_set_vid_size(plane, out_width, out_height);
                 dispc_ovl_set_vid_color_conv(plane, cconv);
         }
 
@@ -2087,8 +2390,10 @@ bool dispc_mgr_is_enabled(enum omap_channel channel)
                 return !!REG_GET(DISPC_CONTROL, 1, 1);
         else if (channel == OMAP_DSS_CHANNEL_LCD2)
                 return !!REG_GET(DISPC_CONTROL2, 0, 0);
-        else
+        else {
                 BUG();
+                return false;
+        }
 }
 
 void dispc_mgr_enable(enum omap_channel channel, bool enable)
@@ -2285,6 +2590,12 @@ void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable)
                 REG_FLD_MOD(DISPC_CONTROL, enable, 11, 11);
 }
 
+static bool _dispc_mgr_size_ok(u16 width, u16 height)
+{
+        return width <= dss_feat_get_param_max(FEAT_PARAM_MGR_WIDTH) &&
+                height <= dss_feat_get_param_max(FEAT_PARAM_MGR_HEIGHT);
+}
+
 static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp,
                 int vsw, int vfp, int vbp)
 {
@@ -2309,11 +2620,20 @@ static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp,
         return true;
 }
 
-bool dispc_lcd_timings_ok(struct omap_video_timings *timings)
+bool dispc_mgr_timings_ok(enum omap_channel channel,
+                const struct omap_video_timings *timings)
 {
-        return _dispc_lcd_timings_ok(timings->hsw, timings->hfp,
-                        timings->hbp, timings->vsw,
-                        timings->vfp, timings->vbp);
+        bool timings_ok;
+
+        timings_ok = _dispc_mgr_size_ok(timings->x_res, timings->y_res);
+
+        if (dispc_mgr_is_lcd(channel))
+                timings_ok =  timings_ok && _dispc_lcd_timings_ok(timings->hsw,
+                                                timings->hfp, timings->hbp,
+                                                timings->vsw, timings->vfp,
+                                                timings->vbp);
+
+        return timings_ok;
 }
 
 static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,
@@ -2340,37 +2660,45 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,
 }
 
 /* change name to mode? */
-void dispc_mgr_set_lcd_timings(enum omap_channel channel,
+void dispc_mgr_set_timings(enum omap_channel channel,
                 struct omap_video_timings *timings)
 {
         unsigned xtot, ytot;
         unsigned long ht, vt;
+        struct omap_video_timings t = *timings;
+
+        DSSDBG("channel %d xres %u yres %u\n", channel, t.x_res, t.y_res);
 
-        if (!_dispc_lcd_timings_ok(timings->hsw, timings->hfp,
-                                timings->hbp, timings->vsw,
-                                timings->vfp, timings->vbp))
+        if (!dispc_mgr_timings_ok(channel, &t)) {
                 BUG();
+                return;
+        }
+
+        if (dispc_mgr_is_lcd(channel)) {
+                _dispc_mgr_set_lcd_timings(channel, t.hsw, t.hfp, t.hbp, t.vsw,
+                                t.vfp, t.vbp);
+
+                xtot = t.x_res + t.hfp + t.hsw + t.hbp;
+                ytot = t.y_res + t.vfp + t.vsw + t.vbp;
 
-        _dispc_mgr_set_lcd_timings(channel, timings->hsw, timings->hfp,
-                        timings->hbp, timings->vsw, timings->vfp,
-                        timings->vbp);
+                ht = (timings->pixel_clock * 1000) / xtot;
+                vt = (timings->pixel_clock * 1000) / xtot / ytot;
 
-        dispc_mgr_set_lcd_size(channel, timings->x_res, timings->y_res);
+                DSSDBG("pck %u\n", timings->pixel_clock);
+                DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
+                        t.hsw, t.hfp, t.hbp, t.vsw, t.vfp, t.vbp);
 
-        xtot = timings->x_res + timings->hfp + timings->hsw + timings->hbp;
-        ytot = timings->y_res + timings->vfp + timings->vsw + timings->vbp;
+                DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+        } else {
+                enum dss_hdmi_venc_clk_source_select source;
 
-        ht = (timings->pixel_clock * 1000) / xtot;
-        vt = (timings->pixel_clock * 1000) / xtot / ytot;
+                source = dss_get_hdmi_venc_clk_source();
 
-        DSSDBG("channel %d xres %u yres %u\n", channel, timings->x_res,
-                        timings->y_res);
-        DSSDBG("pck %u\n", timings->pixel_clock);
-        DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
-                        timings->hsw, timings->hfp, timings->hbp,
-                        timings->vsw, timings->vfp, timings->vbp);
+                if (source == DSS_VENC_TV_CLK)
+                        t.y_res /= 2;
+        }
 
-        DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+        dispc_mgr_set_size(channel, t.x_res, t.y_res);
 }
 
 static void dispc_mgr_set_lcd_divisor(enum omap_channel channel, u16 lck_div,
@@ -2411,6 +2739,7 @@ unsigned long dispc_fclk_rate(void)
                 break;
         default:
                 BUG();
+                return 0;
         }
 
         return r;
@@ -2441,6 +2770,7 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
                 break;
         default:
                 BUG();
+                return 0;
         }
 
         return r / lcd;
@@ -2462,20 +2792,35 @@ unsigned long dispc_mgr_pclk_rate(enum omap_channel channel)
 
                 return r / pcd;
         } else {
-                struct omap_dss_device *dssdev =
-                        dispc_mgr_get_device(channel);
+                enum dss_hdmi_venc_clk_source_select source;
 
-                switch (dssdev->type) {
-                case OMAP_DISPLAY_TYPE_VENC:
+                source = dss_get_hdmi_venc_clk_source();
+
+                switch (source) {
+                case DSS_VENC_TV_CLK:
                         return venc_get_pixel_clock();
-                case OMAP_DISPLAY_TYPE_HDMI:
+                case DSS_HDMI_M_PCLK:
                         return hdmi_get_pixel_clock();
                 default:
                         BUG();
+                        return 0;
                 }
         }
 }
 
+unsigned long dispc_core_clk_rate(void)
+{
+        int lcd;
+        unsigned long fclk = dispc_fclk_rate();
+
+        if (dss_has_feature(FEAT_CORE_CLK_DIV))
+                lcd = REG_GET(DISPC_DIVISOR, 23, 16);
+        else
+                lcd = REG_GET(DISPC_DIVISORo(OMAP_DSS_CHANNEL_LCD), 23, 16);
+
+        return fclk / lcd;
+}
+
 void dispc_dump_clocks(struct seq_file *s)
 {
         int lcd, pcd;
@@ -2588,7 +2933,7 @@ void dispc_dump_irqs(struct seq_file *s)
 }
 #endif
 
-void dispc_dump_regs(struct seq_file *s)
+static void dispc_dump_regs(struct seq_file *s)
 {
         int i, j;
         const char *mgr_names[] = {
@@ -3247,27 +3592,6 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
         return 0;
 }
 
-#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
-void dispc_fake_vsync_irq(void)
-{
-        u32 irqstatus = DISPC_IRQ_VSYNC;
-        int i;
-
-        WARN_ON(!in_interrupt());
-
-        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
-                struct omap_dispc_isr_data *isr_data;
-                isr_data = &dispc.registered_isr[i];
-
-                if (!isr_data->isr)
-                        continue;
-
-                if (isr_data->mask & irqstatus)
-                        isr_data->isr(isr_data->arg, irqstatus);
-        }
-}
-#endif
-
 static void _omap_dispc_initialize_irq(void)
 {
         unsigned long flags;
@@ -3330,7 +3654,7 @@ static void _omap_dispc_initial_config(void)
 }
 
 /* DISPC HW IP initialisation */
-static int omap_dispchw_probe(struct platform_device *pdev)
+static int __init omap_dispchw_probe(struct platform_device *pdev)
 {
         u32 rev;
         int r = 0;
@@ -3399,6 +3723,11 @@ static int omap_dispchw_probe(struct platform_device *pdev)
 
         dispc_runtime_put();
 
+        dss_debugfs_create_file("dispc", dispc_dump_regs);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        dss_debugfs_create_file("dispc_irq", dispc_dump_irqs);
+#endif
         return 0;
 
 err_runtime_get:
@@ -3407,7 +3736,7 @@ err_runtime_get:
         return r;
 }
 
-static int omap_dispchw_remove(struct platform_device *pdev)
+static int __exit omap_dispchw_remove(struct platform_device *pdev)
 {
         pm_runtime_disable(&pdev->dev);
 
@@ -3419,19 +3748,12 @@ static int omap_dispchw_remove(struct platform_device *pdev)
 static int dispc_runtime_suspend(struct device *dev)
 {
         dispc_save_context();
-        dss_runtime_put();
 
         return 0;
 }
 
 static int dispc_runtime_resume(struct device *dev)
 {
-        int r;
-
-        r = dss_runtime_get();
-        if (r < 0)
-                return r;
-
         dispc_restore_context();
 
         return 0;
@@ -3443,8 +3765,7 @@ static const struct dev_pm_ops dispc_pm_ops = {
 };
 
 static struct platform_driver omap_dispchw_driver = {
-        .probe          = omap_dispchw_probe,
-        .remove         = omap_dispchw_remove,
+        .remove         = __exit_p(omap_dispchw_remove),
         .driver         = {
                 .name   = "omapdss_dispc",
                 .owner  = THIS_MODULE,
@@ -3452,12 +3773,12 @@ static struct platform_driver omap_dispchw_driver = {
         },
 };
 
-int dispc_init_platform_driver(void)
+int __init dispc_init_platform_driver(void)
 {
-        return platform_driver_register(&omap_dispchw_driver);
+        return platform_driver_probe(&omap_dispchw_driver, omap_dispchw_probe);
 }
 
-void dispc_uninit_platform_driver(void)
+void __exit dispc_uninit_platform_driver(void)
 {
-        return platform_driver_unregister(&omap_dispchw_driver);
+        platform_driver_unregister(&omap_dispchw_driver);
 }
diff --git a/drivers/video/omap2/dss/dispc.h b/drivers/video/omap2/dss/dispc.h
index 5836bd1650f9..f278080e1063 100644
--- a/drivers/video/omap2/dss/dispc.h
+++ b/drivers/video/omap2/dss/dispc.h
@@ -120,6 +120,7 @@ static inline u16 DISPC_DEFAULT_COLOR(enum omap_channel channel)
                 return 0x03AC;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -134,6 +135,7 @@ static inline u16 DISPC_TRANS_COLOR(enum omap_channel channel)
                 return 0x03B0;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -144,10 +146,12 @@ static inline u16 DISPC_TIMING_H(enum omap_channel channel)
                 return 0x0064;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0400;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -158,10 +162,12 @@ static inline u16 DISPC_TIMING_V(enum omap_channel channel)
                 return 0x0068;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0404;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -172,10 +178,12 @@ static inline u16 DISPC_POL_FREQ(enum omap_channel channel)
                 return 0x006C;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x0408;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -186,10 +194,12 @@ static inline u16 DISPC_DIVISORo(enum omap_channel channel)
                 return 0x0070;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x040C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -205,6 +215,7 @@ static inline u16 DISPC_SIZE_MGR(enum omap_channel channel)
                 return 0x03CC;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -215,10 +226,12 @@ static inline u16 DISPC_DATA_CYCLE1(enum omap_channel channel)
                 return 0x01D4;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C0;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -229,10 +242,12 @@ static inline u16 DISPC_DATA_CYCLE2(enum omap_channel channel)
                 return 0x01D8;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -243,10 +258,12 @@ static inline u16 DISPC_DATA_CYCLE3(enum omap_channel channel)
                 return 0x01DC;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03C8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -257,10 +274,12 @@ static inline u16 DISPC_CPR_COEF_R(enum omap_channel channel)
                 return 0x0220;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03BC;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -271,10 +290,12 @@ static inline u16 DISPC_CPR_COEF_G(enum omap_channel channel)
                 return 0x0224;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03B8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -285,10 +306,12 @@ static inline u16 DISPC_CPR_COEF_B(enum omap_channel channel)
                 return 0x0228;
         case OMAP_DSS_CHANNEL_DIGIT:
                 BUG();
+                return 0;
         case OMAP_DSS_CHANNEL_LCD2:
                 return 0x03B4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -306,6 +329,7 @@ static inline u16 DISPC_OVL_BASE(enum omap_plane plane)
                 return 0x0300;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -321,6 +345,7 @@ static inline u16 DISPC_BA0_OFFSET(enum omap_plane plane)
                 return 0x0008;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -335,6 +360,7 @@ static inline u16 DISPC_BA1_OFFSET(enum omap_plane plane)
                 return 0x000C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -343,6 +369,7 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0544;
         case OMAP_DSS_VIDEO2:
@@ -351,6 +378,7 @@ static inline u16 DISPC_BA0_UV_OFFSET(enum omap_plane plane)
                 return 0x0310;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -359,6 +387,7 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0548;
         case OMAP_DSS_VIDEO2:
@@ -367,6 +396,7 @@ static inline u16 DISPC_BA1_UV_OFFSET(enum omap_plane plane)
                 return 0x0314;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -381,6 +411,7 @@ static inline u16 DISPC_POS_OFFSET(enum omap_plane plane)
                 return 0x009C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -395,6 +426,7 @@ static inline u16 DISPC_SIZE_OFFSET(enum omap_plane plane)
                 return 0x00A8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -410,6 +442,7 @@ static inline u16 DISPC_ATTR_OFFSET(enum omap_plane plane)
                 return 0x0070;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -418,6 +451,7 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0568;
         case OMAP_DSS_VIDEO2:
@@ -426,6 +460,7 @@ static inline u16 DISPC_ATTR2_OFFSET(enum omap_plane plane)
                 return 0x032C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -441,6 +476,7 @@ static inline u16 DISPC_FIFO_THRESH_OFFSET(enum omap_plane plane)
                 return 0x008C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -456,6 +492,7 @@ static inline u16 DISPC_FIFO_SIZE_STATUS_OFFSET(enum omap_plane plane)
                 return 0x0088;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -471,6 +508,7 @@ static inline u16 DISPC_ROW_INC_OFFSET(enum omap_plane plane)
                 return 0x00A4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -486,6 +524,7 @@ static inline u16 DISPC_PIX_INC_OFFSET(enum omap_plane plane)
                 return 0x0098;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -498,8 +537,10 @@ static inline u16 DISPC_WINDOW_SKIP_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO2:
         case OMAP_DSS_VIDEO3:
                 BUG();
+                return 0;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -512,8 +553,10 @@ static inline u16 DISPC_TABLE_BA_OFFSET(enum omap_plane plane)
         case OMAP_DSS_VIDEO2:
         case OMAP_DSS_VIDEO3:
                 BUG();
+                return 0;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -522,6 +565,7 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0024;
@@ -529,6 +573,7 @@ static inline u16 DISPC_FIR_OFFSET(enum omap_plane plane)
                 return 0x0090;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -537,6 +582,7 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0580;
         case OMAP_DSS_VIDEO2:
@@ -545,6 +591,7 @@ static inline u16 DISPC_FIR2_OFFSET(enum omap_plane plane)
                 return 0x0424;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -553,6 +600,7 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0028;
@@ -560,6 +608,7 @@ static inline u16 DISPC_PIC_SIZE_OFFSET(enum omap_plane plane)
                 return 0x0094;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -569,6 +618,7 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x002C;
@@ -576,6 +626,7 @@ static inline u16 DISPC_ACCU0_OFFSET(enum omap_plane plane)
                 return 0x0000;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -584,6 +635,7 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0584;
         case OMAP_DSS_VIDEO2:
@@ -592,6 +644,7 @@ static inline u16 DISPC_ACCU2_0_OFFSET(enum omap_plane plane)
                 return 0x0428;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -600,6 +653,7 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0030;
@@ -607,6 +661,7 @@ static inline u16 DISPC_ACCU1_OFFSET(enum omap_plane plane)
                 return 0x0004;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -615,6 +670,7 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0588;
         case OMAP_DSS_VIDEO2:
@@ -623,6 +679,7 @@ static inline u16 DISPC_ACCU2_1_OFFSET(enum omap_plane plane)
                 return 0x042C;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -632,6 +689,7 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0034 + i * 0x8;
@@ -639,6 +697,7 @@ static inline u16 DISPC_FIR_COEF_H_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0010 + i * 0x8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -648,6 +707,7 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x058C + i * 0x8;
         case OMAP_DSS_VIDEO2:
@@ -656,6 +716,7 @@ static inline u16 DISPC_FIR_COEF_H2_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0430 + i * 0x8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -665,6 +726,7 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
                 return 0x0038 + i * 0x8;
@@ -672,6 +734,7 @@ static inline u16 DISPC_FIR_COEF_HV_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0014 + i * 0x8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -681,6 +744,7 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0590 + i * 8;
         case OMAP_DSS_VIDEO2:
@@ -689,6 +753,7 @@ static inline u16 DISPC_FIR_COEF_HV2_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0434 + i * 0x8;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -698,12 +763,14 @@ static inline u16 DISPC_CONV_COEF_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
         case OMAP_DSS_VIDEO2:
         case OMAP_DSS_VIDEO3:
                 return 0x0074 + i * 0x4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -713,6 +780,7 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x0124 + i * 0x4;
         case OMAP_DSS_VIDEO2:
@@ -721,6 +789,7 @@ static inline u16 DISPC_FIR_COEF_V_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0050 + i * 0x4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -730,6 +799,7 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i)
         switch (plane) {
         case OMAP_DSS_GFX:
                 BUG();
+                return 0;
         case OMAP_DSS_VIDEO1:
                 return 0x05CC + i * 0x4;
         case OMAP_DSS_VIDEO2:
@@ -738,6 +808,7 @@ static inline u16 DISPC_FIR_COEF_V2_OFFSET(enum omap_plane plane, u16 i)
                 return 0x0470 + i * 0x4;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -754,6 +825,7 @@ static inline u16 DISPC_PRELOAD_OFFSET(enum omap_plane plane)
                 return 0x00A0;
         default:
                 BUG();
+                return 0;
         }
 }
 #endif
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 4424c198dbcd..249010630370 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -304,10 +304,18 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
                 return 24;
         default:
                 BUG();
+                return 0;
         }
 }
 EXPORT_SYMBOL(omapdss_default_get_recommended_bpp);
 
+void omapdss_default_get_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        *timings = dssdev->panel.timings;
+}
+EXPORT_SYMBOL(omapdss_default_get_timings);
+
 /* Checks if replication logic should be used. Only use for active matrix,
  * when overlay is in RGB12U or RGB16 mode, and LCD interface is
  * 18bpp or 24bpp */
@@ -340,6 +348,7 @@ bool dss_use_replication(struct omap_dss_device *dssdev,
                 break;
         default:
                 BUG();
+                return false;
         }
 
         return bpp > 16;
@@ -352,46 +361,6 @@ void dss_init_device(struct platform_device *pdev,
         int i;
         int r;
 
-        switch (dssdev->type) {
-#ifdef CONFIG_OMAP2_DSS_DPI
-        case OMAP_DISPLAY_TYPE_DPI:
-                r = dpi_init_display(dssdev);
-                break;
-#endif
-#ifdef CONFIG_OMAP2_DSS_RFBI
-        case OMAP_DISPLAY_TYPE_DBI:
-                r = rfbi_init_display(dssdev);
-                break;
-#endif
-#ifdef CONFIG_OMAP2_DSS_VENC
-        case OMAP_DISPLAY_TYPE_VENC:
-                r = venc_init_display(dssdev);
-                break;
-#endif
-#ifdef CONFIG_OMAP2_DSS_SDI
-        case OMAP_DISPLAY_TYPE_SDI:
-                r = sdi_init_display(dssdev);
-                break;
-#endif
-#ifdef CONFIG_OMAP2_DSS_DSI
-        case OMAP_DISPLAY_TYPE_DSI:
-                r = dsi_init_display(dssdev);
-                break;
-#endif
-        case OMAP_DISPLAY_TYPE_HDMI:
-                r = hdmi_init_display(dssdev);
-                break;
-        default:
-                DSSERR("Support for display '%s' not compiled in.\n",
-                                dssdev->name);
-                return;
-        }
-
-        if (r) {
-                DSSERR("failed to init display %s\n", dssdev->name);
-                return;
-        }
-
         /* create device sysfs files */
         i = 0;
         while ((attr = display_sysfs_attrs[i++]) != NULL) {
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index faaf305fda27..8c2056c9537b 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -156,7 +156,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
                 t->pixel_clock = pck;
         }
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, t);
+        dss_mgr_set_timings(dssdev->manager, t);
 
         return 0;
 }
@@ -202,10 +202,6 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
                         goto err_reg_enable;
         }
 
-        r = dss_runtime_get();
-        if (r)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r)
                 goto err_get_dispc;
@@ -244,8 +240,6 @@ err_dsi_pll_init:
 err_get_dsi:
         dispc_runtime_put();
 err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
         if (cpu_is_omap34xx())
                 regulator_disable(dpi.vdds_dsi_reg);
 err_reg_enable:
@@ -266,7 +260,6 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
         }
 
         dispc_runtime_put();
-        dss_runtime_put();
 
         if (cpu_is_omap34xx())
                 regulator_disable(dpi.vdds_dsi_reg);
@@ -283,21 +276,15 @@ void dpi_set_timings(struct omap_dss_device *dssdev,
         DSSDBG("dpi_set_timings\n");
         dssdev->panel.timings = *timings;
         if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
-                r = dss_runtime_get();
-                if (r)
-                        return;
-
                 r = dispc_runtime_get();
-                if (r) {
-                        dss_runtime_put();
+                if (r)
                         return;
-                }
 
                 dpi_set_mode(dssdev);
-                dispc_mgr_go(dssdev->manager->id);
 
                 dispc_runtime_put();
-                dss_runtime_put();
+        } else {
+                dss_mgr_set_timings(dssdev->manager, timings);
         }
 }
 EXPORT_SYMBOL(dpi_set_timings);
@@ -312,7 +299,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev,
         unsigned long pck;
         struct dispc_clock_info dispc_cinfo;
 
-        if (!dispc_lcd_timings_ok(timings))
+        if (dss_mgr_check_timings(dssdev->manager, timings))
                 return -EINVAL;
 
         if (timings->pixel_clock == 0)
@@ -352,7 +339,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev,
 }
 EXPORT_SYMBOL(dpi_check_timings);
 
-int dpi_init_display(struct omap_dss_device *dssdev)
+static int __init dpi_init_display(struct omap_dss_device *dssdev)
 {
         DSSDBG("init_display\n");
 
@@ -378,12 +365,58 @@ int dpi_init_display(struct omap_dss_device *dssdev)
         return 0;
 }
 
-int dpi_init(void)
+static void __init dpi_probe_pdata(struct platform_device *pdev)
 {
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int i, r;
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                if (dssdev->type != OMAP_DISPLAY_TYPE_DPI)
+                        continue;
+
+                r = dpi_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
+
+                r = omap_dss_register_device(dssdev, &pdev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                        dssdev->name, r);
+        }
+}
+
+static int __init omap_dpi_probe(struct platform_device *pdev)
+{
+        dpi_probe_pdata(pdev);
+
+        return 0;
+}
+
+static int __exit omap_dpi_remove(struct platform_device *pdev)
+{
+        omap_dss_unregister_child_devices(&pdev->dev);
+
         return 0;
 }
 
-void dpi_exit(void)
+static struct platform_driver omap_dpi_driver = {
+        .remove         = __exit_p(omap_dpi_remove),
+        .driver         = {
+                .name   = "omapdss_dpi",
+                .owner  = THIS_MODULE,
+        },
+};
+
+int __init dpi_init_platform_driver(void)
 {
+        return platform_driver_probe(&omap_dpi_driver, omap_dpi_probe);
 }
 
+void __exit dpi_uninit_platform_driver(void)
+{
+        platform_driver_unregister(&omap_dpi_driver);
+}
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 210a3c4f6150..ca8382d346e9 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -256,14 +256,13 @@ struct dsi_data {
         struct platform_device *pdev;
         void __iomem    *base;
 
+        int module_id;
+
         int irq;
 
         struct clk *dss_clk;
         struct clk *sys_clk;
 
-        int (*enable_pads)(int dsi_id, unsigned lane_mask);
-        void (*disable_pads)(int dsi_id, unsigned lane_mask);
-
         struct dsi_clock_info current_cinfo;
 
         bool vdds_dsi_enabled;
@@ -361,11 +360,6 @@ struct platform_device *dsi_get_dsidev_from_id(int module)
         return dsi_pdev_map[module];
 }
 
-static inline int dsi_get_dsidev_id(struct platform_device *dsidev)
-{
-        return dsidev->id;
-}
-
 static inline void dsi_write_reg(struct platform_device *dsidev,
                 const struct dsi_reg idx, u32 val)
 {
@@ -452,6 +446,7 @@ u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
                 return 16;
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -1184,10 +1179,9 @@ static unsigned long dsi_get_txbyteclkhs(struct platform_device *dsidev)
 static unsigned long dsi_fclk_rate(struct platform_device *dsidev)
 {
         unsigned long r;
-        int dsi_module = dsi_get_dsidev_id(dsidev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
-        if (dss_get_dsi_clk_source(dsi_module) == OMAP_DSS_CLK_SRC_FCK) {
+        if (dss_get_dsi_clk_source(dsi->module_id) == OMAP_DSS_CLK_SRC_FCK) {
                 /* DSI FCLK source is DSS_CLK_FCK */
                 r = clk_get_rate(dsi->dss_clk);
         } else {
@@ -1279,10 +1273,9 @@ static int dsi_pll_power(struct platform_device *dsidev,
 }
 
 /* calculate clock rates using dividers in cinfo */
-static int dsi_calc_clock_rates(struct omap_dss_device *dssdev,
+static int dsi_calc_clock_rates(struct platform_device *dsidev,
                 struct dsi_clock_info *cinfo)
 {
-        struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
         if (cinfo->regn == 0 || cinfo->regn > dsi->regn_max)
@@ -1297,21 +1290,8 @@ static int dsi_calc_clock_rates(struct omap_dss_device *dssdev,
         if (cinfo->regm_dsi > dsi->regm_dsi_max)
                 return -EINVAL;
 
-        if (cinfo->use_sys_clk) {
-                cinfo->clkin = clk_get_rate(dsi->sys_clk);
-                /* XXX it is unclear if highfreq should be used
-                 * with DSS_SYS_CLK source also */
-                cinfo->highfreq = 0;
-        } else {
-                cinfo->clkin = dispc_mgr_pclk_rate(dssdev->manager->id);
-
-                if (cinfo->clkin < 32000000)
-                        cinfo->highfreq = 0;
-                else
-                        cinfo->highfreq = 1;
-        }
-
-        cinfo->fint = cinfo->clkin / (cinfo->regn * (cinfo->highfreq ? 2 : 1));
+        cinfo->clkin = clk_get_rate(dsi->sys_clk);
+        cinfo->fint = cinfo->clkin / cinfo->regn;
 
         if (cinfo->fint > dsi->fint_max || cinfo->fint < dsi->fint_min)
                 return -EINVAL;
@@ -1378,27 +1358,21 @@ retry:
 
         memset(&cur, 0, sizeof(cur));
         cur.clkin = dss_sys_clk;
-        cur.use_sys_clk = 1;
-        cur.highfreq = 0;
 
-        /* no highfreq: 0.75MHz < Fint = clkin / regn < 2.1MHz */
-        /* highfreq: 0.75MHz < Fint = clkin / (2*regn) < 2.1MHz */
+        /* 0.75MHz < Fint = clkin / regn < 2.1MHz */
         /* To reduce PLL lock time, keep Fint high (around 2 MHz) */
         for (cur.regn = 1; cur.regn < dsi->regn_max; ++cur.regn) {
-                if (cur.highfreq == 0)
-                        cur.fint = cur.clkin / cur.regn;
-                else
-                        cur.fint = cur.clkin / (2 * cur.regn);
+                cur.fint = cur.clkin / cur.regn;
 
                 if (cur.fint > dsi->fint_max || cur.fint < dsi->fint_min)
                         continue;
 
-                /* DSIPHY(MHz) = (2 * regm / regn) * (clkin / (highfreq + 1)) */
+                /* DSIPHY(MHz) = (2 * regm / regn) * clkin */
                 for (cur.regm = 1; cur.regm < dsi->regm_max; ++cur.regm) {
                         unsigned long a, b;
 
                         a = 2 * cur.regm * (cur.clkin/1000);
-                        b = cur.regn * (cur.highfreq + 1);
+                        b = cur.regn;
                         cur.clkin4ddr = a / b * 1000;
 
                         if (cur.clkin4ddr > 1800 * 1000 * 1000)
@@ -1486,9 +1460,7 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
 
         DSSDBGF();
 
-        dsi->current_cinfo.use_sys_clk = cinfo->use_sys_clk;
-        dsi->current_cinfo.highfreq = cinfo->highfreq;
-
+        dsi->current_cinfo.clkin = cinfo->clkin;
         dsi->current_cinfo.fint = cinfo->fint;
         dsi->current_cinfo.clkin4ddr = cinfo->clkin4ddr;
         dsi->current_cinfo.dsi_pll_hsdiv_dispc_clk =
@@ -1503,17 +1475,13 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
 
         DSSDBG("DSI Fint %ld\n", cinfo->fint);
 
-        DSSDBG("clkin (%s) rate %ld, highfreq %d\n",
-                        cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree",
-                        cinfo->clkin,
-                        cinfo->highfreq);
+        DSSDBG("clkin rate %ld\n", cinfo->clkin);
 
         /* DSIPHY == CLKIN4DDR */
-        DSSDBG("CLKIN4DDR = 2 * %d / %d * %lu / %d = %lu\n",
+        DSSDBG("CLKIN4DDR = 2 * %d / %d * %lu = %lu\n",
                         cinfo->regm,
                         cinfo->regn,
                         cinfo->clkin,
-                        cinfo->highfreq + 1,
                         cinfo->clkin4ddr);
 
         DSSDBG("Data rate on 1 DSI lane %ld Mbps\n",
@@ -1568,10 +1536,6 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
 
         if (dss_has_feature(FEAT_DSI_PLL_FREQSEL))
                 l = FLD_MOD(l, f, 4, 1);        /* DSI_PLL_FREQSEL */
-        l = FLD_MOD(l, cinfo->use_sys_clk ? 0 : 1,
-                        11, 11);                /* DSI_PLL_CLKSEL */
-        l = FLD_MOD(l, cinfo->highfreq,
-                        12, 12);                /* DSI_PLL_HIGHFREQ */
         l = FLD_MOD(l, 1, 13, 13);              /* DSI_PLL_REFEN */
         l = FLD_MOD(l, 0, 14, 14);              /* DSIPHY_CLKINEN */
         l = FLD_MOD(l, 1, 20, 20);              /* DSI_HSDIVBYPASS */
@@ -1716,7 +1680,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         struct dsi_clock_info *cinfo = &dsi->current_cinfo;
         enum omap_dss_clk_source dispc_clk_src, dsi_clk_src;
-        int dsi_module = dsi_get_dsidev_id(dsidev);
+        int dsi_module = dsi->module_id;
 
         dispc_clk_src = dss_get_dispc_clk_source();
         dsi_clk_src = dss_get_dsi_clk_source(dsi_module);
@@ -1726,8 +1690,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
 
         seq_printf(s,   "- DSI%d PLL -\n", dsi_module + 1);
 
-        seq_printf(s,   "dsi pll source = %s\n",
-                        cinfo->use_sys_clk ? "dss_sys_clk" : "pclkfree");
+        seq_printf(s,   "dsi pll clkin\t%lu\n", cinfo->clkin);
 
         seq_printf(s,   "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
 
@@ -1789,7 +1752,6 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         unsigned long flags;
         struct dsi_irq_stats stats;
-        int dsi_module = dsi_get_dsidev_id(dsidev);
 
         spin_lock_irqsave(&dsi->irq_stats_lock, flags);
 
@@ -1806,7 +1768,7 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
 #define PIS(x) \
         seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]);
 
-        seq_printf(s, "-- DSI%d interrupts --\n", dsi_module + 1);
+        seq_printf(s, "-- DSI%d interrupts --\n", dsi->module_id + 1);
         PIS(VC0);
         PIS(VC1);
         PIS(VC2);
@@ -1886,22 +1848,6 @@ static void dsi2_dump_irqs(struct seq_file *s)
 
         dsi_dump_dsidev_irqs(dsidev, s);
 }
-
-void dsi_create_debugfs_files_irq(struct dentry *debugfs_dir,
-                const struct file_operations *debug_fops)
-{
-        struct platform_device *dsidev;
-
-        dsidev = dsi_get_dsidev_from_id(0);
-        if (dsidev)
-                debugfs_create_file("dsi1_irqs", S_IRUGO, debugfs_dir,
-                        &dsi1_dump_irqs, debug_fops);
-
-        dsidev = dsi_get_dsidev_from_id(1);
-        if (dsidev)
-                debugfs_create_file("dsi2_irqs", S_IRUGO, debugfs_dir,
-                        &dsi2_dump_irqs, debug_fops);
-}
 #endif
 
 static void dsi_dump_dsidev_regs(struct platform_device *dsidev,
@@ -2002,21 +1948,6 @@ static void dsi2_dump_regs(struct seq_file *s)
         dsi_dump_dsidev_regs(dsidev, s);
 }
 
-void dsi_create_debugfs_files_reg(struct dentry *debugfs_dir,
-                const struct file_operations *debug_fops)
-{
-        struct platform_device *dsidev;
-
-        dsidev = dsi_get_dsidev_from_id(0);
-        if (dsidev)
-                debugfs_create_file("dsi1_regs", S_IRUGO, debugfs_dir,
-                        &dsi1_dump_regs, debug_fops);
-
-        dsidev = dsi_get_dsidev_from_id(1);
-        if (dsidev)
-                debugfs_create_file("dsi2_regs", S_IRUGO, debugfs_dir,
-                        &dsi2_dump_regs, debug_fops);
-}
 enum dsi_cio_power_state {
         DSI_COMPLEXIO_POWER_OFF         = 0x0,
         DSI_COMPLEXIO_POWER_ON          = 0x1,
@@ -2073,6 +2004,7 @@ static unsigned dsi_get_line_buf_size(struct platform_device *dsidev)
                 return 1365 * 3;        /* 1365x24 bits */
         default:
                 BUG();
+                return 0;
         }
 }
 
@@ -2337,7 +2269,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev)
 
         DSSDBGF();
 
-        r = dsi->enable_pads(dsidev->id, dsi_get_lane_mask(dssdev));
+        r = dss_dsi_enable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));
         if (r)
                 return r;
 
@@ -2447,7 +2379,7 @@ err_cio_pwr:
                 dsi_cio_disable_lane_override(dsidev);
 err_scp_clk_dom:
         dsi_disable_scp_clk(dsidev);
-        dsi->disable_pads(dsidev->id, dsi_get_lane_mask(dssdev));
+        dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));
         return r;
 }
 
@@ -2461,7 +2393,7 @@ static void dsi_cio_uninit(struct omap_dss_device *dssdev)
 
         dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF);
         dsi_disable_scp_clk(dsidev);
-        dsi->disable_pads(dsidev->id, dsi_get_lane_mask(dssdev));
+        dss_dsi_disable_pads(dsi->module_id, dsi_get_lane_mask(dssdev));
 }
 
 static void dsi_config_tx_fifo(struct platform_device *dsidev,
@@ -2485,6 +2417,7 @@ static void dsi_config_tx_fifo(struct platform_device *dsidev,
                 if (add + size > 4) {
                         DSSERR("Illegal FIFO configuration\n");
                         BUG();
+                        return;
                 }
 
                 v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
@@ -2517,6 +2450,7 @@ static void dsi_config_rx_fifo(struct platform_device *dsidev,
                 if (add + size > 4) {
                         DSSERR("Illegal FIFO configuration\n");
                         BUG();
+                        return;
                 }
 
                 v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
@@ -2658,6 +2592,7 @@ static int dsi_sync_vc(struct platform_device *dsidev, int channel)
                 return dsi_sync_vc_l4(dsidev, channel);
         default:
                 BUG();
+                return -EINVAL;
         }
 }
 
@@ -3226,6 +3161,7 @@ static int dsi_vc_generic_send_read_request(struct omap_dss_device *dssdev,
                 data = reqdata[0] | (reqdata[1] << 8);
         } else {
                 BUG();
+                return -EINVAL;
         }
 
         r = dsi_vc_send_short(dsidev, channel, data_type, data, 0);
@@ -3340,7 +3276,6 @@ static int dsi_vc_read_rx_fifo(struct platform_device *dsidev, int channel,
                 goto err;
         }
 
-        BUG();
 err:
         DSSERR("dsi_vc_read_rx_fifo(ch %d type %s) failed\n", channel,
                 type == DSS_DSI_CONTENT_GENERIC ? "GENERIC" : "DCS");
@@ -3735,6 +3670,186 @@ static void dsi_config_blanking_modes(struct omap_dss_device *dssdev)
         dsi_write_reg(dsidev, DSI_CTRL, r);
 }
 
+/*
+ * According to section 'HS Command Mode Interleaving' in OMAP TRM, Scenario 3
+ * results in maximum transition time for data and clock lanes to enter and
+ * exit HS mode. Hence, this is the scenario where the least amount of command
+ * mode data can be interleaved. We program the minimum amount of TXBYTECLKHS
+ * clock cycles that can be used to interleave command mode data in HS so that
+ * all scenarios are satisfied.
+ */
+static int dsi_compute_interleave_hs(int blank, bool ddr_alwon, int enter_hs,
+                int exit_hs, int exiths_clk, int ddr_pre, int ddr_post)
+{
+        int transition;
+
+        /*
+         * If DDR_CLK_ALWAYS_ON is set, we need to consider HS mode transition
+         * time of data lanes only, if it isn't set, we need to consider HS
+         * transition time of both data and clock lanes. HS transition time
+         * of Scenario 3 is considered.
+         */
+        if (ddr_alwon) {
+                transition = enter_hs + exit_hs + max(enter_hs, 2) + 1;
+        } else {
+                int trans1, trans2;
+                trans1 = ddr_pre + enter_hs + exit_hs + max(enter_hs, 2) + 1;
+                trans2 = ddr_pre + enter_hs + exiths_clk + ddr_post + ddr_pre +
+                                enter_hs + 1;
+                transition = max(trans1, trans2);
+        }
+
+        return blank > transition ? blank - transition : 0;
+}
+
+/*
+ * According to section 'LP Command Mode Interleaving' in OMAP TRM, Scenario 1
+ * results in maximum transition time for data lanes to enter and exit LP mode.
+ * Hence, this is the scenario where the least amount of command mode data can
+ * be interleaved. We program the minimum amount of bytes that can be
+ * interleaved in LP so that all scenarios are satisfied.
+ */
+static int dsi_compute_interleave_lp(int blank, int enter_hs, int exit_hs,
+                int lp_clk_div, int tdsi_fclk)
+{
+        int trans_lp;   /* time required for a LP transition, in TXBYTECLKHS */
+        int tlp_avail;  /* time left for interleaving commands, in CLKIN4DDR */
+        int ttxclkesc;  /* period of LP transmit escape clock, in CLKIN4DDR */
+        int thsbyte_clk = 16;   /* Period of TXBYTECLKHS clock, in CLKIN4DDR */
+        int lp_inter;   /* cmd mode data that can be interleaved, in bytes */
+
+        /* maximum LP transition time according to Scenario 1 */
+        trans_lp = exit_hs + max(enter_hs, 2) + 1;
+
+        /* CLKIN4DDR = 16 * TXBYTECLKHS */
+        tlp_avail = thsbyte_clk * (blank - trans_lp);
+
+        ttxclkesc = tdsi_fclk * lp_clk_div;
+
+        lp_inter = ((tlp_avail - 8 * thsbyte_clk - 5 * tdsi_fclk) / ttxclkesc -
+                        26) / 16;
+
+        return max(lp_inter, 0);
+}
+
+static void dsi_config_cmd_mode_interleaving(struct omap_dss_device *dssdev)
+{
+        struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        int blanking_mode;
+        int hfp_blanking_mode, hbp_blanking_mode, hsa_blanking_mode;
+        int hsa, hfp, hbp, width_bytes, bllp, lp_clk_div;
+        int ddr_clk_pre, ddr_clk_post, enter_hs_mode_lat, exit_hs_mode_lat;
+        int tclk_trail, ths_exit, exiths_clk;
+        bool ddr_alwon;
+        struct omap_video_timings *timings = &dssdev->panel.timings;
+        int bpp = dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt);
+        int ndl = dsi->num_lanes_used - 1;
+        int dsi_fclk_hsdiv = dssdev->clocks.dsi.regm_dsi + 1;
+        int hsa_interleave_hs = 0, hsa_interleave_lp = 0;
+        int hfp_interleave_hs = 0, hfp_interleave_lp = 0;
+        int hbp_interleave_hs = 0, hbp_interleave_lp = 0;
+        int bl_interleave_hs = 0, bl_interleave_lp = 0;
+        u32 r;
+
+        r = dsi_read_reg(dsidev, DSI_CTRL);
+        blanking_mode = FLD_GET(r, 20, 20);
+        hfp_blanking_mode = FLD_GET(r, 21, 21);
+        hbp_blanking_mode = FLD_GET(r, 22, 22);
+        hsa_blanking_mode = FLD_GET(r, 23, 23);
+
+        r = dsi_read_reg(dsidev, DSI_VM_TIMING1);
+        hbp = FLD_GET(r, 11, 0);
+        hfp = FLD_GET(r, 23, 12);
+        hsa = FLD_GET(r, 31, 24);
+
+        r = dsi_read_reg(dsidev, DSI_CLK_TIMING);
+        ddr_clk_post = FLD_GET(r, 7, 0);
+        ddr_clk_pre = FLD_GET(r, 15, 8);
+
+        r = dsi_read_reg(dsidev, DSI_VM_TIMING7);
+        exit_hs_mode_lat = FLD_GET(r, 15, 0);
+        enter_hs_mode_lat = FLD_GET(r, 31, 16);
+
+        r = dsi_read_reg(dsidev, DSI_CLK_CTRL);
+        lp_clk_div = FLD_GET(r, 12, 0);
+        ddr_alwon = FLD_GET(r, 13, 13);
+
+        r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG0);
+        ths_exit = FLD_GET(r, 7, 0);
+
+        r = dsi_read_reg(dsidev, DSI_DSIPHY_CFG1);
+        tclk_trail = FLD_GET(r, 15, 8);
+
+        exiths_clk = ths_exit + tclk_trail;
+
+        width_bytes = DIV_ROUND_UP(timings->x_res * bpp, 8);
+        bllp = hbp + hfp + hsa + DIV_ROUND_UP(width_bytes + 6, ndl);
+
+        if (!hsa_blanking_mode) {
+                hsa_interleave_hs = dsi_compute_interleave_hs(hsa, ddr_alwon,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        exiths_clk, ddr_clk_pre, ddr_clk_post);
+                hsa_interleave_lp = dsi_compute_interleave_lp(hsa,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        lp_clk_div, dsi_fclk_hsdiv);
+        }
+
+        if (!hfp_blanking_mode) {
+                hfp_interleave_hs = dsi_compute_interleave_hs(hfp, ddr_alwon,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        exiths_clk, ddr_clk_pre, ddr_clk_post);
+                hfp_interleave_lp = dsi_compute_interleave_lp(hfp,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        lp_clk_div, dsi_fclk_hsdiv);
+        }
+
+        if (!hbp_blanking_mode) {
+                hbp_interleave_hs = dsi_compute_interleave_hs(hbp, ddr_alwon,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        exiths_clk, ddr_clk_pre, ddr_clk_post);
+
+                hbp_interleave_lp = dsi_compute_interleave_lp(hbp,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        lp_clk_div, dsi_fclk_hsdiv);
+        }
+
+        if (!blanking_mode) {
+                bl_interleave_hs = dsi_compute_interleave_hs(bllp, ddr_alwon,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        exiths_clk, ddr_clk_pre, ddr_clk_post);
+
+                bl_interleave_lp = dsi_compute_interleave_lp(bllp,
+                                        enter_hs_mode_lat, exit_hs_mode_lat,
+                                        lp_clk_div, dsi_fclk_hsdiv);
+        }
+
+        DSSDBG("DSI HS interleaving(TXBYTECLKHS) HSA %d, HFP %d, HBP %d, BLLP %d\n",
+                hsa_interleave_hs, hfp_interleave_hs, hbp_interleave_hs,
+                bl_interleave_hs);
+
+        DSSDBG("DSI LP interleaving(bytes) HSA %d, HFP %d, HBP %d, BLLP %d\n",
+                hsa_interleave_lp, hfp_interleave_lp, hbp_interleave_lp,
+                bl_interleave_lp);
+
+        r = dsi_read_reg(dsidev, DSI_VM_TIMING4);
+        r = FLD_MOD(r, hsa_interleave_hs, 23, 16);
+        r = FLD_MOD(r, hfp_interleave_hs, 15, 8);
+        r = FLD_MOD(r, hbp_interleave_hs, 7, 0);
+        dsi_write_reg(dsidev, DSI_VM_TIMING4, r);
+
+        r = dsi_read_reg(dsidev, DSI_VM_TIMING5);
+        r = FLD_MOD(r, hsa_interleave_lp, 23, 16);
+        r = FLD_MOD(r, hfp_interleave_lp, 15, 8);
+        r = FLD_MOD(r, hbp_interleave_lp, 7, 0);
+        dsi_write_reg(dsidev, DSI_VM_TIMING5, r);
+
+        r = dsi_read_reg(dsidev, DSI_VM_TIMING6);
+        r = FLD_MOD(r, bl_interleave_hs, 31, 15);
+        r = FLD_MOD(r, bl_interleave_lp, 16, 0);
+        dsi_write_reg(dsidev, DSI_VM_TIMING6, r);
+}
+
 static int dsi_proto_config(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
@@ -3769,6 +3884,7 @@ static int dsi_proto_config(struct omap_dss_device *dssdev)
                 break;
         default:
                 BUG();
+                return -EINVAL;
         }
 
         r = dsi_read_reg(dsidev, DSI_CTRL);
@@ -3793,6 +3909,7 @@ static int dsi_proto_config(struct omap_dss_device *dssdev)
         if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) {
                 dsi_config_vp_sync_events(dssdev);
                 dsi_config_blanking_modes(dssdev);
+                dsi_config_cmd_mode_interleaving(dssdev);
         }
 
         dsi_vc_initial_config(dsidev, 0);
@@ -4008,6 +4125,7 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)
                         break;
                 default:
                         BUG();
+                        return -EINVAL;
                 };
 
                 dsi_if_enable(dsidev, false);
@@ -4192,10 +4310,6 @@ static void dsi_framedone_irq_callback(void *data, u32 mask)
         __cancel_delayed_work(&dsi->framedone_timeout_work);
 
         dsi_handle_framedone(dsidev, 0);
-
-#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
-        dispc_fake_vsync_irq();
-#endif
 }
 
 int omap_dsi_update(struct omap_dss_device *dssdev, int channel,
@@ -4259,13 +4373,12 @@ static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
                 dispc_mgr_enable_stallmode(dssdev->manager->id, true);
                 dispc_mgr_enable_fifohandcheck(dssdev->manager->id, 1);
 
-                dispc_mgr_set_lcd_timings(dssdev->manager->id, &timings);
+                dss_mgr_set_timings(dssdev->manager, &timings);
         } else {
                 dispc_mgr_enable_stallmode(dssdev->manager->id, false);
                 dispc_mgr_enable_fifohandcheck(dssdev->manager->id, 0);
 
-                dispc_mgr_set_lcd_timings(dssdev->manager->id,
-                        &dssdev->panel.timings);
+                dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
         }
 
                 dispc_mgr_set_lcd_display_type(dssdev->manager->id,
@@ -4294,13 +4407,11 @@ static int dsi_configure_dsi_clocks(struct omap_dss_device *dssdev)
         struct dsi_clock_info cinfo;
         int r;
 
-        /* we always use DSS_CLK_SYSCK as input clock */
-        cinfo.use_sys_clk = true;
         cinfo.regn  = dssdev->clocks.dsi.regn;
         cinfo.regm  = dssdev->clocks.dsi.regm;
         cinfo.regm_dispc = dssdev->clocks.dsi.regm_dispc;
         cinfo.regm_dsi = dssdev->clocks.dsi.regm_dsi;
-        r = dsi_calc_clock_rates(dssdev, &cinfo);
+        r = dsi_calc_clock_rates(dsidev, &cinfo);
         if (r) {
                 DSSERR("Failed to calc dsi clocks\n");
                 return r;
@@ -4345,7 +4456,7 @@ static int dsi_configure_dispc_clocks(struct omap_dss_device *dssdev)
 static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
-        int dsi_module = dsi_get_dsidev_id(dsidev);
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
         int r;
 
         r = dsi_pll_init(dsidev, true, true);
@@ -4357,7 +4468,7 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
                 goto err1;
 
         dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);
-        dss_select_dsi_clk_source(dsi_module, dssdev->clocks.dsi.dsi_fclk_src);
+        dss_select_dsi_clk_source(dsi->module_id, dssdev->clocks.dsi.dsi_fclk_src);
         dss_select_lcd_clk_source(dssdev->manager->id,
                         dssdev->clocks.dispc.channel.lcd_clk_src);
 
@@ -4396,7 +4507,7 @@ err3:
         dsi_cio_uninit(dssdev);
 err2:
         dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
-        dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);
         dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);
 
 err1:
@@ -4410,7 +4521,6 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev,
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
-        int dsi_module = dsi_get_dsidev_id(dsidev);
 
         if (enter_ulps && !dsi->ulps_enabled)
                 dsi_enter_ulps(dsidev);
@@ -4423,7 +4533,7 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev,
         dsi_vc_enable(dsidev, 3, 0);
 
         dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
-        dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);
+        dss_select_dsi_clk_source(dsi->module_id, OMAP_DSS_CLK_SRC_FCK);
         dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);
         dsi_cio_uninit(dssdev);
         dsi_pll_uninit(dsidev, disconnect_lanes);
@@ -4527,7 +4637,7 @@ int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable)
 }
 EXPORT_SYMBOL(omapdss_dsi_enable_te);
 
-int dsi_init_display(struct omap_dss_device *dssdev)
+static int __init dsi_init_display(struct omap_dss_device *dssdev)
 {
         struct platform_device *dsidev = dsi_get_dsidev_from_dssdev(dssdev);
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
@@ -4680,13 +4790,39 @@ static void dsi_put_clocks(struct platform_device *dsidev)
                 clk_put(dsi->sys_clk);
 }
 
+static void __init dsi_probe_pdata(struct platform_device *dsidev)
+{
+        struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
+        struct omap_dss_board_info *pdata = dsidev->dev.platform_data;
+        int i, r;
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                if (dssdev->type != OMAP_DISPLAY_TYPE_DSI)
+                        continue;
+
+                if (dssdev->phy.dsi.module != dsi->module_id)
+                        continue;
+
+                r = dsi_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
+
+                r = omap_dss_register_device(dssdev, &dsidev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                        dssdev->name, r);
+        }
+}
+
 /* DSI1 HW IP initialisation */
-static int omap_dsihw_probe(struct platform_device *dsidev)
+static int __init omap_dsihw_probe(struct platform_device *dsidev)
 {
-        struct omap_display_platform_data *dss_plat_data;
-        struct omap_dss_board_info *board_info;
         u32 rev;
-        int r, i, dsi_module = dsi_get_dsidev_id(dsidev);
+        int r, i;
         struct resource *dsi_mem;
         struct dsi_data *dsi;
 
@@ -4694,15 +4830,11 @@ static int omap_dsihw_probe(struct platform_device *dsidev)
         if (!dsi)
                 return -ENOMEM;
 
+        dsi->module_id = dsidev->id;
         dsi->pdev = dsidev;
-        dsi_pdev_map[dsi_module] = dsidev;
+        dsi_pdev_map[dsi->module_id] = dsidev;
         dev_set_drvdata(&dsidev->dev, dsi);
 
-        dss_plat_data = dsidev->dev.platform_data;
-        board_info = dss_plat_data->board_data;
-        dsi->enable_pads = board_info->dsi_enable_pads;
-        dsi->disable_pads = board_info->dsi_disable_pads;
-
         spin_lock_init(&dsi->irq_lock);
         spin_lock_init(&dsi->errors_lock);
         dsi->errors = 0;
@@ -4780,8 +4912,21 @@ static int omap_dsihw_probe(struct platform_device *dsidev)
         else
                 dsi->num_lanes_supported = 3;
 
+        dsi_probe_pdata(dsidev);
+
         dsi_runtime_put(dsidev);
 
+        if (dsi->module_id == 0)
+                dss_debugfs_create_file("dsi1_regs", dsi1_dump_regs);
+        else if (dsi->module_id == 1)
+                dss_debugfs_create_file("dsi2_regs", dsi2_dump_regs);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        if (dsi->module_id == 0)
+                dss_debugfs_create_file("dsi1_irqs", dsi1_dump_irqs);
+        else if (dsi->module_id == 1)
+                dss_debugfs_create_file("dsi2_irqs", dsi2_dump_irqs);
+#endif
         return 0;
 
 err_runtime_get:
@@ -4790,12 +4935,14 @@ err_runtime_get:
         return r;
 }
 
-static int omap_dsihw_remove(struct platform_device *dsidev)
+static int __exit omap_dsihw_remove(struct platform_device *dsidev)
 {
         struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 
         WARN_ON(dsi->scp_clk_refcount > 0);
 
+        omap_dss_unregister_child_devices(&dsidev->dev);
+
         pm_runtime_disable(&dsidev->dev);
 
         dsi_put_clocks(dsidev);
@@ -4816,7 +4963,6 @@ static int omap_dsihw_remove(struct platform_device *dsidev)
 static int dsi_runtime_suspend(struct device *dev)
 {
         dispc_runtime_put();
-        dss_runtime_put();
 
         return 0;
 }
@@ -4825,20 +4971,11 @@ static int dsi_runtime_resume(struct device *dev)
 {
         int r;
 
-        r = dss_runtime_get();
-        if (r)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r)
-                goto err_get_dispc;
+                return r;
 
         return 0;
-
-err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
-        return r;
 }
 
 static const struct dev_pm_ops dsi_pm_ops = {
@@ -4847,8 +4984,7 @@ static const struct dev_pm_ops dsi_pm_ops = {
 };
 
 static struct platform_driver omap_dsihw_driver = {
-        .probe          = omap_dsihw_probe,
-        .remove         = omap_dsihw_remove,
+        .remove         = __exit_p(omap_dsihw_remove),
         .driver         = {
                 .name   = "omapdss_dsi",
                 .owner  = THIS_MODULE,
@@ -4856,12 +4992,12 @@ static struct platform_driver omap_dsihw_driver = {
         },
 };
 
-int dsi_init_platform_driver(void)
+int __init dsi_init_platform_driver(void)
 {
-        return platform_driver_register(&omap_dsihw_driver);
+        return platform_driver_probe(&omap_dsihw_driver, omap_dsihw_probe);
 }
 
-void dsi_uninit_platform_driver(void)
+void __exit dsi_uninit_platform_driver(void)
 {
-        return platform_driver_unregister(&omap_dsihw_driver);
+        platform_driver_unregister(&omap_dsihw_driver);
 }
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index bd2d5e159463..770632359a17 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -62,6 +62,9 @@ struct dss_reg {
 #define REG_FLD_MOD(idx, val, start, end) \
         dss_write_reg(idx, FLD_MOD(dss_read_reg(idx), val, start, end))
 
+static int dss_runtime_get(void);
+static void dss_runtime_put(void);
+
 static struct {
         struct platform_device *pdev;
         void __iomem    *base;
@@ -277,7 +280,7 @@ void dss_dump_clocks(struct seq_file *s)
         dss_runtime_put();
 }
 
-void dss_dump_regs(struct seq_file *s)
+static void dss_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dss_read_reg(r))
 
@@ -322,6 +325,7 @@ void dss_select_dispc_clk_source(enum omap_dss_clk_source clk_src)
                 break;
         default:
                 BUG();
+                return;
         }
 
         dss_feat_get_reg_field(FEAT_REG_DISPC_CLK_SWITCH, &start, &end);
@@ -335,7 +339,7 @@ void dss_select_dsi_clk_source(int dsi_module,
                 enum omap_dss_clk_source clk_src)
 {
         struct platform_device *dsidev;
-        int b;
+        int b, pos;
 
         switch (clk_src) {
         case OMAP_DSS_CLK_SRC_FCK:
@@ -355,9 +359,11 @@ void dss_select_dsi_clk_source(int dsi_module,
                 break;
         default:
                 BUG();
+                return;
         }
 
-        REG_FLD_MOD(DSS_CONTROL, b, 1, 1);      /* DSI_CLK_SWITCH */
+        pos = dsi_module == 0 ? 1 : 10;
+        REG_FLD_MOD(DSS_CONTROL, b, pos, pos);  /* DSIx_CLK_SWITCH */
 
         dss.dsi_clk_source[dsi_module] = clk_src;
 }
@@ -389,6 +395,7 @@ void dss_select_lcd_clk_source(enum omap_channel channel,
                 break;
         default:
                 BUG();
+                return;
         }
 
         pos = channel == OMAP_DSS_CHANNEL_LCD ? 0 : 12;
@@ -706,7 +713,7 @@ static void dss_put_clocks(void)
         clk_put(dss.dss_clk);
 }
 
-int dss_runtime_get(void)
+static int dss_runtime_get(void)
 {
         int r;
 
@@ -717,14 +724,14 @@ int dss_runtime_get(void)
         return r < 0 ? r : 0;
 }
 
-void dss_runtime_put(void)
+static void dss_runtime_put(void)
 {
         int r;
 
         DSSDBG("dss_runtime_put\n");
 
         r = pm_runtime_put_sync(&dss.pdev->dev);
-        WARN_ON(r < 0);
+        WARN_ON(r < 0 && r != -EBUSY);
 }
 
 /* DEBUGFS */
@@ -740,7 +747,7 @@ void dss_debug_dump_clocks(struct seq_file *s)
 #endif
 
 /* DSS HW IP initialisation */
-static int omap_dsshw_probe(struct platform_device *pdev)
+static int __init omap_dsshw_probe(struct platform_device *pdev)
 {
         struct resource *dss_mem;
         u32 rev;
@@ -785,40 +792,24 @@ static int omap_dsshw_probe(struct platform_device *pdev)
         dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
         dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
 
-        r = dpi_init();
-        if (r) {
-                DSSERR("Failed to initialize DPI\n");
-                goto err_dpi;
-        }
-
-        r = sdi_init();
-        if (r) {
-                DSSERR("Failed to initialize SDI\n");
-                goto err_sdi;
-        }
-
         rev = dss_read_reg(DSS_REVISION);
         printk(KERN_INFO "OMAP DSS rev %d.%d\n",
                         FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
 
         dss_runtime_put();
 
+        dss_debugfs_create_file("dss", dss_dump_regs);
+
         return 0;
-err_sdi:
-        dpi_exit();
-err_dpi:
-        dss_runtime_put();
+
 err_runtime_get:
         pm_runtime_disable(&pdev->dev);
         dss_put_clocks();
         return r;
 }
 
-static int omap_dsshw_remove(struct platform_device *pdev)
+static int __exit omap_dsshw_remove(struct platform_device *pdev)
 {
-        dpi_exit();
-        sdi_exit();
-
         pm_runtime_disable(&pdev->dev);
 
         dss_put_clocks();
@@ -829,11 +820,24 @@ static int omap_dsshw_remove(struct platform_device *pdev)
 static int dss_runtime_suspend(struct device *dev)
 {
         dss_save_context();
+        dss_set_min_bus_tput(dev, 0);
         return 0;
 }
 
 static int dss_runtime_resume(struct device *dev)
 {
+        int r;
+        /*
+         * Set an arbitrarily high tput request to ensure OPP100.
+         * What we should really do is to make a request to stay in OPP100,
+         * without any tput requirements, but that is not currently possible
+         * via the PM layer.
+         */
+
+        r = dss_set_min_bus_tput(dev, 1000000000);
+        if (r)
+                return r;
+
         dss_restore_context();
         return 0;
 }
@@ -844,8 +848,7 @@ static const struct dev_pm_ops dss_pm_ops = {
 };
 
 static struct platform_driver omap_dsshw_driver = {
-        .probe          = omap_dsshw_probe,
-        .remove         = omap_dsshw_remove,
+        .remove         = __exit_p(omap_dsshw_remove),
         .driver         = {
                 .name   = "omapdss_dss",
                 .owner  = THIS_MODULE,
@@ -853,12 +856,12 @@ static struct platform_driver omap_dsshw_driver = {
         },
 };
 
-int dss_init_platform_driver(void)
+int __init dss_init_platform_driver(void)
 {
-        return platform_driver_register(&omap_dsshw_driver);
+        return platform_driver_probe(&omap_dsshw_driver, omap_dsshw_probe);
 }
 
 void dss_uninit_platform_driver(void)
 {
-        return platform_driver_unregister(&omap_dsshw_driver);
+        platform_driver_unregister(&omap_dsshw_driver);
 }
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index d4b3dff2ead3..dd1092ceaeef 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -150,9 +150,6 @@ struct dsi_clock_info {
         u16 regm_dsi;   /* OMAP3: REGM4
                          * OMAP4: REGM5 */
         u16 lp_clk_div;
-
-        u8 highfreq;
-        bool use_sys_clk;
 };
 
 struct seq_file;
@@ -162,6 +159,16 @@ struct platform_device;
 struct bus_type *dss_get_bus(void);
 struct regulator *dss_get_vdds_dsi(void);
 struct regulator *dss_get_vdds_sdi(void);
+int dss_get_ctx_loss_count(struct device *dev);
+int dss_dsi_enable_pads(int dsi_id, unsigned lane_mask);
+void dss_dsi_disable_pads(int dsi_id, unsigned lane_mask);
+int dss_set_min_bus_tput(struct device *dev, unsigned long tput);
+int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *));
+
+int omap_dss_register_device(struct omap_dss_device *dssdev,
+                struct device *parent, int disp_num);
+void omap_dss_unregister_device(struct omap_dss_device *dssdev);
+void omap_dss_unregister_child_devices(struct device *parent);
 
 /* apply */
 void dss_apply_init(void);
@@ -179,6 +186,9 @@ void dss_mgr_get_info(struct omap_overlay_manager *mgr,
 int dss_mgr_set_device(struct omap_overlay_manager *mgr,
                 struct omap_dss_device *dssdev);
 int dss_mgr_unset_device(struct omap_overlay_manager *mgr);
+void dss_mgr_set_timings(struct omap_overlay_manager *mgr,
+                struct omap_video_timings *timings);
+const struct omap_video_timings *dss_mgr_get_timings(struct omap_overlay_manager *mgr);
 
 bool dss_ovl_is_enabled(struct omap_overlay *ovl);
 int dss_ovl_enable(struct omap_overlay *ovl);
@@ -208,9 +218,11 @@ int dss_init_overlay_managers(struct platform_device *pdev);
 void dss_uninit_overlay_managers(struct platform_device *pdev);
 int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
                 const struct omap_overlay_manager_info *info);
+int dss_mgr_check_timings(struct omap_overlay_manager *mgr,
+                const struct omap_video_timings *timings);
 int dss_mgr_check(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev,
                 struct omap_overlay_manager_info *info,
+                const struct omap_video_timings *mgr_timings,
                 struct omap_overlay_info **overlay_infos);
 
 /* overlay */
@@ -220,22 +232,18 @@ void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr);
 void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
 int dss_ovl_simple_check(struct omap_overlay *ovl,
                 const struct omap_overlay_info *info);
-int dss_ovl_check(struct omap_overlay *ovl,
-                struct omap_overlay_info *info, struct omap_dss_device *dssdev);
+int dss_ovl_check(struct omap_overlay *ovl, struct omap_overlay_info *info,
+                const struct omap_video_timings *mgr_timings);
 
 /* DSS */
-int dss_init_platform_driver(void);
+int dss_init_platform_driver(void) __init;
 void dss_uninit_platform_driver(void);
 
-int dss_runtime_get(void);
-void dss_runtime_put(void);
-
 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
 enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void);
 const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);
 void dss_dump_clocks(struct seq_file *s);
 
-void dss_dump_regs(struct seq_file *s);
 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
 void dss_debug_dump_clocks(struct seq_file *s);
 #endif
@@ -265,19 +273,8 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
                 struct dispc_clock_info *dispc_cinfo);
 
 /* SDI */
-#ifdef CONFIG_OMAP2_DSS_SDI
-int sdi_init(void);
-void sdi_exit(void);
-int sdi_init_display(struct omap_dss_device *display);
-#else
-static inline int sdi_init(void)
-{
-        return 0;
-}
-static inline void sdi_exit(void)
-{
-}
-#endif
+int sdi_init_platform_driver(void) __init;
+void sdi_uninit_platform_driver(void) __exit;
 
 /* DSI */
 #ifdef CONFIG_OMAP2_DSS_DSI
@@ -285,19 +282,14 @@ static inline void sdi_exit(void)
 struct dentry;
 struct file_operations;
 
-int dsi_init_platform_driver(void);
-void dsi_uninit_platform_driver(void);
+int dsi_init_platform_driver(void) __init;
+void dsi_uninit_platform_driver(void) __exit;
 
 int dsi_runtime_get(struct platform_device *dsidev);
 void dsi_runtime_put(struct platform_device *dsidev);
 
 void dsi_dump_clocks(struct seq_file *s);
-void dsi_create_debugfs_files_irq(struct dentry *debugfs_dir,
-                const struct file_operations *debug_fops);
-void dsi_create_debugfs_files_reg(struct dentry *debugfs_dir,
-                const struct file_operations *debug_fops);
 
-int dsi_init_display(struct omap_dss_device *display);
 void dsi_irq_handler(void);
 u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt);
 
@@ -314,13 +306,6 @@ void dsi_wait_pll_hsdiv_dispc_active(struct platform_device *dsidev);
 void dsi_wait_pll_hsdiv_dsi_active(struct platform_device *dsidev);
 struct platform_device *dsi_get_dsidev_from_id(int module);
 #else
-static inline int dsi_init_platform_driver(void)
-{
-        return 0;
-}
-static inline void dsi_uninit_platform_driver(void)
-{
-}
 static inline int dsi_runtime_get(struct platform_device *dsidev)
 {
         return 0;
@@ -377,28 +362,14 @@ static inline struct platform_device *dsi_get_dsidev_from_id(int module)
 #endif
 
 /* DPI */
-#ifdef CONFIG_OMAP2_DSS_DPI
-int dpi_init(void);
-void dpi_exit(void);
-int dpi_init_display(struct omap_dss_device *dssdev);
-#else
-static inline int dpi_init(void)
-{
-        return 0;
-}
-static inline void dpi_exit(void)
-{
-}
-#endif
+int dpi_init_platform_driver(void) __init;
+void dpi_uninit_platform_driver(void) __exit;
 
 /* DISPC */
-int dispc_init_platform_driver(void);
-void dispc_uninit_platform_driver(void);
+int dispc_init_platform_driver(void) __init;
+void dispc_uninit_platform_driver(void) __exit;
 void dispc_dump_clocks(struct seq_file *s);
-void dispc_dump_irqs(struct seq_file *s);
-void dispc_dump_regs(struct seq_file *s);
 void dispc_irq_handler(void);
-void dispc_fake_vsync_irq(void);
 
 int dispc_runtime_get(void);
 void dispc_runtime_put(void);
@@ -409,12 +380,12 @@ void dispc_disable_sidle(void);
 void dispc_lcd_enable_signal_polarity(bool act_high);
 void dispc_lcd_enable_signal(bool enable);
 void dispc_pck_free_enable(bool enable);
-void dispc_set_digit_size(u16 width, u16 height);
 void dispc_enable_fifomerge(bool enable);
 void dispc_enable_gamma_table(bool enable);
 void dispc_set_loadmode(enum omap_dss_load_mode mode);
 
-bool dispc_lcd_timings_ok(struct omap_video_timings *timings);
+bool dispc_mgr_timings_ok(enum omap_channel channel,
+                const struct omap_video_timings *timings);
 unsigned long dispc_fclk_rate(void);
 void dispc_find_clk_divs(bool is_tft, unsigned long req_pck, unsigned long fck,
                 struct dispc_clock_info *cinfo);
@@ -424,15 +395,16 @@ int dispc_calc_clock_rates(unsigned long dispc_fclk_rate,
 
 void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high);
 void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,
-                u32 *fifo_low, u32 *fifo_high, bool use_fifomerge);
+                u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,
+                bool manual_update);
 int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi,
-                bool ilace, bool replication);
+                bool ilace, bool replication,
+                const struct omap_video_timings *mgr_timings);
 int dispc_ovl_enable(enum omap_plane plane, bool enable);
 void dispc_ovl_set_channel_out(enum omap_plane plane,
                 enum omap_channel channel);
 
 void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable);
-void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height);
 u32 dispc_mgr_get_vsync_irq(enum omap_channel channel);
 u32 dispc_mgr_get_framedone_irq(enum omap_channel channel);
 bool dispc_mgr_go_busy(enum omap_channel channel);
@@ -445,12 +417,13 @@ void dispc_mgr_enable_stallmode(enum omap_channel channel, bool enable);
 void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines);
 void dispc_mgr_set_lcd_display_type(enum omap_channel channel,
                 enum omap_lcd_display_type type);
-void dispc_mgr_set_lcd_timings(enum omap_channel channel,
+void dispc_mgr_set_timings(enum omap_channel channel,
                 struct omap_video_timings *timings);
 void dispc_mgr_set_pol_freq(enum omap_channel channel,
                 enum omap_panel_config config, u8 acbi, u8 acb);
 unsigned long dispc_mgr_lclk_rate(enum omap_channel channel);
 unsigned long dispc_mgr_pclk_rate(enum omap_channel channel);
+unsigned long dispc_core_clk_rate(void);
 int dispc_mgr_set_clock_div(enum omap_channel channel,
                 struct dispc_clock_info *cinfo);
 int dispc_mgr_get_clock_div(enum omap_channel channel,
@@ -460,19 +433,10 @@ void dispc_mgr_setup(enum omap_channel channel,
 
 /* VENC */
 #ifdef CONFIG_OMAP2_DSS_VENC
-int venc_init_platform_driver(void);
-void venc_uninit_platform_driver(void);
-void venc_dump_regs(struct seq_file *s);
-int venc_init_display(struct omap_dss_device *display);
+int venc_init_platform_driver(void) __init;
+void venc_uninit_platform_driver(void) __exit;
 unsigned long venc_get_pixel_clock(void);
 #else
-static inline int venc_init_platform_driver(void)
-{
-        return 0;
-}
-static inline void venc_uninit_platform_driver(void)
-{
-}
 static inline unsigned long venc_get_pixel_clock(void)
 {
         WARN("%s: VENC not compiled in, returning pclk as 0\n", __func__);
@@ -482,23 +446,10 @@ static inline unsigned long venc_get_pixel_clock(void)
 
 /* HDMI */
 #ifdef CONFIG_OMAP4_DSS_HDMI
-int hdmi_init_platform_driver(void);
-void hdmi_uninit_platform_driver(void);
-int hdmi_init_display(struct omap_dss_device *dssdev);
+int hdmi_init_platform_driver(void) __init;
+void hdmi_uninit_platform_driver(void) __exit;
 unsigned long hdmi_get_pixel_clock(void);
-void hdmi_dump_regs(struct seq_file *s);
 #else
-static inline int hdmi_init_display(struct omap_dss_device *dssdev)
-{
-        return 0;
-}
-static inline int hdmi_init_platform_driver(void)
-{
-        return 0;
-}
-static inline void hdmi_uninit_platform_driver(void)
-{
-}
 static inline unsigned long hdmi_get_pixel_clock(void)
 {
         WARN("%s: HDMI not compiled in, returning pclk as 0\n", __func__);
@@ -514,22 +465,18 @@ int omapdss_hdmi_read_edid(u8 *buf, int len);
 bool omapdss_hdmi_detect(void);
 int hdmi_panel_init(void);
 void hdmi_panel_exit(void);
+#ifdef CONFIG_OMAP4_DSS_HDMI_AUDIO
+int hdmi_audio_enable(void);
+void hdmi_audio_disable(void);
+int hdmi_audio_start(void);
+void hdmi_audio_stop(void);
+bool hdmi_mode_has_audio(void);
+int hdmi_audio_config(struct omap_dss_audio *audio);
+#endif
 
 /* RFBI */
-#ifdef CONFIG_OMAP2_DSS_RFBI
-int rfbi_init_platform_driver(void);
-void rfbi_uninit_platform_driver(void);
-void rfbi_dump_regs(struct seq_file *s);
-int rfbi_init_display(struct omap_dss_device *display);
-#else
-static inline int rfbi_init_platform_driver(void)
-{
-        return 0;
-}
-static inline void rfbi_uninit_platform_driver(void)
-{
-}
-#endif
+int rfbi_init_platform_driver(void) __init;
+void rfbi_uninit_platform_driver(void) __exit;
 
 
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index ce14aa6dd672..938709724f0c 100644
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -52,6 +52,8 @@ struct omap_dss_features {
         const char * const *clksrc_names;
         const struct dss_param_range *dss_params;
 
+        const enum omap_dss_rotation_type supported_rotation_types;
+
         const u32 buffer_size_unit;
         const u32 burst_size_unit;
 };
@@ -311,6 +313,8 @@ static const struct dss_param_range omap2_dss_param_range[] = {
          * scaler cannot scale a image with width more than 768.
          */
         [FEAT_PARAM_LINEWIDTH]                  = { 1, 768 },
+        [FEAT_PARAM_MGR_WIDTH]                  = { 1, 2048 },
+        [FEAT_PARAM_MGR_HEIGHT]                 = { 1, 2048 },
 };
 
 static const struct dss_param_range omap3_dss_param_range[] = {
@@ -324,6 +328,8 @@ static const struct dss_param_range omap3_dss_param_range[] = {
         [FEAT_PARAM_DSIPLL_LPDIV]               = { 1, (1 << 13) - 1},
         [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
         [FEAT_PARAM_LINEWIDTH]                  = { 1, 1024 },
+        [FEAT_PARAM_MGR_WIDTH]                  = { 1, 2048 },
+        [FEAT_PARAM_MGR_HEIGHT]                 = { 1, 2048 },
 };
 
 static const struct dss_param_range omap4_dss_param_range[] = {
@@ -337,6 +343,8 @@ static const struct dss_param_range omap4_dss_param_range[] = {
         [FEAT_PARAM_DSIPLL_LPDIV]               = { 0, (1 << 13) - 1 },
         [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
         [FEAT_PARAM_LINEWIDTH]                  = { 1, 2048 },
+        [FEAT_PARAM_MGR_WIDTH]                  = { 1, 2048 },
+        [FEAT_PARAM_MGR_HEIGHT]                 = { 1, 2048 },
 };
 
 static const enum dss_feat_id omap2_dss_feat_list[] = {
@@ -399,6 +407,7 @@ static const enum dss_feat_id omap4430_es1_0_dss_feat_list[] = {
         FEAT_FIR_COEF_V,
         FEAT_ALPHA_FREE_ZORDER,
         FEAT_FIFO_MERGE,
+        FEAT_BURST_2D,
 };
 
 static const enum dss_feat_id omap4430_es2_0_1_2_dss_feat_list[] = {
@@ -416,6 +425,7 @@ static const enum dss_feat_id omap4430_es2_0_1_2_dss_feat_list[] = {
         FEAT_FIR_COEF_V,
         FEAT_ALPHA_FREE_ZORDER,
         FEAT_FIFO_MERGE,
+        FEAT_BURST_2D,
 };
 
 static const enum dss_feat_id omap4_dss_feat_list[] = {
@@ -434,6 +444,7 @@ static const enum dss_feat_id omap4_dss_feat_list[] = {
         FEAT_FIR_COEF_V,
         FEAT_ALPHA_FREE_ZORDER,
         FEAT_FIFO_MERGE,
+        FEAT_BURST_2D,
 };
 
 /* OMAP2 DSS Features */
@@ -451,6 +462,7 @@ static const struct omap_dss_features omap2_dss_features = {
         .overlay_caps = omap2_dss_overlay_caps,
         .clksrc_names = omap2_dss_clk_source_names,
         .dss_params = omap2_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
         .burst_size_unit = 8,
 };
@@ -470,6 +482,7 @@ static const struct omap_dss_features omap3430_dss_features = {
         .overlay_caps = omap3430_dss_overlay_caps,
         .clksrc_names = omap3_dss_clk_source_names,
         .dss_params = omap3_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
         .burst_size_unit = 8,
 };
@@ -488,6 +501,7 @@ static const struct omap_dss_features omap3630_dss_features = {
         .overlay_caps = omap3630_dss_overlay_caps,
         .clksrc_names = omap3_dss_clk_source_names,
         .dss_params = omap3_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_VRFB,
         .buffer_size_unit = 1,
         .burst_size_unit = 8,
 };
@@ -508,6 +522,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features  = {
         .overlay_caps = omap4_dss_overlay_caps,
         .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
         .burst_size_unit = 16,
 };
@@ -527,6 +542,7 @@ static const struct omap_dss_features omap4430_es2_0_1_2_dss_features = {
         .overlay_caps = omap4_dss_overlay_caps,
         .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
         .burst_size_unit = 16,
 };
@@ -546,6 +562,7 @@ static const struct omap_dss_features omap4_dss_features = {
         .overlay_caps = omap4_dss_overlay_caps,
         .clksrc_names = omap4_dss_clk_source_names,
         .dss_params = omap4_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA | OMAP_DSS_ROT_TILER,
         .buffer_size_unit = 16,
         .burst_size_unit = 16,
 };
@@ -562,13 +579,17 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = {
         .pll_enable             =       ti_hdmi_4xxx_pll_enable,
         .pll_disable            =       ti_hdmi_4xxx_pll_disable,
         .video_enable           =       ti_hdmi_4xxx_wp_video_start,
+        .video_disable          =       ti_hdmi_4xxx_wp_video_stop,
         .dump_wrapper           =       ti_hdmi_4xxx_wp_dump,
         .dump_core              =       ti_hdmi_4xxx_core_dump,
         .dump_pll               =       ti_hdmi_4xxx_pll_dump,
         .dump_phy               =       ti_hdmi_4xxx_phy_dump,
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
         .audio_enable           =       ti_hdmi_4xxx_wp_audio_enable,
+        .audio_disable          =       ti_hdmi_4xxx_wp_audio_disable,
+        .audio_start            =       ti_hdmi_4xxx_audio_start,
+        .audio_stop             =       ti_hdmi_4xxx_audio_stop,
+        .audio_config           =       ti_hdmi_4xxx_audio_config,
 #endif
 
 };
@@ -662,6 +683,11 @@ void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end)
         *end = omap_current_dss_features->reg_fields[id].end;
 }
 
+bool dss_feat_rotation_type_supported(enum omap_dss_rotation_type rot_type)
+{
+        return omap_current_dss_features->supported_rotation_types & rot_type;
+}
+
 void dss_features_init(void)
 {
         if (cpu_is_omap24xx())
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index c332e7ddfce1..bdf469f080e7 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -62,6 +62,7 @@ enum dss_feat_id {
         FEAT_FIFO_MERGE,
         /* An unknown HW bug causing the normal FIFO thresholds not to work */
         FEAT_OMAP3_DSI_FIFO_BUG,
+        FEAT_BURST_2D,
 };
 
 /* DSS register field id */
@@ -91,6 +92,8 @@ enum dss_range_param {
         FEAT_PARAM_DSIPLL_LPDIV,
         FEAT_PARAM_DOWNSCALE,
         FEAT_PARAM_LINEWIDTH,
+        FEAT_PARAM_MGR_WIDTH,
+        FEAT_PARAM_MGR_HEIGHT,
 };
 
 /* DSS Feature Functions */
@@ -108,6 +111,8 @@ const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id);
 u32 dss_feat_get_buffer_size_unit(void);        /* in bytes */
 u32 dss_feat_get_burst_size_unit(void);         /* in bytes */
 
+bool dss_feat_rotation_type_supported(enum omap_dss_rotation_type rot_type);
+
 bool dss_has_feature(enum dss_feat_id id);
 void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end);
 void dss_features_init(void);
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index c4b4f6950a92..8195c7166d20 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -33,12 +33,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/clk.h>
 #include <video/omapdss.h>
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-#include <sound/soc.h>
-#include <sound/pcm_params.h>
-#include "ti_hdmi_4xxx_ip.h"
-#endif
 
 #include "ti_hdmi.h"
 #include "dss.h"
@@ -63,7 +57,6 @@
 
 static struct {
         struct mutex lock;
-        struct omap_display_platform_data *pdata;
         struct platform_device *pdev;
         struct hdmi_ip_data ip_data;
 
@@ -130,25 +123,12 @@ static int hdmi_runtime_get(void)
 
         DSSDBG("hdmi_runtime_get\n");
 
-        /*
-         * HACK: Add dss_runtime_get() to ensure DSS clock domain is enabled.
-         * This should be removed later.
-         */
-        r = dss_runtime_get();
-        if (r < 0)
-                goto err_get_dss;
-
         r = pm_runtime_get_sync(&hdmi.pdev->dev);
         WARN_ON(r < 0);
         if (r < 0)
-                goto err_get_hdmi;
+                return r;
 
         return 0;
-
-err_get_hdmi:
-        dss_runtime_put();
-err_get_dss:
-        return r;
 }
 
 static void hdmi_runtime_put(void)
@@ -159,15 +139,9 @@ static void hdmi_runtime_put(void)
 
         r = pm_runtime_put_sync(&hdmi.pdev->dev);
         WARN_ON(r < 0);
-
-        /*
-         * HACK: This is added to complement the dss_runtime_get() call in
-         * hdmi_runtime_get(). This should be removed later.
-         */
-        dss_runtime_put();
 }
 
-int hdmi_init_display(struct omap_dss_device *dssdev)
+static int __init hdmi_init_display(struct omap_dss_device *dssdev)
 {
         DSSDBG("init_display\n");
 
@@ -344,7 +318,7 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
 
         hdmi_compute_pll(dssdev, phy, &hdmi.ip_data.pll_data);
 
-        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
+        hdmi.ip_data.ops->video_disable(&hdmi.ip_data);
 
         /* config the PLL and PHY hdmi_set_pll_pwrfirst */
         r = hdmi.ip_data.ops->pll_enable(&hdmi.ip_data);
@@ -376,10 +350,11 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         dispc_enable_gamma_table(0);
 
         /* tv size */
-        dispc_set_digit_size(dssdev->panel.timings.x_res,
-                        dssdev->panel.timings.y_res);
+        dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
 
-        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 1);
+        r = hdmi.ip_data.ops->video_enable(&hdmi.ip_data);
+        if (r)
+                goto err_vid_enable;
 
         r = dss_mgr_enable(dssdev->manager);
         if (r)
@@ -388,7 +363,8 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
         return 0;
 
 err_mgr_enable:
-        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
+        hdmi.ip_data.ops->video_disable(&hdmi.ip_data);
+err_vid_enable:
         hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
         hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
 err:
@@ -400,7 +376,7 @@ static void hdmi_power_off(struct omap_dss_device *dssdev)
 {
         dss_mgr_disable(dssdev->manager);
 
-        hdmi.ip_data.ops->video_enable(&hdmi.ip_data, 0);
+        hdmi.ip_data.ops->video_disable(&hdmi.ip_data);
         hdmi.ip_data.ops->phy_disable(&hdmi.ip_data);
         hdmi.ip_data.ops->pll_disable(&hdmi.ip_data);
         hdmi_runtime_put();
@@ -436,10 +412,12 @@ void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev)
                 r = hdmi_power_on(dssdev);
                 if (r)
                         DSSERR("failed to power on device\n");
+        } else {
+                dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
         }
 }
 
-void hdmi_dump_regs(struct seq_file *s)
+static void hdmi_dump_regs(struct seq_file *s)
 {
         mutex_lock(&hdmi.lock);
 
@@ -555,248 +533,201 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev)
         mutex_unlock(&hdmi.lock);
 }
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-
-static int hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
-                                struct snd_soc_dai *dai)
+static int hdmi_get_clocks(struct platform_device *pdev)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
-        struct platform_device *pdev = to_platform_device(codec->dev);
-        struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec);
-        int err = 0;
+        struct clk *clk;
 
-        if (!(ip_data->ops) && !(ip_data->ops->audio_enable)) {
-                dev_err(&pdev->dev, "Cannot enable/disable audio\n");
-                return -ENODEV;
+        clk = clk_get(&pdev->dev, "sys_clk");
+        if (IS_ERR(clk)) {
+                DSSERR("can't get sys_clk\n");
+                return PTR_ERR(clk);
         }
 
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                ip_data->ops->audio_enable(ip_data, true);
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                ip_data->ops->audio_enable(ip_data, false);
-                break;
-        default:
-                err = -EINVAL;
-        }
-        return err;
-}
-
-static int hdmi_audio_hw_params(struct snd_pcm_substream *substream,
-                                    struct snd_pcm_hw_params *params,
-                                    struct snd_soc_dai *dai)
-{
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
-        struct hdmi_ip_data *ip_data = snd_soc_codec_get_drvdata(codec);
-        struct hdmi_audio_format audio_format;
-        struct hdmi_audio_dma audio_dma;
-        struct hdmi_core_audio_config core_cfg;
-        struct hdmi_core_infoframe_audio aud_if_cfg;
-        int err, n, cts;
-        enum hdmi_core_audio_sample_freq sample_freq;
-
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
-                core_cfg.i2s_cfg.word_max_length =
-                        HDMI_AUDIO_I2S_MAX_WORD_20BITS;
-                core_cfg.i2s_cfg.word_length = HDMI_AUDIO_I2S_CHST_WORD_16_BITS;
-                core_cfg.i2s_cfg.in_length_bits =
-                        HDMI_AUDIO_I2S_INPUT_LENGTH_16;
-                core_cfg.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_LEFT;
-                audio_format.samples_per_word = HDMI_AUDIO_ONEWORD_TWOSAMPLES;
-                audio_format.sample_size = HDMI_AUDIO_SAMPLE_16BITS;
-                audio_format.justification = HDMI_AUDIO_JUSTIFY_LEFT;
-                audio_dma.transfer_size = 0x10;
-                break;
-        case SNDRV_PCM_FORMAT_S24_LE:
-                core_cfg.i2s_cfg.word_max_length =
-                        HDMI_AUDIO_I2S_MAX_WORD_24BITS;
-                core_cfg.i2s_cfg.word_length = HDMI_AUDIO_I2S_CHST_WORD_24_BITS;
-                core_cfg.i2s_cfg.in_length_bits =
-                        HDMI_AUDIO_I2S_INPUT_LENGTH_24;
-                audio_format.samples_per_word = HDMI_AUDIO_ONEWORD_ONESAMPLE;
-                audio_format.sample_size = HDMI_AUDIO_SAMPLE_24BITS;
-                audio_format.justification = HDMI_AUDIO_JUSTIFY_RIGHT;
-                core_cfg.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_RIGHT;
-                audio_dma.transfer_size = 0x20;
-                break;
-        default:
+        hdmi.sys_clk = clk;
+
+        return 0;
+}
+
+static void hdmi_put_clocks(void)
+{
+        if (hdmi.sys_clk)
+                clk_put(hdmi.sys_clk);
+}
+
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+int hdmi_compute_acr(u32 sample_freq, u32 *n, u32 *cts)
+{
+        u32 deep_color;
+        bool deep_color_correct = false;
+        u32 pclk = hdmi.ip_data.cfg.timings.pixel_clock;
+
+        if (n == NULL || cts == NULL)
                 return -EINVAL;
-        }
 
-        switch (params_rate(params)) {
+        /* TODO: When implemented, query deep color mode here. */
+        deep_color = 100;
+
+        /*
+         * When using deep color, the default N value (as in the HDMI
+         * specification) yields to an non-integer CTS. Hence, we
+         * modify it while keeping the restrictions described in
+         * section 7.2.1 of the HDMI 1.4a specification.
+         */
+        switch (sample_freq) {
         case 32000:
-                sample_freq = HDMI_AUDIO_FS_32000;
+        case 48000:
+        case 96000:
+        case 192000:
+                if (deep_color == 125)
+                        if (pclk == 27027 || pclk == 74250)
+                                deep_color_correct = true;
+                if (deep_color == 150)
+                        if (pclk == 27027)
+                                deep_color_correct = true;
                 break;
         case 44100:
-                sample_freq = HDMI_AUDIO_FS_44100;
-                break;
-        case 48000:
-                sample_freq = HDMI_AUDIO_FS_48000;
+        case 88200:
+        case 176400:
+                if (deep_color == 125)
+                        if (pclk == 27027)
+                                deep_color_correct = true;
                 break;
         default:
                 return -EINVAL;
         }
 
-        err = hdmi_config_audio_acr(ip_data, params_rate(params), &n, &cts);
-        if (err < 0)
-                return err;
-
-        /* Audio wrapper config */
-        audio_format.stereo_channels = HDMI_AUDIO_STEREO_ONECHANNEL;
-        audio_format.active_chnnls_msk = 0x03;
-        audio_format.type = HDMI_AUDIO_TYPE_LPCM;
-        audio_format.sample_order = HDMI_AUDIO_SAMPLE_LEFT_FIRST;
-        /* Disable start/stop signals of IEC 60958 blocks */
-        audio_format.en_sig_blk_strt_end = HDMI_AUDIO_BLOCK_SIG_STARTEND_OFF;
+        if (deep_color_correct) {
+                switch (sample_freq) {
+                case 32000:
+                        *n = 8192;
+                        break;
+                case 44100:
+                        *n = 12544;
+                        break;
+                case 48000:
+                        *n = 8192;
+                        break;
+                case 88200:
+                        *n = 25088;
+                        break;
+                case 96000:
+                        *n = 16384;
+                        break;
+                case 176400:
+                        *n = 50176;
+                        break;
+                case 192000:
+                        *n = 32768;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        } else {
+                switch (sample_freq) {
+                case 32000:
+                        *n = 4096;
+                        break;
+                case 44100:
+                        *n = 6272;
+                        break;
+                case 48000:
+                        *n = 6144;
+                        break;
+                case 88200:
+                        *n = 12544;
+                        break;
+                case 96000:
+                        *n = 12288;
+                        break;
+                case 176400:
+                        *n = 25088;
+                        break;
+                case 192000:
+                        *n = 24576;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        }
+        /* Calculate CTS. See HDMI 1.3a or 1.4a specifications */
+        *cts = pclk * (*n / 128) * deep_color / (sample_freq / 10);
 
-        audio_dma.block_size = 0xC0;
-        audio_dma.mode = HDMI_AUDIO_TRANSF_DMA;
-        audio_dma.fifo_threshold = 0x20; /* in number of samples */
+        return 0;
+}
 
-        hdmi_wp_audio_config_dma(ip_data, &audio_dma);
-        hdmi_wp_audio_config_format(ip_data, &audio_format);
+int hdmi_audio_enable(void)
+{
+        DSSDBG("audio_enable\n");
 
-        /*
-         * I2S config
-         */
-        core_cfg.i2s_cfg.en_high_bitrate_aud = false;
-        /* Only used with high bitrate audio */
-        core_cfg.i2s_cfg.cbit_order = false;
-        /* Serial data and word select should change on sck rising edge */
-        core_cfg.i2s_cfg.sck_edge_mode = HDMI_AUDIO_I2S_SCK_EDGE_RISING;
-        core_cfg.i2s_cfg.vbit = HDMI_AUDIO_I2S_VBIT_FOR_PCM;
-        /* Set I2S word select polarity */
-        core_cfg.i2s_cfg.ws_polarity = HDMI_AUDIO_I2S_WS_POLARITY_LOW_IS_LEFT;
-        core_cfg.i2s_cfg.direction = HDMI_AUDIO_I2S_MSB_SHIFTED_FIRST;
-        /* Set serial data to word select shift. See Phillips spec. */
-        core_cfg.i2s_cfg.shift = HDMI_AUDIO_I2S_FIRST_BIT_SHIFT;
-        /* Enable one of the four available serial data channels */
-        core_cfg.i2s_cfg.active_sds = HDMI_AUDIO_I2S_SD0_EN;
-
-        /* Core audio config */
-        core_cfg.freq_sample = sample_freq;
-        core_cfg.n = n;
-        core_cfg.cts = cts;
-        if (dss_has_feature(FEAT_HDMI_CTS_SWMODE)) {
-                core_cfg.aud_par_busclk = 0;
-                core_cfg.cts_mode = HDMI_AUDIO_CTS_MODE_SW;
-                core_cfg.use_mclk = dss_has_feature(FEAT_HDMI_AUDIO_USE_MCLK);
-        } else {
-                core_cfg.aud_par_busclk = (((128 * 31) - 1) << 8);
-                core_cfg.cts_mode = HDMI_AUDIO_CTS_MODE_HW;
-                core_cfg.use_mclk = true;
-        }
+        return hdmi.ip_data.ops->audio_enable(&hdmi.ip_data);
+}
 
-        if (core_cfg.use_mclk)
-                core_cfg.mclk_mode = HDMI_AUDIO_MCLK_128FS;
-        core_cfg.layout = HDMI_AUDIO_LAYOUT_2CH;
-        core_cfg.en_spdif = false;
-        /* Use sample frequency from channel status word */
-        core_cfg.fs_override = true;
-        /* Enable ACR packets */
-        core_cfg.en_acr_pkt = true;
-        /* Disable direct streaming digital audio */
-        core_cfg.en_dsd_audio = false;
-        /* Use parallel audio interface */
-        core_cfg.en_parallel_aud_input = true;
-
-        hdmi_core_audio_config(ip_data, &core_cfg);
+void hdmi_audio_disable(void)
+{
+        DSSDBG("audio_disable\n");
 
-        /*
-         * Configure packet
-         * info frame audio see doc CEA861-D page 74
-         */
-        aud_if_cfg.db1_coding_type = HDMI_INFOFRAME_AUDIO_DB1CT_FROM_STREAM;
-        aud_if_cfg.db1_channel_count = 2;
-        aud_if_cfg.db2_sample_freq = HDMI_INFOFRAME_AUDIO_DB2SF_FROM_STREAM;
-        aud_if_cfg.db2_sample_size = HDMI_INFOFRAME_AUDIO_DB2SS_FROM_STREAM;
-        aud_if_cfg.db4_channel_alloc = 0x00;
-        aud_if_cfg.db5_downmix_inh = false;
-        aud_if_cfg.db5_lsv = 0;
-
-        hdmi_core_audio_infoframe_config(ip_data, &aud_if_cfg);
-        return 0;
+        hdmi.ip_data.ops->audio_disable(&hdmi.ip_data);
 }
 
-static int hdmi_audio_startup(struct snd_pcm_substream *substream,
-                                  struct snd_soc_dai *dai)
+int hdmi_audio_start(void)
 {
-        if (!hdmi.ip_data.cfg.cm.mode) {
-                pr_err("Current video settings do not support audio.\n");
-                return -EIO;
-        }
-        return 0;
+        DSSDBG("audio_start\n");
+
+        return hdmi.ip_data.ops->audio_start(&hdmi.ip_data);
 }
 
-static int hdmi_audio_codec_probe(struct snd_soc_codec *codec)
+void hdmi_audio_stop(void)
 {
-        struct hdmi_ip_data *priv = &hdmi.ip_data;
+        DSSDBG("audio_stop\n");
 
-        snd_soc_codec_set_drvdata(codec, priv);
-        return 0;
+        hdmi.ip_data.ops->audio_stop(&hdmi.ip_data);
 }
 
-static struct snd_soc_codec_driver hdmi_audio_codec_drv = {
-        .probe = hdmi_audio_codec_probe,
-};
+bool hdmi_mode_has_audio(void)
+{
+        if (hdmi.ip_data.cfg.cm.mode == HDMI_HDMI)
+                return true;
+        else
+                return false;
+}
 
-static struct snd_soc_dai_ops hdmi_audio_codec_ops = {
-        .hw_params = hdmi_audio_hw_params,
-        .trigger = hdmi_audio_trigger,
-        .startup = hdmi_audio_startup,
-};
+int hdmi_audio_config(struct omap_dss_audio *audio)
+{
+        return hdmi.ip_data.ops->audio_config(&hdmi.ip_data, audio);
+}
 
-static struct snd_soc_dai_driver hdmi_codec_dai_drv = {
-                .name = "hdmi-audio-codec",
-                .playback = {
-                        .channels_min = 2,
-                        .channels_max = 2,
-                        .rates = SNDRV_PCM_RATE_32000 |
-                                SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
-                        .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                SNDRV_PCM_FMTBIT_S24_LE,
-                },
-                .ops = &hdmi_audio_codec_ops,
-};
 #endif
 
-static int hdmi_get_clocks(struct platform_device *pdev)
+static void __init hdmi_probe_pdata(struct platform_device *pdev)
 {
-        struct clk *clk;
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int r, i;
 
-        clk = clk_get(&pdev->dev, "sys_clk");
-        if (IS_ERR(clk)) {
-                DSSERR("can't get sys_clk\n");
-                return PTR_ERR(clk);
-        }
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
 
-        hdmi.sys_clk = clk;
+                if (dssdev->type != OMAP_DISPLAY_TYPE_HDMI)
+                        continue;
 
-        return 0;
-}
+                r = hdmi_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
 
-static void hdmi_put_clocks(void)
-{
-        if (hdmi.sys_clk)
-                clk_put(hdmi.sys_clk);
+                r = omap_dss_register_device(dssdev, &pdev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                        dssdev->name, r);
+        }
 }
 
 /* HDMI HW IP initialisation */
-static int omapdss_hdmihw_probe(struct platform_device *pdev)
+static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
 {
         struct resource *hdmi_mem;
         int r;
 
-        hdmi.pdata = pdev->dev.platform_data;
         hdmi.pdev = pdev;
 
         mutex_init(&hdmi.lock);
@@ -830,28 +761,18 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev)
 
         hdmi_panel_init();
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
+        dss_debugfs_create_file("hdmi", hdmi_dump_regs);
+
+        hdmi_probe_pdata(pdev);
 
-        /* Register ASoC codec DAI */
-        r = snd_soc_register_codec(&pdev->dev, &hdmi_audio_codec_drv,
-                                        &hdmi_codec_dai_drv, 1);
-        if (r) {
-                DSSERR("can't register ASoC HDMI audio codec\n");
-                return r;
-        }
-#endif
         return 0;
 }
 
-static int omapdss_hdmihw_remove(struct platform_device *pdev)
+static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)
 {
-        hdmi_panel_exit();
+        omap_dss_unregister_child_devices(&pdev->dev);
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-        snd_soc_unregister_codec(&pdev->dev);
-#endif
+        hdmi_panel_exit();
 
         pm_runtime_disable(&pdev->dev);
 
@@ -867,7 +788,6 @@ static int hdmi_runtime_suspend(struct device *dev)
         clk_disable(hdmi.sys_clk);
 
         dispc_runtime_put();
-        dss_runtime_put();
 
         return 0;
 }
@@ -876,23 +796,13 @@ static int hdmi_runtime_resume(struct device *dev)
 {
         int r;
 
-        r = dss_runtime_get();
-        if (r < 0)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r < 0)
-                goto err_get_dispc;
-
+                return r;
 
         clk_enable(hdmi.sys_clk);
 
         return 0;
-
-err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
-        return r;
 }
 
 static const struct dev_pm_ops hdmi_pm_ops = {
@@ -901,8 +811,7 @@ static const struct dev_pm_ops hdmi_pm_ops = {
 };
 
 static struct platform_driver omapdss_hdmihw_driver = {
-        .probe          = omapdss_hdmihw_probe,
-        .remove         = omapdss_hdmihw_remove,
+        .remove         = __exit_p(omapdss_hdmihw_remove),
         .driver         = {
                 .name   = "omapdss_hdmi",
                 .owner  = THIS_MODULE,
@@ -910,12 +819,12 @@ static struct platform_driver omapdss_hdmihw_driver = {
         },
 };
 
-int hdmi_init_platform_driver(void)
+int __init hdmi_init_platform_driver(void)
 {
-        return platform_driver_register(&omapdss_hdmihw_driver);
+        return platform_driver_probe(&omapdss_hdmihw_driver, omapdss_hdmihw_probe);
 }
 
-void hdmi_uninit_platform_driver(void)
+void __exit hdmi_uninit_platform_driver(void)
 {
-        return platform_driver_unregister(&omapdss_hdmihw_driver);
+        platform_driver_unregister(&omapdss_hdmihw_driver);
 }
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 533d5dc634d2..1179e3c4b1c7 100644
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -30,7 +30,12 @@
 #include "dss.h"
 
 static struct {
-        struct mutex hdmi_lock;
+        /* This protects the panel ops, mainly when accessing the HDMI IP. */
+        struct mutex lock;
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+        /* This protects the audio ops, specifically. */
+        spinlock_t audio_lock;
+#endif
 } hdmi;
 
 
@@ -54,12 +59,168 @@ static void hdmi_panel_remove(struct omap_dss_device *dssdev)
 
 }
 
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+static int hdmi_panel_audio_enable(struct omap_dss_device *dssdev)
+{
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&hdmi.lock);
+        spin_lock_irqsave(&hdmi.audio_lock, flags);
+
+        /* enable audio only if the display is active and supports audio */
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE ||
+            !hdmi_mode_has_audio()) {
+                DSSERR("audio not supported or display is off\n");
+                r = -EPERM;
+                goto err;
+        }
+
+        r = hdmi_audio_enable();
+
+        if (!r)
+                dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED;
+
+err:
+        spin_unlock_irqrestore(&hdmi.audio_lock, flags);
+        mutex_unlock(&hdmi.lock);
+        return r;
+}
+
+static void hdmi_panel_audio_disable(struct omap_dss_device *dssdev)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&hdmi.audio_lock, flags);
+
+        hdmi_audio_disable();
+
+        dssdev->audio_state = OMAP_DSS_AUDIO_DISABLED;
+
+        spin_unlock_irqrestore(&hdmi.audio_lock, flags);
+}
+
+static int hdmi_panel_audio_start(struct omap_dss_device *dssdev)
+{
+        unsigned long flags;
+        int r;
+
+        spin_lock_irqsave(&hdmi.audio_lock, flags);
+        /*
+         * No need to check the panel state. It was checked when trasitioning
+         * to AUDIO_ENABLED.
+         */
+        if (dssdev->audio_state != OMAP_DSS_AUDIO_ENABLED) {
+                DSSERR("audio start from invalid state\n");
+                r = -EPERM;
+                goto err;
+        }
+
+        r = hdmi_audio_start();
+
+        if (!r)
+                dssdev->audio_state = OMAP_DSS_AUDIO_PLAYING;
+
+err:
+        spin_unlock_irqrestore(&hdmi.audio_lock, flags);
+        return r;
+}
+
+static void hdmi_panel_audio_stop(struct omap_dss_device *dssdev)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&hdmi.audio_lock, flags);
+
+        hdmi_audio_stop();
+        dssdev->audio_state = OMAP_DSS_AUDIO_ENABLED;
+
+        spin_unlock_irqrestore(&hdmi.audio_lock, flags);
+}
+
+static bool hdmi_panel_audio_supported(struct omap_dss_device *dssdev)
+{
+        bool r = false;
+
+        mutex_lock(&hdmi.lock);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                goto err;
+
+        if (!hdmi_mode_has_audio())
+                goto err;
+
+        r = true;
+err:
+        mutex_unlock(&hdmi.lock);
+        return r;
+}
+
+static int hdmi_panel_audio_config(struct omap_dss_device *dssdev,
+                struct omap_dss_audio *audio)
+{
+        unsigned long flags;
+        int r;
+
+        mutex_lock(&hdmi.lock);
+        spin_lock_irqsave(&hdmi.audio_lock, flags);
+
+        /* config audio only if the display is active and supports audio */
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE ||
+            !hdmi_mode_has_audio()) {
+                DSSERR("audio not supported or display is off\n");
+                r = -EPERM;
+                goto err;
+        }
+
+        r = hdmi_audio_config(audio);
+
+        if (!r)
+                dssdev->audio_state = OMAP_DSS_AUDIO_CONFIGURED;
+
+err:
+        spin_unlock_irqrestore(&hdmi.audio_lock, flags);
+        mutex_unlock(&hdmi.lock);
+        return r;
+}
+
+#else
+static int hdmi_panel_audio_enable(struct omap_dss_device *dssdev)
+{
+        return -EPERM;
+}
+
+static void hdmi_panel_audio_disable(struct omap_dss_device *dssdev)
+{
+}
+
+static int hdmi_panel_audio_start(struct omap_dss_device *dssdev)
+{
+        return -EPERM;
+}
+
+static void hdmi_panel_audio_stop(struct omap_dss_device *dssdev)
+{
+}
+
+static bool hdmi_panel_audio_supported(struct omap_dss_device *dssdev)
+{
+        return false;
+}
+
+static int hdmi_panel_audio_config(struct omap_dss_device *dssdev,
+                struct omap_dss_audio *audio)
+{
+        return -EPERM;
+}
+#endif
+
 static int hdmi_panel_enable(struct omap_dss_device *dssdev)
 {
         int r = 0;
         DSSDBG("ENTER hdmi_panel_enable\n");
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
                 r = -EINVAL;
@@ -75,40 +236,52 @@ static int hdmi_panel_enable(struct omap_dss_device *dssdev)
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
 err:
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 
         return r;
 }
 
 static void hdmi_panel_disable(struct omap_dss_device *dssdev)
 {
-        mutex_lock(&hdmi.hdmi_lock);
-
-        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+        mutex_lock(&hdmi.lock);
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                /*
+                 * TODO: notify audio users that the display was disabled. For
+                 * now, disable audio locally to not break our audio state
+                 * machine.
+                 */
+                hdmi_panel_audio_disable(dssdev);
                 omapdss_hdmi_display_disable(dssdev);
+        }
 
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 }
 
 static int hdmi_panel_suspend(struct omap_dss_device *dssdev)
 {
         int r = 0;
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
                 r = -EINVAL;
                 goto err;
         }
 
-        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        /*
+         * TODO: notify audio users that the display was suspended. For now,
+         * disable audio locally to not break our audio state machine.
+         */
+        hdmi_panel_audio_disable(dssdev);
 
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
         omapdss_hdmi_display_disable(dssdev);
 
 err:
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 
         return r;
 }
@@ -117,7 +290,7 @@ static int hdmi_panel_resume(struct omap_dss_device *dssdev)
 {
         int r = 0;
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
                 r = -EINVAL;
@@ -129,11 +302,12 @@ static int hdmi_panel_resume(struct omap_dss_device *dssdev)
                 DSSERR("failed to power on\n");
                 goto err;
         }
+        /* TODO: notify audio users that the panel resumed. */
 
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
 err:
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 
         return r;
 }
@@ -141,11 +315,11 @@ err:
 static void hdmi_get_timings(struct omap_dss_device *dssdev,
                         struct omap_video_timings *timings)
 {
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         *timings = dssdev->panel.timings;
 
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 }
 
 static void hdmi_set_timings(struct omap_dss_device *dssdev,
@@ -153,12 +327,18 @@ static void hdmi_set_timings(struct omap_dss_device *dssdev,
 {
         DSSDBG("hdmi_set_timings\n");
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
+
+        /*
+         * TODO: notify audio users that there was a timings change. For
+         * now, disable audio locally to not break our audio state machine.
+         */
+        hdmi_panel_audio_disable(dssdev);
 
         dssdev->panel.timings = *timings;
         omapdss_hdmi_display_set_timing(dssdev);
 
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 }
 
 static int hdmi_check_timings(struct omap_dss_device *dssdev,
@@ -168,11 +348,11 @@ static int hdmi_check_timings(struct omap_dss_device *dssdev,
 
         DSSDBG("hdmi_check_timings\n");
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         r = omapdss_hdmi_display_check_timing(dssdev, timings);
 
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
         return r;
 }
 
@@ -180,7 +360,7 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, u8 *buf, int len)
 {
         int r;
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
                 r = omapdss_hdmi_display_enable(dssdev);
@@ -194,7 +374,7 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev, u8 *buf, int len)
                         dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
                 omapdss_hdmi_display_disable(dssdev);
 err:
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 
         return r;
 }
@@ -203,7 +383,7 @@ static bool hdmi_detect(struct omap_dss_device *dssdev)
 {
         int r;
 
-        mutex_lock(&hdmi.hdmi_lock);
+        mutex_lock(&hdmi.lock);
 
         if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
                 r = omapdss_hdmi_display_enable(dssdev);
@@ -217,7 +397,7 @@ static bool hdmi_detect(struct omap_dss_device *dssdev)
                         dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED)
                 omapdss_hdmi_display_disable(dssdev);
 err:
-        mutex_unlock(&hdmi.hdmi_lock);
+        mutex_unlock(&hdmi.lock);
 
         return r;
 }
@@ -234,6 +414,12 @@ static struct omap_dss_driver hdmi_driver = {
         .check_timings  = hdmi_check_timings,
         .read_edid      = hdmi_read_edid,
         .detect         = hdmi_detect,
+        .audio_enable   = hdmi_panel_audio_enable,
+        .audio_disable  = hdmi_panel_audio_disable,
+        .audio_start    = hdmi_panel_audio_start,
+        .audio_stop     = hdmi_panel_audio_stop,
+        .audio_supported        = hdmi_panel_audio_supported,
+        .audio_config   = hdmi_panel_audio_config,
         .driver                 = {
                 .name   = "hdmi_panel",
                 .owner  = THIS_MODULE,
@@ -242,7 +428,11 @@ static struct omap_dss_driver hdmi_driver = {
 
 int hdmi_panel_init(void)
 {
-        mutex_init(&hdmi.hdmi_lock);
+        mutex_init(&hdmi.lock);
+
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+        spin_lock_init(&hdmi.audio_lock);
+#endif
 
         omap_dss_register_driver(&hdmi_driver);
 
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index e7364603f6a1..0cbcde4c688a 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -654,9 +654,20 @@ static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr,
         return 0;
 }
 
+int dss_mgr_check_timings(struct omap_overlay_manager *mgr,
+                const struct omap_video_timings *timings)
+{
+        if (!dispc_mgr_timings_ok(mgr->id, timings)) {
+                DSSERR("check_manager: invalid timings\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 int dss_mgr_check(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev,
                 struct omap_overlay_manager_info *info,
+                const struct omap_video_timings *mgr_timings,
                 struct omap_overlay_info **overlay_infos)
 {
         struct omap_overlay *ovl;
@@ -668,6 +679,10 @@ int dss_mgr_check(struct omap_overlay_manager *mgr,
                         return r;
         }
 
+        r = dss_mgr_check_timings(mgr, mgr_timings);
+        if (r)
+                return r;
+
         list_for_each_entry(ovl, &mgr->overlays, list) {
                 struct omap_overlay_info *oi;
                 int r;
@@ -677,7 +692,7 @@ int dss_mgr_check(struct omap_overlay_manager *mgr,
                 if (oi == NULL)
                         continue;
 
-                r = dss_ovl_check(ovl, oi, dssdev);
+                r = dss_ovl_check(ovl, oi, mgr_timings);
                 if (r)
                         return r;
         }
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index 6e821810deec..b0ba60f88dd2 100644
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -628,19 +628,23 @@ int dss_ovl_simple_check(struct omap_overlay *ovl,
                 return -EINVAL;
         }
 
+        if (dss_feat_rotation_type_supported(info->rotation_type) == 0) {
+                DSSERR("check_overlay: rotation type %d not supported\n",
+                                info->rotation_type);
+                return -EINVAL;
+        }
+
         return 0;
 }
 
-int dss_ovl_check(struct omap_overlay *ovl,
-                struct omap_overlay_info *info, struct omap_dss_device *dssdev)
+int dss_ovl_check(struct omap_overlay *ovl, struct omap_overlay_info *info,
+                const struct omap_video_timings *mgr_timings)
 {
         u16 outw, outh;
         u16 dw, dh;
 
-        if (dssdev == NULL)
-                return 0;
-
-        dssdev->driver->get_resolution(dssdev, &dw, &dh);
+        dw = mgr_timings->x_res;
+        dh = mgr_timings->y_res;
 
         if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
                 outw = info->width;
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 788a0ef6323a..3d8c206e90e5 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -304,13 +304,23 @@ static void rfbi_transfer_area(struct omap_dss_device *dssdev, u16 width,
                 u16 height, void (*callback)(void *data), void *data)
 {
         u32 l;
+        struct omap_video_timings timings = {
+                .hsw            = 1,
+                .hfp            = 1,
+                .hbp            = 1,
+                .vsw            = 1,
+                .vfp            = 0,
+                .vbp            = 0,
+                .x_res          = width,
+                .y_res          = height,
+        };
 
         /*BUG_ON(callback == 0);*/
         BUG_ON(rfbi.framedone_callback != NULL);
 
         DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
 
-        dispc_mgr_set_lcd_size(dssdev->manager->id, width, height);
+        dss_mgr_set_timings(dssdev->manager, &timings);
 
         dispc_mgr_enable(dssdev->manager->id, true);
 
@@ -766,6 +776,16 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
                 u16 *x, u16 *y, u16 *w, u16 *h)
 {
         u16 dw, dh;
+        struct omap_video_timings timings = {
+                .hsw            = 1,
+                .hfp            = 1,
+                .hbp            = 1,
+                .vsw            = 1,
+                .vfp            = 0,
+                .vbp            = 0,
+                .x_res          = *w,
+                .y_res          = *h,
+        };
 
         dssdev->driver->get_resolution(dssdev, &dw, &dh);
 
@@ -784,7 +804,7 @@ int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
         if (*w == 0 || *h == 0)
                 return -EINVAL;
 
-        dispc_mgr_set_lcd_size(dssdev->manager->id, *w, *h);
+        dss_mgr_set_timings(dssdev->manager, &timings);
 
         return 0;
 }
@@ -799,7 +819,7 @@ int omap_rfbi_update(struct omap_dss_device *dssdev,
 }
 EXPORT_SYMBOL(omap_rfbi_update);
 
-void rfbi_dump_regs(struct seq_file *s)
+static void rfbi_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, rfbi_read_reg(r))
 
@@ -900,15 +920,39 @@ void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
 }
 EXPORT_SYMBOL(omapdss_rfbi_display_disable);
 
-int rfbi_init_display(struct omap_dss_device *dssdev)
+static int __init rfbi_init_display(struct omap_dss_device *dssdev)
 {
         rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
         dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
         return 0;
 }
 
+static void __init rfbi_probe_pdata(struct platform_device *pdev)
+{
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int i, r;
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                if (dssdev->type != OMAP_DISPLAY_TYPE_DBI)
+                        continue;
+
+                r = rfbi_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
+
+                r = omap_dss_register_device(dssdev, &pdev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                dssdev->name, r);
+        }
+}
+
 /* RFBI HW IP initialisation */
-static int omap_rfbihw_probe(struct platform_device *pdev)
+static int __init omap_rfbihw_probe(struct platform_device *pdev)
 {
         u32 rev;
         struct resource *rfbi_mem;
@@ -956,6 +1000,10 @@ static int omap_rfbihw_probe(struct platform_device *pdev)
 
         rfbi_runtime_put();
 
+        dss_debugfs_create_file("rfbi", rfbi_dump_regs);
+
+        rfbi_probe_pdata(pdev);
+
         return 0;
 
 err_runtime_get:
@@ -963,8 +1011,9 @@ err_runtime_get:
         return r;
 }
 
-static int omap_rfbihw_remove(struct platform_device *pdev)
+static int __exit omap_rfbihw_remove(struct platform_device *pdev)
 {
+        omap_dss_unregister_child_devices(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         return 0;
 }
@@ -972,7 +1021,6 @@ static int omap_rfbihw_remove(struct platform_device *pdev)
 static int rfbi_runtime_suspend(struct device *dev)
 {
         dispc_runtime_put();
-        dss_runtime_put();
 
         return 0;
 }
@@ -981,20 +1029,11 @@ static int rfbi_runtime_resume(struct device *dev)
 {
         int r;
 
-        r = dss_runtime_get();
-        if (r < 0)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r < 0)
-                goto err_get_dispc;
+                return r;
 
         return 0;
-
-err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
-        return r;
 }
 
 static const struct dev_pm_ops rfbi_pm_ops = {
@@ -1003,8 +1042,7 @@ static const struct dev_pm_ops rfbi_pm_ops = {
 };
 
 static struct platform_driver omap_rfbihw_driver = {
-        .probe          = omap_rfbihw_probe,
-        .remove         = omap_rfbihw_remove,
+        .remove         = __exit_p(omap_rfbihw_remove),
         .driver         = {
                 .name   = "omapdss_rfbi",
                 .owner  = THIS_MODULE,
@@ -1012,12 +1050,12 @@ static struct platform_driver omap_rfbihw_driver = {
         },
 };
 
-int rfbi_init_platform_driver(void)
+int __init rfbi_init_platform_driver(void)
 {
-        return platform_driver_register(&omap_rfbihw_driver);
+        return platform_driver_probe(&omap_rfbihw_driver, omap_rfbihw_probe);
 }
 
-void rfbi_uninit_platform_driver(void)
+void __exit rfbi_uninit_platform_driver(void)
 {
-        return platform_driver_unregister(&omap_rfbihw_driver);
+        platform_driver_unregister(&omap_rfbihw_driver);
 }
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 8266ca0d666b..3a43dc2a9b46 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -24,6 +24,7 @@
 #include <linux/err.h>
 #include <linux/regulator/consumer.h>
 #include <linux/export.h>
+#include <linux/platform_device.h>
 
 #include <video/omapdss.h>
 #include "dss.h"
@@ -71,10 +72,6 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
         if (r)
                 goto err_reg_enable;
 
-        r = dss_runtime_get();
-        if (r)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r)
                 goto err_get_dispc;
@@ -107,7 +104,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
         }
 
 
-        dispc_mgr_set_lcd_timings(dssdev->manager->id, t);
+        dss_mgr_set_timings(dssdev->manager, t);
 
         r = dss_set_clock_div(&dss_cinfo);
         if (r)
@@ -137,8 +134,6 @@ err_set_dss_clock_div:
 err_calc_clock_div:
         dispc_runtime_put();
 err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
         regulator_disable(sdi.vdds_sdi_reg);
 err_reg_enable:
         omap_dss_stop_device(dssdev);
@@ -154,7 +149,6 @@ void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
         dss_sdi_disable();
 
         dispc_runtime_put();
-        dss_runtime_put();
 
         regulator_disable(sdi.vdds_sdi_reg);
 
@@ -162,7 +156,7 @@ void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 }
 EXPORT_SYMBOL(omapdss_sdi_display_disable);
 
-int sdi_init_display(struct omap_dss_device *dssdev)
+static int __init sdi_init_display(struct omap_dss_device *dssdev)
 {
         DSSDBG("SDI init\n");
 
@@ -182,11 +176,58 @@ int sdi_init_display(struct omap_dss_device *dssdev)
         return 0;
 }
 
-int sdi_init(void)
+static void __init sdi_probe_pdata(struct platform_device *pdev)
+{
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int i, r;
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                if (dssdev->type != OMAP_DISPLAY_TYPE_SDI)
+                        continue;
+
+                r = sdi_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
+
+                r = omap_dss_register_device(dssdev, &pdev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                        dssdev->name, r);
+        }
+}
+
+static int __init omap_sdi_probe(struct platform_device *pdev)
 {
+        sdi_probe_pdata(pdev);
+
+        return 0;
+}
+
+static int __exit omap_sdi_remove(struct platform_device *pdev)
+{
+        omap_dss_unregister_child_devices(&pdev->dev);
+
         return 0;
 }
 
-void sdi_exit(void)
+static struct platform_driver omap_sdi_driver = {
+        .remove         = __exit_p(omap_sdi_remove),
+        .driver         = {
+                .name   = "omapdss_sdi",
+                .owner  = THIS_MODULE,
+        },
+};
+
+int __init sdi_init_platform_driver(void)
+{
+        return platform_driver_probe(&omap_sdi_driver, omap_sdi_probe);
+}
+
+void __exit sdi_uninit_platform_driver(void)
 {
+        platform_driver_unregister(&omap_sdi_driver);
 }
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 1f58b84d6901..e734cb444bc7 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -96,7 +96,9 @@ struct ti_hdmi_ip_ops {
 
         void (*pll_disable)(struct hdmi_ip_data *ip_data);
 
-        void (*video_enable)(struct hdmi_ip_data *ip_data, bool start);
+        int (*video_enable)(struct hdmi_ip_data *ip_data);
+
+        void (*video_disable)(struct hdmi_ip_data *ip_data);
 
         void (*dump_wrapper)(struct hdmi_ip_data *ip_data, struct seq_file *s);
 
@@ -106,9 +108,17 @@ struct ti_hdmi_ip_ops {
 
         void (*dump_phy)(struct hdmi_ip_data *ip_data, struct seq_file *s);
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-        void (*audio_enable)(struct hdmi_ip_data *ip_data, bool start);
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+        int (*audio_enable)(struct hdmi_ip_data *ip_data);
+
+        void (*audio_disable)(struct hdmi_ip_data *ip_data);
+
+        int (*audio_start)(struct hdmi_ip_data *ip_data);
+
+        void (*audio_stop)(struct hdmi_ip_data *ip_data);
+
+        int (*audio_config)(struct hdmi_ip_data *ip_data,
+                struct omap_dss_audio *audio);
 #endif
 
 };
@@ -173,7 +183,8 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
 int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data, u8 *edid, int len);
 bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data);
-void ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start);
+int ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data);
+void ti_hdmi_4xxx_wp_video_stop(struct hdmi_ip_data *ip_data);
 int ti_hdmi_4xxx_pll_enable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_basic_configure(struct hdmi_ip_data *ip_data);
@@ -181,8 +192,13 @@ void ti_hdmi_4xxx_wp_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_pll_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
 void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s);
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable);
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+int hdmi_compute_acr(u32 sample_freq, u32 *n, u32 *cts);
+int ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data);
+void ti_hdmi_4xxx_wp_audio_disable(struct hdmi_ip_data *ip_data);
+int ti_hdmi_4xxx_audio_start(struct hdmi_ip_data *ip_data);
+void ti_hdmi_4xxx_audio_stop(struct hdmi_ip_data *ip_data);
+int ti_hdmi_4xxx_audio_config(struct hdmi_ip_data *ip_data,
+                struct omap_dss_audio *audio);
 #endif
 #endif
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index bfe6fe65c8be..4dae1b291079 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -29,9 +29,14 @@
 #include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/gpio.h>
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+#include <sound/asound.h>
+#include <sound/asoundef.h>
+#endif
 
 #include "ti_hdmi_4xxx_ip.h"
 #include "dss.h"
+#include "dss_features.h"
 
 static inline void hdmi_write_reg(void __iomem *base_addr,
                                 const u16 idx, u32 val)
@@ -298,9 +303,9 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         REG_FLD_MOD(phy_base, HDMI_TXPHY_PAD_CFG_CTRL, 0x1, 27, 27);
 
         r = request_threaded_irq(gpio_to_irq(ip_data->hpd_gpio),
-                        NULL, hpd_irq_handler,
-                        IRQF_DISABLED | IRQF_TRIGGER_RISING |
-                        IRQF_TRIGGER_FALLING, "hpd", ip_data);
+                                 NULL, hpd_irq_handler,
+                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
+                                 IRQF_ONESHOT, "hpd", ip_data);
         if (r) {
                 DSSERR("HPD IRQ request failed\n");
                 hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
@@ -699,9 +704,15 @@ static void hdmi_wp_init(struct omap_video_timings *timings,
 
 }
 
-void ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data, bool start)
+int ti_hdmi_4xxx_wp_video_start(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, true, 31, 31);
+        return 0;
+}
+
+void ti_hdmi_4xxx_wp_video_stop(struct hdmi_ip_data *ip_data)
 {
-        REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, start, 31, 31);
+        REG_FLD_MOD(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, false, 31, 31);
 }
 
 static void hdmi_wp_video_init_format(struct hdmi_video_format *video_fmt,
@@ -886,10 +897,12 @@ void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
 
 #define CORE_REG(i, name) name(i)
 #define DUMPCORE(r) seq_printf(s, "%-35s %08x\n", #r,\
-                hdmi_read_reg(hdmi_pll_base(ip_data), r))
-#define DUMPCOREAV(i, r) seq_printf(s, "%s[%d]%*s %08x\n", #r, i, \
+                hdmi_read_reg(hdmi_core_sys_base(ip_data), r))
+#define DUMPCOREAV(r) seq_printf(s, "%-35s %08x\n", #r,\
+                hdmi_read_reg(hdmi_av_base(ip_data), r))
+#define DUMPCOREAV2(i, r) seq_printf(s, "%s[%d]%*s %08x\n", #r, i, \
                 (i < 10) ? 32 - strlen(#r) : 31 - strlen(#r), " ", \
-                hdmi_read_reg(hdmi_pll_base(ip_data), CORE_REG(i, r)))
+                hdmi_read_reg(hdmi_av_base(ip_data), CORE_REG(i, r)))
 
         DUMPCORE(HDMI_CORE_SYS_VND_IDL);
         DUMPCORE(HDMI_CORE_SYS_DEV_IDL);
@@ -898,6 +911,13 @@ void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
         DUMPCORE(HDMI_CORE_SYS_SRST);
         DUMPCORE(HDMI_CORE_CTRL1);
         DUMPCORE(HDMI_CORE_SYS_SYS_STAT);
+        DUMPCORE(HDMI_CORE_SYS_DE_DLY);
+        DUMPCORE(HDMI_CORE_SYS_DE_CTRL);
+        DUMPCORE(HDMI_CORE_SYS_DE_TOP);
+        DUMPCORE(HDMI_CORE_SYS_DE_CNTL);
+        DUMPCORE(HDMI_CORE_SYS_DE_CNTH);
+        DUMPCORE(HDMI_CORE_SYS_DE_LINL);
+        DUMPCORE(HDMI_CORE_SYS_DE_LINH_1);
         DUMPCORE(HDMI_CORE_SYS_VID_ACEN);
         DUMPCORE(HDMI_CORE_SYS_VID_MODE);
         DUMPCORE(HDMI_CORE_SYS_INTR_STATE);
@@ -907,102 +927,91 @@ void ti_hdmi_4xxx_core_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
         DUMPCORE(HDMI_CORE_SYS_INTR4);
         DUMPCORE(HDMI_CORE_SYS_UMASK1);
         DUMPCORE(HDMI_CORE_SYS_TMDS_CTRL);
-        DUMPCORE(HDMI_CORE_SYS_DE_DLY);
-        DUMPCORE(HDMI_CORE_SYS_DE_CTRL);
-        DUMPCORE(HDMI_CORE_SYS_DE_TOP);
-        DUMPCORE(HDMI_CORE_SYS_DE_CNTL);
-        DUMPCORE(HDMI_CORE_SYS_DE_CNTH);
-        DUMPCORE(HDMI_CORE_SYS_DE_LINL);
-        DUMPCORE(HDMI_CORE_SYS_DE_LINH_1);
 
-        DUMPCORE(HDMI_CORE_DDC_CMD);
-        DUMPCORE(HDMI_CORE_DDC_STATUS);
         DUMPCORE(HDMI_CORE_DDC_ADDR);
+        DUMPCORE(HDMI_CORE_DDC_SEGM);
         DUMPCORE(HDMI_CORE_DDC_OFFSET);
         DUMPCORE(HDMI_CORE_DDC_COUNT1);
         DUMPCORE(HDMI_CORE_DDC_COUNT2);
+        DUMPCORE(HDMI_CORE_DDC_STATUS);
+        DUMPCORE(HDMI_CORE_DDC_CMD);
         DUMPCORE(HDMI_CORE_DDC_DATA);
-        DUMPCORE(HDMI_CORE_DDC_SEGM);
 
-        DUMPCORE(HDMI_CORE_AV_HDMI_CTRL);
-        DUMPCORE(HDMI_CORE_AV_DPD);
-        DUMPCORE(HDMI_CORE_AV_PB_CTRL1);
-        DUMPCORE(HDMI_CORE_AV_PB_CTRL2);
-        DUMPCORE(HDMI_CORE_AV_AVI_TYPE);
-        DUMPCORE(HDMI_CORE_AV_AVI_VERS);
-        DUMPCORE(HDMI_CORE_AV_AVI_LEN);
-        DUMPCORE(HDMI_CORE_AV_AVI_CHSUM);
+        DUMPCOREAV(HDMI_CORE_AV_ACR_CTRL);
+        DUMPCOREAV(HDMI_CORE_AV_FREQ_SVAL);
+        DUMPCOREAV(HDMI_CORE_AV_N_SVAL1);
+        DUMPCOREAV(HDMI_CORE_AV_N_SVAL2);
+        DUMPCOREAV(HDMI_CORE_AV_N_SVAL3);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_SVAL1);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_SVAL2);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_SVAL3);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_HVAL1);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_HVAL2);
+        DUMPCOREAV(HDMI_CORE_AV_CTS_HVAL3);
+        DUMPCOREAV(HDMI_CORE_AV_AUD_MODE);
+        DUMPCOREAV(HDMI_CORE_AV_SPDIF_CTRL);
+        DUMPCOREAV(HDMI_CORE_AV_HW_SPDIF_FS);
+        DUMPCOREAV(HDMI_CORE_AV_SWAP_I2S);
+        DUMPCOREAV(HDMI_CORE_AV_SPDIF_ERTH);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_IN_MAP);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_IN_CTRL);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_CHST0);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_CHST1);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_CHST2);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_CHST4);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_CHST5);
+        DUMPCOREAV(HDMI_CORE_AV_ASRC);
+        DUMPCOREAV(HDMI_CORE_AV_I2S_IN_LEN);
+        DUMPCOREAV(HDMI_CORE_AV_HDMI_CTRL);
+        DUMPCOREAV(HDMI_CORE_AV_AUDO_TXSTAT);
+        DUMPCOREAV(HDMI_CORE_AV_AUD_PAR_BUSCLK_1);
+        DUMPCOREAV(HDMI_CORE_AV_AUD_PAR_BUSCLK_2);
+        DUMPCOREAV(HDMI_CORE_AV_AUD_PAR_BUSCLK_3);
+        DUMPCOREAV(HDMI_CORE_AV_TEST_TXCTRL);
+        DUMPCOREAV(HDMI_CORE_AV_DPD);
+        DUMPCOREAV(HDMI_CORE_AV_PB_CTRL1);
+        DUMPCOREAV(HDMI_CORE_AV_PB_CTRL2);
+        DUMPCOREAV(HDMI_CORE_AV_AVI_TYPE);
+        DUMPCOREAV(HDMI_CORE_AV_AVI_VERS);
+        DUMPCOREAV(HDMI_CORE_AV_AVI_LEN);
+        DUMPCOREAV(HDMI_CORE_AV_AVI_CHSUM);
 
         for (i = 0; i < HDMI_CORE_AV_AVI_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_AVI_DBYTE);
+                DUMPCOREAV2(i, HDMI_CORE_AV_AVI_DBYTE);
+
+        DUMPCOREAV(HDMI_CORE_AV_SPD_TYPE);
+        DUMPCOREAV(HDMI_CORE_AV_SPD_VERS);
+        DUMPCOREAV(HDMI_CORE_AV_SPD_LEN);
+        DUMPCOREAV(HDMI_CORE_AV_SPD_CHSUM);
 
         for (i = 0; i < HDMI_CORE_AV_SPD_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_SPD_DBYTE);
+                DUMPCOREAV2(i, HDMI_CORE_AV_SPD_DBYTE);
+
+        DUMPCOREAV(HDMI_CORE_AV_AUDIO_TYPE);
+        DUMPCOREAV(HDMI_CORE_AV_AUDIO_VERS);
+        DUMPCOREAV(HDMI_CORE_AV_AUDIO_LEN);
+        DUMPCOREAV(HDMI_CORE_AV_AUDIO_CHSUM);
 
         for (i = 0; i < HDMI_CORE_AV_AUD_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_AUD_DBYTE);
+                DUMPCOREAV2(i, HDMI_CORE_AV_AUD_DBYTE);
+
+        DUMPCOREAV(HDMI_CORE_AV_MPEG_TYPE);
+        DUMPCOREAV(HDMI_CORE_AV_MPEG_VERS);
+        DUMPCOREAV(HDMI_CORE_AV_MPEG_LEN);
+        DUMPCOREAV(HDMI_CORE_AV_MPEG_CHSUM);
 
         for (i = 0; i < HDMI_CORE_AV_MPEG_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_MPEG_DBYTE);
+                DUMPCOREAV2(i, HDMI_CORE_AV_MPEG_DBYTE);
 
         for (i = 0; i < HDMI_CORE_AV_GEN_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_GEN_DBYTE);
+                DUMPCOREAV2(i, HDMI_CORE_AV_GEN_DBYTE);
+
+        DUMPCOREAV(HDMI_CORE_AV_CP_BYTE1);
 
         for (i = 0; i < HDMI_CORE_AV_GEN2_DBYTE_NELEMS; i++)
-                DUMPCOREAV(i, HDMI_CORE_AV_GEN2_DBYTE);
-
-        DUMPCORE(HDMI_CORE_AV_ACR_CTRL);
-        DUMPCORE(HDMI_CORE_AV_FREQ_SVAL);
-        DUMPCORE(HDMI_CORE_AV_N_SVAL1);
-        DUMPCORE(HDMI_CORE_AV_N_SVAL2);
-        DUMPCORE(HDMI_CORE_AV_N_SVAL3);
-        DUMPCORE(HDMI_CORE_AV_CTS_SVAL1);
-        DUMPCORE(HDMI_CORE_AV_CTS_SVAL2);
-        DUMPCORE(HDMI_CORE_AV_CTS_SVAL3);
-        DUMPCORE(HDMI_CORE_AV_CTS_HVAL1);
-        DUMPCORE(HDMI_CORE_AV_CTS_HVAL2);
-        DUMPCORE(HDMI_CORE_AV_CTS_HVAL3);
-        DUMPCORE(HDMI_CORE_AV_AUD_MODE);
-        DUMPCORE(HDMI_CORE_AV_SPDIF_CTRL);
-        DUMPCORE(HDMI_CORE_AV_HW_SPDIF_FS);
-        DUMPCORE(HDMI_CORE_AV_SWAP_I2S);
-        DUMPCORE(HDMI_CORE_AV_SPDIF_ERTH);
-        DUMPCORE(HDMI_CORE_AV_I2S_IN_MAP);
-        DUMPCORE(HDMI_CORE_AV_I2S_IN_CTRL);
-        DUMPCORE(HDMI_CORE_AV_I2S_CHST0);
-        DUMPCORE(HDMI_CORE_AV_I2S_CHST1);
-        DUMPCORE(HDMI_CORE_AV_I2S_CHST2);
-        DUMPCORE(HDMI_CORE_AV_I2S_CHST4);
-        DUMPCORE(HDMI_CORE_AV_I2S_CHST5);
-        DUMPCORE(HDMI_CORE_AV_ASRC);
-        DUMPCORE(HDMI_CORE_AV_I2S_IN_LEN);
-        DUMPCORE(HDMI_CORE_AV_HDMI_CTRL);
-        DUMPCORE(HDMI_CORE_AV_AUDO_TXSTAT);
-        DUMPCORE(HDMI_CORE_AV_AUD_PAR_BUSCLK_1);
-        DUMPCORE(HDMI_CORE_AV_AUD_PAR_BUSCLK_2);
-        DUMPCORE(HDMI_CORE_AV_AUD_PAR_BUSCLK_3);
-        DUMPCORE(HDMI_CORE_AV_TEST_TXCTRL);
-        DUMPCORE(HDMI_CORE_AV_DPD);
-        DUMPCORE(HDMI_CORE_AV_PB_CTRL1);
-        DUMPCORE(HDMI_CORE_AV_PB_CTRL2);
-        DUMPCORE(HDMI_CORE_AV_AVI_TYPE);
-        DUMPCORE(HDMI_CORE_AV_AVI_VERS);
-        DUMPCORE(HDMI_CORE_AV_AVI_LEN);
-        DUMPCORE(HDMI_CORE_AV_AVI_CHSUM);
-        DUMPCORE(HDMI_CORE_AV_SPD_TYPE);
-        DUMPCORE(HDMI_CORE_AV_SPD_VERS);
-        DUMPCORE(HDMI_CORE_AV_SPD_LEN);
-        DUMPCORE(HDMI_CORE_AV_SPD_CHSUM);
-        DUMPCORE(HDMI_CORE_AV_AUDIO_TYPE);
-        DUMPCORE(HDMI_CORE_AV_AUDIO_VERS);
-        DUMPCORE(HDMI_CORE_AV_AUDIO_LEN);
-        DUMPCORE(HDMI_CORE_AV_AUDIO_CHSUM);
-        DUMPCORE(HDMI_CORE_AV_MPEG_TYPE);
-        DUMPCORE(HDMI_CORE_AV_MPEG_VERS);
-        DUMPCORE(HDMI_CORE_AV_MPEG_LEN);
-        DUMPCORE(HDMI_CORE_AV_MPEG_CHSUM);
-        DUMPCORE(HDMI_CORE_AV_CP_BYTE1);
-        DUMPCORE(HDMI_CORE_AV_CEC_ADDR_ID);
+                DUMPCOREAV2(i, HDMI_CORE_AV_GEN2_DBYTE);
+
+        DUMPCOREAV(HDMI_CORE_AV_CEC_ADDR_ID);
 }
 
 void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
@@ -1016,9 +1025,8 @@ void ti_hdmi_4xxx_phy_dump(struct hdmi_ip_data *ip_data, struct seq_file *s)
         DUMPPHY(HDMI_TXPHY_PAD_CFG_CTRL);
 }
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data,
+#if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
+static void ti_hdmi_4xxx_wp_audio_config_format(struct hdmi_ip_data *ip_data,
                                         struct hdmi_audio_format *aud_fmt)
 {
         u32 r;
@@ -1037,7 +1045,7 @@ void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data,
         hdmi_write_reg(hdmi_wp_base(ip_data), HDMI_WP_AUDIO_CFG, r);
 }
 
-void hdmi_wp_audio_config_dma(struct hdmi_ip_data *ip_data,
+static void ti_hdmi_4xxx_wp_audio_config_dma(struct hdmi_ip_data *ip_data,
                                         struct hdmi_audio_dma *aud_dma)
 {
         u32 r;
@@ -1055,7 +1063,7 @@ void hdmi_wp_audio_config_dma(struct hdmi_ip_data *ip_data,
         hdmi_write_reg(hdmi_wp_base(ip_data), HDMI_WP_AUDIO_CTRL, r);
 }
 
-void hdmi_core_audio_config(struct hdmi_ip_data *ip_data,
+static void ti_hdmi_4xxx_core_audio_config(struct hdmi_ip_data *ip_data,
                                         struct hdmi_core_audio_config *cfg)
 {
         u32 r;
@@ -1106,27 +1114,33 @@ void hdmi_core_audio_config(struct hdmi_ip_data *ip_data,
         REG_FLD_MOD(av_base, HDMI_CORE_AV_SPDIF_CTRL,
                                                 cfg->fs_override, 1, 1);
 
-        /* I2S parameters */
-        REG_FLD_MOD(av_base, HDMI_CORE_AV_I2S_CHST4,
-                                                cfg->freq_sample, 3, 0);
-
+        /*
+         * Set IEC-60958-3 channel status word. It is passed to the IP
+         * just as it is received. The user of the driver is responsible
+         * for its contents.
+         */
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST0,
+                       cfg->iec60958_cfg->status[0]);
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST1,
+                       cfg->iec60958_cfg->status[1]);
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST2,
+                       cfg->iec60958_cfg->status[2]);
+        /* yes, this is correct: status[3] goes to CHST4 register */
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST4,
+                       cfg->iec60958_cfg->status[3]);
+        /* yes, this is correct: status[4] goes to CHST5 register */
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST5,
+                       cfg->iec60958_cfg->status[4]);
+
+        /* set I2S parameters */
         r = hdmi_read_reg(av_base, HDMI_CORE_AV_I2S_IN_CTRL);
-        r = FLD_MOD(r, cfg->i2s_cfg.en_high_bitrate_aud, 7, 7);
         r = FLD_MOD(r, cfg->i2s_cfg.sck_edge_mode, 6, 6);
-        r = FLD_MOD(r, cfg->i2s_cfg.cbit_order, 5, 5);
         r = FLD_MOD(r, cfg->i2s_cfg.vbit, 4, 4);
-        r = FLD_MOD(r, cfg->i2s_cfg.ws_polarity, 3, 3);
         r = FLD_MOD(r, cfg->i2s_cfg.justification, 2, 2);
         r = FLD_MOD(r, cfg->i2s_cfg.direction, 1, 1);
         r = FLD_MOD(r, cfg->i2s_cfg.shift, 0, 0);
         hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_IN_CTRL, r);
 
-        r = hdmi_read_reg(av_base, HDMI_CORE_AV_I2S_CHST5);
-        r = FLD_MOD(r, cfg->freq_sample, 7, 4);
-        r = FLD_MOD(r, cfg->i2s_cfg.word_length, 3, 1);
-        r = FLD_MOD(r, cfg->i2s_cfg.word_max_length, 0, 0);
-        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_CHST5, r);
-
         REG_FLD_MOD(av_base, HDMI_CORE_AV_I2S_IN_LEN,
                         cfg->i2s_cfg.in_length_bits, 3, 0);
 
@@ -1138,12 +1152,19 @@ void hdmi_core_audio_config(struct hdmi_ip_data *ip_data,
         r = FLD_MOD(r, cfg->en_parallel_aud_input, 2, 2);
         r = FLD_MOD(r, cfg->en_spdif, 1, 1);
         hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_MODE, r);
+
+        /* Audio channel mappings */
+        /* TODO: Make channel mapping dynamic. For now, map channels
+         * in the ALSA order: FL/FR/RL/RR/C/LFE/SL/SR. Remapping is needed as
+         * HDMI speaker order is different. See CEA-861 Section 6.6.2.
+         */
+        hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_IN_MAP, 0x78);
+        REG_FLD_MOD(av_base, HDMI_CORE_AV_SWAP_I2S, 1, 5, 5);
 }
 
-void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,
-                struct hdmi_core_infoframe_audio *info_aud)
+static void ti_hdmi_4xxx_core_audio_infoframe_cfg(struct hdmi_ip_data *ip_data,
+                struct snd_cea_861_aud_if *info_aud)
 {
-        u8 val;
         u8 sum = 0, checksum = 0;
         void __iomem *av_base = hdmi_av_base(ip_data);
 
@@ -1157,24 +1178,23 @@ void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,
         hdmi_write_reg(av_base, HDMI_CORE_AV_AUDIO_LEN, 0x0a);
         sum += 0x84 + 0x001 + 0x00a;
 
-        val = (info_aud->db1_coding_type << 4)
-                        | (info_aud->db1_channel_count - 1);
-        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(0), val);
-        sum += val;
+        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(0),
+                       info_aud->db1_ct_cc);
+        sum += info_aud->db1_ct_cc;
 
-        val = (info_aud->db2_sample_freq << 2) | info_aud->db2_sample_size;
-        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(1), val);
-        sum += val;
+        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(1),
+                       info_aud->db2_sf_ss);
+        sum += info_aud->db2_sf_ss;
 
-        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(2), 0x00);
+        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(2), info_aud->db3);
+        sum += info_aud->db3;
 
-        val = info_aud->db4_channel_alloc;
-        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(3), val);
-        sum += val;
+        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(3), info_aud->db4_ca);
+        sum += info_aud->db4_ca;
 
-        val = (info_aud->db5_downmix_inh << 7) | (info_aud->db5_lsv << 3);
-        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(4), val);
-        sum += val;
+        hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(4),
+                       info_aud->db5_dminh_lsv);
+        sum += info_aud->db5_dminh_lsv;
 
         hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(5), 0x00);
         hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(6), 0x00);
@@ -1192,70 +1212,212 @@ void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,
          */
 }
 
-int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
-                                u32 sample_freq, u32 *n, u32 *cts)
+int ti_hdmi_4xxx_audio_config(struct hdmi_ip_data *ip_data,
+                struct omap_dss_audio *audio)
 {
-        u32 r;
-        u32 deep_color = 0;
-        u32 pclk = ip_data->cfg.timings.pixel_clock;
-
-        if (n == NULL || cts == NULL)
+        struct hdmi_audio_format audio_format;
+        struct hdmi_audio_dma audio_dma;
+        struct hdmi_core_audio_config core;
+        int err, n, cts, channel_count;
+        unsigned int fs_nr;
+        bool word_length_16b = false;
+
+        if (!audio || !audio->iec || !audio->cea || !ip_data)
                 return -EINVAL;
+
+        core.iec60958_cfg = audio->iec;
         /*
-         * Obtain current deep color configuration. This needed
-         * to calculate the TMDS clock based on the pixel clock.
+         * In the IEC-60958 status word, check if the audio sample word length
+         * is 16-bit as several optimizations can be performed in such case.
          */
-        r = REG_GET(hdmi_wp_base(ip_data), HDMI_WP_VIDEO_CFG, 1, 0);
-        switch (r) {
-        case 1: /* No deep color selected */
-                deep_color = 100;
+        if (!(audio->iec->status[4] & IEC958_AES4_CON_MAX_WORDLEN_24))
+                if (audio->iec->status[4] & IEC958_AES4_CON_WORDLEN_20_16)
+                        word_length_16b = true;
+
+        /* I2S configuration. See Phillips' specification */
+        if (word_length_16b)
+                core.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_LEFT;
+        else
+                core.i2s_cfg.justification = HDMI_AUDIO_JUSTIFY_RIGHT;
+        /*
+         * The I2S input word length is twice the lenght given in the IEC-60958
+         * status word. If the word size is greater than
+         * 20 bits, increment by one.
+         */
+        core.i2s_cfg.in_length_bits = audio->iec->status[4]
+                & IEC958_AES4_CON_WORDLEN;
+        if (audio->iec->status[4] & IEC958_AES4_CON_MAX_WORDLEN_24)
+                core.i2s_cfg.in_length_bits++;
+        core.i2s_cfg.sck_edge_mode = HDMI_AUDIO_I2S_SCK_EDGE_RISING;
+        core.i2s_cfg.vbit = HDMI_AUDIO_I2S_VBIT_FOR_PCM;
+        core.i2s_cfg.direction = HDMI_AUDIO_I2S_MSB_SHIFTED_FIRST;
+        core.i2s_cfg.shift = HDMI_AUDIO_I2S_FIRST_BIT_SHIFT;
+
+        /* convert sample frequency to a number */
+        switch (audio->iec->status[3] & IEC958_AES3_CON_FS) {
+        case IEC958_AES3_CON_FS_32000:
+                fs_nr = 32000;
+                break;
+        case IEC958_AES3_CON_FS_44100:
+                fs_nr = 44100;
+                break;
+        case IEC958_AES3_CON_FS_48000:
+                fs_nr = 48000;
                 break;
-        case 2: /* 10-bit deep color selected */
-                deep_color = 125;
+        case IEC958_AES3_CON_FS_88200:
+                fs_nr = 88200;
                 break;
-        case 3: /* 12-bit deep color selected */
-                deep_color = 150;
+        case IEC958_AES3_CON_FS_96000:
+                fs_nr = 96000;
+                break;
+        case IEC958_AES3_CON_FS_176400:
+                fs_nr = 176400;
+                break;
+        case IEC958_AES3_CON_FS_192000:
+                fs_nr = 192000;
                 break;
         default:
                 return -EINVAL;
         }
 
-        switch (sample_freq) {
-        case 32000:
-                if ((deep_color == 125) && ((pclk == 54054)
-                                || (pclk == 74250)))
-                        *n = 8192;
-                else
-                        *n = 4096;
+        err = hdmi_compute_acr(fs_nr, &n, &cts);
+
+        /* Audio clock regeneration settings */
+        core.n = n;
+        core.cts = cts;
+        if (dss_has_feature(FEAT_HDMI_CTS_SWMODE)) {
+                core.aud_par_busclk = 0;
+                core.cts_mode = HDMI_AUDIO_CTS_MODE_SW;
+                core.use_mclk = dss_has_feature(FEAT_HDMI_AUDIO_USE_MCLK);
+        } else {
+                core.aud_par_busclk = (((128 * 31) - 1) << 8);
+                core.cts_mode = HDMI_AUDIO_CTS_MODE_HW;
+                core.use_mclk = true;
+        }
+
+        if (core.use_mclk)
+                core.mclk_mode = HDMI_AUDIO_MCLK_128FS;
+
+        /* Audio channels settings */
+        channel_count = (audio->cea->db1_ct_cc &
+                         CEA861_AUDIO_INFOFRAME_DB1CC) + 1;
+
+        switch (channel_count) {
+        case 2:
+                audio_format.active_chnnls_msk = 0x03;
+                break;
+        case 3:
+                audio_format.active_chnnls_msk = 0x07;
+                break;
+        case 4:
+                audio_format.active_chnnls_msk = 0x0f;
+                break;
+        case 5:
+                audio_format.active_chnnls_msk = 0x1f;
                 break;
-        case 44100:
-                *n = 6272;
+        case 6:
+                audio_format.active_chnnls_msk = 0x3f;
                 break;
-        case 48000:
-                if ((deep_color == 125) && ((pclk == 54054)
-                                || (pclk == 74250)))
-                        *n = 8192;
-                else
-                        *n = 6144;
+        case 7:
+                audio_format.active_chnnls_msk = 0x7f;
+                break;
+        case 8:
+                audio_format.active_chnnls_msk = 0xff;
                 break;
         default:
-                *n = 0;
                 return -EINVAL;
         }
 
-        /* Calculate CTS. See HDMI 1.3a or 1.4a specifications */
-        *cts = pclk * (*n / 128) * deep_color / (sample_freq / 10);
+        /*
+         * the HDMI IP needs to enable four stereo channels when transmitting
+         * more than 2 audio channels
+         */
+        if (channel_count == 2) {
+                audio_format.stereo_channels = HDMI_AUDIO_STEREO_ONECHANNEL;
+                core.i2s_cfg.active_sds = HDMI_AUDIO_I2S_SD0_EN;
+                core.layout = HDMI_AUDIO_LAYOUT_2CH;
+        } else {
+                audio_format.stereo_channels = HDMI_AUDIO_STEREO_FOURCHANNELS;
+                core.i2s_cfg.active_sds = HDMI_AUDIO_I2S_SD0_EN |
+                                HDMI_AUDIO_I2S_SD1_EN | HDMI_AUDIO_I2S_SD2_EN |
+                                HDMI_AUDIO_I2S_SD3_EN;
+                core.layout = HDMI_AUDIO_LAYOUT_8CH;
+        }
+
+        core.en_spdif = false;
+        /* use sample frequency from channel status word */
+        core.fs_override = true;
+        /* enable ACR packets */
+        core.en_acr_pkt = true;
+        /* disable direct streaming digital audio */
+        core.en_dsd_audio = false;
+        /* use parallel audio interface */
+        core.en_parallel_aud_input = true;
+
+        /* DMA settings */
+        if (word_length_16b)
+                audio_dma.transfer_size = 0x10;
+        else
+                audio_dma.transfer_size = 0x20;
+        audio_dma.block_size = 0xC0;
+        audio_dma.mode = HDMI_AUDIO_TRANSF_DMA;
+        audio_dma.fifo_threshold = 0x20; /* in number of samples */
+
+        /* audio FIFO format settings */
+        if (word_length_16b) {
+                audio_format.samples_per_word = HDMI_AUDIO_ONEWORD_TWOSAMPLES;
+                audio_format.sample_size = HDMI_AUDIO_SAMPLE_16BITS;
+                audio_format.justification = HDMI_AUDIO_JUSTIFY_LEFT;
+        } else {
+                audio_format.samples_per_word = HDMI_AUDIO_ONEWORD_ONESAMPLE;
+                audio_format.sample_size = HDMI_AUDIO_SAMPLE_24BITS;
+                audio_format.justification = HDMI_AUDIO_JUSTIFY_RIGHT;
+        }
+        audio_format.type = HDMI_AUDIO_TYPE_LPCM;
+        audio_format.sample_order = HDMI_AUDIO_SAMPLE_LEFT_FIRST;
+        /* disable start/stop signals of IEC 60958 blocks */
+        audio_format.en_sig_blk_strt_end = HDMI_AUDIO_BLOCK_SIG_STARTEND_ON;
+
+        /* configure DMA and audio FIFO format*/
+        ti_hdmi_4xxx_wp_audio_config_dma(ip_data, &audio_dma);
+        ti_hdmi_4xxx_wp_audio_config_format(ip_data, &audio_format);
+
+        /* configure the core*/
+        ti_hdmi_4xxx_core_audio_config(ip_data, &core);
+
+        /* configure CEA 861 audio infoframe*/
+        ti_hdmi_4xxx_core_audio_infoframe_cfg(ip_data, audio->cea);
 
         return 0;
 }
 
-void ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data, bool enable)
+int ti_hdmi_4xxx_wp_audio_enable(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                    HDMI_WP_AUDIO_CTRL, true, 31, 31);
+        return 0;
+}
+
+void ti_hdmi_4xxx_wp_audio_disable(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_wp_base(ip_data),
+                    HDMI_WP_AUDIO_CTRL, false, 31, 31);
+}
+
+int ti_hdmi_4xxx_audio_start(struct hdmi_ip_data *ip_data)
 {
         REG_FLD_MOD(hdmi_av_base(ip_data),
-                                HDMI_CORE_AV_AUD_MODE, enable, 0, 0);
+                    HDMI_CORE_AV_AUD_MODE, true, 0, 0);
         REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                HDMI_WP_AUDIO_CTRL, enable, 31, 31);
+                    HDMI_WP_AUDIO_CTRL, true, 30, 30);
+        return 0;
+}
+
+void ti_hdmi_4xxx_audio_stop(struct hdmi_ip_data *ip_data)
+{
+        REG_FLD_MOD(hdmi_av_base(ip_data),
+                    HDMI_CORE_AV_AUD_MODE, false, 0, 0);
         REG_FLD_MOD(hdmi_wp_base(ip_data),
-                                HDMI_WP_AUDIO_CTRL, enable, 30, 30);
+                    HDMI_WP_AUDIO_CTRL, false, 30, 30);
 }
 #endif
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
index a14d1a0e6e41..8366ae19e82e 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
@@ -24,11 +24,6 @@
 #include <linux/string.h>
 #include <video/omapdss.h>
 #include "ti_hdmi.h"
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-#include <sound/soc.h>
-#include <sound/pcm_params.h>
-#endif
 
 /* HDMI Wrapper */
 
@@ -57,6 +52,13 @@
 #define HDMI_CORE_SYS_SRST                      0x14
 #define HDMI_CORE_CTRL1                         0x20
 #define HDMI_CORE_SYS_SYS_STAT                  0x24
+#define HDMI_CORE_SYS_DE_DLY                    0xC8
+#define HDMI_CORE_SYS_DE_CTRL                   0xCC
+#define HDMI_CORE_SYS_DE_TOP                    0xD0
+#define HDMI_CORE_SYS_DE_CNTL                   0xD8
+#define HDMI_CORE_SYS_DE_CNTH                   0xDC
+#define HDMI_CORE_SYS_DE_LINL                   0xE0
+#define HDMI_CORE_SYS_DE_LINH_1                 0xE4
 #define HDMI_CORE_SYS_VID_ACEN                  0x124
 #define HDMI_CORE_SYS_VID_MODE                  0x128
 #define HDMI_CORE_SYS_INTR_STATE                0x1C0
@@ -66,50 +68,24 @@
 #define HDMI_CORE_SYS_INTR4                     0x1D0
 #define HDMI_CORE_SYS_UMASK1                    0x1D4
 #define HDMI_CORE_SYS_TMDS_CTRL                 0x208
-#define HDMI_CORE_SYS_DE_DLY                    0xC8
-#define HDMI_CORE_SYS_DE_CTRL                   0xCC
-#define HDMI_CORE_SYS_DE_TOP                    0xD0
-#define HDMI_CORE_SYS_DE_CNTL                   0xD8
-#define HDMI_CORE_SYS_DE_CNTH                   0xDC
-#define HDMI_CORE_SYS_DE_LINL                   0xE0
-#define HDMI_CORE_SYS_DE_LINH_1                 0xE4
+
 #define HDMI_CORE_CTRL1_VEN_FOLLOWVSYNC 0x1
 #define HDMI_CORE_CTRL1_HEN_FOLLOWHSYNC 0x1
-#define HDMI_CORE_CTRL1_BSEL_24BITBUS           0x1
+#define HDMI_CORE_CTRL1_BSEL_24BITBUS   0x1
 #define HDMI_CORE_CTRL1_EDGE_RISINGEDGE 0x1
 
 /* HDMI DDC E-DID */
-#define HDMI_CORE_DDC_CMD                       0x3CC
-#define HDMI_CORE_DDC_STATUS                    0x3C8
 #define HDMI_CORE_DDC_ADDR                      0x3B4
+#define HDMI_CORE_DDC_SEGM                      0x3B8
 #define HDMI_CORE_DDC_OFFSET                    0x3BC
 #define HDMI_CORE_DDC_COUNT1                    0x3C0
 #define HDMI_CORE_DDC_COUNT2                    0x3C4
+#define HDMI_CORE_DDC_STATUS                    0x3C8
+#define HDMI_CORE_DDC_CMD                       0x3CC
 #define HDMI_CORE_DDC_DATA                      0x3D0
-#define HDMI_CORE_DDC_SEGM                      0x3B8
 
 /* HDMI IP Core Audio Video */
 
-#define HDMI_CORE_AV_HDMI_CTRL                  0xBC
-#define HDMI_CORE_AV_DPD                        0xF4
-#define HDMI_CORE_AV_PB_CTRL1                   0xF8
-#define HDMI_CORE_AV_PB_CTRL2                   0xFC
-#define HDMI_CORE_AV_AVI_TYPE                   0x100
-#define HDMI_CORE_AV_AVI_VERS                   0x104
-#define HDMI_CORE_AV_AVI_LEN                    0x108
-#define HDMI_CORE_AV_AVI_CHSUM                  0x10C
-#define HDMI_CORE_AV_AVI_DBYTE(n)               (n * 4 + 0x110)
-#define HDMI_CORE_AV_AVI_DBYTE_NELEMS           15
-#define HDMI_CORE_AV_SPD_DBYTE(n)               (n * 4 + 0x190)
-#define HDMI_CORE_AV_SPD_DBYTE_NELEMS           27
-#define HDMI_CORE_AV_AUD_DBYTE(n)               (n * 4 + 0x210)
-#define HDMI_CORE_AV_AUD_DBYTE_NELEMS           10
-#define HDMI_CORE_AV_MPEG_DBYTE(n)              (n * 4 + 0x290)
-#define HDMI_CORE_AV_MPEG_DBYTE_NELEMS          27
-#define HDMI_CORE_AV_GEN_DBYTE(n)               (n * 4 + 0x300)
-#define HDMI_CORE_AV_GEN_DBYTE_NELEMS           31
-#define HDMI_CORE_AV_GEN2_DBYTE(n)              (n * 4 + 0x380)
-#define HDMI_CORE_AV_GEN2_DBYTE_NELEMS          31
 #define HDMI_CORE_AV_ACR_CTRL                   0x4
 #define HDMI_CORE_AV_FREQ_SVAL                  0x8
 #define HDMI_CORE_AV_N_SVAL1                    0xC
@@ -148,25 +124,39 @@
 #define HDMI_CORE_AV_AVI_VERS                   0x104
 #define HDMI_CORE_AV_AVI_LEN                    0x108
 #define HDMI_CORE_AV_AVI_CHSUM                  0x10C
+#define HDMI_CORE_AV_AVI_DBYTE(n)               (n * 4 + 0x110)
 #define HDMI_CORE_AV_SPD_TYPE                   0x180
 #define HDMI_CORE_AV_SPD_VERS                   0x184
 #define HDMI_CORE_AV_SPD_LEN                    0x188
 #define HDMI_CORE_AV_SPD_CHSUM                  0x18C
+#define HDMI_CORE_AV_SPD_DBYTE(n)               (n * 4 + 0x190)
 #define HDMI_CORE_AV_AUDIO_TYPE                 0x200
 #define HDMI_CORE_AV_AUDIO_VERS                 0x204
 #define HDMI_CORE_AV_AUDIO_LEN                  0x208
 #define HDMI_CORE_AV_AUDIO_CHSUM                0x20C
+#define HDMI_CORE_AV_AUD_DBYTE(n)               (n * 4 + 0x210)
 #define HDMI_CORE_AV_MPEG_TYPE                  0x280
 #define HDMI_CORE_AV_MPEG_VERS                  0x284
 #define HDMI_CORE_AV_MPEG_LEN                   0x288
 #define HDMI_CORE_AV_MPEG_CHSUM                 0x28C
+#define HDMI_CORE_AV_MPEG_DBYTE(n)              (n * 4 + 0x290)
+#define HDMI_CORE_AV_GEN_DBYTE(n)               (n * 4 + 0x300)
 #define HDMI_CORE_AV_CP_BYTE1                   0x37C
+#define HDMI_CORE_AV_GEN2_DBYTE(n)              (n * 4 + 0x380)
 #define HDMI_CORE_AV_CEC_ADDR_ID                0x3FC
+
 #define HDMI_CORE_AV_SPD_DBYTE_ELSIZE           0x4
 #define HDMI_CORE_AV_GEN2_DBYTE_ELSIZE          0x4
 #define HDMI_CORE_AV_MPEG_DBYTE_ELSIZE          0x4
 #define HDMI_CORE_AV_GEN_DBYTE_ELSIZE           0x4
 
+#define HDMI_CORE_AV_AVI_DBYTE_NELEMS           15
+#define HDMI_CORE_AV_SPD_DBYTE_NELEMS           27
+#define HDMI_CORE_AV_AUD_DBYTE_NELEMS           10
+#define HDMI_CORE_AV_MPEG_DBYTE_NELEMS          27
+#define HDMI_CORE_AV_GEN_DBYTE_NELEMS           31
+#define HDMI_CORE_AV_GEN2_DBYTE_NELEMS          31
+
 /* PLL */
 
 #define PLLCTRL_PLL_CONTROL                     0x0
@@ -284,35 +274,6 @@ enum hdmi_core_infoframe {
         HDMI_INFOFRAME_AVI_DB5PR_8 = 7,
         HDMI_INFOFRAME_AVI_DB5PR_9 = 8,
         HDMI_INFOFRAME_AVI_DB5PR_10 = 9,
-        HDMI_INFOFRAME_AUDIO_DB1CT_FROM_STREAM = 0,
-        HDMI_INFOFRAME_AUDIO_DB1CT_IEC60958 = 1,
-        HDMI_INFOFRAME_AUDIO_DB1CT_AC3 = 2,
-        HDMI_INFOFRAME_AUDIO_DB1CT_MPEG1 = 3,
-        HDMI_INFOFRAME_AUDIO_DB1CT_MP3 = 4,
-        HDMI_INFOFRAME_AUDIO_DB1CT_MPEG2_MULTICH = 5,
-        HDMI_INFOFRAME_AUDIO_DB1CT_AAC = 6,
-        HDMI_INFOFRAME_AUDIO_DB1CT_DTS = 7,
-        HDMI_INFOFRAME_AUDIO_DB1CT_ATRAC = 8,
-        HDMI_INFOFRAME_AUDIO_DB1CT_ONEBIT = 9,
-        HDMI_INFOFRAME_AUDIO_DB1CT_DOLBY_DIGITAL_PLUS = 10,
-        HDMI_INFOFRAME_AUDIO_DB1CT_DTS_HD = 11,
-        HDMI_INFOFRAME_AUDIO_DB1CT_MAT = 12,
-        HDMI_INFOFRAME_AUDIO_DB1CT_DST = 13,
-        HDMI_INFOFRAME_AUDIO_DB1CT_WMA_PRO = 14,
-        HDMI_INFOFRAME_AUDIO_DB2SF_FROM_STREAM = 0,
-        HDMI_INFOFRAME_AUDIO_DB2SF_32000 = 1,
-        HDMI_INFOFRAME_AUDIO_DB2SF_44100 = 2,
-        HDMI_INFOFRAME_AUDIO_DB2SF_48000 = 3,
-        HDMI_INFOFRAME_AUDIO_DB2SF_88200 = 4,
-        HDMI_INFOFRAME_AUDIO_DB2SF_96000 = 5,
-        HDMI_INFOFRAME_AUDIO_DB2SF_176400 = 6,
-        HDMI_INFOFRAME_AUDIO_DB2SF_192000 = 7,
-        HDMI_INFOFRAME_AUDIO_DB2SS_FROM_STREAM = 0,
-        HDMI_INFOFRAME_AUDIO_DB2SS_16BIT = 1,
-        HDMI_INFOFRAME_AUDIO_DB2SS_20BIT = 2,
-        HDMI_INFOFRAME_AUDIO_DB2SS_24BIT = 3,
-        HDMI_INFOFRAME_AUDIO_DB5_DM_INH_PERMITTED = 0,
-        HDMI_INFOFRAME_AUDIO_DB5_DM_INH_PROHIBITED = 1
 };
 
 enum hdmi_packing_mode {
@@ -322,17 +283,6 @@ enum hdmi_packing_mode {
         HDMI_PACK_ALREADYPACKED = 7
 };
 
-enum hdmi_core_audio_sample_freq {
-        HDMI_AUDIO_FS_32000 = 0x3,
-        HDMI_AUDIO_FS_44100 = 0x0,
-        HDMI_AUDIO_FS_48000 = 0x2,
-        HDMI_AUDIO_FS_88200 = 0x8,
-        HDMI_AUDIO_FS_96000 = 0xA,
-        HDMI_AUDIO_FS_176400 = 0xC,
-        HDMI_AUDIO_FS_192000 = 0xE,
-        HDMI_AUDIO_FS_NOT_INDICATED = 0x1
-};
-
 enum hdmi_core_audio_layout {
         HDMI_AUDIO_LAYOUT_2CH = 0,
         HDMI_AUDIO_LAYOUT_8CH = 1
@@ -387,37 +337,12 @@ enum hdmi_audio_blk_strt_end_sig {
 };
 
 enum hdmi_audio_i2s_config {
-        HDMI_AUDIO_I2S_WS_POLARITY_LOW_IS_LEFT = 0,
-        HDMI_AUDIO_I2S_WS_POLARIT_YLOW_IS_RIGHT = 1,
         HDMI_AUDIO_I2S_MSB_SHIFTED_FIRST = 0,
         HDMI_AUDIO_I2S_LSB_SHIFTED_FIRST = 1,
-        HDMI_AUDIO_I2S_MAX_WORD_20BITS = 0,
-        HDMI_AUDIO_I2S_MAX_WORD_24BITS = 1,
-        HDMI_AUDIO_I2S_CHST_WORD_NOT_SPECIFIED = 0,
-        HDMI_AUDIO_I2S_CHST_WORD_16_BITS = 1,
-        HDMI_AUDIO_I2S_CHST_WORD_17_BITS = 6,
-        HDMI_AUDIO_I2S_CHST_WORD_18_BITS = 2,
-        HDMI_AUDIO_I2S_CHST_WORD_19_BITS = 4,
-        HDMI_AUDIO_I2S_CHST_WORD_20_BITS_20MAX = 5,
-        HDMI_AUDIO_I2S_CHST_WORD_20_BITS_24MAX = 1,
-        HDMI_AUDIO_I2S_CHST_WORD_21_BITS = 6,
-        HDMI_AUDIO_I2S_CHST_WORD_22_BITS = 2,
-        HDMI_AUDIO_I2S_CHST_WORD_23_BITS = 4,
-        HDMI_AUDIO_I2S_CHST_WORD_24_BITS = 5,
         HDMI_AUDIO_I2S_SCK_EDGE_FALLING = 0,
         HDMI_AUDIO_I2S_SCK_EDGE_RISING = 1,
         HDMI_AUDIO_I2S_VBIT_FOR_PCM = 0,
         HDMI_AUDIO_I2S_VBIT_FOR_COMPRESSED = 1,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_NA = 0,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_16 = 2,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_17 = 12,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_18 = 4,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_19 = 8,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_20 = 10,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_21 = 13,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_22 = 5,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_23 = 9,
-        HDMI_AUDIO_I2S_INPUT_LENGTH_24 = 11,
         HDMI_AUDIO_I2S_FIRST_BIT_SHIFT = 0,
         HDMI_AUDIO_I2S_FIRST_BIT_NO_SHIFT = 1,
         HDMI_AUDIO_I2S_SD0_EN = 1,
@@ -446,20 +371,6 @@ struct hdmi_core_video_config {
         enum hdmi_core_tclkselclkmult   tclk_sel_clkmult;
 };
 
-/*
- * Refer to section 8.2 in HDMI 1.3 specification for
- * details about infoframe databytes
- */
-struct hdmi_core_infoframe_audio {
-        u8 db1_coding_type;
-        u8 db1_channel_count;
-        u8 db2_sample_freq;
-        u8 db2_sample_size;
-        u8 db4_channel_alloc;
-        bool db5_downmix_inh;
-        u8 db5_lsv;     /* Level shift values for downmix */
-};
-
 struct hdmi_core_packet_enable_repeat {
         u32     audio_pkt;
         u32     audio_pkt_repeat;
@@ -496,15 +407,10 @@ struct hdmi_audio_dma {
 };
 
 struct hdmi_core_audio_i2s_config {
-        u8 word_max_length;
-        u8 word_length;
         u8 in_length_bits;
         u8 justification;
-        u8 en_high_bitrate_aud;
         u8 sck_edge_mode;
-        u8 cbit_order;
         u8 vbit;
-        u8 ws_polarity;
         u8 direction;
         u8 shift;
         u8 active_sds;
@@ -512,7 +418,7 @@ struct hdmi_core_audio_i2s_config {
 
 struct hdmi_core_audio_config {
         struct hdmi_core_audio_i2s_config       i2s_cfg;
-        enum hdmi_core_audio_sample_freq        freq_sample;
+        struct snd_aes_iec958                   *iec60958_cfg;
         bool                                    fs_override;
         u32                                     n;
         u32                                     cts;
@@ -527,17 +433,4 @@ struct hdmi_core_audio_config {
         bool                                    en_spdif;
 };
 
-#if defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI) || \
-        defined(CONFIG_SND_OMAP_SOC_OMAP4_HDMI_MODULE)
-int hdmi_config_audio_acr(struct hdmi_ip_data *ip_data,
-                                u32 sample_freq, u32 *n, u32 *cts);
-void hdmi_core_audio_infoframe_config(struct hdmi_ip_data *ip_data,
-                struct hdmi_core_infoframe_audio *info_aud);
-void hdmi_core_audio_config(struct hdmi_ip_data *ip_data,
-                                        struct hdmi_core_audio_config *cfg);
-void hdmi_wp_audio_config_dma(struct hdmi_ip_data *ip_data,
-                                        struct hdmi_audio_dma *aud_dma);
-void hdmi_wp_audio_config_format(struct hdmi_ip_data *ip_data,
-                                        struct hdmi_audio_format *aud_fmt);
-#endif
 #endif
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 9c3daf71750c..2b8973931ff4 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -415,6 +415,7 @@ static const struct venc_config *venc_timings_to_config(
                 return &venc_config_ntsc_trm;
 
         BUG();
+        return NULL;
 }
 
 static int venc_power_on(struct omap_dss_device *dssdev)
@@ -440,10 +441,11 @@ static int venc_power_on(struct omap_dss_device *dssdev)
 
         venc_write_reg(VENC_OUTPUT_CONTROL, l);
 
-        dispc_set_digit_size(dssdev->panel.timings.x_res,
-                        dssdev->panel.timings.y_res/2);
+        dss_mgr_set_timings(dssdev->manager, &dssdev->panel.timings);
 
-        regulator_enable(venc.vdda_dac_reg);
+        r = regulator_enable(venc.vdda_dac_reg);
+        if (r)
+                goto err;
 
         if (dssdev->platform_enable)
                 dssdev->platform_enable(dssdev);
@@ -485,16 +487,68 @@ unsigned long venc_get_pixel_clock(void)
         return 13500000;
 }
 
+static ssize_t display_output_type_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        const char *ret;
+
+        switch (dssdev->phy.venc.type) {
+        case OMAP_DSS_VENC_TYPE_COMPOSITE:
+                ret = "composite";
+                break;
+        case OMAP_DSS_VENC_TYPE_SVIDEO:
+                ret = "svideo";
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", ret);
+}
+
+static ssize_t display_output_type_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        enum omap_dss_venc_type new_type;
+
+        if (sysfs_streq("composite", buf))
+                new_type = OMAP_DSS_VENC_TYPE_COMPOSITE;
+        else if (sysfs_streq("svideo", buf))
+                new_type = OMAP_DSS_VENC_TYPE_SVIDEO;
+        else
+                return -EINVAL;
+
+        mutex_lock(&venc.venc_lock);
+
+        if (dssdev->phy.venc.type != new_type) {
+                dssdev->phy.venc.type = new_type;
+                if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                        venc_power_off(dssdev);
+                        venc_power_on(dssdev);
+                }
+        }
+
+        mutex_unlock(&venc.venc_lock);
+
+        return size;
+}
+
+static DEVICE_ATTR(output_type, S_IRUGO | S_IWUSR,
+                display_output_type_show, display_output_type_store);
+
 /* driver */
 static int venc_panel_probe(struct omap_dss_device *dssdev)
 {
         dssdev->panel.timings = omap_dss_pal_timings;
 
-        return 0;
+        return device_create_file(&dssdev->dev, &dev_attr_output_type);
 }
 
 static void venc_panel_remove(struct omap_dss_device *dssdev)
 {
+        device_remove_file(&dssdev->dev, &dev_attr_output_type);
 }
 
 static int venc_panel_enable(struct omap_dss_device *dssdev)
@@ -577,12 +631,6 @@ static int venc_panel_resume(struct omap_dss_device *dssdev)
         return venc_panel_enable(dssdev);
 }
 
-static void venc_get_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings)
-{
-        *timings = dssdev->panel.timings;
-}
-
 static void venc_set_timings(struct omap_dss_device *dssdev,
                         struct omap_video_timings *timings)
 {
@@ -597,6 +645,8 @@ static void venc_set_timings(struct omap_dss_device *dssdev,
                 /* turn the venc off and on to get new timings to use */
                 venc_panel_disable(dssdev);
                 venc_panel_enable(dssdev);
+        } else {
+                dss_mgr_set_timings(dssdev->manager, timings);
         }
 }
 
@@ -661,7 +711,6 @@ static struct omap_dss_driver venc_driver = {
         .get_resolution = omapdss_default_get_resolution,
         .get_recommended_bpp = omapdss_default_get_recommended_bpp,
 
-        .get_timings    = venc_get_timings,
         .set_timings    = venc_set_timings,
         .check_timings  = venc_check_timings,
 
@@ -675,7 +724,7 @@ static struct omap_dss_driver venc_driver = {
 };
 /* driver end */
 
-int venc_init_display(struct omap_dss_device *dssdev)
+static int __init venc_init_display(struct omap_dss_device *dssdev)
 {
         DSSDBG("init_display\n");
 
@@ -695,7 +744,7 @@ int venc_init_display(struct omap_dss_device *dssdev)
         return 0;
 }
 
-void venc_dump_regs(struct seq_file *s)
+static void venc_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
 
@@ -779,8 +828,32 @@ static void venc_put_clocks(void)
                 clk_put(venc.tv_dac_clk);
 }
 
+static void __init venc_probe_pdata(struct platform_device *pdev)
+{
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int r, i;
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                if (dssdev->type != OMAP_DISPLAY_TYPE_VENC)
+                        continue;
+
+                r = venc_init_display(dssdev);
+                if (r) {
+                        DSSERR("device %s init failed: %d\n", dssdev->name, r);
+                        continue;
+                }
+
+                r = omap_dss_register_device(dssdev, &pdev->dev, i);
+                if (r)
+                        DSSERR("device %s register failed: %d\n",
+                                        dssdev->name, r);
+        }
+}
+
 /* VENC HW IP initialisation */
-static int omap_venchw_probe(struct platform_device *pdev)
+static int __init omap_venchw_probe(struct platform_device *pdev)
 {
         u8 rev_id;
         struct resource *venc_mem;
@@ -824,6 +897,10 @@ static int omap_venchw_probe(struct platform_device *pdev)
         if (r)
                 goto err_reg_panel_driver;
 
+        dss_debugfs_create_file("venc", venc_dump_regs);
+
+        venc_probe_pdata(pdev);
+
         return 0;
 
 err_reg_panel_driver:
@@ -833,12 +910,15 @@ err_runtime_get:
         return r;
 }
 
-static int omap_venchw_remove(struct platform_device *pdev)
+static int __exit omap_venchw_remove(struct platform_device *pdev)
 {
+        omap_dss_unregister_child_devices(&pdev->dev);
+
         if (venc.vdda_dac_reg != NULL) {
                 regulator_put(venc.vdda_dac_reg);
                 venc.vdda_dac_reg = NULL;
         }
+
         omap_dss_unregister_driver(&venc_driver);
 
         pm_runtime_disable(&pdev->dev);
@@ -853,7 +933,6 @@ static int venc_runtime_suspend(struct device *dev)
                 clk_disable(venc.tv_dac_clk);
 
         dispc_runtime_put();
-        dss_runtime_put();
 
         return 0;
 }
@@ -862,23 +941,14 @@ static int venc_runtime_resume(struct device *dev)
 {
         int r;
 
-        r = dss_runtime_get();
-        if (r < 0)
-                goto err_get_dss;
-
         r = dispc_runtime_get();
         if (r < 0)
-                goto err_get_dispc;
+                return r;
 
         if (venc.tv_dac_clk)
                 clk_enable(venc.tv_dac_clk);
 
         return 0;
-
-err_get_dispc:
-        dss_runtime_put();
-err_get_dss:
-        return r;
 }
 
 static const struct dev_pm_ops venc_pm_ops = {
@@ -887,8 +957,7 @@ static const struct dev_pm_ops venc_pm_ops = {
 };
 
 static struct platform_driver omap_venchw_driver = {
-        .probe          = omap_venchw_probe,
-        .remove         = omap_venchw_remove,
+        .remove         = __exit_p(omap_venchw_remove),
         .driver         = {
                 .name   = "omapdss_venc",
                 .owner  = THIS_MODULE,
@@ -896,18 +965,18 @@ static struct platform_driver omap_venchw_driver = {
         },
 };
 
-int venc_init_platform_driver(void)
+int __init venc_init_platform_driver(void)
 {
         if (cpu_is_omap44xx())
                 return 0;
 
-        return platform_driver_register(&omap_venchw_driver);
+        return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe);
 }
 
-void venc_uninit_platform_driver(void)
+void __exit venc_uninit_platform_driver(void)
 {
         if (cpu_is_omap44xx())
                 return;
 
-        return platform_driver_unregister(&omap_venchw_driver);
+        platform_driver_unregister(&omap_venchw_driver);
 }
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 6a09ef87e14f..c6cf372d22c5 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -70,7 +70,7 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
 
         DBG("omapfb_setup_plane\n");
 
-        if (ofbi->num_overlays != 1) {
+        if (ofbi->num_overlays == 0) {
                 r = -EINVAL;
                 goto out;
         }
@@ -185,7 +185,7 @@ static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
 {
         struct omapfb_info *ofbi = FB2OFB(fbi);
 
-        if (ofbi->num_overlays != 1) {
+        if (ofbi->num_overlays == 0) {
                 memset(pi, 0, sizeof(*pi));
         } else {
                 struct omap_overlay *ovl;
@@ -225,6 +225,9 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
         down_write_nested(&rg->lock, rg->id);
         atomic_inc(&rg->lock_count);
 
+        if (rg->size == size && rg->type == mi->type)
+                goto out;
+
         if (atomic_read(&rg->map_count)) {
                 r = -EBUSY;
                 goto out;
@@ -247,12 +250,10 @@ static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
                 }
         }
 
-        if (rg->size != size || rg->type != mi->type) {
-                r = omapfb_realloc_fbmem(fbi, size, mi->type);
-                if (r) {
-                        dev_err(fbdev->dev, "realloc fbmem failed\n");
-                        goto out;
-                }
+        r = omapfb_realloc_fbmem(fbi, size, mi->type);
+        if (r) {
+                dev_err(fbdev->dev, "realloc fbmem failed\n");
+                goto out;
         }
 
  out:
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index b00db4068d21..3450ea0966c9 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -179,6 +179,7 @@ static unsigned omapfb_get_vrfb_offset(const struct omapfb_info *ofbi, int rot)
                 break;
         default:
                 BUG();
+                return 0;
         }
 
         offset *= vrfb->bytespp;
@@ -1502,7 +1503,7 @@ static int omapfb_parse_vram_param(const char *param, int max_entries,
 
                 fbnum = simple_strtoul(p, &p, 10);
 
-                if (p == param)
+                if (p == start)
                         return -EINVAL;
 
                 if (*p != ':')
@@ -2307,7 +2308,7 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
         return 0;
 }
 
-static int omapfb_probe(struct platform_device *pdev)
+static int __init omapfb_probe(struct platform_device *pdev)
 {
         struct omapfb2_device *fbdev = NULL;
         int r = 0;
@@ -2448,7 +2449,7 @@ err0:
         return r;
 }
 
-static int omapfb_remove(struct platform_device *pdev)
+static int __exit omapfb_remove(struct platform_device *pdev)
 {
         struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
 
@@ -2462,8 +2463,7 @@ static int omapfb_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver omapfb_driver = {
-        .probe          = omapfb_probe,
-        .remove         = omapfb_remove,
+        .remove         = __exit_p(omapfb_remove),
         .driver         = {
                 .name   = "omapfb",
                 .owner  = THIS_MODULE,
@@ -2474,7 +2474,7 @@ static int __init omapfb_init(void)
 {
         DBG("omapfb_init\n");
 
-        if (platform_driver_register(&omapfb_driver)) {
+        if (platform_driver_probe(&omapfb_driver, omapfb_probe)) {
                 printk(KERN_ERR "failed to register omapfb driver\n");
                 return -ENODEV;
         }
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
index c0bdc9b54ecf..30361a09aecd 100644
--- a/drivers/video/omap2/omapfb/omapfb.h
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -166,6 +166,7 @@ static inline struct omapfb_display_data *get_display_data(
 
         /* This should never happen */
         BUG();
+        return NULL;
 }
 
 static inline void omapfb_lock(struct omapfb2_device *fbdev)
diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c
index 4e5b960c32c8..7e990220ad2a 100644
--- a/drivers/video/omap2/vrfb.c
+++ b/drivers/video/omap2/vrfb.c
@@ -179,8 +179,10 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
                 pixel_size_exp = 2;
         else if (bytespp == 2)
                 pixel_size_exp = 1;
-        else
+        else {
                 BUG();
+                return;
+        }
 
         vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
         vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT);
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index 1d71c08a818f..0b4ae0cebeda 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -316,12 +316,9 @@ pxa3xx_gcu_wait_idle(struct pxa3xx_gcu_priv *priv)
                 ret = wait_event_interruptible_timeout(priv->wait_idle,
                                         !priv->shared->hw_running, HZ*4);
 
-                if (ret < 0)
+                if (ret != 0)
                         break;
 
-                if (ret > 0)
-                        continue;
-
                 if (gc_readl(priv, REG_GCRBEXHR) == rbexhr &&
                     priv->shared->num_interrupts == num) {
                         QERROR("TIMEOUT");
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index f3105160bf98..ea7b661e7229 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -47,7 +47,7 @@
 #ifdef CONFIG_FB_S3C_DEBUG_REGWRITE
 #undef writel
 #define writel(v, r) do { \
-        printk(KERN_DEBUG "%s: %08x => %p\n", __func__, (unsigned int)v, r); \
+        pr_debug("%s: %08x => %p\n", __func__, (unsigned int)v, r); \
         __raw_writel(v, r); \
 } while (0)
 #endif /* FB_S3C_DEBUG_REGWRITE */
@@ -361,7 +361,7 @@ static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
         result = (unsigned int)tmp / 1000;
 
         dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
-                pixclk, clk, result, clk / result);
+                pixclk, clk, result, result ? clk / result : clk);
 
         return result;
 }
@@ -495,7 +495,6 @@ static int s3c_fb_set_par(struct fb_info *info)
         u32 alpha = 0;
         u32 data;
         u32 pagewidth;
-        int clkdiv;
 
         dev_dbg(sfb->dev, "setting framebuffer parameters\n");
 
@@ -532,48 +531,9 @@ static int s3c_fb_set_par(struct fb_info *info)
         /* disable the window whilst we update it */
         writel(0, regs + WINCON(win_no));
 
-        /* use platform specified window as the basis for the lcd timings */
-
-        if (win_no == sfb->pdata->default_win) {
-                clkdiv = s3c_fb_calc_pixclk(sfb, var->pixclock);
-
-                data = sfb->pdata->vidcon0;
-                data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
-
-                if (clkdiv > 1)
-                        data |= VIDCON0_CLKVAL_F(clkdiv-1) | VIDCON0_CLKDIR;
-                else
-                        data &= ~VIDCON0_CLKDIR;        /* 1:1 clock */
-
-                /* write the timing data to the panel */
-
-                if (sfb->variant.is_2443)
-                        data |= (1 << 5);
-
-                writel(data, regs + VIDCON0);
-
+        if (!sfb->output_on)
                 s3c_fb_enable(sfb, 1);
 
-                data = VIDTCON0_VBPD(var->upper_margin - 1) |
-                       VIDTCON0_VFPD(var->lower_margin - 1) |
-                       VIDTCON0_VSPW(var->vsync_len - 1);
-
-                writel(data, regs + sfb->variant.vidtcon);
-
-                data = VIDTCON1_HBPD(var->left_margin - 1) |
-                       VIDTCON1_HFPD(var->right_margin - 1) |
-                       VIDTCON1_HSPW(var->hsync_len - 1);
-
-                /* VIDTCON1 */
-                writel(data, regs + sfb->variant.vidtcon + 4);
-
-                data = VIDTCON2_LINEVAL(var->yres - 1) |
-                       VIDTCON2_HOZVAL(var->xres - 1) |
-                       VIDTCON2_LINEVAL_E(var->yres - 1) |
-                       VIDTCON2_HOZVAL_E(var->xres - 1);
-                writel(data, regs + sfb->variant.vidtcon + 8);
-        }
-
         /* write the buffer address */
 
         /* start and end registers stride is 8 */
@@ -839,6 +799,7 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
         struct s3c_fb *sfb = win->parent;
         unsigned int index = win->index;
         u32 wincon;
+        u32 output_on = sfb->output_on;
 
         dev_dbg(sfb->dev, "blank mode %d\n", blank_mode);
 
@@ -877,34 +838,18 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
 
         shadow_protect_win(win, 1);
         writel(wincon, sfb->regs + sfb->variant.wincon + (index * 4));
-        shadow_protect_win(win, 0);
 
         /* Check the enabled state to see if we need to be running the
          * main LCD interface, as if there are no active windows then
          * it is highly likely that we also do not need to output
          * anything.
          */
-
-        /* We could do something like the following code, but the current
-         * system of using framebuffer events means that we cannot make
-         * the distinction between just window 0 being inactive and all
-         * the windows being down.
-         *
-         * s3c_fb_enable(sfb, sfb->enabled ? 1 : 0);
-        */
-
-        /* we're stuck with this until we can do something about overriding
-         * the power control using the blanking event for a single fb.
-         */
-        if (index == sfb->pdata->default_win) {
-                shadow_protect_win(win, 1);
-                s3c_fb_enable(sfb, blank_mode != FB_BLANK_POWERDOWN ? 1 : 0);
-                shadow_protect_win(win, 0);
-        }
+        s3c_fb_enable(sfb, sfb->enabled ? 1 : 0);
+        shadow_protect_win(win, 0);
 
         pm_runtime_put_sync(sfb->dev);
 
-        return 0;
+        return output_on == sfb->output_on;
 }
 
 /**
@@ -1111,7 +1056,7 @@ static struct fb_ops s3c_fb_ops = {
  *
  * Calculate the pixel clock when none has been given through platform data.
  */
-static void __devinit s3c_fb_missing_pixclock(struct fb_videomode *mode)
+static void s3c_fb_missing_pixclock(struct fb_videomode *mode)
 {
         u64 pixclk = 1000000000000ULL;
         u32 div;
@@ -1144,11 +1089,11 @@ static int __devinit s3c_fb_alloc_memory(struct s3c_fb *sfb,
 
         dev_dbg(sfb->dev, "allocating memory for display\n");
 
-        real_size = windata->win_mode.xres * windata->win_mode.yres;
+        real_size = windata->xres * windata->yres;
         virt_size = windata->virtual_x * windata->virtual_y;
 
         dev_dbg(sfb->dev, "real_size=%u (%u.%u), virt_size=%u (%u.%u)\n",
-                real_size, windata->win_mode.xres, windata->win_mode.yres,
+                real_size, windata->xres, windata->yres,
                 virt_size, windata->virtual_x, windata->virtual_y);
 
         size = (real_size > virt_size) ? real_size : virt_size;
@@ -1230,7 +1175,7 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
                                       struct s3c_fb_win **res)
 {
         struct fb_var_screeninfo *var;
-        struct fb_videomode *initmode;
+        struct fb_videomode initmode;
         struct s3c_fb_pd_win *windata;
         struct s3c_fb_win *win;
         struct fb_info *fbinfo;
@@ -1251,11 +1196,11 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
         }
 
         windata = sfb->pdata->win[win_no];
-        initmode = &windata->win_mode;
+        initmode = *sfb->pdata->vtiming;
 
         WARN_ON(windata->max_bpp == 0);
-        WARN_ON(windata->win_mode.xres == 0);
-        WARN_ON(windata->win_mode.yres == 0);
+        WARN_ON(windata->xres == 0);
+        WARN_ON(windata->yres == 0);
 
         win = fbinfo->par;
         *res = win;
@@ -1294,7 +1239,9 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
         }
 
         /* setup the initial video mode from the window */
-        fb_videomode_to_var(&fbinfo->var, initmode);
+        initmode.xres = windata->xres;
+        initmode.yres = windata->yres;
+        fb_videomode_to_var(&fbinfo->var, &initmode);
 
         fbinfo->fix.type        = FB_TYPE_PACKED_PIXELS;
         fbinfo->fix.accel       = FB_ACCEL_NONE;
@@ -1339,6 +1286,53 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
 }
 
 /**
+ * s3c_fb_set_rgb_timing() - set video timing for rgb interface.
+ * @sfb: The base resources for the hardware.
+ *
+ * Set horizontal and vertical lcd rgb interface timing.
+ */
+static void s3c_fb_set_rgb_timing(struct s3c_fb *sfb)
+{
+        struct fb_videomode *vmode = sfb->pdata->vtiming;
+        void __iomem *regs = sfb->regs;
+        int clkdiv;
+        u32 data;
+
+        if (!vmode->pixclock)
+                s3c_fb_missing_pixclock(vmode);
+
+        clkdiv = s3c_fb_calc_pixclk(sfb, vmode->pixclock);
+
+        data = sfb->pdata->vidcon0;
+        data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
+
+        if (clkdiv > 1)
+                data |= VIDCON0_CLKVAL_F(clkdiv-1) | VIDCON0_CLKDIR;
+        else
+                data &= ~VIDCON0_CLKDIR;        /* 1:1 clock */
+
+        if (sfb->variant.is_2443)
+                data |= (1 << 5);
+        writel(data, regs + VIDCON0);
+
+        data = VIDTCON0_VBPD(vmode->upper_margin - 1) |
+               VIDTCON0_VFPD(vmode->lower_margin - 1) |
+               VIDTCON0_VSPW(vmode->vsync_len - 1);
+        writel(data, regs + sfb->variant.vidtcon);
+
+        data = VIDTCON1_HBPD(vmode->left_margin - 1) |
+               VIDTCON1_HFPD(vmode->right_margin - 1) |
+               VIDTCON1_HSPW(vmode->hsync_len - 1);
+        writel(data, regs + sfb->variant.vidtcon + 4);
+
+        data = VIDTCON2_LINEVAL(vmode->yres - 1) |
+               VIDTCON2_HOZVAL(vmode->xres - 1) |
+               VIDTCON2_LINEVAL_E(vmode->yres - 1) |
+               VIDTCON2_HOZVAL_E(vmode->xres - 1);
+        writel(data, regs + sfb->variant.vidtcon + 8);
+}
+
+/**
  * s3c_fb_clear_win() - clear hardware window registers.
  * @sfb: The base resources for the hardware.
  * @win: The window to process.
@@ -1354,8 +1348,14 @@ static void s3c_fb_clear_win(struct s3c_fb *sfb, int win)
         writel(0, regs + VIDOSD_A(win, sfb->variant));
         writel(0, regs + VIDOSD_B(win, sfb->variant));
         writel(0, regs + VIDOSD_C(win, sfb->variant));
-        reg = readl(regs + SHADOWCON);
-        writel(reg & ~SHADOWCON_WINx_PROTECT(win), regs + SHADOWCON);
+
+        if (sfb->variant.has_shadowcon) {
+                reg = readl(sfb->regs + SHADOWCON);
+                reg &= ~(SHADOWCON_WINx_PROTECT(win) |
+                        SHADOWCON_CHx_ENABLE(win) |
+                        SHADOWCON_CHx_LOCAL_ENABLE(win));
+                writel(reg, sfb->regs + SHADOWCON);
+        }
 }
 
 static int __devinit s3c_fb_probe(struct platform_device *pdev)
@@ -1481,15 +1481,14 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
                 writel(0xffffff, regs + WKEYCON1);
         }
 
+        s3c_fb_set_rgb_timing(sfb);
+
         /* we have the register setup, start allocating framebuffers */
 
         for (win = 0; win < fbdrv->variant.nr_windows; win++) {
                 if (!pd->win[win])
                         continue;
 
-                if (!pd->win[win]->win_mode.pixclock)
-                        s3c_fb_missing_pixclock(&pd->win[win]->win_mode);
-
                 ret = s3c_fb_probe_win(sfb, win, fbdrv->win[win],
                                        &sfb->windows[win]);
                 if (ret < 0) {
@@ -1564,6 +1563,8 @@ static int s3c_fb_suspend(struct device *dev)
         struct s3c_fb_win *win;
         int win_no;
 
+        pm_runtime_get_sync(sfb->dev);
+
         for (win_no = S3C_FB_MAX_WIN - 1; win_no >= 0; win_no--) {
                 win = sfb->windows[win_no];
                 if (!win)
@@ -1577,6 +1578,9 @@ static int s3c_fb_suspend(struct device *dev)
                 clk_disable(sfb->lcd_clk);
 
         clk_disable(sfb->bus_clk);
+
+        pm_runtime_put_sync(sfb->dev);
+
         return 0;
 }
 
@@ -1589,6 +1593,8 @@ static int s3c_fb_resume(struct device *dev)
         int win_no;
         u32 reg;
 
+        pm_runtime_get_sync(sfb->dev);
+
         clk_enable(sfb->bus_clk);
 
         if (!sfb->variant.has_clksel)
@@ -1623,6 +1629,8 @@ static int s3c_fb_resume(struct device *dev)
                 shadow_protect_win(win, 0);
         }
 
+        s3c_fb_set_rgb_timing(sfb);
+
         /* restore framebuffers */
         for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {
                 win = sfb->windows[win_no];
@@ -1633,6 +1641,8 @@ static int s3c_fb_resume(struct device *dev)
                 s3c_fb_set_par(win->fbinfo);
         }
 
+        pm_runtime_put_sync(sfb->dev);
+
         return 0;
 }
 #endif
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index cee7803a0a1c..f3d3b9ce4751 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1351,7 +1351,7 @@ static void savagefb_set_par_int(struct savagefb_par  *par, struct savage_reg *r
         /* following part not present in X11 driver */
         cr67 = vga_in8(0x3d5, par) & 0xf;
         vga_out8(0x3d5, 0x50 | cr67, par);
-        udelay(10000);
+        mdelay(10);
         vga_out8(0x3d4, 0x67, par);
         /* end of part */
         vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
@@ -1904,11 +1904,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x66, par);
         cr66 = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr66 | 0x02, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x66, par);
         vga_out8(0x3d5, cr66 & ~0x02, par);     /* clear reset flag */
-        udelay(10000);
+        mdelay(10);
 
 
         /*
@@ -1918,11 +1918,11 @@ static int savage_init_hw(struct savagefb_par *par)
         vga_out8(0x3d4, 0x3f, par);
         cr3f = vga_in8(0x3d5, par);
         vga_out8(0x3d5, cr3f | 0x08, par);
-        udelay(10000);
+        mdelay(10);
 
         vga_out8(0x3d4, 0x3f, par);
         vga_out8(0x3d5, cr3f & ~0x08, par);     /* clear reset flags */
-        udelay(10000);
+        mdelay(10);
 
         /* Savage ramdac speeds */
         par->numClocks = 4;
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index eafb19da2c07..930e550e752a 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -31,6 +31,7 @@
 
 #include "sh_mobile_lcdcfb.h"
 
+/* HDMI Core Control Register (HTOP0) */
 #define HDMI_SYSTEM_CTRL                        0x00 /* System control */
 #define HDMI_L_R_DATA_SWAP_CTRL_RPKT            0x01 /* L/R data swap control,
                                                         bits 19..16 of 20-bit N for Audio Clock Regeneration packet */
@@ -201,6 +202,68 @@
 #define HDMI_REVISION_ID                        0xF1 /* Revision ID */
 #define HDMI_TEST_MODE                          0xFE /* Test mode */
 
+/* HDMI Control Register (HTOP1) */
+#define HDMI_HTOP1_TEST_MODE                    0x0000 /* Test mode */
+#define HDMI_HTOP1_VIDEO_INPUT                  0x0008 /* VideoInput */
+#define HDMI_HTOP1_CORE_RSTN                    0x000C /* CoreResetn */
+#define HDMI_HTOP1_PLLBW                        0x0018 /* PLLBW */
+#define HDMI_HTOP1_CLK_TO_PHY                   0x001C /* Clk to Phy */
+#define HDMI_HTOP1_VIDEO_INPUT2                 0x0020 /* VideoInput2 */
+#define HDMI_HTOP1_TISEMP0_1                    0x0024 /* tisemp0-1 */
+#define HDMI_HTOP1_TISEMP2_C                    0x0028 /* tisemp2-c */
+#define HDMI_HTOP1_TISIDRV                      0x002C /* tisidrv */
+#define HDMI_HTOP1_TISEN                        0x0034 /* tisen */
+#define HDMI_HTOP1_TISDREN                      0x0038 /* tisdren  */
+#define HDMI_HTOP1_CISRANGE                     0x003C /* cisrange  */
+#define HDMI_HTOP1_ENABLE_SELECTOR              0x0040 /* Enable Selector */
+#define HDMI_HTOP1_MACRO_RESET                  0x0044 /* Macro reset */
+#define HDMI_HTOP1_PLL_CALIBRATION              0x0048 /* PLL calibration */
+#define HDMI_HTOP1_RE_CALIBRATION               0x004C /* Re-calibration */
+#define HDMI_HTOP1_CURRENT                      0x0050 /* Current */
+#define HDMI_HTOP1_PLL_LOCK_DETECT              0x0054 /* PLL lock detect */
+#define HDMI_HTOP1_PHY_TEST_MODE                0x0058 /* PHY Test Mode */
+#define HDMI_HTOP1_CLK_SET                      0x0080 /* Clock Set */
+#define HDMI_HTOP1_DDC_FAIL_SAFE                0x0084 /* DDC fail safe */
+#define HDMI_HTOP1_PRBS                         0x0088 /* PRBS */
+#define HDMI_HTOP1_EDID_AINC_CONTROL            0x008C /* EDID ainc Control */
+#define HDMI_HTOP1_HTOP_DCL_MODE                0x00FC /* Deep Coloer Mode */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0           0x0100 /* Deep Color:FRC COEF0 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1           0x0104 /* Deep Color:FRC COEF1 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2           0x0108 /* Deep Color:FRC COEF2 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3           0x010C /* Deep Color:FRC COEF3 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0_C         0x0110 /* Deep Color:FRC COEF0C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1_C         0x0114 /* Deep Color:FRC COEF1C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2_C         0x0118 /* Deep Color:FRC COEF2C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3_C         0x011C /* Deep Color:FRC COEF3C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_MODE            0x0120 /* Deep Color:FRC Mode */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START1         0x0124 /* Deep Color:Rect Start1 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE1          0x0128 /* Deep Color:Rect Size1 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START2         0x012C /* Deep Color:Rect Start2 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE2          0x0130 /* Deep Color:Rect Size2 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START3         0x0134 /* Deep Color:Rect Start3 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE3          0x0138 /* Deep Color:Rect Size3 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START4         0x013C /* Deep Color:Rect Start4 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE4          0x0140 /* Deep Color:Rect Size4 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1       0x0144 /* Deep Color:Fil Para Y1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2       0x0148 /* Deep Color:Fil Para Y1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1      0x014C /* Deep Color:Fil Para CB1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2      0x0150 /* Deep Color:Fil Para CB1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1      0x0154 /* Deep Color:Fil Para CR1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2      0x0158 /* Deep Color:Fil Para CR1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1       0x015C /* Deep Color:Fil Para Y2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2       0x0160 /* Deep Color:Fil Para Y2_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1      0x0164 /* Deep Color:Fil Para CB2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2      0x0168 /* Deep Color:Fil Para CB2_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1      0x016C /* Deep Color:Fil Para CR2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2      0x0170 /* Deep Color:Fil Para CR2_2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1         0x0174 /* Deep Color:Cor Para Y1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1        0x0178 /* Deep Color:Cor Para CB1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1        0x017C /* Deep Color:Cor Para CR1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2         0x0180 /* Deep Color:Cor Para Y2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2        0x0184 /* Deep Color:Cor Para CB2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2        0x0188 /* Deep Color:Cor Para CR2 */
+#define HDMI_HTOP1_EDID_DATA_READ               0x0200 /* EDID Data Read 128Byte:0x03FC */
+
 enum hotplug_state {
         HDMI_HOTPLUG_DISCONNECTED,
         HDMI_HOTPLUG_CONNECTED,
@@ -211,6 +274,7 @@ struct sh_hdmi {
         struct sh_mobile_lcdc_entity entity;
 
         void __iomem *base;
+        void __iomem *htop1;
         enum hotplug_state hp_state;    /* hot-plug status */
         u8 preprogrammed_vic;           /* use a pre-programmed VIC or
                                            the external mode */
@@ -222,20 +286,66 @@ struct sh_hdmi {
         struct delayed_work edid_work;
         struct fb_videomode mode;
         struct fb_monspecs monspec;
+
+        /* register access functions */
+        void (*write)(struct sh_hdmi *hdmi, u8 data, u8 reg);
+        u8 (*read)(struct sh_hdmi *hdmi, u8 reg);
 };
 
 #define entity_to_sh_hdmi(e)    container_of(e, struct sh_hdmi, entity)
 
-static void hdmi_write(struct sh_hdmi *hdmi, u8 data, u8 reg)
+static void __hdmi_write8(struct sh_hdmi *hdmi, u8 data, u8 reg)
 {
         iowrite8(data, hdmi->base + reg);
 }
 
-static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
+static u8 __hdmi_read8(struct sh_hdmi *hdmi, u8 reg)
 {
         return ioread8(hdmi->base + reg);
 }
 
+static void __hdmi_write32(struct sh_hdmi *hdmi, u8 data, u8 reg)
+{
+        iowrite32((u32)data, hdmi->base + (reg * 4));
+        udelay(100);
+}
+
+static u8 __hdmi_read32(struct sh_hdmi *hdmi, u8 reg)
+{
+        return (u8)ioread32(hdmi->base + (reg * 4));
+}
+
+static void hdmi_write(struct sh_hdmi *hdmi, u8 data, u8 reg)
+{
+        hdmi->write(hdmi, data, reg);
+}
+
+static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
+{
+        return hdmi->read(hdmi, reg);
+}
+
+static void hdmi_bit_set(struct sh_hdmi *hdmi, u8 mask, u8 data, u8 reg)
+{
+        u8 val = hdmi_read(hdmi, reg);
+
+        val &= ~mask;
+        val |= (data & mask);
+
+        hdmi_write(hdmi, val, reg);
+}
+
+static void hdmi_htop1_write(struct sh_hdmi *hdmi, u32 data, u32 reg)
+{
+        iowrite32(data, hdmi->htop1 + reg);
+        udelay(100);
+}
+
+static u32 hdmi_htop1_read(struct sh_hdmi *hdmi, u32 reg)
+{
+        return ioread32(hdmi->htop1 + reg);
+}
+
 /*
  *      HDMI sound
  */
@@ -693,11 +803,11 @@ static void sh_hdmi_configure(struct sh_hdmi *hdmi)
         msleep(10);
 
         /* PS mode b->d, reset PLLA and PLLB */
-        hdmi_write(hdmi, 0x4C, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x4C, HDMI_SYSTEM_CTRL);
 
         udelay(10);
 
-        hdmi_write(hdmi, 0x40, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x40, HDMI_SYSTEM_CTRL);
 }
 
 static unsigned long sh_hdmi_rate_error(struct sh_hdmi *hdmi,
@@ -746,7 +856,9 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
         /* Read EDID */
         dev_dbg(hdmi->dev, "Read back EDID code:");
         for (i = 0; i < 128; i++) {
-                edid[i] = hdmi_read(hdmi, HDMI_EDID_KSV_FIFO_ACCESS_WINDOW);
+                edid[i] = (hdmi->htop1) ?
+                        (u8)hdmi_htop1_read(hdmi, HDMI_HTOP1_EDID_DATA_READ + (i * 4)) :
+                        hdmi_read(hdmi, HDMI_EDID_KSV_FIFO_ACCESS_WINDOW);
 #ifdef DEBUG
                 if ((i % 16) == 0) {
                         printk(KERN_CONT "\n");
@@ -917,13 +1029,13 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
         u8 status1, status2, mask1, mask2;
 
         /* mode_b and PLLA and PLLB reset */
-        hdmi_write(hdmi, 0x2C, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x2C, HDMI_SYSTEM_CTRL);
 
         /* How long shall reset be held? */
         udelay(10);
 
         /* mode_b and PLLA and PLLB reset release */
-        hdmi_write(hdmi, 0x20, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x20, HDMI_SYSTEM_CTRL);
 
         status1 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_1);
         status2 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_2);
@@ -1001,7 +1113,7 @@ static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
          */
         if (hdmi->hp_state == HDMI_HOTPLUG_EDID_DONE) {
                 /* PS mode d->e. All functions are active */
-                hdmi_write(hdmi, 0x80, HDMI_SYSTEM_CTRL);
+                hdmi_bit_set(hdmi, 0xFC, 0x80, HDMI_SYSTEM_CTRL);
                 dev_dbg(hdmi->dev, "HDMI running\n");
         }
 
@@ -1016,7 +1128,7 @@ static void sh_hdmi_display_off(struct sh_mobile_lcdc_entity *entity)
 
         dev_dbg(hdmi->dev, "%s(%p)\n", __func__, hdmi);
         /* PS mode e->a */
-        hdmi_write(hdmi, 0x10, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x10, HDMI_SYSTEM_CTRL);
 }
 
 static const struct sh_mobile_lcdc_entity_ops sh_hdmi_ops = {
@@ -1110,10 +1222,58 @@ out:
         dev_dbg(hdmi->dev, "%s(%p): end\n", __func__, hdmi);
 }
 
+static void sh_hdmi_htop1_init(struct sh_hdmi *hdmi)
+{
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_MODE);
+        hdmi_htop1_write(hdmi, 0x0000000b, 0x0010);
+        hdmi_htop1_write(hdmi, 0x00006710, HDMI_HTOP1_HTOP_DCL_FRC_MODE);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2);
+        hdmi_htop1_write(hdmi, 0x00000008, HDMI_HTOP1_CURRENT);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP0_1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP2_C);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PHY_TEST_MODE);
+        hdmi_htop1_write(hdmi, 0x00000081, HDMI_HTOP1_TISIDRV);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PLLBW);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+        hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+        hdmi_htop1_write(hdmi, 0x00000016, HDMI_HTOP1_CISRANGE);
+        msleep(100);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_ENABLE_SELECTOR);
+        msleep(100);
+        hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_CLK_TO_PHY);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT2);
+        hdmi_htop1_write(hdmi, 0x0000000a, HDMI_HTOP1_CLK_SET);
+}
+
 static int __init sh_hdmi_probe(struct platform_device *pdev)
 {
         struct sh_mobile_hdmi_info *pdata = pdev->dev.platform_data;
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        struct resource *htop1_res;
         int irq = platform_get_irq(pdev, 0), ret;
         struct sh_hdmi *hdmi;
         long rate;
@@ -1121,6 +1281,15 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
         if (!res || !pdata || irq < 0)
                 return -ENODEV;
 
+        htop1_res = NULL;
+        if (pdata->flags & HDMI_HAS_HTOP1) {
+                htop1_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                if (!htop1_res) {
+                        dev_err(&pdev->dev, "htop1 needs register base\n");
+                        return -EINVAL;
+                }
+        }
+
         hdmi = kzalloc(sizeof(*hdmi), GFP_KERNEL);
         if (!hdmi) {
                 dev_err(&pdev->dev, "Cannot allocate device data\n");
@@ -1138,6 +1307,15 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
                 goto egetclk;
         }
 
+        /* select register access functions */
+        if (pdata->flags & HDMI_32BIT_REG) {
+                hdmi->write     = __hdmi_write32;
+                hdmi->read      = __hdmi_read32;
+        } else {
+                hdmi->write     = __hdmi_write8;
+                hdmi->read      = __hdmi_read8;
+        }
+
         /* An arbitrary relaxed pixclock just to get things started: from standard 480p */
         rate = clk_round_rate(hdmi->hdmi_clk, PICOS2KHZ(37037));
         if (rate > 0)
@@ -1176,6 +1354,24 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_get_sync(&pdev->dev);
 
+        /* init interrupt polarity */
+        if (pdata->flags & HDMI_OUTPUT_PUSH_PULL)
+                hdmi_bit_set(hdmi, 0x02, 0x02, HDMI_SYSTEM_CTRL);
+
+        if (pdata->flags & HDMI_OUTPUT_POLARITY_HI)
+                hdmi_bit_set(hdmi, 0x01, 0x01, HDMI_SYSTEM_CTRL);
+
+        /* enable htop1 register if needed */
+        if (htop1_res) {
+                hdmi->htop1 = ioremap(htop1_res->start, resource_size(htop1_res));
+                if (!hdmi->htop1) {
+                        dev_err(&pdev->dev, "control register region already claimed\n");
+                        ret = -ENOMEM;
+                        goto emap_htop1;
+                }
+                sh_hdmi_htop1_init(hdmi);
+        }
+
         /* Product and revision IDs are 0 in sh-mobile version */
         dev_info(&pdev->dev, "Detected HDMI controller 0x%x:0x%x\n",
                  hdmi_read(hdmi, HDMI_PRODUCT_ID), hdmi_read(hdmi, HDMI_REVISION_ID));
@@ -1199,6 +1395,9 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
 ecodec:
         free_irq(irq, hdmi);
 ereqirq:
+        if (hdmi->htop1)
+                iounmap(hdmi->htop1);
+emap_htop1:
         pm_runtime_put(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         iounmap(hdmi->base);
@@ -1230,6 +1429,8 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
         clk_disable(hdmi->hdmi_clk);
         clk_put(hdmi->hdmi_clk);
+        if (hdmi->htop1)
+                iounmap(hdmi->htop1);
         iounmap(hdmi->base);
         release_mem_region(res->start, resource_size(res));
         kfree(hdmi);
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index aff73842d877..85d6738b6c64 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -105,51 +105,6 @@ static const unsigned short ModeIndex_1920x1440[]    = {0x68, 0x69, 0x00, 0x6b};
 static const unsigned short ModeIndex_300_2048x1536[]= {0x6c, 0x6d, 0x00, 0x00};
 static const unsigned short ModeIndex_310_2048x1536[]= {0x6c, 0x6d, 0x00, 0x6e};
 
-static const unsigned short SiS_DRAMType[17][5]={
-        {0x0C,0x0A,0x02,0x40,0x39},
-        {0x0D,0x0A,0x01,0x40,0x48},
-        {0x0C,0x09,0x02,0x20,0x35},
-        {0x0D,0x09,0x01,0x20,0x44},
-        {0x0C,0x08,0x02,0x10,0x31},
-        {0x0D,0x08,0x01,0x10,0x40},
-        {0x0C,0x0A,0x01,0x20,0x34},
-        {0x0C,0x09,0x01,0x08,0x32},
-        {0x0B,0x08,0x02,0x08,0x21},
-        {0x0C,0x08,0x01,0x08,0x30},
-        {0x0A,0x08,0x02,0x04,0x11},
-        {0x0B,0x0A,0x01,0x10,0x28},
-        {0x09,0x08,0x02,0x02,0x01},
-        {0x0B,0x09,0x01,0x08,0x24},
-        {0x0B,0x08,0x01,0x04,0x20},
-        {0x0A,0x08,0x01,0x02,0x10},
-        {0x09,0x08,0x01,0x01,0x00}
-};
-
-static const unsigned short SiS_SDRDRAM_TYPE[13][5] =
-{
-        { 2,12, 9,64,0x35},
-        { 1,13, 9,64,0x44},
-        { 2,12, 8,32,0x31},
-        { 2,11, 9,32,0x25},
-        { 1,12, 9,32,0x34},
-        { 1,13, 8,32,0x40},
-        { 2,11, 8,16,0x21},
-        { 1,12, 8,16,0x30},
-        { 1,11, 9,16,0x24},
-        { 1,11, 8, 8,0x20},
-        { 2, 9, 8, 4,0x01},
-        { 1,10, 8, 4,0x10},
-        { 1, 9, 8, 2,0x00}
-};
-
-static const unsigned short SiS_DDRDRAM_TYPE[4][5] =
-{
-        { 2,12, 9,64,0x35},
-        { 2,12, 8,32,0x31},
-        { 2,11, 8,16,0x21},
-        { 2, 9, 8, 4,0x01}
-};
-
 static const unsigned char SiS_MDA_DAC[] =
 {
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 078ca2167d6f..a7a48db64ce2 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -4222,6 +4222,26 @@ sisfb_post_300_buswidth(struct sis_video_info *ivideo)
         return 1;                       /* 32bit */
 }
 
+static const unsigned short __devinitconst SiS_DRAMType[17][5] = {
+        {0x0C,0x0A,0x02,0x40,0x39},
+        {0x0D,0x0A,0x01,0x40,0x48},
+        {0x0C,0x09,0x02,0x20,0x35},
+        {0x0D,0x09,0x01,0x20,0x44},
+        {0x0C,0x08,0x02,0x10,0x31},
+        {0x0D,0x08,0x01,0x10,0x40},
+        {0x0C,0x0A,0x01,0x20,0x34},
+        {0x0C,0x09,0x01,0x08,0x32},
+        {0x0B,0x08,0x02,0x08,0x21},
+        {0x0C,0x08,0x01,0x08,0x30},
+        {0x0A,0x08,0x02,0x04,0x11},
+        {0x0B,0x0A,0x01,0x10,0x28},
+        {0x09,0x08,0x02,0x02,0x01},
+        {0x0B,0x09,0x01,0x08,0x24},
+        {0x0B,0x08,0x01,0x04,0x20},
+        {0x0A,0x08,0x01,0x02,0x10},
+        {0x09,0x08,0x01,0x01,0x00}
+};
+
 static int __devinit
 sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth,
                         int PseudoRankCapacity, int PseudoAdrPinCount,
@@ -4231,27 +4251,8 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
         unsigned short sr14;
         unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid;
         unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;
-        static const unsigned short SiS_DRAMType[17][5] = {
-                {0x0C,0x0A,0x02,0x40,0x39},
-                {0x0D,0x0A,0x01,0x40,0x48},
-                {0x0C,0x09,0x02,0x20,0x35},
-                {0x0D,0x09,0x01,0x20,0x44},
-                {0x0C,0x08,0x02,0x10,0x31},
-                {0x0D,0x08,0x01,0x10,0x40},
-                {0x0C,0x0A,0x01,0x20,0x34},
-                {0x0C,0x09,0x01,0x08,0x32},
-                {0x0B,0x08,0x02,0x08,0x21},
-                {0x0C,0x08,0x01,0x08,0x30},
-                {0x0A,0x08,0x02,0x04,0x11},
-                {0x0B,0x0A,0x01,0x10,0x28},
-                {0x09,0x08,0x02,0x02,0x01},
-                {0x0B,0x09,0x01,0x08,0x24},
-                {0x0B,0x08,0x01,0x04,0x20},
-                {0x0A,0x08,0x01,0x02,0x10},
-                {0x09,0x08,0x01,0x01,0x00}
-        };
 
-         for(k = 0; k <= 16; k++) {
+         for(k = 0; k < ARRAY_SIZE(SiS_DRAMType); k++) {
 
                 RankCapacity = buswidth * SiS_DRAMType[k][3];
 
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 30f7a815a62b..5b6abc6de84b 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -1036,6 +1036,6 @@ static void __exit xxxfb_exit(void)
      */
 
 module_init(xxxfb_init);
-module_exit(xxxfb_remove);
+module_exit(xxxfb_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
index ccbfef5e828f..af3ef27ad36c 100644
--- a/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
@@ -846,7 +846,7 @@ static void ufx_raw_rect(struct ufx_data *dev, u16 *cmd, int x, int y,
         }
 }
 
-int ufx_handle_damage(struct ufx_data *dev, int x, int y,
+static int ufx_handle_damage(struct ufx_data *dev, int x, int y,
         int width, int height)
 {
         size_t packed_line_len = ALIGN((width * 2), 4);
@@ -1083,7 +1083,7 @@ static int ufx_ops_open(struct fb_info *info, int user)
 
                 struct fb_deferred_io *fbdefio;
 
-                fbdefio = kmalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
+                fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
 
                 if (fbdefio) {
                         fbdefio->delay = UFX_DEFIO_WRITE_DELAY;
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 7af1e8166182..8af64148294b 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -893,7 +893,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)
 
                 struct fb_deferred_io *fbdefio;
 
-                fbdefio = kmalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
+                fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
 
                 if (fbdefio) {
                         fbdefio->delay = DL_DEFIO_WRITE_DELAY;
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 0c8837565bc7..c80e770e1800 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1276,17 +1276,12 @@ static int viafb_dfph_proc_open(struct inode *inode, struct file *file)
 static ssize_t viafb_dfph_proc_write(struct file *file,
         const char __user *buffer, size_t count, loff_t *pos)
 {
-        char buf[20];
-        u8 reg_val = 0;
-        unsigned long length;
-        if (count < 1)
-                return -EINVAL;
-        length = count > 20 ? 20 : count;
-        if (copy_from_user(&buf[0], buffer, length))
-                return -EFAULT;
-        buf[length - 1] = '\0'; /*Ensure end string */
-        if (kstrtou8(buf, 0, &reg_val) < 0)
-                return -EINVAL;
+        int err;
+        u8 reg_val;
+        err = kstrtou8_from_user(buffer, count, 0, &reg_val);
+        if (err)
+                return err;
+
         viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
         return count;
 }
@@ -1316,17 +1311,12 @@ static int viafb_dfpl_proc_open(struct inode *inode, struct file *file)
 static ssize_t viafb_dfpl_proc_write(struct file *file,
         const char __user *buffer, size_t count, loff_t *pos)
 {
-        char buf[20];
-        u8 reg_val = 0;
-        unsigned long length;
-        if (count < 1)
-                return -EINVAL;
-        length = count > 20 ? 20 : count;
-        if (copy_from_user(&buf[0], buffer, length))
-                return -EFAULT;
-        buf[length - 1] = '\0'; /*Ensure end string */
-        if (kstrtou8(buf, 0, &reg_val) < 0)
-                return -EINVAL;
+        int err;
+        u8 reg_val;
+        err = kstrtou8_from_user(buffer, count, 0, &reg_val);
+        if (err)
+                return err;
+
         viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
         return count;
 }
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index afcd13676542..e4841c36798b 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -4,7 +4,7 @@
  * Watchdog driver for ARM SP805 watchdog module
  *
  * Copyright (C) 2010 ST Microelectronics
- * Viresh Kumar<viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2 or later. This program is licensed "as is" without any
@@ -331,6 +331,6 @@ static struct amba_driver sp805_wdt_driver = {
 
 module_amba_driver(sp805_wdt_driver);
 
-MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
+MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");
 MODULE_DESCRIPTION("ARM SP805 Watchdog Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 6908e4ce2a0d..7595581d032c 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -827,6 +827,9 @@ int bind_evtchn_to_irq(unsigned int evtchn)
                                               handle_edge_irq, "event");
 
                 xen_irq_info_evtchn_init(irq, evtchn);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_EVTCHN);
         }
 
 out:
@@ -862,6 +865,9 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                 xen_irq_info_ipi_init(cpu, irq, evtchn, ipi);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_IPI);
         }
 
  out:
@@ -939,6 +945,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
                 xen_irq_info_virq_init(cpu, irq, evtchn, virq);
 
                 bind_evtchn_to_cpu(evtchn, cpu);
+        } else {
+                struct irq_info *info = info_for_irq(irq);
+                WARN_ON(info == NULL || info->type != IRQT_VIRQ);
         }
 
 out:
diff --git a/drivers/xen/pci.c b/drivers/xen/pci.c
index b84bf0b6cc34..18fff88254eb 100644
--- a/drivers/xen/pci.c
+++ b/drivers/xen/pci.c
@@ -59,7 +59,7 @@ static int xen_add_device(struct device *dev)
 
 #ifdef CONFIG_ACPI
                 handle = DEVICE_ACPI_HANDLE(&pci_dev->dev);
-                if (!handle)
+                if (!handle && pci_dev->bus->bridge)
                         handle = DEVICE_ACPI_HANDLE(pci_dev->bus->bridge);
 #ifdef CONFIG_PCI_IOV
                 if (!handle && pci_dev->is_virtfn)
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index dcb79521e6c8..89f264c67420 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -269,7 +269,7 @@ static inline struct tmem_oid oswiz(unsigned type, u32 ind)
 }
 
 /* returns 0 if the page was successfully put into frontswap, -1 if not */
-static int tmem_frontswap_put_page(unsigned type, pgoff_t offset,
+static int tmem_frontswap_store(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -295,7 +295,7 @@ static int tmem_frontswap_put_page(unsigned type, pgoff_t offset,
  * returns 0 if the page was successfully gotten from frontswap, -1 if
  * was not present (should never happen!)
  */
-static int tmem_frontswap_get_page(unsigned type, pgoff_t offset,
+static int tmem_frontswap_load(unsigned type, pgoff_t offset,
                                    struct page *page)
 {
         u64 ind64 = (u64)offset;
@@ -362,8 +362,8 @@ static int __init no_frontswap(char *s)
 __setup("nofrontswap", no_frontswap);
 
 static struct frontswap_ops __initdata tmem_frontswap_ops = {
-        .put_page = tmem_frontswap_put_page,
-        .get_page = tmem_frontswap_get_page,
+        .store = tmem_frontswap_store,
+        .load = tmem_frontswap_load,
         .invalidate_page = tmem_frontswap_flush_page,
         .invalidate_area = tmem_frontswap_flush_area,
         .init = tmem_frontswap_init