319 files changed, 4622 insertions, 2036 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 63407d264885..9cb65b0e7597 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -34,6 +34,9 @@ ACPI_MODULE_NAME("acpi_lpss");
 
 /* Offsets relative to LPSS_PRIVATE_OFFSET */
 #define LPSS_CLK_DIVIDER_DEF_MASK       (BIT(1) | BIT(16))
+#define LPSS_RESETS                     0x04
+#define LPSS_RESETS_RESET_FUNC          BIT(0)
+#define LPSS_RESETS_RESET_APB           BIT(1)
 #define LPSS_GENERAL                    0x08
 #define LPSS_GENERAL_LTR_MODE_SW        BIT(2)
 #define LPSS_GENERAL_UART_RTS_OVRD      BIT(3)
@@ -99,6 +102,17 @@ static void lpss_uart_setup(struct lpss_private_data *pdata)
         writel(reg | LPSS_GENERAL_UART_RTS_OVRD, pdata->mmio_base + offset);
 }
 
+static void lpss_i2c_setup(struct lpss_private_data *pdata)
+{
+        unsigned int offset;
+        u32 val;
+
+        offset = pdata->dev_desc->prv_offset + LPSS_RESETS;
+        val = readl(pdata->mmio_base + offset);
+        val |= LPSS_RESETS_RESET_APB | LPSS_RESETS_RESET_FUNC;
+        writel(val, pdata->mmio_base + offset);
+}
+
 static struct lpss_device_desc lpt_dev_desc = {
         .clk_required = true,
         .prv_offset = 0x800,
@@ -171,6 +185,7 @@ static struct lpss_device_desc byt_i2c_dev_desc = {
         .prv_offset = 0x800,
         .save_ctx = true,
         .shared_clock = &i2c_clock,
+        .setup = lpss_i2c_setup,
 };
 
 #else
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index e48fc98e71c4..0d7116f34b95 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -32,6 +32,7 @@
 #include <linux/jiffies.h>
 #include <linux/async.h>
 #include <linux/dmi.h>
+#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
 #include <asm/unaligned.h>
@@ -70,6 +71,7 @@ MODULE_DESCRIPTION("ACPI Battery Driver");
 MODULE_LICENSE("GPL");
 
 static int battery_bix_broken_package;
+static int battery_notification_delay_ms;
 static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -930,7 +932,10 @@ static ssize_t acpi_battery_write_alarm(struct file *file,
                 goto end;
         }
         alarm_string[count] = '\0';
-        battery->alarm = simple_strtol(alarm_string, NULL, 0);
+        if (kstrtoint(alarm_string, 0, &battery->alarm)) {
+                result = -EINVAL;
+                goto end;
+        }
         result = acpi_battery_set_alarm(battery);
       end:
         if (!result)
@@ -1062,6 +1067,14 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
         if (!battery)
                 return;
         old = battery->bat.dev;
+        /*
+        * On Acer Aspire V5-573G notifications are sometimes triggered too
+        * early. For example, when AC is unplugged and notification is
+        * triggered, battery state is still reported as "Full", and changes to
+        * "Discharging" only after short delay, without any notification.
+        */
+        if (battery_notification_delay_ms > 0)
+                msleep(battery_notification_delay_ms);
         if (event == ACPI_BATTERY_NOTIFY_INFO)
                 acpi_battery_refresh(battery);
         acpi_battery_update(battery, false);
@@ -1106,14 +1119,35 @@ static int battery_notify(struct notifier_block *nb,
         return 0;
 }
 
+static int battery_bix_broken_package_quirk(const struct dmi_system_id *d)
+{
+        battery_bix_broken_package = 1;
+        return 0;
+}
+
+static int battery_notification_delay_quirk(const struct dmi_system_id *d)
+{
+        battery_notification_delay_ms = 1000;
+        return 0;
+}
+
 static struct dmi_system_id bat_dmi_table[] = {
         {
+                .callback = battery_bix_broken_package_quirk,
                 .ident = "NEC LZ750/LS",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "PC-LZ750LS"),
                 },
         },
+        {
+                .callback = battery_notification_delay_quirk,
+                .ident = "Acer Aspire V5-573G",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
+                },
+        },
         {},
 };
 
@@ -1227,8 +1261,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
         if (acpi_disabled)
                 return;
 
-        if (dmi_check_system(bat_dmi_table))
-                battery_bix_broken_package = 1;
+        dmi_check_system(bat_dmi_table);
         
 #ifdef CONFIG_ACPI_PROCFS_POWER
         acpi_battery_dir = acpi_lock_battery_dir();
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 3f2bdc812d23..bad25b070fe0 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -235,7 +235,8 @@ void acpi_os_vprintf(const char *fmt, va_list args)
 static unsigned long acpi_rsdp;
 static int __init setup_acpi_rsdp(char *arg)
 {
-        acpi_rsdp = simple_strtoul(arg, NULL, 16);
+        if (kstrtoul(arg, 16, &acpi_rsdp))
+                return -EINVAL;
         return 0;
 }
 early_param("acpi_rsdp", setup_acpi_rsdp);
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 05550ba44d32..6d5a6cda0734 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -360,7 +360,8 @@ static int __init acpi_parse_apic_instance(char *str)
         if (!str)
                 return -EINVAL;
 
-        acpi_apic_instance = simple_strtoul(str, NULL, 0);
+        if (kstrtoint(str, 0, &acpi_apic_instance))
+                return -EINVAL;
 
         pr_notice("Shall use APIC/MADT table %d\n", acpi_apic_instance);
 
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 83969f8c5727..6467c919c509 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -176,14 +176,24 @@ static int __init cma_activate_area(struct cma *cma)
                 base_pfn = pfn;
                 for (j = pageblock_nr_pages; j; --j, pfn++) {
                         WARN_ON_ONCE(!pfn_valid(pfn));
+                        /*
+                         * alloc_contig_range requires the pfn range
+                         * specified to be in the same zone. Make this
+                         * simple by forcing the entire CMA resv range
+                         * to be in the same zone.
+                         */
                         if (page_zone(pfn_to_page(pfn)) != zone)
-                                return -EINVAL;
+                                goto err;
                 }
                 init_cma_reserved_pageblock(pfn_to_page(base_pfn));
         } while (--i);
 
         mutex_init(&cma->lock);
         return 0;
+
+err:
+        kfree(cma->bitmap);
+        return -EINVAL;
 }
 
 static struct cma cma_areas[MAX_CMA_AREAS];
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index b6c8aaf4931b..5b17ec88ea05 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1337,8 +1337,11 @@ int drbd_submit_peer_request(struct drbd_device *device,
                 return 0;
         }
 
+        /* Discards don't have any payload.
+         * But the scsi layer still expects a bio_vec it can use internally,
+         * see sd_setup_discard_cmnd() and blk_add_request_payload(). */
         if (peer_req->flags & EE_IS_TRIM)
-                nr_pages = 0; /* discards don't have any payload. */
+                nr_pages = 1;
 
         /* In most cases, we will only need one bio.  But in case the lower
          * level restrictions happen to be different at this offset on this
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 677db049f55a..56d46ffb08e1 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3777,7 +3777,7 @@ static void floppy_rb0_cb(struct bio *bio, int err)
         int drive = cbdata->drive;
 
         if (err) {
-                pr_info("floppy: error %d while reading block 0", err);
+                pr_info("floppy: error %d while reading block 0\n", err);
                 set_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
         }
         complete(&cbdata->complete);
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 77087a29b127..a3b042c4d448 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -79,7 +79,7 @@ MODULE_PARM_DESC(home_node, "Home node for the device");
 
 static int queue_mode = NULL_Q_MQ;
 module_param(queue_mode, int, S_IRUGO);
-MODULE_PARM_DESC(use_mq, "Use blk-mq interface (0=bio,1=rq,2=multiqueue)");
+MODULE_PARM_DESC(queue_mode, "Block interface to use (0=bio,1=rq,2=multiqueue)");
 
 static int gb = 250;
 module_param(gb, int, S_IRUGO);
@@ -227,7 +227,10 @@ static void null_cmd_end_timer(struct nullb_cmd *cmd)
 
 static void null_softirq_done_fn(struct request *rq)
 {
-        end_cmd(blk_mq_rq_to_pdu(rq));
+        if (queue_mode == NULL_Q_MQ)
+                end_cmd(blk_mq_rq_to_pdu(rq));
+        else
+                end_cmd(rq->special);
 }
 
 static inline void null_handle_cmd(struct nullb_cmd *cmd)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index bbeb404b3a07..b2c98c1bc037 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1431,6 +1431,14 @@ static bool obj_request_exists_test(struct rbd_obj_request *obj_request)
         return test_bit(OBJ_REQ_EXISTS, &obj_request->flags) != 0;
 }
 
+static bool obj_request_overlaps_parent(struct rbd_obj_request *obj_request)
+{
+        struct rbd_device *rbd_dev = obj_request->img_request->rbd_dev;
+
+        return obj_request->img_offset <
+            round_up(rbd_dev->parent_overlap, rbd_obj_bytes(&rbd_dev->header));
+}
+
 static void rbd_obj_request_get(struct rbd_obj_request *obj_request)
 {
         dout("%s: obj %p (was %d)\n", __func__, obj_request,
@@ -2748,7 +2756,7 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request)
          */
         if (!img_request_write_test(img_request) ||
                 !img_request_layered_test(img_request) ||
-                rbd_dev->parent_overlap <= obj_request->img_offset ||
+                !obj_request_overlaps_parent(obj_request) ||
                 ((known = obj_request_known_test(obj_request)) &&
                         obj_request_exists_test(obj_request))) {
 
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 48eccb350180..089e72cd37be 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -622,8 +622,10 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity)
         memset(&zram->stats, 0, sizeof(zram->stats));
 
         zram->disksize = 0;
-        if (reset_capacity)
+        if (reset_capacity) {
                 set_capacity(zram->disk, 0);
+                revalidate_disk(zram->disk);
+        }
         up_write(&zram->init_lock);
 }
 
@@ -664,6 +666,7 @@ static ssize_t disksize_store(struct device *dev,
         zram->comp = comp;
         zram->disksize = disksize;
         set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
+        revalidate_disk(zram->disk);
         up_write(&zram->init_lock);
         return len;
 
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index a118ec1650fa..1f37d9870e7a 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -45,7 +45,7 @@ config OMAP_INTERCONNECT
 
 config ARM_CCI
         bool "ARM CCI driver support"
-        depends on ARM
+        depends on ARM && OF && CPU_V7
         help
           Driver supporting the CCI cache coherent interconnect for ARM
           platforms.
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 4ad71ef2cd59..0a7ac0a7b252 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -980,7 +980,6 @@ static void push_to_pool(struct work_struct *work)
 static size_t account(struct entropy_store *r, size_t nbytes, int min,
                       int reserved)
 {
-        int have_bytes;
         int entropy_count, orig;
         size_t ibytes;
 
@@ -989,17 +988,19 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
         /* Can we pull enough? */
 retry:
         entropy_count = orig = ACCESS_ONCE(r->entropy_count);
-        have_bytes = entropy_count >> (ENTROPY_SHIFT + 3);
         ibytes = nbytes;
         /* If limited, never pull more than available */
-        if (r->limit)
-                ibytes = min_t(size_t, ibytes, have_bytes - reserved);
+        if (r->limit) {
+                int have_bytes = entropy_count >> (ENTROPY_SHIFT + 3);
+
+                if ((have_bytes -= reserved) < 0)
+                        have_bytes = 0;
+                ibytes = min_t(size_t, ibytes, have_bytes);
+        }
         if (ibytes < min)
                 ibytes = 0;
-        if (have_bytes >= ibytes + reserved)
-                entropy_count -= ibytes << (ENTROPY_SHIFT + 3);
-        else
-                entropy_count = reserved << (ENTROPY_SHIFT + 3);
+        if ((entropy_count -= ibytes << (ENTROPY_SHIFT + 3)) < 0)
+                entropy_count = 0;
 
         if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
                 goto retry;
diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 9d7d7eed03fd..f74f882f7f29 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -631,7 +631,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
                         SRC_TOP4, 16, 1),
         MUX(0, "mout_user_aclk266", mout_user_aclk266_p, SRC_TOP4, 20, 1),
         MUX(0, "mout_user_aclk166", mout_user_aclk166_p, SRC_TOP4, 24, 1),
-        MUX(0, "mout_user_aclk333", mout_user_aclk333_p, SRC_TOP4, 28, 1),
+        MUX(CLK_MOUT_USER_ACLK333, "mout_user_aclk333", mout_user_aclk333_p,
+                        SRC_TOP4, 28, 1),
 
         MUX(0, "mout_user_aclk400_disp1", mout_user_aclk400_disp1_p,
                         SRC_TOP5, 0, 1),
@@ -684,7 +685,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
                         SRC_TOP11, 12, 1),
         MUX(0, "mout_sw_aclk266", mout_sw_aclk266_p, SRC_TOP11, 20, 1),
         MUX(0, "mout_sw_aclk166", mout_sw_aclk166_p, SRC_TOP11, 24, 1),
-        MUX(0, "mout_sw_aclk333", mout_sw_aclk333_p, SRC_TOP11, 28, 1),
+        MUX(CLK_MOUT_SW_ACLK333, "mout_sw_aclk333", mout_sw_aclk333_p,
+                        SRC_TOP11, 28, 1),
 
         MUX(0, "mout_sw_aclk400_disp1", mout_sw_aclk400_disp1_p,
                         SRC_TOP12, 4, 1),
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 8d6420013a04..ab51bf20a3ed 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -153,19 +153,16 @@ static void exynos4_mct_write(unsigned int value, unsigned long offset)
 }
 
 /* Clocksource handling */
-static void exynos4_mct_frc_start(u32 hi, u32 lo)
+static void exynos4_mct_frc_start(void)
 {
         u32 reg;
 
-        exynos4_mct_write(lo, EXYNOS4_MCT_G_CNT_L);
-        exynos4_mct_write(hi, EXYNOS4_MCT_G_CNT_U);
-
         reg = __raw_readl(reg_base + EXYNOS4_MCT_G_TCON);
         reg |= MCT_G_TCON_START;
         exynos4_mct_write(reg, EXYNOS4_MCT_G_TCON);
 }
 
-static cycle_t exynos4_frc_read(struct clocksource *cs)
+static cycle_t notrace _exynos4_frc_read(void)
 {
         unsigned int lo, hi;
         u32 hi2 = __raw_readl(reg_base + EXYNOS4_MCT_G_CNT_U);
@@ -179,9 +176,14 @@ static cycle_t exynos4_frc_read(struct clocksource *cs)
         return ((cycle_t)hi << 32) | lo;
 }
 
+static cycle_t exynos4_frc_read(struct clocksource *cs)
+{
+        return _exynos4_frc_read();
+}
+
 static void exynos4_frc_resume(struct clocksource *cs)
 {
-        exynos4_mct_frc_start(0, 0);
+        exynos4_mct_frc_start();
 }
 
 struct clocksource mct_frc = {
@@ -195,12 +197,23 @@ struct clocksource mct_frc = {
 
 static u64 notrace exynos4_read_sched_clock(void)
 {
-        return exynos4_frc_read(&mct_frc);
+        return _exynos4_frc_read();
+}
+
+static struct delay_timer exynos4_delay_timer;
+
+static cycles_t exynos4_read_current_timer(void)
+{
+        return _exynos4_frc_read();
 }
 
 static void __init exynos4_clocksource_init(void)
 {
-        exynos4_mct_frc_start(0, 0);
+        exynos4_mct_frc_start();
+
+        exynos4_delay_timer.read_current_timer = &exynos4_read_current_timer;
+        exynos4_delay_timer.freq = clk_rate;
+        register_current_timer_delay(&exynos4_delay_timer);
 
         if (clocksource_register_hz(&mct_frc, clk_rate))
                 panic("%s: can't register clocksource\n", mct_frc.name);
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index e473d6555f96..ffe350f86bca 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -186,6 +186,8 @@ config CPU_FREQ_GOV_CONSERVATIVE
 config GENERIC_CPUFREQ_CPU0
         tristate "Generic CPU0 cpufreq driver"
         depends on HAVE_CLK && OF
+        # if CPU_THERMAL is on and THERMAL=m, CPU0 cannot be =y:
+        depends on !CPU_THERMAL || THERMAL
         select PM_OPP
         help
           This adds a generic cpufreq driver for CPU0 frequency management.
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index aed2b0cb83dc..62259d27f03e 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2242,10 +2242,8 @@ int cpufreq_update_policy(unsigned int cpu)
         struct cpufreq_policy new_policy;
         int ret;
 
-        if (!policy) {
-                ret = -ENODEV;
-                goto no_policy;
-        }
+        if (!policy)
+                return -ENODEV;
 
         down_write(&policy->rwsem);
 
@@ -2264,7 +2262,7 @@ int cpufreq_update_policy(unsigned int cpu)
                 new_policy.cur = cpufreq_driver->get(cpu);
                 if (WARN_ON(!new_policy.cur)) {
                         ret = -EIO;
-                        goto no_policy;
+                        goto unlock;
                 }
 
                 if (!policy->cur) {
@@ -2279,10 +2277,10 @@ int cpufreq_update_policy(unsigned int cpu)
 
         ret = cpufreq_set_policy(policy, &new_policy);
 
+unlock:
         up_write(&policy->rwsem);
 
         cpufreq_cpu_put(policy);
-no_policy:
         return ret;
 }
 EXPORT_SYMBOL(cpufreq_update_policy);
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 4e7f492ad583..924bb2d42b1c 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -196,10 +196,7 @@ static signed int pid_calc(struct _pid *pid, int32_t busy)
         pid->last_err = fp_error;
 
         result = pterm + mul_fp(pid->integral, pid->i_gain) + dterm;
-        if (result >= 0)
-                result = result + (1 << (FRAC_BITS-1));
-        else
-                result = result - (1 << (FRAC_BITS-1));
+        result = result + (1 << (FRAC_BITS-1));
         return (signed int)fp_toint(result);
 }
 
diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidle/cpuidle-armada-370-xp.c
index 28587d0f3947..a5fba0287bfb 100644
--- a/drivers/cpuidle/cpuidle-armada-370-xp.c
+++ b/drivers/cpuidle/cpuidle-armada-370-xp.c
@@ -55,7 +55,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = {
                 .power_usage            = 50,
                 .target_residency       = 100,
                 .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                .name                   = "MV CPU IDLE",
+                .name                   = "Idle",
                 .desc                   = "CPU power down",
         },
         .states[2]              = {
@@ -65,7 +65,7 @@ static struct cpuidle_driver armada_370_xp_idle_driver = {
                 .target_residency       = 1000,
                 .flags                  = CPUIDLE_FLAG_TIME_VALID |
                                                 ARMADA_370_XP_FLAG_DEEP_IDLE,
-                .name                   = "MV CPU DEEP IDLE",
+                .name                   = "Deep idle",
                 .desc                   = "CPU and L2 Fabric power down",
         },
         .state_count = ARMADA_370_XP_MAX_STATES,
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 4b9dc836dcf9..e992abc5ef26 100644
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -40,7 +40,7 @@ struct pstore_read_data {
 static inline u64 generic_id(unsigned long timestamp,
                              unsigned int part, int count)
 {
-        return (timestamp * 100 + part) * 1000 + count;
+        return ((u64) timestamp * 100 + part) * 1000 + count;
 }
 
 static int efi_pstore_read_func(struct efivar_entry *entry, void *data)
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index cd36deb619fa..eff1a2f22f09 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -353,10 +353,10 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
                                        int depth, void *data)
 {
         struct param_info *info = data;
-        void *prop, *dest;
-        unsigned long len;
+        const void *prop;
+        void *dest;
         u64 val;
-        int i;
+        int i, len;
 
         if (depth != 1 ||
             (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c
index 5c6a8e8a9580..82d774161cc9 100644
--- a/drivers/firmware/efi/fdt.c
+++ b/drivers/firmware/efi/fdt.c
@@ -63,7 +63,7 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt,
          */
         prev = 0;
         for (;;) {
-                const char *type, *name;
+                const char *type;
                 int len;
 
                 node = fdt_next_node(fdt, prev, NULL);
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 03711d00aaae..8218078b6133 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -419,8 +419,9 @@ long drm_ioctl(struct file *filp,
                         retcode = -EFAULT;
                         goto err_i1;
                 }
-        } else
+        } else if (cmd & IOC_OUT) {
                 memset(kdata, 0, usize);
+        }
 
         if (ioctl->flags & DRM_UNLOCKED)
                 retcode = func(dev, kdata, file_priv);
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 7c2497dea1e9..0dc57d5ecd10 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -64,6 +64,7 @@
 void drm_modeset_acquire_init(struct drm_modeset_acquire_ctx *ctx,
                 uint32_t flags)
 {
+        memset(ctx, 0, sizeof(*ctx));
         ww_acquire_init(&ctx->ww_ctx, &crtc_ww_class);
         INIT_LIST_HEAD(&ctx->locked);
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 482127f633c5..9e530f205ad2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -40,7 +40,7 @@ exynos_dpi_detect(struct drm_connector *connector, bool force)
 {
         struct exynos_dpi *ctx = connector_to_dpi(connector);
 
-        if (!ctx->panel->connector)
+        if (ctx->panel && !ctx->panel->connector)
                 drm_panel_attach(ctx->panel, &ctx->connector);
 
         return connector_status_connected;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index d91f27777537..ab7d182063c3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -765,24 +765,24 @@ static int exynos_drm_init(void)
 
         return 0;
 
-err_unregister_pd:
-        platform_device_unregister(exynos_drm_pdev);
-
 err_remove_vidi:
 #ifdef CONFIG_DRM_EXYNOS_VIDI
         exynos_drm_remove_vidi();
+
+err_unregister_pd:
 #endif
+        platform_device_unregister(exynos_drm_pdev);
 
         return ret;
 }
 
 static void exynos_drm_exit(void)
 {
+        platform_driver_unregister(&exynos_drm_platform_driver);
 #ifdef CONFIG_DRM_EXYNOS_VIDI
         exynos_drm_remove_vidi();
 #endif
         platform_device_unregister(exynos_drm_pdev);
-        platform_driver_unregister(&exynos_drm_platform_driver);
 }
 
 module_init(exynos_drm_init);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 36535f398848..06cde4506278 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -343,7 +343,7 @@ struct exynos_drm_display * exynos_dpi_probe(struct device *dev);
 int exynos_dpi_remove(struct device *dev);
 #else
 static inline struct exynos_drm_display *
-exynos_dpi_probe(struct device *dev) { return 0; }
+exynos_dpi_probe(struct device *dev) { return NULL; }
 static inline int exynos_dpi_remove(struct device *dev) { return 0; }
 #endif
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index bb45ab2e7384..33161ad38201 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -741,6 +741,8 @@ static void fimd_apply(struct exynos_drm_manager *mgr)
                 win_data = &ctx->win_data[i];
                 if (win_data->enabled)
                         fimd_win_commit(mgr, i);
+                else
+                        fimd_win_disable(mgr, i);
         }
 
         fimd_commit(mgr);
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index c104d0c9b385..aa259b0a873a 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -2090,6 +2090,11 @@ out:
 
 static void hdmi_dpms(struct exynos_drm_display *display, int mode)
 {
+        struct hdmi_context *hdata = display->ctx;
+        struct drm_encoder *encoder = hdata->encoder;
+        struct drm_crtc *crtc = encoder->crtc;
+        struct drm_crtc_helper_funcs *funcs = NULL;
+
         DRM_DEBUG_KMS("mode %d\n", mode);
 
         switch (mode) {
@@ -2099,6 +2104,20 @@ static void hdmi_dpms(struct exynos_drm_display *display, int mode)
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
+                /*
+                 * The SFRs of VP and Mixer are updated by Vertical Sync of
+                 * Timing generator which is a part of HDMI so the sequence
+                 * to disable TV Subsystem should be as following,
+                 *      VP -> Mixer -> HDMI
+                 *
+                 * Below codes will try to disable Mixer and VP(if used)
+                 * prior to disabling HDMI.
+                 */
+                if (crtc)
+                        funcs = crtc->helper_private;
+                if (funcs && funcs->dpms)
+                        (*funcs->dpms)(crtc, mode);
+
                 hdmi_poweroff(display);
                 break;
         default:
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 4c5aed7e54c8..7529946d0a74 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -377,6 +377,20 @@ static void mixer_run(struct mixer_context *ctx)
         mixer_regs_dump(ctx);
 }
 
+static void mixer_stop(struct mixer_context *ctx)
+{
+        struct mixer_resources *res = &ctx->mixer_res;
+        int timeout = 20;
+
+        mixer_reg_writemask(res, MXR_STATUS, 0, MXR_STATUS_REG_RUN);
+
+        while (!(mixer_reg_read(res, MXR_STATUS) & MXR_STATUS_REG_IDLE) &&
+                        --timeout)
+                usleep_range(10000, 12000);
+
+        mixer_regs_dump(ctx);
+}
+
 static void vp_video_buffer(struct mixer_context *ctx, int win)
 {
         struct mixer_resources *res = &ctx->mixer_res;
@@ -497,13 +511,8 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
 static void mixer_layer_update(struct mixer_context *ctx)
 {
         struct mixer_resources *res = &ctx->mixer_res;
-        u32 val;
-
-        val = mixer_reg_read(res, MXR_CFG);
 
-        /* allow one update per vsync only */
-        if (!(val & MXR_CFG_LAYER_UPDATE_COUNT_MASK))
-                mixer_reg_writemask(res, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);
+        mixer_reg_writemask(res, MXR_CFG, ~0, MXR_CFG_LAYER_UPDATE);
 }
 
 static void mixer_graph_buffer(struct mixer_context *ctx, int win)
@@ -1010,6 +1019,8 @@ static void mixer_wait_for_vblank(struct exynos_drm_manager *mgr)
         }
         mutex_unlock(&mixer_ctx->mixer_mutex);
 
+        drm_vblank_get(mgr->crtc->dev, mixer_ctx->pipe);
+
         atomic_set(&mixer_ctx->wait_vsync_event, 1);
 
         /*
@@ -1020,6 +1031,8 @@ static void mixer_wait_for_vblank(struct exynos_drm_manager *mgr)
                                 !atomic_read(&mixer_ctx->wait_vsync_event),
                                 HZ/20))
                 DRM_DEBUG_KMS("vblank wait timed out.\n");
+
+        drm_vblank_put(mgr->crtc->dev, mixer_ctx->pipe);
 }
 
 static void mixer_window_suspend(struct exynos_drm_manager *mgr)
@@ -1061,7 +1074,7 @@ static void mixer_poweron(struct exynos_drm_manager *mgr)
                 mutex_unlock(&ctx->mixer_mutex);
                 return;
         }
-        ctx->powered = true;
+
         mutex_unlock(&ctx->mixer_mutex);
 
         pm_runtime_get_sync(ctx->dev);
@@ -1072,6 +1085,12 @@ static void mixer_poweron(struct exynos_drm_manager *mgr)
                 clk_prepare_enable(res->sclk_mixer);
         }
 
+        mutex_lock(&ctx->mixer_mutex);
+        ctx->powered = true;
+        mutex_unlock(&ctx->mixer_mutex);
+
+        mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);
+
         mixer_reg_write(res, MXR_INT_EN, ctx->int_en);
         mixer_win_reset(ctx);
 
@@ -1084,14 +1103,21 @@ static void mixer_poweroff(struct exynos_drm_manager *mgr)
         struct mixer_resources *res = &ctx->mixer_res;
 
         mutex_lock(&ctx->mixer_mutex);
-        if (!ctx->powered)
-                goto out;
+        if (!ctx->powered) {
+                mutex_unlock(&ctx->mixer_mutex);
+                return;
+        }
         mutex_unlock(&ctx->mixer_mutex);
 
+        mixer_stop(ctx);
         mixer_window_suspend(mgr);
 
         ctx->int_en = mixer_reg_read(res, MXR_INT_EN);
 
+        mutex_lock(&ctx->mixer_mutex);
+        ctx->powered = false;
+        mutex_unlock(&ctx->mixer_mutex);
+
         clk_disable_unprepare(res->mixer);
         if (ctx->vp_enabled) {
                 clk_disable_unprepare(res->vp);
@@ -1099,12 +1125,6 @@ static void mixer_poweroff(struct exynos_drm_manager *mgr)
         }
 
         pm_runtime_put_sync(ctx->dev);
-
-        mutex_lock(&ctx->mixer_mutex);
-        ctx->powered = false;
-
-out:
-        mutex_unlock(&ctx->mixer_mutex);
 }
 
 static void mixer_dpms(struct exynos_drm_manager *mgr, int mode)
diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h
index 4537026bc385..5f32e1a29411 100644
--- a/drivers/gpu/drm/exynos/regs-mixer.h
+++ b/drivers/gpu/drm/exynos/regs-mixer.h
@@ -78,6 +78,7 @@
 #define MXR_STATUS_BIG_ENDIAN           (1 << 3)
 #define MXR_STATUS_ENDIAN_MASK          (1 << 3)
 #define MXR_STATUS_SYNC_ENABLE          (1 << 2)
+#define MXR_STATUS_REG_IDLE             (1 << 1)
 #define MXR_STATUS_REG_RUN              (1 << 0)
 
 /* bits for MXR_CFG */
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 240c331405b9..ac357b02bd35 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -810,6 +810,12 @@ static int
 tda998x_encoder_mode_valid(struct drm_encoder *encoder,
                           struct drm_display_mode *mode)
 {
+        if (mode->clock > 150000)
+                return MODE_CLOCK_HIGH;
+        if (mode->htotal >= BIT(13))
+                return MODE_BAD_HVALUE;
+        if (mode->vtotal >= BIT(11))
+                return MODE_BAD_VVALUE;
         return MODE_OK;
 }
 
@@ -1048,8 +1054,8 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk)
                         return i;
                 }
         } else {
-                for (i = 10; i > 0; i--) {
-                        msleep(10);
+                for (i = 100; i > 0; i--) {
+                        msleep(1);
                         ret = reg_read(priv, REG_INT_FLAGS_2);
                         if (ret < 0)
                                 return ret;
@@ -1183,7 +1189,6 @@ static void
 tda998x_encoder_destroy(struct drm_encoder *encoder)
 {
         struct tda998x_priv *priv = to_tda998x_priv(encoder);
-        drm_i2c_encoder_destroy(encoder);
 
         /* disable all IRQs and free the IRQ handler */
         cec_write(priv, REG_CEC_RXSHPDINTENA, 0);
@@ -1193,6 +1198,7 @@ tda998x_encoder_destroy(struct drm_encoder *encoder)
 
         if (priv->cec)
                 i2c_unregister_device(priv->cec);
+        drm_i2c_encoder_destroy(encoder);
         kfree(priv);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 601caa88c092..b8c689202c40 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -446,7 +446,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 
                 memset(&stats, 0, sizeof(stats));
                 stats.file_priv = file->driver_priv;
+                spin_lock(&file->table_lock);
                 idr_for_each(&file->object_idr, per_file_stats, &stats);
+                spin_unlock(&file->table_lock);
                 /*
                  * Although we have a valid reference on file->pid, that does
                  * not guarantee that the task_struct who called get_pid() is
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 4c22a5b7f4c5..6c656392d67d 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -36,6 +36,8 @@
 #include "i915_drv.h"
 #include "i915_trace.h"
 #include <linux/pci.h>
+#include <linux/console.h>
+#include <linux/vt.h>
 #include <linux/vgaarb.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
@@ -1386,7 +1388,6 @@ cleanup_gem:
         i915_gem_context_fini(dev);
         mutex_unlock(&dev->struct_mutex);
         WARN_ON(dev_priv->mm.aliasing_ppgtt);
-        drm_mm_takedown(&dev_priv->gtt.base.mm);
 cleanup_irq:
         drm_irq_uninstall(dev);
 cleanup_gem_stolen:
@@ -1450,6 +1451,38 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
 }
 #endif
 
+#if !defined(CONFIG_VGA_CONSOLE)
+static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
+{
+        return 0;
+}
+#elif !defined(CONFIG_DUMMY_CONSOLE)
+static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
+{
+        return -ENODEV;
+}
+#else
+static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
+{
+        int ret;
+
+        DRM_INFO("Replacing VGA console driver\n");
+
+        console_lock();
+        ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1);
+        if (ret == 0) {
+                ret = do_unregister_con_driver(&vga_con);
+
+                /* Ignore "already unregistered". */
+                if (ret == -ENODEV)
+                        ret = 0;
+        }
+        console_unlock();
+
+        return ret;
+}
+#endif
+
 static void i915_dump_device_info(struct drm_i915_private *dev_priv)
 {
         const struct intel_device_info *info = &dev_priv->info;
@@ -1623,8 +1656,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         if (ret)
                 goto out_regs;
 
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                ret = i915_kick_out_vgacon(dev_priv);
+                if (ret) {
+                        DRM_ERROR("failed to remove conflicting VGA console\n");
+                        goto out_gtt;
+                }
+
                 i915_kick_out_firmware_fb(dev_priv);
+        }
 
         pci_set_master(dev->pdev);
 
@@ -1756,8 +1796,6 @@ out_mtrrfree:
         arch_phys_wc_del(dev_priv->gtt.mtrr);
         io_mapping_free(dev_priv->gtt.mappable);
 out_gtt:
-        list_del(&dev_priv->gtt.base.global_link);
-        drm_mm_takedown(&dev_priv->gtt.base.mm);
         dev_priv->gtt.base.cleanup(&dev_priv->gtt.base);
 out_regs:
         intel_uncore_fini(dev);
@@ -1846,7 +1884,6 @@ int i915_driver_unload(struct drm_device *dev)
                         i915_free_hws(dev);
         }
 
-        list_del(&dev_priv->gtt.base.global_link);
         WARN_ON(!list_empty(&dev_priv->vm_list));
 
         drm_vblank_cleanup(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 49414d30e8d4..a47fbf60b781 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -977,6 +977,8 @@ struct i915_power_well {
         bool always_on;
         /* power well enable/disable usage count */
         int count;
+        /* cached hw enabled state */
+        bool hw_enabled;
         unsigned long domains;
         unsigned long data;
         const struct i915_power_well_ops *ops;
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 3ffe308d5893..a5ddf3bce9c3 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -598,6 +598,7 @@ static int do_switch(struct intel_engine_cs *ring,
         struct intel_context *from = ring->last_context;
         struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(to);
         u32 hw_flags = 0;
+        bool uninitialized = false;
         int ret, i;
 
         if (from != NULL && ring == &dev_priv->ring[RCS]) {
@@ -696,19 +697,20 @@ static int do_switch(struct intel_engine_cs *ring,
                 i915_gem_context_unreference(from);
         }
 
+        uninitialized = !to->is_initialized && from == NULL;
+        to->is_initialized = true;
+
 done:
         i915_gem_context_reference(to);
         ring->last_context = to;
         to->last_ring = ring;
 
-        if (ring->id == RCS && !to->is_initialized && from == NULL) {
+        if (uninitialized) {
                 ret = i915_gem_render_state_init(ring);
                 if (ret)
                         DRM_ERROR("init render state: %d\n", ret);
         }
 
-        to->is_initialized = true;
-
         return 0;
 
 unpin_out:
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index eec820aec022..8b3cde703364 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1992,7 +1992,10 @@ static void gen6_gmch_remove(struct i915_address_space *vm)
 
         struct i915_gtt *gtt = container_of(vm, struct i915_gtt, base);
 
-        drm_mm_takedown(&vm->mm);
+        if (drm_mm_initialized(&vm->mm)) {
+                drm_mm_takedown(&vm->mm);
+                list_del(&vm->global_link);
+        }
         iounmap(gtt->gsm);
         teardown_scratch_page(vm->dev);
 }
@@ -2025,6 +2028,10 @@ static int i915_gmch_probe(struct drm_device *dev,
 
 static void i915_gmch_remove(struct i915_address_space *vm)
 {
+        if (drm_mm_initialized(&vm->mm)) {
+                drm_mm_takedown(&vm->mm);
+                list_del(&vm->global_link);
+        }
         intel_gmch_remove();
 }
 
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 87ec60e181a7..66cf41765bf9 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -888,6 +888,8 @@ static void i915_gem_record_rings(struct drm_device *dev,
         for (i = 0; i < I915_NUM_RINGS; i++) {
                 struct intel_engine_cs *ring = &dev_priv->ring[i];
 
+                error->ring[i].pid = -1;
+
                 if (ring->dev == NULL)
                         continue;
 
@@ -895,7 +897,6 @@ static void i915_gem_record_rings(struct drm_device *dev,
 
                 i915_record_ring_state(dev, ring, &error->ring[i]);
 
-                error->ring[i].pid = -1;
                 request = i915_gem_find_active_request(ring);
                 if (request) {
                         /* We need to copy these to an anonymous buffer
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6f8017a7e937..267f069765ad 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2847,10 +2847,14 @@ static int semaphore_passed(struct intel_engine_cs *ring)
         struct intel_engine_cs *signaller;
         u32 seqno, ctl;
 
-        ring->hangcheck.deadlock = true;
+        ring->hangcheck.deadlock++;
 
         signaller = semaphore_waits_for(ring, &seqno);
-        if (signaller == NULL || signaller->hangcheck.deadlock)
+        if (signaller == NULL)
+                return -1;
+
+        /* Prevent pathological recursion due to driver bugs */
+        if (signaller->hangcheck.deadlock >= I915_NUM_RINGS)
                 return -1;
 
         /* cursory check for an unkickable deadlock */
@@ -2858,7 +2862,13 @@ static int semaphore_passed(struct intel_engine_cs *ring)
         if (ctl & RING_WAIT_SEMAPHORE && semaphore_passed(signaller) < 0)
                 return -1;
 
-        return i915_seqno_passed(signaller->get_seqno(signaller, false), seqno);
+        if (i915_seqno_passed(signaller->get_seqno(signaller, false), seqno))
+                return 1;
+
+        if (signaller->hangcheck.deadlock)
+                return -1;
+
+        return 0;
 }
 
 static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)
@@ -2867,7 +2877,7 @@ static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)
         int i;
 
         for_each_ring(ring, dev_priv, i)
-                ring->hangcheck.deadlock = false;
+                ring->hangcheck.deadlock = 0;
 }
 
 static enum intel_ring_hangcheck_action
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 1ee98f121a00..827498e081df 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -315,9 +315,6 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
         const struct bdb_lfp_backlight_data *backlight_data;
         const struct bdb_lfp_backlight_data_entry *entry;
 
-        /* Err to enabling backlight if no backlight block. */
-        dev_priv->vbt.backlight.present = true;
-
         backlight_data = find_section(bdb, BDB_LVDS_BACKLIGHT);
         if (!backlight_data)
                 return;
@@ -1088,6 +1085,9 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
 
         dev_priv->vbt.crt_ddc_pin = GMBUS_PORT_VGADDC;
 
+        /* Default to having backlight */
+        dev_priv->vbt.backlight.present = true;
+
         /* LFP panel data */
         dev_priv->vbt.lvds_dither = 1;
         dev_priv->vbt.lvds_vbt = 0;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index efd3cf50cb0f..556c916dbf9d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2087,6 +2087,7 @@ void intel_flush_primary_plane(struct drm_i915_private *dev_priv,
 static void intel_enable_primary_hw_plane(struct drm_i915_private *dev_priv,
                                           enum plane plane, enum pipe pipe)
 {
+        struct drm_device *dev = dev_priv->dev;
         struct intel_crtc *intel_crtc =
                 to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
         int reg;
@@ -2106,6 +2107,14 @@ static void intel_enable_primary_hw_plane(struct drm_i915_private *dev_priv,
 
         I915_WRITE(reg, val | DISPLAY_PLANE_ENABLE);
         intel_flush_primary_plane(dev_priv, plane);
+
+        /*
+         * BDW signals flip done immediately if the plane
+         * is disabled, even if the plane enable is already
+         * armed to occur at the next vblank :(
+         */
+        if (IS_BROADWELL(dev))
+                intel_wait_for_vblank(dev, intel_crtc->pipe);
 }
 
 /**
@@ -4564,7 +4573,10 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
         if (intel_crtc->active)
                 return;
 
-        vlv_prepare_pll(intel_crtc);
+        is_dsi = intel_pipe_has_type(crtc, INTEL_OUTPUT_DSI);
+
+        if (!is_dsi && !IS_CHERRYVIEW(dev))
+                vlv_prepare_pll(intel_crtc);
 
         /* Set up the display plane register */
         dspcntr = DISPPLANE_GAMMA_ENABLE;
@@ -4598,8 +4610,6 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
                 if (encoder->pre_pll_enable)
                         encoder->pre_pll_enable(encoder);
 
-        is_dsi = intel_pipe_has_type(crtc, INTEL_OUTPUT_DSI);
-
         if (!is_dsi) {
                 if (IS_CHERRYVIEW(dev))
                         chv_enable_pll(intel_crtc);
@@ -11087,6 +11097,22 @@ const char *intel_output_name(int output)
         return names[output];
 }
 
+static bool intel_crt_present(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        if (IS_ULT(dev))
+                return false;
+
+        if (IS_CHERRYVIEW(dev))
+                return false;
+
+        if (IS_VALLEYVIEW(dev) && !dev_priv->vbt.int_crt_support)
+                return false;
+
+        return true;
+}
+
 static void intel_setup_outputs(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11095,7 +11121,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 
         intel_lvds_init(dev);
 
-        if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev) && dev_priv->vbt.int_crt_support)
+        if (intel_crt_present(dev))
                 intel_crt_init(dev);
 
         if (HAS_DDI(dev)) {
@@ -12411,8 +12437,8 @@ intel_display_capture_error_state(struct drm_device *dev)
 
         for_each_pipe(i) {
                 error->pipe[i].power_domain_on =
-                        intel_display_power_enabled_sw(dev_priv,
-                                                       POWER_DOMAIN_PIPE(i));
+                        intel_display_power_enabled_unlocked(dev_priv,
+                                                           POWER_DOMAIN_PIPE(i));
                 if (!error->pipe[i].power_domain_on)
                         continue;
 
@@ -12447,7 +12473,7 @@ intel_display_capture_error_state(struct drm_device *dev)
                 enum transcoder cpu_transcoder = transcoders[i];
 
                 error->transcoder[i].power_domain_on =
-                        intel_display_power_enabled_sw(dev_priv,
+                        intel_display_power_enabled_unlocked(dev_priv,
                                 POWER_DOMAIN_TRANSCODER(cpu_transcoder));
                 if (!error->transcoder[i].power_domain_on)
                         continue;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index bda0ae3d80cc..eaa27ee9e367 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -950,8 +950,8 @@ int intel_power_domains_init(struct drm_i915_private *);
 void intel_power_domains_remove(struct drm_i915_private *);
 bool intel_display_power_enabled(struct drm_i915_private *dev_priv,
                                  enum intel_display_power_domain domain);
-bool intel_display_power_enabled_sw(struct drm_i915_private *dev_priv,
-                                    enum intel_display_power_domain domain);
+bool intel_display_power_enabled_unlocked(struct drm_i915_private *dev_priv,
+                                          enum intel_display_power_domain domain);
 void intel_display_power_get(struct drm_i915_private *dev_priv,
                              enum intel_display_power_domain domain);
 void intel_display_power_put(struct drm_i915_private *dev_priv,
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 5e6c888b4928..38a98570d10c 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector)
         ctl = freq << 16;
         I915_WRITE(BLC_PWM_CTL, ctl);
 
-        /* XXX: combine this into above write? */
-        intel_panel_actually_set_backlight(connector, panel->backlight.level);
-
         ctl2 = BLM_PIPE(pipe);
         if (panel->backlight.combination_mode)
                 ctl2 |= BLM_COMBINATION_MODE;
@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector)
         I915_WRITE(BLC_PWM_CTL2, ctl2);
         POSTING_READ(BLC_PWM_CTL2);
         I915_WRITE(BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE);
+
+        intel_panel_actually_set_backlight(connector, panel->backlight.level);
 }
 
 static void vlv_enable_backlight(struct intel_connector *connector)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d1e53abec1b5..ee72807069e4 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -511,8 +511,7 @@ void intel_update_fbc(struct drm_device *dev)
         obj = intel_fb->obj;
         adjusted_mode = &intel_crtc->config.adjusted_mode;
 
-        if (i915.enable_fbc < 0 &&
-            INTEL_INFO(dev)->gen <= 7 && !IS_HASWELL(dev)) {
+        if (i915.enable_fbc < 0) {
                 if (set_no_fbc_reason(dev_priv, FBC_CHIP_DEFAULT))
                         DRM_DEBUG_KMS("disabled per chip default\n");
                 goto out_disable;
@@ -3210,6 +3209,14 @@ void gen6_set_rps(struct drm_device *dev, u8 val)
 */
 static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
 {
+        struct drm_device *dev = dev_priv->dev;
+
+        /* Latest VLV doesn't need to force the gfx clock */
+        if (dev->pdev->revision >= 0xd) {
+                valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
+                return;
+        }
+
         /*
          * When we are idle.  Drop to min voltage state.
          */
@@ -3506,15 +3513,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
         I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-        /* WaDisablePwrmtrEvent:chv (pre-production hw) */
-        I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-        I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
         /* 5: Enable RPS */
         I915_WRITE(GEN6_RP_CONTROL,
                    GEN6_RP_MEDIA_TURBO |
                    GEN6_RP_MEDIA_HW_NORMAL_MODE |
-                   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+                   GEN6_RP_MEDIA_IS_GFX |
                    GEN6_RP_ENABLE |
                    GEN6_RP_UP_BUSY_AVG |
                    GEN6_RP_DOWN_IDLE_AVG);
@@ -5608,8 +5611,8 @@ static bool hsw_power_well_enabled(struct drm_i915_private *dev_priv,
                      (HSW_PWR_WELL_ENABLE_REQUEST | HSW_PWR_WELL_STATE_ENABLED);
 }
 
-bool intel_display_power_enabled_sw(struct drm_i915_private *dev_priv,
-                                    enum intel_display_power_domain domain)
+bool intel_display_power_enabled_unlocked(struct drm_i915_private *dev_priv,
+                                          enum intel_display_power_domain domain)
 {
         struct i915_power_domains *power_domains;
         struct i915_power_well *power_well;
@@ -5620,16 +5623,19 @@ bool intel_display_power_enabled_sw(struct drm_i915_private *dev_priv,
                 return false;
 
         power_domains = &dev_priv->power_domains;
+
         is_enabled = true;
+
         for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
                 if (power_well->always_on)
                         continue;
 
-                if (!power_well->count) {
+                if (!power_well->hw_enabled) {
                         is_enabled = false;
                         break;
                 }
         }
+
         return is_enabled;
 }
 
@@ -5637,30 +5643,15 @@ bool intel_display_power_enabled(struct drm_i915_private *dev_priv,
                                  enum intel_display_power_domain domain)
 {
         struct i915_power_domains *power_domains;
-        struct i915_power_well *power_well;
-        bool is_enabled;
-        int i;
-
-        if (dev_priv->pm.suspended)
-                return false;
+        bool ret;
 
         power_domains = &dev_priv->power_domains;
 
-        is_enabled = true;
-
         mutex_lock(&power_domains->lock);
-        for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {
-                if (power_well->always_on)
-                        continue;
-
-                if (!power_well->ops->is_enabled(dev_priv, power_well)) {
-                        is_enabled = false;
-                        break;
-                }
-        }
+        ret = intel_display_power_enabled_unlocked(dev_priv, domain);
         mutex_unlock(&power_domains->lock);
 
-        return is_enabled;
+        return ret;
 }
 
 /*
@@ -5981,6 +5972,7 @@ void intel_display_power_get(struct drm_i915_private *dev_priv,
                 if (!power_well->count++) {
                         DRM_DEBUG_KMS("enabling %s\n", power_well->name);
                         power_well->ops->enable(dev_priv, power_well);
+                        power_well->hw_enabled = true;
                 }
 
                 check_power_well_state(dev_priv, power_well);
@@ -6010,6 +6002,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
 
                 if (!--power_well->count && i915.disable_power_well) {
                         DRM_DEBUG_KMS("disabling %s\n", power_well->name);
+                        power_well->hw_enabled = false;
                         power_well->ops->disable(dev_priv, power_well);
                 }
 
@@ -6024,33 +6017,56 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
 static struct i915_power_domains *hsw_pwr;
 
 /* Display audio driver power well request */
-void i915_request_power_well(void)
+int i915_request_power_well(void)
 {
         struct drm_i915_private *dev_priv;
 
-        if (WARN_ON(!hsw_pwr))
-                return;
+        if (!hsw_pwr)
+                return -ENODEV;
 
         dev_priv = container_of(hsw_pwr, struct drm_i915_private,
                                 power_domains);
         intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(i915_request_power_well);
 
 /* Display audio driver power well release */
-void i915_release_power_well(void)
+int i915_release_power_well(void)
 {
         struct drm_i915_private *dev_priv;
 
-        if (WARN_ON(!hsw_pwr))
-                return;
+        if (!hsw_pwr)
+                return -ENODEV;
 
         dev_priv = container_of(hsw_pwr, struct drm_i915_private,
                                 power_domains);
         intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(i915_release_power_well);
 
+/*
+ * Private interface for the audio driver to get CDCLK in kHz.
+ *
+ * Caller must request power well using i915_request_power_well() prior to
+ * making the call.
+ */
+int i915_get_cdclk_freq(void)
+{
+        struct drm_i915_private *dev_priv;
+
+        if (!hsw_pwr)
+                return -ENODEV;
+
+        dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+                                power_domains);
+
+        return intel_ddi_get_cdclk_freq(dev_priv);
+}
+EXPORT_SYMBOL_GPL(i915_get_cdclk_freq);
+
+
 #define POWER_DOMAIN_MASK (BIT(POWER_DOMAIN_NUM) - 1)
 
 #define HSW_ALWAYS_ON_POWER_DOMAINS (                   \
@@ -6270,8 +6286,11 @@ static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
         int i;
 
         mutex_lock(&power_domains->lock);
-        for_each_power_well(i, power_well, POWER_DOMAIN_MASK, power_domains)
+        for_each_power_well(i, power_well, POWER_DOMAIN_MASK, power_domains) {
                 power_well->ops->sync_hw(dev_priv, power_well);
+                power_well->hw_enabled = power_well->ops->is_enabled(dev_priv,
+                                                                     power_well);
+        }
         mutex_unlock(&power_domains->lock);
 }
 
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 910c83cf7d44..e72017bdcd7f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -55,7 +55,7 @@ struct intel_ring_hangcheck {
         u32 seqno;
         int score;
         enum intel_ring_hangcheck_action action;
-        bool deadlock;
+        int deadlock;
 };
 
 struct intel_ringbuffer {
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 6a4d5bc17697..20375cc7f82d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1385,7 +1385,9 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
                          >> SDVO_PORT_MULTIPLY_SHIFT) + 1;
         }
 
-        dotclock = pipe_config->port_clock / pipe_config->pixel_multiplier;
+        dotclock = pipe_config->port_clock;
+        if (pipe_config->pixel_multiplier)
+                dotclock /= pipe_config->pixel_multiplier;
 
         if (HAS_PCH_SPLIT(dev))
                 ironlake_check_encoder_dotclock(pipe_config, dotclock);
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 1b66ddcdfb33..9a17b4e92ef4 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -691,6 +691,14 @@ intel_post_enable_primary(struct drm_crtc *crtc)
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
         /*
+         * BDW signals flip done immediately if the plane
+         * is disabled, even if the plane enable is already
+         * armed to occur at the next vblank :(
+         */
+        if (IS_BROADWELL(dev))
+                intel_wait_for_vblank(dev, intel_crtc->pipe);
+
+        /*
          * FIXME IPS should be fine as long as one plane is
          * enabled, but in practice it seems to have problems
          * when going from primary only to sprite only and vice
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 79cba593df0d..4f6fef7ac069 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -320,7 +320,8 @@ static void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
         struct drm_i915_private *dev_priv = dev->dev_private;
         unsigned long irqflags;
 
-        del_timer_sync(&dev_priv->uncore.force_wake_timer);
+        if (del_timer_sync(&dev_priv->uncore.force_wake_timer))
+                gen6_force_wake_timer((unsigned long)dev_priv);
 
         /* Hold uncore.lock across reset to prevent any register access
          * with forcewake not set correctly
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index ae750f6928c1..7f7aadef8a82 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -277,6 +277,7 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
         static const char *hpd_reg_names[] = {"hpd-gdsc", "hpd-5v"};
         static const char *pwr_reg_names[] = {"core-vdda", "core-vcc"};
         static const char *hpd_clk_names[] = {"iface_clk", "core_clk", "mdp_core_clk"};
+        static unsigned long hpd_clk_freq[] = {0, 19200000, 0};
         static const char *pwr_clk_names[] = {"extp_clk", "alt_iface_clk"};
 
         config.phy_init      = hdmi_phy_8x74_init;
@@ -286,6 +287,7 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
         config.pwr_reg_names = pwr_reg_names;
         config.pwr_reg_cnt   = ARRAY_SIZE(pwr_reg_names);
         config.hpd_clk_names = hpd_clk_names;
+        config.hpd_freq      = hpd_clk_freq;
         config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);
         config.pwr_clk_names = pwr_clk_names;
         config.pwr_clk_cnt   = ARRAY_SIZE(pwr_clk_names);
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 9fafee6a3e43..9d7723c6528a 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -87,6 +87,7 @@ struct hdmi_platform_config {
 
         /* clks that need to be on for hpd: */
         const char **hpd_clk_names;
+        const long unsigned *hpd_freq;
         int hpd_clk_cnt;
 
         /* clks that need to be on for screen pwr (ie pixel clk): */
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index e56a6196867c..28f7e3ec6c28 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -127,6 +127,14 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
         }
 
         for (i = 0; i < config->hpd_clk_cnt; i++) {
+                if (config->hpd_freq && config->hpd_freq[i]) {
+                        ret = clk_set_rate(hdmi->hpd_clks[i],
+                                        config->hpd_freq[i]);
+                        if (ret)
+                                dev_warn(dev->dev, "failed to set clk %s (%d)\n",
+                                                config->hpd_clk_names[i], ret);
+                }
+
                 ret = clk_prepare_enable(hdmi->hpd_clks[i]);
                 if (ret) {
                         dev_err(dev->dev, "failed to enable hpd clk: %s (%d)\n",
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 42caf7fcb0b9..71510ee26e96 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -20,6 +20,10 @@
 #include "msm_mmu.h"
 #include "mdp5_kms.h"
 
+static const char *iommu_ports[] = {
+                "mdp_0",
+};
+
 static struct mdp5_platform_config *mdp5_get_config(struct platform_device *dev);
 
 static int mdp5_hw_init(struct msm_kms *kms)
@@ -104,6 +108,12 @@ static void mdp5_preclose(struct msm_kms *kms, struct drm_file *file)
 static void mdp5_destroy(struct msm_kms *kms)
 {
         struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
+        struct msm_mmu *mmu = mdp5_kms->mmu;
+
+        if (mmu) {
+                mmu->funcs->detach(mmu, iommu_ports, ARRAY_SIZE(iommu_ports));
+                mmu->funcs->destroy(mmu);
+        }
         kfree(mdp5_kms);
 }
 
@@ -216,10 +226,6 @@ fail:
         return ret;
 }
 
-static const char *iommu_ports[] = {
-                "mdp_0",
-};
-
 static int get_clk(struct platform_device *pdev, struct clk **clkp,
                 const char *name)
 {
@@ -317,17 +323,23 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
                 mmu = msm_iommu_new(dev, config->iommu);
                 if (IS_ERR(mmu)) {
                         ret = PTR_ERR(mmu);
+                        dev_err(dev->dev, "failed to init iommu: %d\n", ret);
                         goto fail;
                 }
+
                 ret = mmu->funcs->attach(mmu, iommu_ports,
                                 ARRAY_SIZE(iommu_ports));
-                if (ret)
+                if (ret) {
+                        dev_err(dev->dev, "failed to attach iommu: %d\n", ret);
+                        mmu->funcs->destroy(mmu);
                         goto fail;
+                }
         } else {
                 dev_info(dev->dev, "no iommu, fallback to phys "
                                 "contig buffers for scanout\n");
                 mmu = NULL;
         }
+        mdp5_kms->mmu = mmu;
 
         mdp5_kms->id = msm_register_mmu(dev, mmu);
         if (mdp5_kms->id < 0) {
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
index c8b1a2522c25..6e981b692d1d 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
@@ -33,6 +33,7 @@ struct mdp5_kms {
 
         /* mapper-id used to request GEM buffer mapped for scanout: */
         int id;
+        struct msm_mmu *mmu;
 
         /* for tracking smp allocation amongst pipes: */
         mdp5_smp_state_t smp_state;
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 0d2562fb681e..9a5d87db5c23 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -159,7 +159,7 @@ static int msm_unload(struct drm_device *dev)
 static int get_mdp_ver(struct platform_device *pdev)
 {
 #ifdef CONFIG_OF
-        const static struct of_device_id match_types[] = { {
+        static const struct of_device_id match_types[] = { {
                 .compatible = "qcom,mdss_mdp",
                 .data   = (void *)5,
         }, {
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index a752ab83b810..5107fc4826bc 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -59,7 +59,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
         struct drm_framebuffer *fb = NULL;
         struct fb_info *fbi = NULL;
         struct drm_mode_fb_cmd2 mode_cmd = {0};
-        dma_addr_t paddr;
+        uint32_t paddr;
         int ret, size;
 
         sizes->surface_bpp = 32;
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index bb8026daebc9..690d7e7b6d1e 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -278,6 +278,7 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
                 uint32_t *iova)
 {
         struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        struct drm_device *dev = obj->dev;
         int ret = 0;
 
         if (!msm_obj->domain[id].iova) {
@@ -285,6 +286,11 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
                 struct msm_mmu *mmu = priv->mmus[id];
                 struct page **pages = get_pages(obj);
 
+                if (!mmu) {
+                        dev_err(dev->dev, "null MMU pointer\n");
+                        return -EINVAL;
+                }
+
                 if (IS_ERR(pages))
                         return PTR_ERR(pages);
 
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 92b745986231..4b2ad9181edf 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -28,7 +28,7 @@ static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,
                 unsigned long iova, int flags, void *arg)
 {
         DBG("*** fault: iova=%08lx, flags=%d", iova, flags);
-        return 0;
+        return -ENOSYS;
 }
 
 static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
@@ -40,8 +40,10 @@ static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
         for (i = 0; i < cnt; i++) {
                 struct device *msm_iommu_get_ctx(const char *ctx_name);
                 struct device *ctx = msm_iommu_get_ctx(names[i]);
-                if (IS_ERR_OR_NULL(ctx))
+                if (IS_ERR_OR_NULL(ctx)) {
+                        dev_warn(dev->dev, "couldn't get %s context", names[i]);
                         continue;
+                }
                 ret = iommu_attach_device(iommu->domain, ctx);
                 if (ret) {
                         dev_warn(dev->dev, "could not attach iommu to %s", names[i]);
@@ -52,6 +54,20 @@ static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
         return 0;
 }
 
+static void msm_iommu_detach(struct msm_mmu *mmu, const char **names, int cnt)
+{
+        struct msm_iommu *iommu = to_msm_iommu(mmu);
+        int i;
+
+        for (i = 0; i < cnt; i++) {
+                struct device *msm_iommu_get_ctx(const char *ctx_name);
+                struct device *ctx = msm_iommu_get_ctx(names[i]);
+                if (IS_ERR_OR_NULL(ctx))
+                        continue;
+                iommu_detach_device(iommu->domain, ctx);
+        }
+}
+
 static int msm_iommu_map(struct msm_mmu *mmu, uint32_t iova,
                 struct sg_table *sgt, unsigned len, int prot)
 {
@@ -110,7 +126,7 @@ static int msm_iommu_unmap(struct msm_mmu *mmu, uint32_t iova,
 
                 VERB("unmap[%d]: %08x(%x)", i, iova, bytes);
 
-                BUG_ON(!IS_ALIGNED(bytes, PAGE_SIZE));
+                BUG_ON(!PAGE_ALIGNED(bytes));
 
                 da += bytes;
         }
@@ -127,6 +143,7 @@ static void msm_iommu_destroy(struct msm_mmu *mmu)
 
 static const struct msm_mmu_funcs funcs = {
                 .attach = msm_iommu_attach,
+                .detach = msm_iommu_detach,
                 .map = msm_iommu_map,
                 .unmap = msm_iommu_unmap,
                 .destroy = msm_iommu_destroy,
diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h
index 030324482b4a..21da6d154f71 100644
--- a/drivers/gpu/drm/msm/msm_mmu.h
+++ b/drivers/gpu/drm/msm/msm_mmu.h
@@ -22,6 +22,7 @@
 
 struct msm_mmu_funcs {
         int (*attach)(struct msm_mmu *mmu, const char **names, int cnt);
+        void (*detach)(struct msm_mmu *mmu, const char **names, int cnt);
         int (*map)(struct msm_mmu *mmu, uint32_t iova, struct sg_table *sgt,
                         unsigned len, int prot);
         int (*unmap)(struct msm_mmu *mmu, uint32_t iova, struct sg_table *sgt,
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index 2b6156d0e4b5..8b307e143632 100644
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -140,6 +140,7 @@ nouveau-y += core/subdev/i2c/nv4e.o
 nouveau-y += core/subdev/i2c/nv50.o
 nouveau-y += core/subdev/i2c/nv94.o
 nouveau-y += core/subdev/i2c/nvd0.o
+nouveau-y += core/subdev/i2c/gf117.o
 nouveau-y += core/subdev/i2c/nve0.o
 nouveau-y += core/subdev/ibus/nvc0.o
 nouveau-y += core/subdev/ibus/nve0.o
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
index f199957995fa..8d55ed633b19 100644
--- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
@@ -314,7 +314,7 @@ nvc0_identify(struct nouveau_device *device)
                 device->cname = "GF117";
                 device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
                 device->oclass[NVDEV_SUBDEV_GPIO   ] =  nvd0_gpio_oclass;
-                device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;
+                device->oclass[NVDEV_SUBDEV_I2C    ] =  gf117_i2c_oclass;
                 device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;
                 device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;
                 device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/base.c b/drivers/gpu/drm/nouveau/core/engine/disp/base.c
index c41f656abe64..9c38c5e40500 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/base.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/base.c
@@ -99,8 +99,10 @@ _nouveau_disp_dtor(struct nouveau_object *object)
 
         nouveau_event_destroy(&disp->vblank);
 
-        list_for_each_entry_safe(outp, outt, &disp->outp, head) {
-                nouveau_object_ref(NULL, (struct nouveau_object **)&outp);
+        if (disp->outp.next) {
+                list_for_each_entry_safe(outp, outt, &disp->outp, head) {
+                        nouveau_object_ref(NULL, (struct nouveau_object **)&outp);
+                }
         }
 
         nouveau_engine_destroy(&disp->base);
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dport.c b/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
index 39562d48101d..5a5b59b21130 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
@@ -241,7 +241,9 @@ dp_link_train_eq(struct dp_state *dp)
                 dp_set_training_pattern(dp, 2);
 
         do {
-                if (dp_link_train_update(dp, dp->pc2, 400))
+                if ((tries &&
+                    dp_link_train_commit(dp, dp->pc2)) ||
+                    dp_link_train_update(dp, dp->pc2, 400))
                         break;
 
                 eq_done = !!(dp->stat[2] & DPCD_LS04_INTERLANE_ALIGN_DONE);
@@ -253,9 +255,6 @@ dp_link_train_eq(struct dp_state *dp)
                             !(lane & DPCD_LS02_LANE0_SYMBOL_LOCKED))
                                 eq_done = false;
                 }
-
-                if (dp_link_train_commit(dp, dp->pc2))
-                        break;
         } while (!eq_done && cr_done && ++tries <= 5);
 
         return eq_done ? 0 : -1;
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 1e85f36c705f..26e962b7e702 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -1270,7 +1270,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, u32 pclk, u32 *conf)
         i--;
 
         outp = exec_lookup(priv, head, i, ctrl, &data, &ver, &hdr, &cnt, &len, &info1);
-        if (!data)
+        if (!outp)
                 return NULL;
 
         if (outp->info.location == 0) {
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc
index 2f7345f7fe07..7445f12b1d9e 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc
@@ -54,7 +54,7 @@ mmio_list_base:
 #ifdef INCLUDE_CODE
 // reports an exception to the host
 //
-// In: $r15 error code (see nvc0.fuc)
+// In: $r15 error code (see os.h)
 //
 error:
         push $r14
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc
index c8ddb8d71b91..b4ad18bf5a26 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc
@@ -49,7 +49,7 @@ hub_mmio_list_next:
 #ifdef INCLUDE_CODE
 // reports an exception to the host
 //
-// In: $r15 error code (see nvc0.fuc)
+// In: $r15 error code (see os.h)
 //
 error:
         nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(5), 0, $r15)
@@ -343,13 +343,25 @@ ih:
         ih_no_ctxsw:
         and $r11 $r10 NV_PGRAPH_FECS_INTR_FWMTHD
         bra e #ih_no_fwmthd
-                // none we handle, ack, and fall-through to unhandled
+                // none we handle; report to host and ack
+                nv_rd32($r15, NV_PGRAPH_TRAPPED_DATA_LO)
+                nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(4), 0, $r15)
+                nv_rd32($r15, NV_PGRAPH_TRAPPED_ADDR)
+                nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(3), 0, $r15)
+                extr $r14 $r15 16:18
+                shl b32 $r14 $r14 2
+                imm32($r15, NV_PGRAPH_FE_OBJECT_TABLE(0))
+                add b32 $r14 $r15
+                call(nv_rd32)
+                nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(2), 0, $r15)
+                mov $r15 E_BAD_FWMTHD
+                call(error)
                 mov $r11 0x100
                 nv_wr32(0x400144, $r11)
 
         // anything we didn't handle, bring it to the host's attention
         ih_no_fwmthd:
-        mov $r11 0x104 // FIFO | CHSW
+        mov $r11 0x504 // FIFO | CHSW | FWMTHD
         not b32 $r11
         and $r11 $r10 $r11
         bra e #ih_no_other
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h
index 214dd16ec566..5f953c5c20b7 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h
@@ -478,10 +478,10 @@ uint32_t gm107_grhub_code[] = {
         0x01040080,
         0xbd0001f6,
         0x01004104,
-        0x627e020f,
-        0x717e0006,
+        0xa87e020f,
+        0xb77e0006,
         0x100f0006,
-        0x0006b37e,
+        0x0006f97e,
         0x98000e98,
         0x207e010f,
         0x14950001,
@@ -523,8 +523,8 @@ uint32_t gm107_grhub_code[] = {
         0x800040b7,
         0xf40132b6,
         0x000fb41b,
-        0x0006b37e,
-        0x627e000f,
+        0x0006f97e,
+        0xa87e000f,
         0x00800006,
         0x01f60201,
         0xbd04bd00,
@@ -554,7 +554,7 @@ uint32_t gm107_grhub_code[] = {
         0x0009f602,
         0x32f404bd,
         0x0231f401,
-        0x0008367e,
+        0x00087c7e,
         0x99f094bd,
         0x17008007,
         0x0009f602,
@@ -563,7 +563,7 @@ uint32_t gm107_grhub_code[] = {
         0x37008006,
         0x0009f602,
         0x31f404bd,
-        0x08367e01,
+        0x087c7e01,
         0xf094bd00,
         0x00800699,
         0x09f60217,
@@ -572,7 +572,7 @@ uint32_t gm107_grhub_code[] = {
         0x20f92f0e,
         0x32f412b2,
         0x0232f401,
-        0x0008367e,
+        0x00087c7e,
         0x008020fc,
         0x02f602c0,
         0xf404bd00,
@@ -580,7 +580,7 @@ uint32_t gm107_grhub_code[] = {
         0x23c8130e,
         0x0d0bf41f,
         0xf40131f4,
-        0x367e0232,
+        0x7c7e0232,
 /* 0x054e: chsw_done */
         0x01020008,
         0x02c30080,
@@ -593,7 +593,7 @@ uint32_t gm107_grhub_code[] = {
         0xb0ff2a0e,
         0x1bf401e4,
         0x7ef2b20c,
-        0xf40007d6,
+        0xf400081c,
 /* 0x057a: main_not_ctx_chan */
         0xe4b0400e,
         0x2c1bf402,
@@ -602,7 +602,7 @@ uint32_t gm107_grhub_code[] = {
         0x0009f602,
         0x32f404bd,
         0x0232f401,
-        0x0008367e,
+        0x00087c7e,
         0x99f094bd,
         0x17008007,
         0x0009f602,
@@ -642,238 +642,238 @@ uint32_t gm107_grhub_code[] = {
 /* 0x061a: ih_no_ctxsw */
         0xabe40000,
         0x0bf40400,
-        0x01004b10,
-        0x448ebfb2,
-        0x8f7e4001,
-/* 0x062e: ih_no_fwmthd */
-        0x044b0000,
-        0xffb0bd01,
-        0x0bf4b4ab,
-        0x0700800c,
-        0x000bf603,
-/* 0x0642: ih_no_other */
-        0x004004bd,
-        0x000af601,
-        0xf0fc04bd,
-        0xd0fce0fc,
-        0xa0fcb0fc,
-        0x80fc90fc,
-        0xfc0088fe,
-        0x0032f480,
-/* 0x0662: ctx_4170s */
-        0xf5f001f8,
-        0x8effb210,
-        0x7e404170,
-        0xf800008f,
-/* 0x0671: ctx_4170w */
-        0x41708e00,
+        0x07088e56,
         0x00657e40,
-        0xf0ffb200,
-        0x1bf410f4,
-/* 0x0683: ctx_redswitch */
-        0x4e00f8f3,
-        0xe5f00200,
-        0x20e5f040,
-        0x8010e5f0,
-        0xf6018500,
-        0x04bd000e,
-/* 0x069a: ctx_redswitch_delay */
-        0xf2b6080f,
-        0xfd1bf401,
-        0x0400e5f1,
-        0x0100e5f1,
-        0x01850080,
-        0xbd000ef6,
-/* 0x06b3: ctx_86c */
-        0x8000f804,
-        0xf6022300,
+        0x80ffb200,
+        0xf6020400,
         0x04bd000f,
-        0x148effb2,
-        0x8f7e408a,
-        0xffb20000,
-        0x41a88c8e,
+        0x4007048e,
+        0x0000657e,
+        0x0080ffb2,
+        0x0ff60203,
+        0xc704bd00,
+        0xee9450fe,
+        0x07008f02,
+        0x00efbb40,
+        0x0000657e,
+        0x02020080,
+        0xbd000ff6,
+        0x7e030f04,
+        0x4b0002f8,
+        0xbfb20100,
+        0x4001448e,
         0x00008f7e,
-/* 0x06d2: ctx_mem */
-        0x008000f8,
-        0x0ff60284,
-/* 0x06db: ctx_mem_wait */
-        0x8f04bd00,
-        0xcf028400,
-        0xfffd00ff,
-        0xf61bf405,
-/* 0x06ea: ctx_load */
-        0x94bd00f8,
-        0x800599f0,
-        0xf6023700,
-        0x04bd0009,
-        0xb87e0c0a,
-        0xf4bd0000,
-        0x02890080,
+/* 0x0674: ih_no_fwmthd */
+        0xbd05044b,
+        0xb4abffb0,
+        0x800c0bf4,
+        0xf6030700,
+        0x04bd000b,
+/* 0x0688: ih_no_other */
+        0xf6010040,
+        0x04bd000a,
+        0xe0fcf0fc,
+        0xb0fcd0fc,
+        0x90fca0fc,
+        0x88fe80fc,
+        0xf480fc00,
+        0x01f80032,
+/* 0x06a8: ctx_4170s */
+        0xb210f5f0,
+        0x41708eff,
+        0x008f7e40,
+/* 0x06b7: ctx_4170w */
+        0x8e00f800,
+        0x7e404170,
+        0xb2000065,
+        0x10f4f0ff,
+        0xf8f31bf4,
+/* 0x06c9: ctx_redswitch */
+        0x02004e00,
+        0xf040e5f0,
+        0xe5f020e5,
+        0x85008010,
+        0x000ef601,
+        0x080f04bd,
+/* 0x06e0: ctx_redswitch_delay */
+        0xf401f2b6,
+        0xe5f1fd1b,
+        0xe5f10400,
+        0x00800100,
+        0x0ef60185,
+        0xf804bd00,
+/* 0x06f9: ctx_86c */
+        0x23008000,
+        0x000ff602,
+        0xffb204bd,
+        0x408a148e,
+        0x00008f7e,
+        0x8c8effb2,
+        0x8f7e41a8,
+        0x00f80000,
+/* 0x0718: ctx_mem */
+        0x02840080,
         0xbd000ff6,
-        0xc1008004,
-        0x0002f602,
-        0x008004bd,
-        0x02f60283,
-        0x0f04bd00,
-        0x06d27e07,
-        0xc0008000,
-        0x0002f602,
-        0x0bfe04bd,
-        0x1f2af000,
-        0xb60424b6,
-        0x94bd0220,
-        0x800899f0,
-        0xf6023700,
-        0x04bd0009,
-        0x02810080,
-        0xbd0002f6,
-        0x0000d204,
-        0x25f08000,
-        0x88008002,
-        0x0002f602,
-        0x100104bd,
-        0xf0020042,
-        0x12fa0223,
-        0xbd03f805,
-        0x0899f094,
-        0x02170080,
-        0xbd0009f6,
-        0x81019804,
-        0x981814b6,
-        0x25b68002,
-        0x0512fd08,
-        0xbd1601b5,
-        0x0999f094,
-        0x02370080,
-        0xbd0009f6,
-        0x81008004,
-        0x0001f602,
-        0x010204bd,
-        0x02880080,
+/* 0x0721: ctx_mem_wait */
+        0x84008f04,
+        0x00ffcf02,
+        0xf405fffd,
+        0x00f8f61b,
+/* 0x0730: ctx_load */
+        0x99f094bd,
+        0x37008005,
+        0x0009f602,
+        0x0c0a04bd,
+        0x0000b87e,
+        0x0080f4bd,
+        0x0ff60289,
+        0x8004bd00,
+        0xf602c100,
+        0x04bd0002,
+        0x02830080,
         0xbd0002f6,
-        0x01004104,
-        0xfa0613f0,
-        0x03f80501,
+        0x7e070f04,
+        0x80000718,
+        0xf602c000,
+        0x04bd0002,
+        0xf0000bfe,
+        0x24b61f2a,
+        0x0220b604,
         0x99f094bd,
-        0x17008009,
+        0x37008008,
         0x0009f602,
-        0x94bd04bd,
-        0x800599f0,
+        0x008004bd,
+        0x02f60281,
+        0xd204bd00,
+        0x80000000,
+        0x800225f0,
+        0xf6028800,
+        0x04bd0002,
+        0x00421001,
+        0x0223f002,
+        0xf80512fa,
+        0xf094bd03,
+        0x00800899,
+        0x09f60217,
+        0x9804bd00,
+        0x14b68101,
+        0x80029818,
+        0xfd0825b6,
+        0x01b50512,
+        0xf094bd16,
+        0x00800999,
+        0x09f60237,
+        0x8004bd00,
+        0xf6028100,
+        0x04bd0001,
+        0x00800102,
+        0x02f60288,
+        0x4104bd00,
+        0x13f00100,
+        0x0501fa06,
+        0x94bd03f8,
+        0x800999f0,
         0xf6021700,
         0x04bd0009,
-/* 0x07d6: ctx_chan */
-        0xea7e00f8,
-        0x0c0a0006,
-        0x0000b87e,
-        0xd27e050f,
-        0x00f80006,
-/* 0x07e8: ctx_mmio_exec */
-        0x80410398,
+        0x99f094bd,
+        0x17008005,
+        0x0009f602,
+        0x00f804bd,
+/* 0x081c: ctx_chan */
+        0x0007307e,
+        0xb87e0c0a,
+        0x050f0000,
+        0x0007187e,
+/* 0x082e: ctx_mmio_exec */
+        0x039800f8,
+        0x81008041,
+        0x0003f602,
+        0x34bd04bd,
+/* 0x083c: ctx_mmio_loop */
+        0xf4ff34c4,
+        0x00450e1b,
+        0x0653f002,
+        0xf80535fa,
+/* 0x084d: ctx_mmio_pull */
+        0x804e9803,
+        0x7e814f98,
+        0xb600008f,
+        0x12b60830,
+        0xdf1bf401,
+/* 0x0860: ctx_mmio_done */
+        0x80160398,
         0xf6028100,
         0x04bd0003,
-/* 0x07f6: ctx_mmio_loop */
-        0x34c434bd,
-        0x0e1bf4ff,
-        0xf0020045,
-        0x35fa0653,
-/* 0x0807: ctx_mmio_pull */
-        0x9803f805,
-        0x4f98804e,
-        0x008f7e81,
-        0x0830b600,
-        0xf40112b6,
-/* 0x081a: ctx_mmio_done */
-        0x0398df1b,
-        0x81008016,
-        0x0003f602,
-        0x00b504bd,
-        0x01004140,
-        0xfa0613f0,
-        0x03f80601,
-/* 0x0836: ctx_xfer */
-        0x040e00f8,
-        0x03020080,
-        0xbd000ef6,
-/* 0x0841: ctx_xfer_idle */
-        0x00008e04,
-        0x00eecf03,
-        0x2000e4f1,
-        0xf4f51bf4,
-        0x02f40611,
-/* 0x0855: ctx_xfer_pre */
-        0x7e100f0c,
-        0xf40006b3,
-/* 0x085e: ctx_xfer_pre_load */
-        0x020f1b11,
-        0x0006627e,
-        0x0006717e,
-        0x0006837e,
-        0x627ef4bd,
-        0xea7e0006,
-/* 0x0876: ctx_xfer_exec */
-        0x01980006,
-        0x8024bd16,
-        0xf6010500,
-        0x04bd0002,
-        0x008e1fb2,
-        0x8f7e41a5,
-        0xfcf00000,
-        0x022cf001,
-        0xfd0124b6,
-        0xffb205f2,
-        0x41a5048e,
+        0x414000b5,
+        0x13f00100,
+        0x0601fa06,
+        0x00f803f8,
+/* 0x087c: ctx_xfer */
+        0x0080040e,
+        0x0ef60302,
+/* 0x0887: ctx_xfer_idle */
+        0x8e04bd00,
+        0xcf030000,
+        0xe4f100ee,
+        0x1bf42000,
+        0x0611f4f5,
+/* 0x089b: ctx_xfer_pre */
+        0x0f0c02f4,
+        0x06f97e10,
+        0x1b11f400,
+/* 0x08a4: ctx_xfer_pre_load */
+        0xa87e020f,
+        0xb77e0006,
+        0xc97e0006,
+        0xf4bd0006,
+        0x0006a87e,
+        0x0007307e,
+/* 0x08bc: ctx_xfer_exec */
+        0xbd160198,
+        0x05008024,
+        0x0002f601,
+        0x1fb204bd,
+        0x41a5008e,
         0x00008f7e,
-        0x0002167e,
-        0xfc8024bd,
-        0x02f60247,
-        0xf004bd00,
-        0x20b6012c,
-        0x4afc8003,
-        0x0002f602,
-        0xacf004bd,
-        0x06a5f001,
-        0x0c98000b,
-        0x010d9800,
-        0x3d7e000e,
-        0x080a0001,
-        0x0000ec7e,
-        0x00020a7e,
-        0x0a1201f4,
-        0x00b87e0c,
-        0x7e050f00,
-        0xf40006d2,
-/* 0x08f2: ctx_xfer_post */
-        0x020f2d02,
-        0x0006627e,
-        0xb37ef4bd,
-        0x277e0006,
-        0x717e0002,
+        0xf001fcf0,
+        0x24b6022c,
+        0x05f2fd01,
+        0x048effb2,
+        0x8f7e41a5,
+        0x167e0000,
+        0x24bd0002,
+        0x0247fc80,
+        0xbd0002f6,
+        0x012cf004,
+        0x800320b6,
+        0xf6024afc,
+        0x04bd0002,
+        0xf001acf0,
+        0x000b06a5,
+        0x98000c98,
+        0x000e010d,
+        0x00013d7e,
+        0xec7e080a,
+        0x0a7e0000,
+        0x01f40002,
+        0x7e0c0a12,
+        0x0f0000b8,
+        0x07187e05,
+        0x2d02f400,
+/* 0x0938: ctx_xfer_post */
+        0xa87e020f,
         0xf4bd0006,
-        0x0006627e,
-        0x981011f4,
-        0x11fd4001,
-        0x070bf405,
-        0x0007e87e,
-/* 0x091c: ctx_xfer_no_post_mmio */
-/* 0x091c: ctx_xfer_done */
-        0x000000f8,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
+        0x0006f97e,
+        0x0002277e,
+        0x0006b77e,
+        0xa87ef4bd,
+        0x11f40006,
+        0x40019810,
+        0xf40511fd,
+        0x2e7e070b,
+/* 0x0962: ctx_xfer_no_post_mmio */
+/* 0x0962: ctx_xfer_done */
+        0x00f80008,
         0x00000000,
         0x00000000,
         0x00000000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
index 64dfd75192bf..e49b5a877ae4 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h
@@ -478,10 +478,10 @@ uint32_t nv108_grhub_code[] = {
         0x01040080,
         0xbd0001f6,
         0x01004104,
-        0x627e020f,
-        0x717e0006,
+        0xa87e020f,
+        0xb77e0006,
         0x100f0006,
-        0x0006b37e,
+        0x0006f97e,
         0x98000e98,
         0x207e010f,
         0x14950001,
@@ -523,8 +523,8 @@ uint32_t nv108_grhub_code[] = {
         0x800040b7,
         0xf40132b6,
         0x000fb41b,
-        0x0006b37e,
-        0x627e000f,
+        0x0006f97e,
+        0xa87e000f,
         0x00800006,
         0x01f60201,
         0xbd04bd00,
@@ -554,7 +554,7 @@ uint32_t nv108_grhub_code[] = {
         0x0009f602,
         0x32f404bd,
         0x0231f401,
-        0x0008367e,
+        0x00087c7e,
         0x99f094bd,
         0x17008007,
         0x0009f602,
@@ -563,7 +563,7 @@ uint32_t nv108_grhub_code[] = {
         0x37008006,
         0x0009f602,
         0x31f404bd,
-        0x08367e01,
+        0x087c7e01,
         0xf094bd00,
         0x00800699,
         0x09f60217,
@@ -572,7 +572,7 @@ uint32_t nv108_grhub_code[] = {
         0x20f92f0e,
         0x32f412b2,
         0x0232f401,
-        0x0008367e,
+        0x00087c7e,
         0x008020fc,
         0x02f602c0,
         0xf404bd00,
@@ -580,7 +580,7 @@ uint32_t nv108_grhub_code[] = {
         0x23c8130e,
         0x0d0bf41f,
         0xf40131f4,
-        0x367e0232,
+        0x7c7e0232,
 /* 0x054e: chsw_done */
         0x01020008,
         0x02c30080,
@@ -593,7 +593,7 @@ uint32_t nv108_grhub_code[] = {
         0xb0ff2a0e,
         0x1bf401e4,
         0x7ef2b20c,
-        0xf40007d6,
+        0xf400081c,
 /* 0x057a: main_not_ctx_chan */
         0xe4b0400e,
         0x2c1bf402,
@@ -602,7 +602,7 @@ uint32_t nv108_grhub_code[] = {
         0x0009f602,
         0x32f404bd,
         0x0232f401,
-        0x0008367e,
+        0x00087c7e,
         0x99f094bd,
         0x17008007,
         0x0009f602,
@@ -642,238 +642,238 @@ uint32_t nv108_grhub_code[] = {
 /* 0x061a: ih_no_ctxsw */
         0xabe40000,
         0x0bf40400,
-        0x01004b10,
-        0x448ebfb2,
-        0x8f7e4001,
-/* 0x062e: ih_no_fwmthd */
-        0x044b0000,
-        0xffb0bd01,
-        0x0bf4b4ab,
-        0x0700800c,
-        0x000bf603,
-/* 0x0642: ih_no_other */
-        0x004004bd,
-        0x000af601,
-        0xf0fc04bd,
-        0xd0fce0fc,
-        0xa0fcb0fc,
-        0x80fc90fc,
-        0xfc0088fe,
-        0x0032f480,
-/* 0x0662: ctx_4170s */
-        0xf5f001f8,
-        0x8effb210,
-        0x7e404170,
-        0xf800008f,
-/* 0x0671: ctx_4170w */
-        0x41708e00,
+        0x07088e56,
         0x00657e40,
-        0xf0ffb200,
-        0x1bf410f4,
-/* 0x0683: ctx_redswitch */
-        0x4e00f8f3,
-        0xe5f00200,
-        0x20e5f040,
-        0x8010e5f0,
-        0xf6018500,
-        0x04bd000e,
-/* 0x069a: ctx_redswitch_delay */
-        0xf2b6080f,
-        0xfd1bf401,
-        0x0400e5f1,
-        0x0100e5f1,
-        0x01850080,
-        0xbd000ef6,
-/* 0x06b3: ctx_86c */
-        0x8000f804,
-        0xf6022300,
+        0x80ffb200,
+        0xf6020400,
         0x04bd000f,
-        0x148effb2,
-        0x8f7e408a,
-        0xffb20000,
-        0x41a88c8e,
+        0x4007048e,
+        0x0000657e,
+        0x0080ffb2,
+        0x0ff60203,
+        0xc704bd00,
+        0xee9450fe,
+        0x07008f02,
+        0x00efbb40,
+        0x0000657e,
+        0x02020080,
+        0xbd000ff6,
+        0x7e030f04,
+        0x4b0002f8,
+        0xbfb20100,
+        0x4001448e,
         0x00008f7e,
-/* 0x06d2: ctx_mem */
-        0x008000f8,
-        0x0ff60284,
-/* 0x06db: ctx_mem_wait */
-        0x8f04bd00,
-        0xcf028400,
-        0xfffd00ff,
-        0xf61bf405,
-/* 0x06ea: ctx_load */
-        0x94bd00f8,
-        0x800599f0,
-        0xf6023700,
-        0x04bd0009,
-        0xb87e0c0a,
-        0xf4bd0000,
-        0x02890080,
+/* 0x0674: ih_no_fwmthd */
+        0xbd05044b,
+        0xb4abffb0,
+        0x800c0bf4,
+        0xf6030700,
+        0x04bd000b,
+/* 0x0688: ih_no_other */
+        0xf6010040,
+        0x04bd000a,
+        0xe0fcf0fc,
+        0xb0fcd0fc,
+        0x90fca0fc,
+        0x88fe80fc,
+        0xf480fc00,
+        0x01f80032,
+/* 0x06a8: ctx_4170s */
+        0xb210f5f0,
+        0x41708eff,
+        0x008f7e40,
+/* 0x06b7: ctx_4170w */
+        0x8e00f800,
+        0x7e404170,
+        0xb2000065,
+        0x10f4f0ff,
+        0xf8f31bf4,
+/* 0x06c9: ctx_redswitch */
+        0x02004e00,
+        0xf040e5f0,
+        0xe5f020e5,
+        0x85008010,
+        0x000ef601,
+        0x080f04bd,
+/* 0x06e0: ctx_redswitch_delay */
+        0xf401f2b6,
+        0xe5f1fd1b,
+        0xe5f10400,
+        0x00800100,
+        0x0ef60185,
+        0xf804bd00,
+/* 0x06f9: ctx_86c */
+        0x23008000,
+        0x000ff602,
+        0xffb204bd,
+        0x408a148e,
+        0x00008f7e,
+        0x8c8effb2,
+        0x8f7e41a8,
+        0x00f80000,
+/* 0x0718: ctx_mem */
+        0x02840080,
         0xbd000ff6,
-        0xc1008004,
-        0x0002f602,
-        0x008004bd,
-        0x02f60283,
-        0x0f04bd00,
-        0x06d27e07,
-        0xc0008000,
-        0x0002f602,
-        0x0bfe04bd,
-        0x1f2af000,
-        0xb60424b6,
-        0x94bd0220,
-        0x800899f0,
-        0xf6023700,
-        0x04bd0009,
-        0x02810080,
-        0xbd0002f6,
-        0x0000d204,
-        0x25f08000,
-        0x88008002,
-        0x0002f602,
-        0x100104bd,
-        0xf0020042,
-        0x12fa0223,
-        0xbd03f805,
-        0x0899f094,
-        0x02170080,
-        0xbd0009f6,
-        0x81019804,
-        0x981814b6,
-        0x25b68002,
-        0x0512fd08,
-        0xbd1601b5,
-        0x0999f094,
-        0x02370080,
-        0xbd0009f6,
-        0x81008004,
-        0x0001f602,
-        0x010204bd,
-        0x02880080,
+/* 0x0721: ctx_mem_wait */
+        0x84008f04,
+        0x00ffcf02,
+        0xf405fffd,
+        0x00f8f61b,
+/* 0x0730: ctx_load */
+        0x99f094bd,
+        0x37008005,
+        0x0009f602,
+        0x0c0a04bd,
+        0x0000b87e,
+        0x0080f4bd,
+        0x0ff60289,
+        0x8004bd00,
+        0xf602c100,
+        0x04bd0002,
+        0x02830080,
         0xbd0002f6,
-        0x01004104,
-        0xfa0613f0,
-        0x03f80501,
+        0x7e070f04,
+        0x80000718,
+        0xf602c000,
+        0x04bd0002,
+        0xf0000bfe,
+        0x24b61f2a,
+        0x0220b604,
         0x99f094bd,
-        0x17008009,
+        0x37008008,
         0x0009f602,
-        0x94bd04bd,
-        0x800599f0,
+        0x008004bd,
+        0x02f60281,
+        0xd204bd00,
+        0x80000000,
+        0x800225f0,
+        0xf6028800,
+        0x04bd0002,
+        0x00421001,
+        0x0223f002,
+        0xf80512fa,
+        0xf094bd03,
+        0x00800899,
+        0x09f60217,
+        0x9804bd00,
+        0x14b68101,
+        0x80029818,
+        0xfd0825b6,
+        0x01b50512,
+        0xf094bd16,
+        0x00800999,
+        0x09f60237,
+        0x8004bd00,
+        0xf6028100,
+        0x04bd0001,
+        0x00800102,
+        0x02f60288,
+        0x4104bd00,
+        0x13f00100,
+        0x0501fa06,
+        0x94bd03f8,
+        0x800999f0,
         0xf6021700,
         0x04bd0009,
-/* 0x07d6: ctx_chan */
-        0xea7e00f8,
-        0x0c0a0006,
-        0x0000b87e,
-        0xd27e050f,
-        0x00f80006,
-/* 0x07e8: ctx_mmio_exec */
-        0x80410398,
+        0x99f094bd,
+        0x17008005,
+        0x0009f602,
+        0x00f804bd,
+/* 0x081c: ctx_chan */
+        0x0007307e,
+        0xb87e0c0a,
+        0x050f0000,
+        0x0007187e,
+/* 0x082e: ctx_mmio_exec */
+        0x039800f8,
+        0x81008041,
+        0x0003f602,
+        0x34bd04bd,
+/* 0x083c: ctx_mmio_loop */
+        0xf4ff34c4,
+        0x00450e1b,
+        0x0653f002,
+        0xf80535fa,
+/* 0x084d: ctx_mmio_pull */
+        0x804e9803,
+        0x7e814f98,
+        0xb600008f,
+        0x12b60830,
+        0xdf1bf401,
+/* 0x0860: ctx_mmio_done */
+        0x80160398,
         0xf6028100,
         0x04bd0003,
-/* 0x07f6: ctx_mmio_loop */
-        0x34c434bd,
-        0x0e1bf4ff,
-        0xf0020045,
-        0x35fa0653,
-/* 0x0807: ctx_mmio_pull */
-        0x9803f805,
-        0x4f98804e,
-        0x008f7e81,
-        0x0830b600,
-        0xf40112b6,
-/* 0x081a: ctx_mmio_done */
-        0x0398df1b,
-        0x81008016,
-        0x0003f602,
-        0x00b504bd,
-        0x01004140,
-        0xfa0613f0,
-        0x03f80601,
-/* 0x0836: ctx_xfer */
-        0x040e00f8,
-        0x03020080,
-        0xbd000ef6,
-/* 0x0841: ctx_xfer_idle */
-        0x00008e04,
-        0x00eecf03,
-        0x2000e4f1,
-        0xf4f51bf4,
-        0x02f40611,
-/* 0x0855: ctx_xfer_pre */
-        0x7e100f0c,
-        0xf40006b3,
-/* 0x085e: ctx_xfer_pre_load */
-        0x020f1b11,
-        0x0006627e,
-        0x0006717e,
-        0x0006837e,
-        0x627ef4bd,
-        0xea7e0006,
-/* 0x0876: ctx_xfer_exec */
-        0x01980006,
-        0x8024bd16,
-        0xf6010500,
-        0x04bd0002,
-        0x008e1fb2,
-        0x8f7e41a5,
-        0xfcf00000,
-        0x022cf001,
-        0xfd0124b6,
-        0xffb205f2,
-        0x41a5048e,
+        0x414000b5,
+        0x13f00100,
+        0x0601fa06,
+        0x00f803f8,
+/* 0x087c: ctx_xfer */
+        0x0080040e,
+        0x0ef60302,
+/* 0x0887: ctx_xfer_idle */
+        0x8e04bd00,
+        0xcf030000,
+        0xe4f100ee,
+        0x1bf42000,
+        0x0611f4f5,
+/* 0x089b: ctx_xfer_pre */
+        0x0f0c02f4,
+        0x06f97e10,
+        0x1b11f400,
+/* 0x08a4: ctx_xfer_pre_load */
+        0xa87e020f,
+        0xb77e0006,
+        0xc97e0006,
+        0xf4bd0006,
+        0x0006a87e,
+        0x0007307e,
+/* 0x08bc: ctx_xfer_exec */
+        0xbd160198,
+        0x05008024,
+        0x0002f601,
+        0x1fb204bd,
+        0x41a5008e,
         0x00008f7e,
-        0x0002167e,
-        0xfc8024bd,
-        0x02f60247,
-        0xf004bd00,
-        0x20b6012c,
-        0x4afc8003,
-        0x0002f602,
-        0xacf004bd,
-        0x06a5f001,
-        0x0c98000b,
-        0x010d9800,
-        0x3d7e000e,
-        0x080a0001,
-        0x0000ec7e,
-        0x00020a7e,
-        0x0a1201f4,
-        0x00b87e0c,
-        0x7e050f00,
-        0xf40006d2,
-/* 0x08f2: ctx_xfer_post */
-        0x020f2d02,
-        0x0006627e,
-        0xb37ef4bd,
-        0x277e0006,
-        0x717e0002,
+        0xf001fcf0,
+        0x24b6022c,
+        0x05f2fd01,
+        0x048effb2,
+        0x8f7e41a5,
+        0x167e0000,
+        0x24bd0002,
+        0x0247fc80,
+        0xbd0002f6,
+        0x012cf004,
+        0x800320b6,
+        0xf6024afc,
+        0x04bd0002,
+        0xf001acf0,
+        0x000b06a5,
+        0x98000c98,
+        0x000e010d,
+        0x00013d7e,
+        0xec7e080a,
+        0x0a7e0000,
+        0x01f40002,
+        0x7e0c0a12,
+        0x0f0000b8,
+        0x07187e05,
+        0x2d02f400,
+/* 0x0938: ctx_xfer_post */
+        0xa87e020f,
         0xf4bd0006,
-        0x0006627e,
-        0x981011f4,
-        0x11fd4001,
-        0x070bf405,
-        0x0007e87e,
-/* 0x091c: ctx_xfer_no_post_mmio */
-/* 0x091c: ctx_xfer_done */
-        0x000000f8,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
-        0x00000000,
+        0x0006f97e,
+        0x0002277e,
+        0x0006b77e,
+        0xa87ef4bd,
+        0x11f40006,
+        0x40019810,
+        0xf40511fd,
+        0x2e7e070b,
+/* 0x0962: ctx_xfer_no_post_mmio */
+/* 0x0962: ctx_xfer_done */
+        0x00f80008,
         0x00000000,
         0x00000000,
         0x00000000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
index f8f7b278a13f..92dfe6a4ac87 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
@@ -528,10 +528,10 @@ uint32_t nvc0_grhub_code[] = {
         0x0001d001,
         0x17f104bd,
         0xf7f00100,
-        0xb521f502,
-        0xc721f507,
-        0x10f7f007,
-        0x081421f5,
+        0x0d21f502,
+        0x1f21f508,
+        0x10f7f008,
+        0x086c21f5,
         0x98000e98,
         0x21f5010f,
         0x14950150,
@@ -574,9 +574,9 @@ uint32_t nvc0_grhub_code[] = {
         0xb6800040,
         0x1bf40132,
         0x00f7f0be,
-        0x081421f5,
+        0x086c21f5,
         0xf500f7f0,
-        0xf107b521,
+        0xf1080d21,
         0xf0010007,
         0x01d00203,
         0xbd04bd00,
@@ -610,8 +610,8 @@ uint32_t nvc0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x31f40132,
-        0xe821f502,
-        0xf094bd09,
+        0x4021f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -621,7 +621,7 @@ uint32_t nvc0_grhub_code[] = {
         0x0203f00f,
         0xbd0009d0,
         0x0131f404,
-        0x09e821f5,
+        0x0a4021f5,
         0x99f094bd,
         0x0007f106,
         0x0203f017,
@@ -631,7 +631,7 @@ uint32_t nvc0_grhub_code[] = {
         0x12b920f9,
         0x0132f402,
         0xf50232f4,
-        0xfc09e821,
+        0xfc0a4021,
         0x0007f120,
         0x0203f0c0,
         0xbd0002d0,
@@ -640,7 +640,7 @@ uint32_t nvc0_grhub_code[] = {
         0xf41f23c8,
         0x31f40d0b,
         0x0232f401,
-        0x09e821f5,
+        0x0a4021f5,
 /* 0x063c: chsw_done */
         0xf10127f0,
         0xf0c30007,
@@ -654,7 +654,7 @@ uint32_t nvc0_grhub_code[] = {
 /* 0x0660: main_not_ctx_switch */
         0xf401e4b0,
         0xf2b90d1b,
-        0x7821f502,
+        0xd021f502,
         0x460ef409,
 /* 0x0670: main_not_ctx_chan */
         0xf402e4b0,
@@ -664,8 +664,8 @@ uint32_t nvc0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x32f40132,
-        0xe821f502,
-        0xf094bd09,
+        0x4021f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -710,18 +710,40 @@ uint32_t nvc0_grhub_code[] = {
 /* 0x072b: ih_no_ctxsw */
         0xe40421f4,
         0xf40400ab,
-        0xb7f1140b,
+        0xe7f16c0b,
+        0xe3f00708,
+        0x6821f440,
+        0xf102ffb9,
+        0xf0040007,
+        0x0fd00203,
+        0xf104bd00,
+        0xf00704e7,
+        0x21f440e3,
+        0x02ffb968,
+        0x030007f1,
+        0xd00203f0,
+        0x04bd000f,
+        0x9450fec7,
+        0xf7f102ee,
+        0xf3f00700,
+        0x00efbb40,
+        0xf16821f4,
+        0xf0020007,
+        0x0fd00203,
+        0xf004bd00,
+        0x21f503f7,
+        0xb7f1037e,
         0xbfb90100,
         0x44e7f102,
         0x40e3f001,
-/* 0x0743: ih_no_fwmthd */
+/* 0x079b: ih_no_fwmthd */
         0xf19d21f4,
-        0xbd0104b7,
+        0xbd0504b7,
         0xb4abffb0,
         0xf10f0bf4,
         0xf0070007,
         0x0bd00303,
-/* 0x075b: ih_no_other */
+/* 0x07b3: ih_no_other */
         0xf104bd00,
         0xf0010007,
         0x0ad00003,
@@ -731,36 +753,36 @@ uint32_t nvc0_grhub_code[] = {
         0xfc90fca0,
         0x0088fe80,
         0x32f480fc,
-/* 0x077f: ctx_4160s */
+/* 0x07d7: ctx_4160s */
         0xf001f800,
         0xffb901f7,
         0x60e7f102,
         0x40e3f041,
-/* 0x078f: ctx_4160s_wait */
+/* 0x07e7: ctx_4160s_wait */
         0xf19d21f4,
         0xf04160e7,
         0x21f440e3,
         0x02ffb968,
         0xf404ffc8,
         0x00f8f00b,
-/* 0x07a4: ctx_4160c */
+/* 0x07fc: ctx_4160c */
         0xffb9f4bd,
         0x60e7f102,
         0x40e3f041,
         0xf89d21f4,
-/* 0x07b5: ctx_4170s */
+/* 0x080d: ctx_4170s */
         0x10f5f000,
         0xf102ffb9,
         0xf04170e7,
         0x21f440e3,
-/* 0x07c7: ctx_4170w */
+/* 0x081f: ctx_4170w */
         0xf100f89d,
         0xf04170e7,
         0x21f440e3,
         0x02ffb968,
         0xf410f4f0,
         0x00f8f01b,
-/* 0x07dc: ctx_redswitch */
+/* 0x0834: ctx_redswitch */
         0x0200e7f1,
         0xf040e5f0,
         0xe5f020e5,
@@ -768,7 +790,7 @@ uint32_t nvc0_grhub_code[] = {
         0x0103f085,
         0xbd000ed0,
         0x08f7f004,
-/* 0x07f8: ctx_redswitch_delay */
+/* 0x0850: ctx_redswitch_delay */
         0xf401f2b6,
         0xe5f1fd1b,
         0xe5f10400,
@@ -776,7 +798,7 @@ uint32_t nvc0_grhub_code[] = {
         0x03f08500,
         0x000ed001,
         0x00f804bd,
-/* 0x0814: ctx_86c */
+/* 0x086c: ctx_86c */
         0x1b0007f1,
         0xd00203f0,
         0x04bd000f,
@@ -787,16 +809,16 @@ uint32_t nvc0_grhub_code[] = {
         0xa86ce7f1,
         0xf441e3f0,
         0x00f89d21,
-/* 0x083c: ctx_mem */
+/* 0x0894: ctx_mem */
         0x840007f1,
         0xd00203f0,
         0x04bd000f,
-/* 0x0848: ctx_mem_wait */
+/* 0x08a0: ctx_mem_wait */
         0x8400f7f1,
         0xcf02f3f0,
         0xfffd00ff,
         0xf31bf405,
-/* 0x085a: ctx_load */
+/* 0x08b2: ctx_load */
         0x94bd00f8,
         0xf10599f0,
         0xf00f0007,
@@ -814,7 +836,7 @@ uint32_t nvc0_grhub_code[] = {
         0x02d00203,
         0xf004bd00,
         0x21f507f7,
-        0x07f1083c,
+        0x07f10894,
         0x03f0c000,
         0x0002d002,
         0x0bfe04bd,
@@ -869,31 +891,31 @@ uint32_t nvc0_grhub_code[] = {
         0x03f01700,
         0x0009d002,
         0x00f804bd,
-/* 0x0978: ctx_chan */
-        0x077f21f5,
-        0x085a21f5,
+/* 0x09d0: ctx_chan */
+        0x07d721f5,
+        0x08b221f5,
         0xf40ca7f0,
         0xf7f0d021,
-        0x3c21f505,
-        0xa421f508,
-/* 0x0993: ctx_mmio_exec */
+        0x9421f505,
+        0xfc21f508,
+/* 0x09eb: ctx_mmio_exec */
         0x9800f807,
         0x07f14103,
         0x03f08100,
         0x0003d002,
         0x34bd04bd,
-/* 0x09a4: ctx_mmio_loop */
+/* 0x09fc: ctx_mmio_loop */
         0xf4ff34c4,
         0x57f10f1b,
         0x53f00200,
         0x0535fa06,
-/* 0x09b6: ctx_mmio_pull */
+/* 0x0a0e: ctx_mmio_pull */
         0x4e9803f8,
         0x814f9880,
         0xb69d21f4,
         0x12b60830,
         0xdf1bf401,
-/* 0x09c8: ctx_mmio_done */
+/* 0x0a20: ctx_mmio_done */
         0xf1160398,
         0xf0810007,
         0x03d00203,
@@ -902,30 +924,30 @@ uint32_t nvc0_grhub_code[] = {
         0x13f00100,
         0x0601fa06,
         0x00f803f8,
-/* 0x09e8: ctx_xfer */
+/* 0x0a40: ctx_xfer */
         0xf104e7f0,
         0xf0020007,
         0x0ed00303,
-/* 0x09f7: ctx_xfer_idle */
+/* 0x0a4f: ctx_xfer_idle */
         0xf104bd00,
         0xf00000e7,
         0xeecf03e3,
         0x00e4f100,
         0xf21bf420,
         0xf40611f4,
-/* 0x0a0e: ctx_xfer_pre */
+/* 0x0a66: ctx_xfer_pre */
         0xf7f01102,
-        0x1421f510,
-        0x7f21f508,
+        0x6c21f510,
+        0xd721f508,
         0x1c11f407,
-/* 0x0a1c: ctx_xfer_pre_load */
+/* 0x0a74: ctx_xfer_pre_load */
         0xf502f7f0,
-        0xf507b521,
-        0xf507c721,
-        0xbd07dc21,
-        0xb521f5f4,
-        0x5a21f507,
-/* 0x0a35: ctx_xfer_exec */
+        0xf5080d21,
+        0xf5081f21,
+        0xbd083421,
+        0x0d21f5f4,
+        0xb221f508,
+/* 0x0a8d: ctx_xfer_exec */
         0x16019808,
         0x07f124bd,
         0x03f00500,
@@ -960,23 +982,65 @@ uint32_t nvc0_grhub_code[] = {
         0x1301f402,
         0xf40ca7f0,
         0xf7f0d021,
-        0x3c21f505,
+        0x9421f505,
         0x3202f408,
-/* 0x0ac4: ctx_xfer_post */
+/* 0x0b1c: ctx_xfer_post */
         0xf502f7f0,
-        0xbd07b521,
-        0x1421f5f4,
+        0xbd080d21,
+        0x6c21f5f4,
         0x7f21f508,
-        0xc721f502,
-        0xf5f4bd07,
-        0xf407b521,
+        0x1f21f502,
+        0xf5f4bd08,
+        0xf4080d21,
         0x01981011,
         0x0511fd40,
         0xf5070bf4,
-/* 0x0aef: ctx_xfer_no_post_mmio */
-        0xf5099321,
-/* 0x0af3: ctx_xfer_done */
-        0xf807a421,
+/* 0x0b47: ctx_xfer_no_post_mmio */
+        0xf509eb21,
+/* 0x0b4b: ctx_xfer_done */
+        0xf807fc21,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
         0x00000000,
         0x00000000,
         0x00000000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
index 624215a005b0..62b0c7601d8b 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h
@@ -528,10 +528,10 @@ uint32_t nvd7_grhub_code[] = {
         0x0001d001,
         0x17f104bd,
         0xf7f00100,
-        0xb521f502,
-        0xc721f507,
-        0x10f7f007,
-        0x081421f5,
+        0x0d21f502,
+        0x1f21f508,
+        0x10f7f008,
+        0x086c21f5,
         0x98000e98,
         0x21f5010f,
         0x14950150,
@@ -574,9 +574,9 @@ uint32_t nvd7_grhub_code[] = {
         0xb6800040,
         0x1bf40132,
         0x00f7f0be,
-        0x081421f5,
+        0x086c21f5,
         0xf500f7f0,
-        0xf107b521,
+        0xf1080d21,
         0xf0010007,
         0x01d00203,
         0xbd04bd00,
@@ -610,8 +610,8 @@ uint32_t nvd7_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x31f40132,
-        0xe821f502,
-        0xf094bd09,
+        0x4021f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -621,7 +621,7 @@ uint32_t nvd7_grhub_code[] = {
         0x0203f00f,
         0xbd0009d0,
         0x0131f404,
-        0x09e821f5,
+        0x0a4021f5,
         0x99f094bd,
         0x0007f106,
         0x0203f017,
@@ -631,7 +631,7 @@ uint32_t nvd7_grhub_code[] = {
         0x12b920f9,
         0x0132f402,
         0xf50232f4,
-        0xfc09e821,
+        0xfc0a4021,
         0x0007f120,
         0x0203f0c0,
         0xbd0002d0,
@@ -640,7 +640,7 @@ uint32_t nvd7_grhub_code[] = {
         0xf41f23c8,
         0x31f40d0b,
         0x0232f401,
-        0x09e821f5,
+        0x0a4021f5,
 /* 0x063c: chsw_done */
         0xf10127f0,
         0xf0c30007,
@@ -654,7 +654,7 @@ uint32_t nvd7_grhub_code[] = {
 /* 0x0660: main_not_ctx_switch */
         0xf401e4b0,
         0xf2b90d1b,
-        0x7821f502,
+        0xd021f502,
         0x460ef409,
 /* 0x0670: main_not_ctx_chan */
         0xf402e4b0,
@@ -664,8 +664,8 @@ uint32_t nvd7_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x32f40132,
-        0xe821f502,
-        0xf094bd09,
+        0x4021f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -710,18 +710,40 @@ uint32_t nvd7_grhub_code[] = {
 /* 0x072b: ih_no_ctxsw */
         0xe40421f4,
         0xf40400ab,
-        0xb7f1140b,
+        0xe7f16c0b,
+        0xe3f00708,
+        0x6821f440,
+        0xf102ffb9,
+        0xf0040007,
+        0x0fd00203,
+        0xf104bd00,
+        0xf00704e7,
+        0x21f440e3,
+        0x02ffb968,
+        0x030007f1,
+        0xd00203f0,
+        0x04bd000f,
+        0x9450fec7,
+        0xf7f102ee,
+        0xf3f00700,
+        0x00efbb40,
+        0xf16821f4,
+        0xf0020007,
+        0x0fd00203,
+        0xf004bd00,
+        0x21f503f7,
+        0xb7f1037e,
         0xbfb90100,
         0x44e7f102,
         0x40e3f001,
-/* 0x0743: ih_no_fwmthd */
+/* 0x079b: ih_no_fwmthd */
         0xf19d21f4,
-        0xbd0104b7,
+        0xbd0504b7,
         0xb4abffb0,
         0xf10f0bf4,
         0xf0070007,
         0x0bd00303,
-/* 0x075b: ih_no_other */
+/* 0x07b3: ih_no_other */
         0xf104bd00,
         0xf0010007,
         0x0ad00003,
@@ -731,36 +753,36 @@ uint32_t nvd7_grhub_code[] = {
         0xfc90fca0,
         0x0088fe80,
         0x32f480fc,
-/* 0x077f: ctx_4160s */
+/* 0x07d7: ctx_4160s */
         0xf001f800,
         0xffb901f7,
         0x60e7f102,
         0x40e3f041,
-/* 0x078f: ctx_4160s_wait */
+/* 0x07e7: ctx_4160s_wait */
         0xf19d21f4,
         0xf04160e7,
         0x21f440e3,
         0x02ffb968,
         0xf404ffc8,
         0x00f8f00b,
-/* 0x07a4: ctx_4160c */
+/* 0x07fc: ctx_4160c */
         0xffb9f4bd,
         0x60e7f102,
         0x40e3f041,
         0xf89d21f4,
-/* 0x07b5: ctx_4170s */
+/* 0x080d: ctx_4170s */
         0x10f5f000,
         0xf102ffb9,
         0xf04170e7,
         0x21f440e3,
-/* 0x07c7: ctx_4170w */
+/* 0x081f: ctx_4170w */
         0xf100f89d,
         0xf04170e7,
         0x21f440e3,
         0x02ffb968,
         0xf410f4f0,
         0x00f8f01b,
-/* 0x07dc: ctx_redswitch */
+/* 0x0834: ctx_redswitch */
         0x0200e7f1,
         0xf040e5f0,
         0xe5f020e5,
@@ -768,7 +790,7 @@ uint32_t nvd7_grhub_code[] = {
         0x0103f085,
         0xbd000ed0,
         0x08f7f004,
-/* 0x07f8: ctx_redswitch_delay */
+/* 0x0850: ctx_redswitch_delay */
         0xf401f2b6,
         0xe5f1fd1b,
         0xe5f10400,
@@ -776,7 +798,7 @@ uint32_t nvd7_grhub_code[] = {
         0x03f08500,
         0x000ed001,
         0x00f804bd,
-/* 0x0814: ctx_86c */
+/* 0x086c: ctx_86c */
         0x1b0007f1,
         0xd00203f0,
         0x04bd000f,
@@ -787,16 +809,16 @@ uint32_t nvd7_grhub_code[] = {
         0xa86ce7f1,
         0xf441e3f0,
         0x00f89d21,
-/* 0x083c: ctx_mem */
+/* 0x0894: ctx_mem */
         0x840007f1,
         0xd00203f0,
         0x04bd000f,
-/* 0x0848: ctx_mem_wait */
+/* 0x08a0: ctx_mem_wait */
         0x8400f7f1,
         0xcf02f3f0,
         0xfffd00ff,
         0xf31bf405,
-/* 0x085a: ctx_load */
+/* 0x08b2: ctx_load */
         0x94bd00f8,
         0xf10599f0,
         0xf00f0007,
@@ -814,7 +836,7 @@ uint32_t nvd7_grhub_code[] = {
         0x02d00203,
         0xf004bd00,
         0x21f507f7,
-        0x07f1083c,
+        0x07f10894,
         0x03f0c000,
         0x0002d002,
         0x0bfe04bd,
@@ -869,31 +891,31 @@ uint32_t nvd7_grhub_code[] = {
         0x03f01700,
         0x0009d002,
         0x00f804bd,
-/* 0x0978: ctx_chan */
-        0x077f21f5,
-        0x085a21f5,
+/* 0x09d0: ctx_chan */
+        0x07d721f5,
+        0x08b221f5,
         0xf40ca7f0,
         0xf7f0d021,
-        0x3c21f505,
-        0xa421f508,
-/* 0x0993: ctx_mmio_exec */
+        0x9421f505,
+        0xfc21f508,
+/* 0x09eb: ctx_mmio_exec */
         0x9800f807,
         0x07f14103,
         0x03f08100,
         0x0003d002,
         0x34bd04bd,
-/* 0x09a4: ctx_mmio_loop */
+/* 0x09fc: ctx_mmio_loop */
         0xf4ff34c4,
         0x57f10f1b,
         0x53f00200,
         0x0535fa06,
-/* 0x09b6: ctx_mmio_pull */
+/* 0x0a0e: ctx_mmio_pull */
         0x4e9803f8,
         0x814f9880,
         0xb69d21f4,
         0x12b60830,
         0xdf1bf401,
-/* 0x09c8: ctx_mmio_done */
+/* 0x0a20: ctx_mmio_done */
         0xf1160398,
         0xf0810007,
         0x03d00203,
@@ -902,30 +924,30 @@ uint32_t nvd7_grhub_code[] = {
         0x13f00100,
         0x0601fa06,
         0x00f803f8,
-/* 0x09e8: ctx_xfer */
+/* 0x0a40: ctx_xfer */
         0xf104e7f0,
         0xf0020007,
         0x0ed00303,
-/* 0x09f7: ctx_xfer_idle */
+/* 0x0a4f: ctx_xfer_idle */
         0xf104bd00,
         0xf00000e7,
         0xeecf03e3,
         0x00e4f100,
         0xf21bf420,
         0xf40611f4,
-/* 0x0a0e: ctx_xfer_pre */
+/* 0x0a66: ctx_xfer_pre */
         0xf7f01102,
-        0x1421f510,
-        0x7f21f508,
+        0x6c21f510,
+        0xd721f508,
         0x1c11f407,
-/* 0x0a1c: ctx_xfer_pre_load */
+/* 0x0a74: ctx_xfer_pre_load */
         0xf502f7f0,
-        0xf507b521,
-        0xf507c721,
-        0xbd07dc21,
-        0xb521f5f4,
-        0x5a21f507,
-/* 0x0a35: ctx_xfer_exec */
+        0xf5080d21,
+        0xf5081f21,
+        0xbd083421,
+        0x0d21f5f4,
+        0xb221f508,
+/* 0x0a8d: ctx_xfer_exec */
         0x16019808,
         0x07f124bd,
         0x03f00500,
@@ -960,23 +982,65 @@ uint32_t nvd7_grhub_code[] = {
         0x1301f402,
         0xf40ca7f0,
         0xf7f0d021,
-        0x3c21f505,
+        0x9421f505,
         0x3202f408,
-/* 0x0ac4: ctx_xfer_post */
+/* 0x0b1c: ctx_xfer_post */
         0xf502f7f0,
-        0xbd07b521,
-        0x1421f5f4,
+        0xbd080d21,
+        0x6c21f5f4,
         0x7f21f508,
-        0xc721f502,
-        0xf5f4bd07,
-        0xf407b521,
+        0x1f21f502,
+        0xf5f4bd08,
+        0xf4080d21,
         0x01981011,
         0x0511fd40,
         0xf5070bf4,
-/* 0x0aef: ctx_xfer_no_post_mmio */
-        0xf5099321,
-/* 0x0af3: ctx_xfer_done */
-        0xf807a421,
+/* 0x0b47: ctx_xfer_no_post_mmio */
+        0xf509eb21,
+/* 0x0b4b: ctx_xfer_done */
+        0xf807fc21,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
         0x00000000,
         0x00000000,
         0x00000000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
index 6547b3dfc7ed..51c3797d8537 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h
@@ -528,10 +528,10 @@ uint32_t nve0_grhub_code[] = {
         0x0001d001,
         0x17f104bd,
         0xf7f00100,
-        0x7f21f502,
-        0x9121f507,
+        0xd721f502,
+        0xe921f507,
         0x10f7f007,
-        0x07de21f5,
+        0x083621f5,
         0x98000e98,
         0x21f5010f,
         0x14950150,
@@ -574,9 +574,9 @@ uint32_t nve0_grhub_code[] = {
         0xb6800040,
         0x1bf40132,
         0x00f7f0be,
-        0x07de21f5,
+        0x083621f5,
         0xf500f7f0,
-        0xf1077f21,
+        0xf107d721,
         0xf0010007,
         0x01d00203,
         0xbd04bd00,
@@ -610,8 +610,8 @@ uint32_t nve0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x31f40132,
-        0xaa21f502,
-        0xf094bd09,
+        0x0221f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -621,7 +621,7 @@ uint32_t nve0_grhub_code[] = {
         0x0203f00f,
         0xbd0009d0,
         0x0131f404,
-        0x09aa21f5,
+        0x0a0221f5,
         0x99f094bd,
         0x0007f106,
         0x0203f017,
@@ -631,7 +631,7 @@ uint32_t nve0_grhub_code[] = {
         0x12b920f9,
         0x0132f402,
         0xf50232f4,
-        0xfc09aa21,
+        0xfc0a0221,
         0x0007f120,
         0x0203f0c0,
         0xbd0002d0,
@@ -640,7 +640,7 @@ uint32_t nve0_grhub_code[] = {
         0xf41f23c8,
         0x31f40d0b,
         0x0232f401,
-        0x09aa21f5,
+        0x0a0221f5,
 /* 0x063c: chsw_done */
         0xf10127f0,
         0xf0c30007,
@@ -654,7 +654,7 @@ uint32_t nve0_grhub_code[] = {
 /* 0x0660: main_not_ctx_switch */
         0xf401e4b0,
         0xf2b90d1b,
-        0x4221f502,
+        0x9a21f502,
         0x460ef409,
 /* 0x0670: main_not_ctx_chan */
         0xf402e4b0,
@@ -664,8 +664,8 @@ uint32_t nve0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x32f40132,
-        0xaa21f502,
-        0xf094bd09,
+        0x0221f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -710,18 +710,40 @@ uint32_t nve0_grhub_code[] = {
 /* 0x072b: ih_no_ctxsw */
         0xe40421f4,
         0xf40400ab,
-        0xb7f1140b,
+        0xe7f16c0b,
+        0xe3f00708,
+        0x6821f440,
+        0xf102ffb9,
+        0xf0040007,
+        0x0fd00203,
+        0xf104bd00,
+        0xf00704e7,
+        0x21f440e3,
+        0x02ffb968,
+        0x030007f1,
+        0xd00203f0,
+        0x04bd000f,
+        0x9450fec7,
+        0xf7f102ee,
+        0xf3f00700,
+        0x00efbb40,
+        0xf16821f4,
+        0xf0020007,
+        0x0fd00203,
+        0xf004bd00,
+        0x21f503f7,
+        0xb7f1037e,
         0xbfb90100,
         0x44e7f102,
         0x40e3f001,
-/* 0x0743: ih_no_fwmthd */
+/* 0x079b: ih_no_fwmthd */
         0xf19d21f4,
-        0xbd0104b7,
+        0xbd0504b7,
         0xb4abffb0,
         0xf10f0bf4,
         0xf0070007,
         0x0bd00303,
-/* 0x075b: ih_no_other */
+/* 0x07b3: ih_no_other */
         0xf104bd00,
         0xf0010007,
         0x0ad00003,
@@ -731,19 +753,19 @@ uint32_t nve0_grhub_code[] = {
         0xfc90fca0,
         0x0088fe80,
         0x32f480fc,
-/* 0x077f: ctx_4170s */
+/* 0x07d7: ctx_4170s */
         0xf001f800,
         0xffb910f5,
         0x70e7f102,
         0x40e3f041,
         0xf89d21f4,
-/* 0x0791: ctx_4170w */
+/* 0x07e9: ctx_4170w */
         0x70e7f100,
         0x40e3f041,
         0xb96821f4,
         0xf4f002ff,
         0xf01bf410,
-/* 0x07a6: ctx_redswitch */
+/* 0x07fe: ctx_redswitch */
         0xe7f100f8,
         0xe5f00200,
         0x20e5f040,
@@ -751,7 +773,7 @@ uint32_t nve0_grhub_code[] = {
         0xf0850007,
         0x0ed00103,
         0xf004bd00,
-/* 0x07c2: ctx_redswitch_delay */
+/* 0x081a: ctx_redswitch_delay */
         0xf2b608f7,
         0xfd1bf401,
         0x0400e5f1,
@@ -759,7 +781,7 @@ uint32_t nve0_grhub_code[] = {
         0x850007f1,
         0xd00103f0,
         0x04bd000e,
-/* 0x07de: ctx_86c */
+/* 0x0836: ctx_86c */
         0x07f100f8,
         0x03f01b00,
         0x000fd002,
@@ -770,17 +792,17 @@ uint32_t nve0_grhub_code[] = {
         0xe7f102ff,
         0xe3f0a86c,
         0x9d21f441,
-/* 0x0806: ctx_mem */
+/* 0x085e: ctx_mem */
         0x07f100f8,
         0x03f08400,
         0x000fd002,
-/* 0x0812: ctx_mem_wait */
+/* 0x086a: ctx_mem_wait */
         0xf7f104bd,
         0xf3f08400,
         0x00ffcf02,
         0xf405fffd,
         0x00f8f31b,
-/* 0x0824: ctx_load */
+/* 0x087c: ctx_load */
         0x99f094bd,
         0x0007f105,
         0x0203f00f,
@@ -797,7 +819,7 @@ uint32_t nve0_grhub_code[] = {
         0x0203f083,
         0xbd0002d0,
         0x07f7f004,
-        0x080621f5,
+        0x085e21f5,
         0xc00007f1,
         0xd00203f0,
         0x04bd0002,
@@ -852,29 +874,29 @@ uint32_t nve0_grhub_code[] = {
         0x170007f1,
         0xd00203f0,
         0x04bd0009,
-/* 0x0942: ctx_chan */
+/* 0x099a: ctx_chan */
         0x21f500f8,
-        0xa7f00824,
+        0xa7f0087c,
         0xd021f40c,
         0xf505f7f0,
-        0xf8080621,
-/* 0x0955: ctx_mmio_exec */
+        0xf8085e21,
+/* 0x09ad: ctx_mmio_exec */
         0x41039800,
         0x810007f1,
         0xd00203f0,
         0x04bd0003,
-/* 0x0966: ctx_mmio_loop */
+/* 0x09be: ctx_mmio_loop */
         0x34c434bd,
         0x0f1bf4ff,
         0x020057f1,
         0xfa0653f0,
         0x03f80535,
-/* 0x0978: ctx_mmio_pull */
+/* 0x09d0: ctx_mmio_pull */
         0x98804e98,
         0x21f4814f,
         0x0830b69d,
         0xf40112b6,
-/* 0x098a: ctx_mmio_done */
+/* 0x09e2: ctx_mmio_done */
         0x0398df1b,
         0x0007f116,
         0x0203f081,
@@ -883,30 +905,30 @@ uint32_t nve0_grhub_code[] = {
         0x010017f1,
         0xfa0613f0,
         0x03f80601,
-/* 0x09aa: ctx_xfer */
+/* 0x0a02: ctx_xfer */
         0xe7f000f8,
         0x0007f104,
         0x0303f002,
         0xbd000ed0,
-/* 0x09b9: ctx_xfer_idle */
+/* 0x0a11: ctx_xfer_idle */
         0x00e7f104,
         0x03e3f000,
         0xf100eecf,
         0xf42000e4,
         0x11f4f21b,
         0x0d02f406,
-/* 0x09d0: ctx_xfer_pre */
+/* 0x0a28: ctx_xfer_pre */
         0xf510f7f0,
-        0xf407de21,
-/* 0x09da: ctx_xfer_pre_load */
+        0xf4083621,
+/* 0x0a32: ctx_xfer_pre_load */
         0xf7f01c11,
-        0x7f21f502,
-        0x9121f507,
-        0xa621f507,
+        0xd721f502,
+        0xe921f507,
+        0xfe21f507,
         0xf5f4bd07,
-        0xf5077f21,
-/* 0x09f3: ctx_xfer_exec */
-        0x98082421,
+        0xf507d721,
+/* 0x0a4b: ctx_xfer_exec */
+        0x98087c21,
         0x24bd1601,
         0x050007f1,
         0xd00103f0,
@@ -941,21 +963,21 @@ uint32_t nve0_grhub_code[] = {
         0xa7f01301,
         0xd021f40c,
         0xf505f7f0,
-        0xf4080621,
-/* 0x0a82: ctx_xfer_post */
+        0xf4085e21,
+/* 0x0ada: ctx_xfer_post */
         0xf7f02e02,
-        0x7f21f502,
+        0xd721f502,
         0xf5f4bd07,
-        0xf507de21,
+        0xf5083621,
         0xf5027f21,
-        0xbd079121,
-        0x7f21f5f4,
+        0xbd07e921,
+        0xd721f5f4,
         0x1011f407,
         0xfd400198,
         0x0bf40511,
-        0x5521f507,
-/* 0x0aad: ctx_xfer_no_post_mmio */
-/* 0x0aad: ctx_xfer_done */
+        0xad21f507,
+/* 0x0b05: ctx_xfer_no_post_mmio */
+/* 0x0b05: ctx_xfer_done */
         0x0000f809,
         0x00000000,
         0x00000000,
@@ -977,4 +999,46 @@ uint32_t nve0_grhub_code[] = {
         0x00000000,
         0x00000000,
         0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
 };
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
index a5aee5a4302f..a0af4b703a8e 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h
@@ -528,10 +528,10 @@ uint32_t nvf0_grhub_code[] = {
         0x0001d001,
         0x17f104bd,
         0xf7f00100,
-        0x7f21f502,
-        0x9121f507,
+        0xd721f502,
+        0xe921f507,
         0x10f7f007,
-        0x07de21f5,
+        0x083621f5,
         0x98000e98,
         0x21f5010f,
         0x14950150,
@@ -574,9 +574,9 @@ uint32_t nvf0_grhub_code[] = {
         0xb6800040,
         0x1bf40132,
         0x00f7f0be,
-        0x07de21f5,
+        0x083621f5,
         0xf500f7f0,
-        0xf1077f21,
+        0xf107d721,
         0xf0010007,
         0x01d00203,
         0xbd04bd00,
@@ -610,8 +610,8 @@ uint32_t nvf0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x31f40132,
-        0xaa21f502,
-        0xf094bd09,
+        0x0221f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -621,7 +621,7 @@ uint32_t nvf0_grhub_code[] = {
         0x0203f037,
         0xbd0009d0,
         0x0131f404,
-        0x09aa21f5,
+        0x0a0221f5,
         0x99f094bd,
         0x0007f106,
         0x0203f017,
@@ -631,7 +631,7 @@ uint32_t nvf0_grhub_code[] = {
         0x12b920f9,
         0x0132f402,
         0xf50232f4,
-        0xfc09aa21,
+        0xfc0a0221,
         0x0007f120,
         0x0203f0c0,
         0xbd0002d0,
@@ -640,7 +640,7 @@ uint32_t nvf0_grhub_code[] = {
         0xf41f23c8,
         0x31f40d0b,
         0x0232f401,
-        0x09aa21f5,
+        0x0a0221f5,
 /* 0x063c: chsw_done */
         0xf10127f0,
         0xf0c30007,
@@ -654,7 +654,7 @@ uint32_t nvf0_grhub_code[] = {
 /* 0x0660: main_not_ctx_switch */
         0xf401e4b0,
         0xf2b90d1b,
-        0x4221f502,
+        0x9a21f502,
         0x460ef409,
 /* 0x0670: main_not_ctx_chan */
         0xf402e4b0,
@@ -664,8 +664,8 @@ uint32_t nvf0_grhub_code[] = {
         0x09d00203,
         0xf404bd00,
         0x32f40132,
-        0xaa21f502,
-        0xf094bd09,
+        0x0221f502,
+        0xf094bd0a,
         0x07f10799,
         0x03f01700,
         0x0009d002,
@@ -710,18 +710,40 @@ uint32_t nvf0_grhub_code[] = {
 /* 0x072b: ih_no_ctxsw */
         0xe40421f4,
         0xf40400ab,
-        0xb7f1140b,
+        0xe7f16c0b,
+        0xe3f00708,
+        0x6821f440,
+        0xf102ffb9,
+        0xf0040007,
+        0x0fd00203,
+        0xf104bd00,
+        0xf00704e7,
+        0x21f440e3,
+        0x02ffb968,
+        0x030007f1,
+        0xd00203f0,
+        0x04bd000f,
+        0x9450fec7,
+        0xf7f102ee,
+        0xf3f00700,
+        0x00efbb40,
+        0xf16821f4,
+        0xf0020007,
+        0x0fd00203,
+        0xf004bd00,
+        0x21f503f7,
+        0xb7f1037e,
         0xbfb90100,
         0x44e7f102,
         0x40e3f001,
-/* 0x0743: ih_no_fwmthd */
+/* 0x079b: ih_no_fwmthd */
         0xf19d21f4,
-        0xbd0104b7,
+        0xbd0504b7,
         0xb4abffb0,
         0xf10f0bf4,
         0xf0070007,
         0x0bd00303,
-/* 0x075b: ih_no_other */
+/* 0x07b3: ih_no_other */
         0xf104bd00,
         0xf0010007,
         0x0ad00003,
@@ -731,19 +753,19 @@ uint32_t nvf0_grhub_code[] = {
         0xfc90fca0,
         0x0088fe80,
         0x32f480fc,
-/* 0x077f: ctx_4170s */
+/* 0x07d7: ctx_4170s */
         0xf001f800,
         0xffb910f5,
         0x70e7f102,
         0x40e3f041,
         0xf89d21f4,
-/* 0x0791: ctx_4170w */
+/* 0x07e9: ctx_4170w */
         0x70e7f100,
         0x40e3f041,
         0xb96821f4,
         0xf4f002ff,
         0xf01bf410,
-/* 0x07a6: ctx_redswitch */
+/* 0x07fe: ctx_redswitch */
         0xe7f100f8,
         0xe5f00200,
         0x20e5f040,
@@ -751,7 +773,7 @@ uint32_t nvf0_grhub_code[] = {
         0xf0850007,
         0x0ed00103,
         0xf004bd00,
-/* 0x07c2: ctx_redswitch_delay */
+/* 0x081a: ctx_redswitch_delay */
         0xf2b608f7,
         0xfd1bf401,
         0x0400e5f1,
@@ -759,7 +781,7 @@ uint32_t nvf0_grhub_code[] = {
         0x850007f1,
         0xd00103f0,
         0x04bd000e,
-/* 0x07de: ctx_86c */
+/* 0x0836: ctx_86c */
         0x07f100f8,
         0x03f02300,
         0x000fd002,
@@ -770,17 +792,17 @@ uint32_t nvf0_grhub_code[] = {
         0xe7f102ff,
         0xe3f0a88c,
         0x9d21f441,
-/* 0x0806: ctx_mem */
+/* 0x085e: ctx_mem */
         0x07f100f8,
         0x03f08400,
         0x000fd002,
-/* 0x0812: ctx_mem_wait */
+/* 0x086a: ctx_mem_wait */
         0xf7f104bd,
         0xf3f08400,
         0x00ffcf02,
         0xf405fffd,
         0x00f8f31b,
-/* 0x0824: ctx_load */
+/* 0x087c: ctx_load */
         0x99f094bd,
         0x0007f105,
         0x0203f037,
@@ -797,7 +819,7 @@ uint32_t nvf0_grhub_code[] = {
         0x0203f083,
         0xbd0002d0,
         0x07f7f004,
-        0x080621f5,
+        0x085e21f5,
         0xc00007f1,
         0xd00203f0,
         0x04bd0002,
@@ -852,29 +874,29 @@ uint32_t nvf0_grhub_code[] = {
         0x170007f1,
         0xd00203f0,
         0x04bd0009,
-/* 0x0942: ctx_chan */
+/* 0x099a: ctx_chan */
         0x21f500f8,
-        0xa7f00824,
+        0xa7f0087c,
         0xd021f40c,
         0xf505f7f0,
-        0xf8080621,
-/* 0x0955: ctx_mmio_exec */
+        0xf8085e21,
+/* 0x09ad: ctx_mmio_exec */
         0x41039800,
         0x810007f1,
         0xd00203f0,
         0x04bd0003,
-/* 0x0966: ctx_mmio_loop */
+/* 0x09be: ctx_mmio_loop */
         0x34c434bd,
         0x0f1bf4ff,
         0x020057f1,
         0xfa0653f0,
         0x03f80535,
-/* 0x0978: ctx_mmio_pull */
+/* 0x09d0: ctx_mmio_pull */
         0x98804e98,
         0x21f4814f,
         0x0830b69d,
         0xf40112b6,
-/* 0x098a: ctx_mmio_done */
+/* 0x09e2: ctx_mmio_done */
         0x0398df1b,
         0x0007f116,
         0x0203f081,
@@ -883,30 +905,30 @@ uint32_t nvf0_grhub_code[] = {
         0x010017f1,
         0xfa0613f0,
         0x03f80601,
-/* 0x09aa: ctx_xfer */
+/* 0x0a02: ctx_xfer */
         0xe7f000f8,
         0x0007f104,
         0x0303f002,
         0xbd000ed0,
-/* 0x09b9: ctx_xfer_idle */
+/* 0x0a11: ctx_xfer_idle */
         0x00e7f104,
         0x03e3f000,
         0xf100eecf,
         0xf42000e4,
         0x11f4f21b,
         0x0d02f406,
-/* 0x09d0: ctx_xfer_pre */
+/* 0x0a28: ctx_xfer_pre */
         0xf510f7f0,
-        0xf407de21,
-/* 0x09da: ctx_xfer_pre_load */
+        0xf4083621,
+/* 0x0a32: ctx_xfer_pre_load */
         0xf7f01c11,
-        0x7f21f502,
-        0x9121f507,
-        0xa621f507,
+        0xd721f502,
+        0xe921f507,
+        0xfe21f507,
         0xf5f4bd07,
-        0xf5077f21,
-/* 0x09f3: ctx_xfer_exec */
-        0x98082421,
+        0xf507d721,
+/* 0x0a4b: ctx_xfer_exec */
+        0x98087c21,
         0x24bd1601,
         0x050007f1,
         0xd00103f0,
@@ -941,21 +963,21 @@ uint32_t nvf0_grhub_code[] = {
         0xa7f01301,
         0xd021f40c,
         0xf505f7f0,
-        0xf4080621,
-/* 0x0a82: ctx_xfer_post */
+        0xf4085e21,
+/* 0x0ada: ctx_xfer_post */
         0xf7f02e02,
-        0x7f21f502,
+        0xd721f502,
         0xf5f4bd07,
-        0xf507de21,
+        0xf5083621,
         0xf5027f21,
-        0xbd079121,
-        0x7f21f5f4,
+        0xbd07e921,
+        0xd721f5f4,
         0x1011f407,
         0xfd400198,
         0x0bf40511,
-        0x5521f507,
-/* 0x0aad: ctx_xfer_no_post_mmio */
-/* 0x0aad: ctx_xfer_done */
+        0xad21f507,
+/* 0x0b05: ctx_xfer_no_post_mmio */
+/* 0x0b05: ctx_xfer_done */
         0x0000f809,
         0x00000000,
         0x00000000,
@@ -977,4 +999,46 @@ uint32_t nvf0_grhub_code[] = {
         0x00000000,
         0x00000000,
         0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
 };
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc
index a47d49db5232..2a0b0f844299 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc
@@ -30,6 +30,12 @@
 #define GK110 0xf0
 #define GK208 0x108
 
+#define NV_PGRAPH_TRAPPED_ADDR                                         0x400704
+#define NV_PGRAPH_TRAPPED_DATA_LO                                      0x400708
+#define NV_PGRAPH_TRAPPED_DATA_HI                                      0x40070c
+
+#define NV_PGRAPH_FE_OBJECT_TABLE(n)                        ((n) * 4 + 0x400700)
+
 #define NV_PGRAPH_FECS_INTR_ACK                                        0x409004
 #define NV_PGRAPH_FECS_INTR                                            0x409008
 #define NV_PGRAPH_FECS_INTR_FWMTHD                                   0x00000400
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h
index fd1d380de094..1718ae4e8224 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h
@@ -3,5 +3,6 @@
 
 #define E_BAD_COMMAND  0x00000001
 #define E_CMD_OVERFLOW 0x00000002
+#define E_BAD_FWMTHD   0x00000003
 
 #endif
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
index 1a2d56493cf6..20665c21d80e 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
@@ -976,7 +976,6 @@ nv50_graph_init(struct nouveau_object *object)
                 break;
         case 0xa0:
         default:
-                nv_wr32(priv, 0x402cc0, 0x00000000);
                 if (nv_device(priv)->chipset == 0xa0 ||
                     nv_device(priv)->chipset == 0xaa ||
                     nv_device(priv)->chipset == 0xac) {
@@ -991,10 +990,10 @@ nv50_graph_init(struct nouveau_object *object)
 
         /* zero out zcull regions */
         for (i = 0; i < 8; i++) {
-                nv_wr32(priv, 0x402c20 + (i * 8), 0x00000000);
-                nv_wr32(priv, 0x402c24 + (i * 8), 0x00000000);
-                nv_wr32(priv, 0x402c28 + (i * 8), 0x00000000);
-                nv_wr32(priv, 0x402c2c + (i * 8), 0x00000000);
+                nv_wr32(priv, 0x402c20 + (i * 0x10), 0x00000000);
+                nv_wr32(priv, 0x402c24 + (i * 0x10), 0x00000000);
+                nv_wr32(priv, 0x402c28 + (i * 0x10), 0x00000000);
+                nv_wr32(priv, 0x402c2c + (i * 0x10), 0x00000000);
         }
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index bf7bdb1f291e..aa0838916354 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -789,17 +789,40 @@ nvc0_graph_ctxctl_debug(struct nvc0_graph_priv *priv)
 static void
 nvc0_graph_ctxctl_isr(struct nvc0_graph_priv *priv)
 {
-        u32 ustat = nv_rd32(priv, 0x409c18);
+        u32 stat = nv_rd32(priv, 0x409c18);
 
-        if (ustat & 0x00000001)
-                nv_error(priv, "CTXCTL ucode error\n");
-        if (ustat & 0x00080000)
-                nv_error(priv, "CTXCTL watchdog timeout\n");
-        if (ustat & ~0x00080001)
-                nv_error(priv, "CTXCTL 0x%08x\n", ustat);
+        if (stat & 0x00000001) {
+                u32 code = nv_rd32(priv, 0x409814);
+                if (code == E_BAD_FWMTHD) {
+                        u32 class = nv_rd32(priv, 0x409808);
+                        u32  addr = nv_rd32(priv, 0x40980c);
+                        u32  subc = (addr & 0x00070000) >> 16;
+                        u32  mthd = (addr & 0x00003ffc);
+                        u32  data = nv_rd32(priv, 0x409810);
+
+                        nv_error(priv, "FECS MTHD subc %d class 0x%04x "
+                                       "mthd 0x%04x data 0x%08x\n",
+                                 subc, class, mthd, data);
 
-        nvc0_graph_ctxctl_debug(priv);
-        nv_wr32(priv, 0x409c20, ustat);
+                        nv_wr32(priv, 0x409c20, 0x00000001);
+                        stat &= ~0x00000001;
+                } else {
+                        nv_error(priv, "FECS ucode error %d\n", code);
+                }
+        }
+
+        if (stat & 0x00080000) {
+                nv_error(priv, "FECS watchdog timeout\n");
+                nvc0_graph_ctxctl_debug(priv);
+                nv_wr32(priv, 0x409c20, 0x00080000);
+                stat &= ~0x00080000;
+        }
+
+        if (stat) {
+                nv_error(priv, "FECS 0x%08x\n", stat);
+                nvc0_graph_ctxctl_debug(priv);
+                nv_wr32(priv, 0x409c20, stat);
+        }
 }
 
 static void
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
index 75203a99d902..ffc289198dd8 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
@@ -38,6 +38,8 @@
 #include <engine/fifo.h>
 #include <engine/graph.h>
 
+#include "fuc/os.h"
+
 #define GPC_MAX 32
 #define TPC_MAX (GPC_MAX * 8)
 
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h b/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h
index db1b39d08013..825f7bb46b67 100644
--- a/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h
@@ -84,6 +84,7 @@ extern struct nouveau_oclass *nv4e_i2c_oclass;
 extern struct nouveau_oclass *nv50_i2c_oclass;
 extern struct nouveau_oclass *nv94_i2c_oclass;
 extern struct nouveau_oclass *nvd0_i2c_oclass;
+extern struct nouveau_oclass *gf117_i2c_oclass;
 extern struct nouveau_oclass *nve0_i2c_oclass;
 
 static inline int
diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c
index 4ac1aa30ea11..0e62a3240144 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c
@@ -307,7 +307,6 @@ calc_clk(struct nve0_clock_priv *priv,
                 info->dsrc = src0;
                 if (div0) {
                         info->ddiv |= 0x80000000;
-                        info->ddiv |= div0 << 8;
                         info->ddiv |= div0;
                 }
                 if (div1D) {
@@ -352,7 +351,7 @@ nve0_clock_prog_0(struct nve0_clock_priv *priv, int clk)
 {
         struct nve0_clock_info *info = &priv->eng[clk];
         if (!info->ssel) {
-                nv_mask(priv, 0x1371d0 + (clk * 0x04), 0x80003f3f, info->ddiv);
+                nv_mask(priv, 0x1371d0 + (clk * 0x04), 0x8000003f, info->ddiv);
                 nv_wr32(priv, 0x137160 + (clk * 0x04), info->dsrc);
         }
 }
@@ -389,7 +388,10 @@ static void
 nve0_clock_prog_3(struct nve0_clock_priv *priv, int clk)
 {
         struct nve0_clock_info *info = &priv->eng[clk];
-        nv_mask(priv, 0x137250 + (clk * 0x04), 0x00003f3f, info->mdiv);
+        if (info->ssel)
+                nv_mask(priv, 0x137250 + (clk * 0x04), 0x00003f00, info->mdiv);
+        else
+                nv_mask(priv, 0x137250 + (clk * 0x04), 0x0000003f, info->mdiv);
 }
 
 static void
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
index 84c7efbc4f38..1ad3ea503133 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
@@ -262,8 +262,8 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
         struct nve0_ram *ram = (void *)pfb->ram;
         struct nve0_ramfuc *fuc = &ram->fuc;
         struct nouveau_ram_data *next = ram->base.next;
-        int vc = !(next->bios.ramcfg_11_02_08);
-        int mv = !(next->bios.ramcfg_11_02_04);
+        int vc = !next->bios.ramcfg_11_02_08;
+        int mv = !next->bios.ramcfg_11_02_04;
         u32 mask, data;
 
         ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000);
@@ -370,8 +370,8 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
                 }
         }
 
-        if ( (next->bios.ramcfg_11_02_40) ||
-             (next->bios.ramcfg_11_07_10)) {
+        if (next->bios.ramcfg_11_02_40 ||
+            next->bios.ramcfg_11_07_10) {
                 ram_mask(fuc, 0x132040, 0x00010000, 0x00010000);
                 ram_nsec(fuc, 20000);
         }
@@ -417,7 +417,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
                 ram_mask(fuc, 0x10f694, 0xff00ff00, data);
         }
 
-        if (ram->mode == 2 && (next->bios.ramcfg_11_08_10))
+        if (ram->mode == 2 && next->bios.ramcfg_11_08_10)
                 data = 0x00000080;
         else
                 data = 0x00000000;
@@ -425,13 +425,13 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 
         mask = 0x00070000;
         data = 0x00000000;
-        if (!(next->bios.ramcfg_11_02_80))
+        if (!next->bios.ramcfg_11_02_80)
                 data |= 0x03000000;
-        if (!(next->bios.ramcfg_11_02_40))
+        if (!next->bios.ramcfg_11_02_40)
                 data |= 0x00002000;
-        if (!(next->bios.ramcfg_11_07_10))
+        if (!next->bios.ramcfg_11_07_10)
                 data |= 0x00004000;
-        if (!(next->bios.ramcfg_11_07_08))
+        if (!next->bios.ramcfg_11_07_08)
                 data |= 0x00000003;
         else
                 data |= 0x74000000;
@@ -486,7 +486,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 
         data = mask = 0x00000000;
         if (NOTE00(ramcfg_02_03 != 0)) {
-                data |= (next->bios.ramcfg_11_02_03) << 8;
+                data |= next->bios.ramcfg_11_02_03 << 8;
                 mask |= 0x00000300;
         }
         if (NOTE00(ramcfg_01_10)) {
@@ -498,7 +498,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 
         data = mask = 0x00000000;
         if (NOTE00(timing_30_07 != 0)) {
-                data |= (next->bios.timing_20_30_07) << 28;
+                data |= next->bios.timing_20_30_07 << 28;
                 mask |= 0x70000000;
         }
         if (NOTE00(ramcfg_01_01)) {
@@ -510,7 +510,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 
         data = mask = 0x00000000;
         if (NOTE00(timing_30_07 != 0)) {
-                data |= (next->bios.timing_20_30_07) << 28;
+                data |= next->bios.timing_20_30_07 << 28;
                 mask |= 0x70000000;
         }
         if (NOTE00(ramcfg_01_02)) {
@@ -522,16 +522,16 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 
         mask = 0x33f00000;
         data = 0x00000000;
-        if (!(next->bios.ramcfg_11_01_04))
+        if (!next->bios.ramcfg_11_01_04)
                 data |= 0x20200000;
-        if (!(next->bios.ramcfg_11_07_80))
+        if (!next->bios.ramcfg_11_07_80)
                 data |= 0x12800000;
         /*XXX: see note above about there probably being some condition
          *     for the 10f824 stuff that uses ramcfg 3...
          */
-        if ( (next->bios.ramcfg_11_03_f0)) {
+        if (next->bios.ramcfg_11_03_f0) {
                 if (next->bios.rammap_11_08_0c) {
-                        if (!(next->bios.ramcfg_11_07_80))
+                        if (!next->bios.ramcfg_11_07_80)
                                 mask |= 0x00000020;
                         else
                                 data |= 0x00000020;
@@ -563,7 +563,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
                 ram_wait(fuc, 0x100710, 0x80000000, 0x80000000, 200000);
         }
 
-        data = (next->bios.timing_20_30_07) << 8;
+        data = next->bios.timing_20_30_07 << 8;
         if (next->bios.ramcfg_11_01_01)
                 data |= 0x80000000;
         ram_mask(fuc, 0x100778, 0x00000700, data);
@@ -588,7 +588,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
         ram_wr32(fuc, 0x10f310, 0x00000001); /* REFRESH */
         ram_wr32(fuc, 0x10f210, 0x80000000); /* REFRESH_AUTO = 1 */
 
-        if ((next->bios.ramcfg_11_08_10) && (ram->mode == 2) /*XXX*/) {
+        if (next->bios.ramcfg_11_08_10 && (ram->mode == 2) /*XXX*/) {
                 u32 temp = ram_mask(fuc, 0x10f294, 0xff000000, 0x24000000);
                 nve0_ram_train(fuc, 0xbc0e0000, 0xa4010000); /*XXX*/
                 ram_nsec(fuc, 1000);
@@ -621,8 +621,8 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
         data  = ram_rd32(fuc, 0x10f978);
         data &= ~0x00046144;
         data |=  0x0000000b;
-        if (!(next->bios.ramcfg_11_07_08)) {
-                if (!(next->bios.ramcfg_11_07_04))
+        if (!next->bios.ramcfg_11_07_08) {
+                if (!next->bios.ramcfg_11_07_04)
                         data |= 0x0000200c;
                 else
                         data |= 0x00000000;
@@ -636,11 +636,11 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
                 ram_wr32(fuc, 0x10f830, data);
         }
 
-        if (!(next->bios.ramcfg_11_07_08)) {
+        if (!next->bios.ramcfg_11_07_08) {
                 data = 0x88020000;
-                if ( (next->bios.ramcfg_11_07_04))
+                if ( next->bios.ramcfg_11_07_04)
                         data |= 0x10000000;
-                if (!(next->bios.rammap_11_08_10))
+                if (!next->bios.rammap_11_08_10)
                         data |= 0x00080000;
         } else {
                 data = 0xa40e0000;
@@ -689,8 +689,8 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
         const u32 runk0 = ram->fN1 << 16;
         const u32 runk1 = ram->fN1;
         struct nouveau_ram_data *next = ram->base.next;
-        int vc = !(next->bios.ramcfg_11_02_08);
-        int mv = !(next->bios.ramcfg_11_02_04);
+        int vc = !next->bios.ramcfg_11_02_08;
+        int mv = !next->bios.ramcfg_11_02_04;
         u32 mask, data;
 
         ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000);
@@ -705,7 +705,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
         }
 
         ram_mask(fuc, 0x10f200, 0x00000800, 0x00000000);
-        if ((next->bios.ramcfg_11_03_f0))
+        if (next->bios.ramcfg_11_03_f0)
                 ram_mask(fuc, 0x10f808, 0x04000000, 0x04000000);
 
         ram_wr32(fuc, 0x10f314, 0x00000001); /* PRECHARGE */
@@ -761,7 +761,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
 
         ram_mask(fuc, 0x1373f4, 0x00000000, 0x00010010);
         data  = ram_rd32(fuc, 0x1373ec) & ~0x00030000;
-        data |= (next->bios.ramcfg_11_03_30) << 12;
+        data |= next->bios.ramcfg_11_03_30 << 16;
         ram_wr32(fuc, 0x1373ec, data);
         ram_mask(fuc, 0x1373f4, 0x00000003, 0x00000000);
         ram_mask(fuc, 0x1373f4, 0x00000010, 0x00000000);
@@ -793,8 +793,8 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
                 }
         }
 
-        if ( (next->bios.ramcfg_11_02_40) ||
-             (next->bios.ramcfg_11_07_10)) {
+        if (next->bios.ramcfg_11_02_40 ||
+            next->bios.ramcfg_11_07_10) {
                 ram_mask(fuc, 0x132040, 0x00010000, 0x00010000);
                 ram_nsec(fuc, 20000);
         }
@@ -810,13 +810,13 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
 
         mask = 0x00010000;
         data = 0x00000000;
-        if (!(next->bios.ramcfg_11_02_80))
+        if (!next->bios.ramcfg_11_02_80)
                 data |= 0x03000000;
-        if (!(next->bios.ramcfg_11_02_40))
+        if (!next->bios.ramcfg_11_02_40)
                 data |= 0x00002000;
-        if (!(next->bios.ramcfg_11_07_10))
+        if (!next->bios.ramcfg_11_07_10)
                 data |= 0x00004000;
-        if (!(next->bios.ramcfg_11_07_08))
+        if (!next->bios.ramcfg_11_07_08)
                 data |= 0x00000003;
         else
                 data |= 0x14000000;
@@ -844,16 +844,16 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
 
         mask = 0x33f00000;
         data = 0x00000000;
-        if (!(next->bios.ramcfg_11_01_04))
+        if (!next->bios.ramcfg_11_01_04)
                 data |= 0x20200000;
-        if (!(next->bios.ramcfg_11_07_80))
+        if (!next->bios.ramcfg_11_07_80)
                 data |= 0x12800000;
         /*XXX: see note above about there probably being some condition
          *     for the 10f824 stuff that uses ramcfg 3...
          */
-        if ( (next->bios.ramcfg_11_03_f0)) {
+        if (next->bios.ramcfg_11_03_f0) {
                 if (next->bios.rammap_11_08_0c) {
-                        if (!(next->bios.ramcfg_11_07_80))
+                        if (!next->bios.ramcfg_11_07_80)
                                 mask |= 0x00000020;
                         else
                                 data |= 0x00000020;
@@ -876,7 +876,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq)
                 data = next->bios.timing_20_2c_1fc0;
         ram_mask(fuc, 0x10f24c, 0x7f000000, data << 24);
 
-        ram_mask(fuc, 0x10f224, 0x001f0000, next->bios.timing_20_30_f8);
+        ram_mask(fuc, 0x10f224, 0x001f0000, next->bios.timing_20_30_f8 << 16);
 
         ram_wr32(fuc, 0x10f090, 0x4000007f);
         ram_nsec(fuc, 1000);
diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/gf117.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/gf117.c
new file mode 100644
index 000000000000..fa891c39866b
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/gf117.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+
+#include "nv50.h"
+
+struct nouveau_oclass *
+gf117_i2c_oclass = &(struct nouveau_i2c_impl) {
+        .base.handle = NV_SUBDEV(I2C, 0xd7),
+        .base.ofuncs = &(struct nouveau_ofuncs) {
+                .ctor = _nouveau_i2c_ctor,
+                .dtor = _nouveau_i2c_dtor,
+                .init = _nouveau_i2c_init,
+                .fini = _nouveau_i2c_fini,
+        },
+        .sclass = nvd0_i2c_sclass,
+        .pad_x = &nv04_i2c_pad_oclass,
+        .pad_s = &nv04_i2c_pad_oclass,
+}.base;
diff --git a/drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c b/drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c
index 7120124dceac..ebef970a0645 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/ibus/nve0.c
@@ -95,6 +95,23 @@ nve0_ibus_intr(struct nouveau_subdev *subdev)
 }
 
 static int
+nve0_ibus_init(struct nouveau_object *object)
+{
+        struct nve0_ibus_priv *priv = (void *)object;
+        int ret = nouveau_ibus_init(&priv->base);
+        if (ret == 0) {
+                nv_mask(priv, 0x122318, 0x0003ffff, 0x00001000);
+                nv_mask(priv, 0x12231c, 0x0003ffff, 0x00000200);
+                nv_mask(priv, 0x122310, 0x0003ffff, 0x00000800);
+                nv_mask(priv, 0x122348, 0x0003ffff, 0x00000100);
+                nv_mask(priv, 0x1223b0, 0x0003ffff, 0x00000fff);
+                nv_mask(priv, 0x122348, 0x0003ffff, 0x00000200);
+                nv_mask(priv, 0x122358, 0x0003ffff, 0x00002880);
+        }
+        return ret;
+}
+
+static int
 nve0_ibus_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                struct nouveau_oclass *oclass, void *data, u32 size,
                struct nouveau_object **pobject)
@@ -117,7 +134,7 @@ nve0_ibus_oclass = {
         .ofuncs = &(struct nouveau_ofuncs) {
                 .ctor = nve0_ibus_ctor,
                 .dtor = _nouveau_ibus_dtor,
-                .init = _nouveau_ibus_init,
+                .init = nve0_ibus_init,
                 .fini = _nouveau_ibus_fini,
         },
 };
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc
index 2284ecb1c9b8..c2bb616a8da5 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/host.fuc
@@ -83,7 +83,7 @@ host_send:
                 // increment GET
                 add b32 $r1 0x1
                 and $r14 $r1 #fifo_qmaskf
-                nv_iowr(NV_PPWR_FIFO_GET(0), $r1)
+                nv_iowr(NV_PPWR_FIFO_GET(0), $r14)
                 bra #host_send
         host_send_done:
         ret
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h
index 4bd43a99fdcc..39a5dc150a05 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h
@@ -1018,7 +1018,7 @@ uint32_t nv108_pwr_code[] = {
         0xb600023f,
         0x1ec40110,
         0x04b0400f,
-        0xbd0001f6,
+        0xbd000ef6,
         0xc70ef404,
 /* 0x0328: host_send_done */
 /* 0x032a: host_recv */
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
index 5a73fa620978..254205cd5166 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
@@ -1124,7 +1124,7 @@ uint32_t nva3_pwr_code[] = {
         0x0f1ec401,
         0x04b007f1,
         0xd00604b6,
-        0x04bd0001,
+        0x04bd000e,
 /* 0x03cb: host_send_done */
         0xf8ba0ef4,
 /* 0x03cd: host_recv */
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h
index 4dba00d2dd1a..7ac87405d01b 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h
@@ -1124,7 +1124,7 @@ uint32_t nvc0_pwr_code[] = {
         0x0f1ec401,
         0x04b007f1,
         0xd00604b6,
-        0x04bd0001,
+        0x04bd000e,
 /* 0x03cb: host_send_done */
         0xf8ba0ef4,
 /* 0x03cd: host_recv */
diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h
index 5e24c6bc041d..cd9ff1a73284 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h
@@ -1033,7 +1033,7 @@ uint32_t nvd0_pwr_code[] = {
         0xb6026b21,
         0x1ec40110,
         0xb007f10f,
-        0x0001d004,
+        0x000ed004,
         0x0ef404bd,
 /* 0x0365: host_send_done */
 /* 0x0367: host_recv */
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 26b5647188ef..47ad74255bf1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -736,6 +736,9 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
                   fb->bits_per_pixel, fb->pitches[0], crtc->x, crtc->y,
                   new_bo->bo.offset };
 
+        /* Keep vblanks on during flip, for the target crtc of this flip */
+        drm_vblank_get(dev, nouveau_crtc(crtc)->index);
+
         /* Emit a page flip */
         if (nv_device(drm->device)->card_type >= NV_50) {
                 ret = nv50_display_flip_next(crtc, fb, chan, swap_interval);
@@ -779,6 +782,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         return 0;
 
 fail_unreserve:
+        drm_vblank_put(dev, nouveau_crtc(crtc)->index);
         ttm_bo_unreserve(&old_bo->bo);
 fail_unpin:
         mutex_unlock(&chan->cli->mutex);
@@ -817,6 +821,9 @@ nouveau_finish_page_flip(struct nouveau_channel *chan,
                 drm_send_vblank_event(dev, crtcid, s->event);
         }
 
+        /* Give up ownership of vblank for page-flipped crtc */
+        drm_vblank_put(dev, s->crtc);
+
         list_del(&s->head);
         if (ps)
                 *ps = *s;
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 26c12a3fe430..a03c73411a56 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1052,7 +1052,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
         int encoder_mode = atombios_get_encoder_mode(radeon_crtc->encoder);
 
         /* pass the actual clock to atombios_crtc_program_pll for DCE5,6 for HDMI */
-        if (ASIC_IS_DCE5(rdev) && !ASIC_IS_DCE8(rdev) &&
+        if (ASIC_IS_DCE5(rdev) &&
             (encoder_mode == ATOM_ENCODER_MODE_HDMI) &&
             (radeon_crtc->bpc > 8))
                 clock = radeon_crtc->adjusted_clock;
@@ -1136,6 +1136,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         u32 fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_NONE);
         u32 tmp, viewport_w, viewport_h;
         int r;
+        bool bypass_lut = false;
 
         /* no fb bound */
         if (!atomic && !crtc->primary->fb) {
@@ -1174,33 +1175,73 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
         radeon_bo_unreserve(rbo);
 
-        switch (target_fb->bits_per_pixel) {
-        case 8:
+        switch (target_fb->pixel_format) {
+        case DRM_FORMAT_C8:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_INDEXED));
                 break;
-        case 15:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ARGB4444:
+                fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) |
+                             EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB4444));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN16);
+#endif
+                break;
+        case DRM_FORMAT_XRGB1555:
+        case DRM_FORMAT_ARGB1555:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB1555));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN16);
+#endif
+                break;
+        case DRM_FORMAT_BGRX5551:
+        case DRM_FORMAT_BGRA5551:
+                fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) |
+                             EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_BGRA5551));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN16);
+#endif
                 break;
-        case 16:
+        case DRM_FORMAT_RGB565:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_16BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB565));
 #ifdef __BIG_ENDIAN
                 fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN16);
 #endif
                 break;
-        case 24:
-        case 32:
+        case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_ARGB8888:
                 fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP) |
                              EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB8888));
 #ifdef __BIG_ENDIAN
                 fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN32);
 #endif
                 break;
+        case DRM_FORMAT_XRGB2101010:
+        case DRM_FORMAT_ARGB2101010:
+                fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP) |
+                             EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_ARGB2101010));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN32);
+#endif
+                /* Greater 8 bpc fb needs to bypass hw-lut to retain precision */
+                bypass_lut = true;
+                break;
+        case DRM_FORMAT_BGRX1010102:
+        case DRM_FORMAT_BGRA1010102:
+                fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_32BPP) |
+                             EVERGREEN_GRPH_FORMAT(EVERGREEN_GRPH_FORMAT_BGRA1010102));
+#ifdef __BIG_ENDIAN
+                fb_swap = EVERGREEN_GRPH_ENDIAN_SWAP(EVERGREEN_GRPH_ENDIAN_8IN32);
+#endif
+                /* Greater 8 bpc fb needs to bypass hw-lut to retain precision */
+                bypass_lut = true;
+                break;
         default:
-                DRM_ERROR("Unsupported screen depth %d\n",
-                          target_fb->bits_per_pixel);
+                DRM_ERROR("Unsupported screen format %s\n",
+                          drm_get_format_name(target_fb->pixel_format));
                 return -EINVAL;
         }
 
@@ -1329,6 +1370,18 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(EVERGREEN_GRPH_CONTROL + radeon_crtc->crtc_offset, fb_format);
         WREG32(EVERGREEN_GRPH_SWAP_CONTROL + radeon_crtc->crtc_offset, fb_swap);
 
+        /*
+         * The LUT only has 256 slots for indexing by a 8 bpc fb. Bypass the LUT
+         * for > 8 bpc scanout to avoid truncation of fb indices to 8 msb's, to
+         * retain the full precision throughout the pipeline.
+         */
+        WREG32_P(EVERGREEN_GRPH_LUT_10BIT_BYPASS_CONTROL + radeon_crtc->crtc_offset,
+                 (bypass_lut ? EVERGREEN_LUT_10BIT_BYPASS_EN : 0),
+                 ~EVERGREEN_LUT_10BIT_BYPASS_EN);
+
+        if (bypass_lut)
+                DRM_DEBUG_KMS("Bypassing hardware LUT due to 10 bit fb scanout.\n");
+
         WREG32(EVERGREEN_GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
         WREG32(EVERGREEN_GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
         WREG32(EVERGREEN_GRPH_X_START + radeon_crtc->crtc_offset, 0);
@@ -1396,6 +1449,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         u32 fb_swap = R600_D1GRPH_SWAP_ENDIAN_NONE;
         u32 tmp, viewport_w, viewport_h;
         int r;
+        bool bypass_lut = false;
 
         /* no fb bound */
         if (!atomic && !crtc->primary->fb) {
@@ -1433,18 +1487,30 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
         radeon_bo_unreserve(rbo);
 
-        switch (target_fb->bits_per_pixel) {
-        case 8:
+        switch (target_fb->pixel_format) {
+        case DRM_FORMAT_C8:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_8BPP |
                     AVIVO_D1GRPH_CONTROL_8BPP_INDEXED;
                 break;
-        case 15:
+        case DRM_FORMAT_XRGB4444:
+        case DRM_FORMAT_ARGB4444:
+                fb_format =
+                    AVIVO_D1GRPH_CONTROL_DEPTH_16BPP |
+                    AVIVO_D1GRPH_CONTROL_16BPP_ARGB4444;
+#ifdef __BIG_ENDIAN
+                fb_swap = R600_D1GRPH_SWAP_ENDIAN_16BIT;
+#endif
+                break;
+        case DRM_FORMAT_XRGB1555:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_16BPP |
                     AVIVO_D1GRPH_CONTROL_16BPP_ARGB1555;
+#ifdef __BIG_ENDIAN
+                fb_swap = R600_D1GRPH_SWAP_ENDIAN_16BIT;
+#endif
                 break;
-        case 16:
+        case DRM_FORMAT_RGB565:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_16BPP |
                     AVIVO_D1GRPH_CONTROL_16BPP_RGB565;
@@ -1452,8 +1518,8 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
                 fb_swap = R600_D1GRPH_SWAP_ENDIAN_16BIT;
 #endif
                 break;
-        case 24:
-        case 32:
+        case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_ARGB8888:
                 fb_format =
                     AVIVO_D1GRPH_CONTROL_DEPTH_32BPP |
                     AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888;
@@ -1461,9 +1527,20 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
                 fb_swap = R600_D1GRPH_SWAP_ENDIAN_32BIT;
 #endif
                 break;
+        case DRM_FORMAT_XRGB2101010:
+        case DRM_FORMAT_ARGB2101010:
+                fb_format =
+                    AVIVO_D1GRPH_CONTROL_DEPTH_32BPP |
+                    AVIVO_D1GRPH_CONTROL_32BPP_ARGB2101010;
+#ifdef __BIG_ENDIAN
+                fb_swap = R600_D1GRPH_SWAP_ENDIAN_32BIT;
+#endif
+                /* Greater 8 bpc fb needs to bypass hw-lut to retain precision */
+                bypass_lut = true;
+                break;
         default:
-                DRM_ERROR("Unsupported screen depth %d\n",
-                          target_fb->bits_per_pixel);
+                DRM_ERROR("Unsupported screen format %s\n",
+                          drm_get_format_name(target_fb->pixel_format));
                 return -EINVAL;
         }
 
@@ -1502,6 +1579,13 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         if (rdev->family >= CHIP_R600)
                 WREG32(R600_D1GRPH_SWAP_CONTROL + radeon_crtc->crtc_offset, fb_swap);
 
+        /* LUT only has 256 slots for 8 bpc fb. Bypass for > 8 bpc scanout for precision */
+        WREG32_P(AVIVO_D1GRPH_LUT_SEL + radeon_crtc->crtc_offset,
+                 (bypass_lut ? AVIVO_LUT_10BIT_BYPASS_EN : 0), ~AVIVO_LUT_10BIT_BYPASS_EN);
+
+        if (bypass_lut)
+                DRM_DEBUG_KMS("Bypassing hardware LUT due to 10 bit fb scanout.\n");
+
         WREG32(AVIVO_D1GRPH_SURFACE_OFFSET_X + radeon_crtc->crtc_offset, 0);
         WREG32(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0);
         WREG32(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0);
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index c5b1f2da3954..35f4182c63b6 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -403,16 +403,18 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
 {
         struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
         u8 msg[DP_DPCD_SIZE];
-        int ret, i;
+        int ret;
+
+        char dpcd_hex_dump[DP_DPCD_SIZE * 3];
 
         ret = drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_DPCD_REV, msg,
                                DP_DPCD_SIZE);
         if (ret > 0) {
                 memcpy(dig_connector->dpcd, msg, DP_DPCD_SIZE);
-                DRM_DEBUG_KMS("DPCD: ");
-                for (i = 0; i < DP_DPCD_SIZE; i++)
-                        DRM_DEBUG_KMS("%02x ", msg[i]);
-                DRM_DEBUG_KMS("\n");
+
+                hex_dump_to_buffer(dig_connector->dpcd, sizeof(dig_connector->dpcd),
+                                   32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);
+                DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump);
 
                 radeon_dp_probe_oui(radeon_connector);
 
diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h
index ae88660f34ea..0c6e1b55d968 100644
--- a/drivers/gpu/drm/radeon/cikd.h
+++ b/drivers/gpu/drm/radeon/cikd.h
@@ -1752,12 +1752,12 @@
 #define         EOP_TC_WB_ACTION_EN                     (1 << 15) /* L2 */
 #define         EOP_TCL1_ACTION_EN                      (1 << 16)
 #define         EOP_TC_ACTION_EN                        (1 << 17) /* L2 */
+#define         EOP_TCL2_VOLATILE                       (1 << 24)
 #define         EOP_CACHE_POLICY(x)                     ((x) << 25)
                 /* 0 - LRU
                  * 1 - Stream
                  * 2 - Bypass
                  */
-#define         EOP_TCL2_VOLATILE                       (1 << 27)
 #define         DATA_SEL(x)                             ((x) << 29)
                 /* 0 - discard
                  * 1 - send low 32bit data
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c
index 5a9a5f4d7888..47d31e915758 100644
--- a/drivers/gpu/drm/radeon/cypress_dpm.c
+++ b/drivers/gpu/drm/radeon/cypress_dpm.c
@@ -1551,7 +1551,7 @@ int cypress_populate_smc_voltage_tables(struct radeon_device *rdev,
 
                 table->voltageMaskTable.highMask[RV770_SMC_VOLTAGEMASK_VDDCI] = 0;
                 table->voltageMaskTable.lowMask[RV770_SMC_VOLTAGEMASK_VDDCI] =
-                        cpu_to_be32(eg_pi->vddc_voltage_table.mask_low);
+                        cpu_to_be32(eg_pi->vddci_voltage_table.mask_low);
         }
 
         return 0;
diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h
index a0f63ff5a5e9..333d143fca2c 100644
--- a/drivers/gpu/drm/radeon/evergreen_reg.h
+++ b/drivers/gpu/drm/radeon/evergreen_reg.h
@@ -116,6 +116,8 @@
 #       define EVERGREEN_GRPH_ARRAY_LINEAR_ALIGNED      1
 #       define EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1      2
 #       define EVERGREEN_GRPH_ARRAY_2D_TILED_THIN1      4
+#define EVERGREEN_GRPH_LUT_10BIT_BYPASS_CONTROL         0x6808
+#       define EVERGREEN_LUT_10BIT_BYPASS_EN            (1 << 8)
 #define EVERGREEN_GRPH_SWAP_CONTROL                     0x680c
 #       define EVERGREEN_GRPH_ENDIAN_SWAP(x)            (((x) & 0x3) << 0)
 #       define EVERGREEN_GRPH_ENDIAN_NONE               0
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index 3f6e817d97ee..9ef8c38f2d66 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -2726,7 +2726,7 @@ int kv_dpm_init(struct radeon_device *rdev)
         pi->caps_sclk_ds = true;
         pi->enable_auto_thermal_throttling = true;
         pi->disable_nb_ps3_in_battery = false;
-        pi->bapm_enable = false;
+        pi->bapm_enable = true;
         pi->voltage_drop_t = 0;
         pi->caps_sclk_throttle_low_notification = false;
         pi->caps_fps = false; /* true? */
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 004c931606c4..01fc4888e6fe 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -1315,7 +1315,7 @@ static void ni_populate_smc_voltage_tables(struct radeon_device *rdev,
 
                 table->voltageMaskTable.highMask[NISLANDS_SMC_VOLTAGEMASK_VDDCI] = 0;
                 table->voltageMaskTable.lowMask[NISLANDS_SMC_VOLTAGEMASK_VDDCI] =
-                        cpu_to_be32(eg_pi->vddc_voltage_table.mask_low);
+                        cpu_to_be32(eg_pi->vddci_voltage_table.mask_low);
         }
 }
 
diff --git a/drivers/gpu/drm/radeon/r500_reg.h b/drivers/gpu/drm/radeon/r500_reg.h
index 1dd0d32993d5..136b7bc7cd20 100644
--- a/drivers/gpu/drm/radeon/r500_reg.h
+++ b/drivers/gpu/drm/radeon/r500_reg.h
@@ -402,6 +402,7 @@
  * block and vice versa.  This applies to GRPH, CUR, etc.
  */
 #define AVIVO_D1GRPH_LUT_SEL                                    0x6108
+#       define AVIVO_LUT_10BIT_BYPASS_EN                        (1 << 8)
 #define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS                    0x6110
 #define R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH                0x6914
 #define R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH                0x6114
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 4b0bbf88d5c0..29d9cc04c04e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -102,6 +102,7 @@ extern int radeon_runtime_pm;
 extern int radeon_hard_reset;
 extern int radeon_vm_size;
 extern int radeon_vm_block_size;
+extern int radeon_deep_color;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -749,10 +750,6 @@ union radeon_irq_stat_regs {
         struct cik_irq_stat_regs cik;
 };
 
-#define RADEON_MAX_HPD_PINS 7
-#define RADEON_MAX_CRTCS 6
-#define RADEON_MAX_AFMT_BLOCKS 7
-
 struct radeon_irq {
         bool                            installed;
         spinlock_t                      lock;
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 30844814c25a..173f378428a9 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1227,11 +1227,19 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
                         rdev->clock.default_dispclk =
                                 le32_to_cpu(firmware_info->info_21.ulDefaultDispEngineClkFreq);
                         if (rdev->clock.default_dispclk == 0) {
-                                if (ASIC_IS_DCE5(rdev))
+                                if (ASIC_IS_DCE6(rdev))
+                                        rdev->clock.default_dispclk = 60000; /* 600 Mhz */
+                                else if (ASIC_IS_DCE5(rdev))
                                         rdev->clock.default_dispclk = 54000; /* 540 Mhz */
                                 else
                                         rdev->clock.default_dispclk = 60000; /* 600 Mhz */
                         }
+                        /* set a reasonable default for DP */
+                        if (ASIC_IS_DCE6(rdev) && (rdev->clock.default_dispclk < 53900)) {
+                                DRM_INFO("Changing default dispclk from %dMhz to 600Mhz\n",
+                                         rdev->clock.default_dispclk / 100);
+                                rdev->clock.default_dispclk = 60000;
+                        }
                         rdev->clock.dp_extclk =
                                 le16_to_cpu(firmware_info->info_21.usUniphyDPModeExtClkFreq);
                         rdev->clock.current_dispclk = rdev->clock.default_dispclk;
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 933c5c39654d..44831197e82e 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -199,6 +199,9 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)
                 }
         }
 
+        if ((radeon_deep_color == 0) && (bpc > 8))
+                bpc = 8;
+
         DRM_DEBUG("%s: Display bpc=%d, returned bpc=%d\n",
                           connector->name, connector->display_info.bpc, bpc);
 
@@ -1288,17 +1291,15 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector,
                     (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D) ||
                     (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B))
                         return MODE_OK;
-                else if (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_A) {
-                        if (ASIC_IS_DCE6(rdev)) {
-                                /* HDMI 1.3+ supports max clock of 340 Mhz */
-                                if (mode->clock > 340000)
-                                        return MODE_CLOCK_HIGH;
-                                else
-                                        return MODE_OK;
-                        } else
+                else if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) {
+                        /* HDMI 1.3+ supports max clock of 340 Mhz */
+                        if (mode->clock > 340000)
                                 return MODE_CLOCK_HIGH;
-                } else
+                        else
+                                return MODE_OK;
+                } else {
                         return MODE_CLOCK_HIGH;
+                }
         }
 
         /* check against the max pixel clock */
@@ -1549,6 +1550,8 @@ out:
 static int radeon_dp_mode_valid(struct drm_connector *connector,
                                   struct drm_display_mode *mode)
 {
+        struct drm_device *dev = connector->dev;
+        struct radeon_device *rdev = dev->dev_private;
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;
 
@@ -1579,14 +1582,23 @@ static int radeon_dp_mode_valid(struct drm_connector *connector,
                                         return MODE_PANEL;
                         }
                 }
-                return MODE_OK;
         } else {
                 if ((radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
-                    (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
+                    (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {
                         return radeon_dp_mode_valid_helper(connector, mode);
-                else
-                        return MODE_OK;
+                } else {
+                        if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) {
+                                /* HDMI 1.3+ supports max clock of 340 Mhz */
+                                if (mode->clock > 340000)
+                                        return MODE_CLOCK_HIGH;
+                        } else {
+                                if (mode->clock > 165000)
+                                        return MODE_CLOCK_HIGH;
+                        }
+                }
         }
+
+        return MODE_OK;
 }
 
 static const struct drm_connector_helper_funcs radeon_dp_connector_helper_funcs = {
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 5ed617056b9c..13896edcf0b6 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -66,7 +66,8 @@ static void avivo_crtc_load_lut(struct drm_crtc *crtc)
                              (radeon_crtc->lut_b[i] << 0));
         }
 
-        WREG32(AVIVO_D1GRPH_LUT_SEL + radeon_crtc->crtc_offset, radeon_crtc->crtc_id);
+        /* Only change bit 0 of LUT_SEL, other bits are set elsewhere */
+        WREG32_P(AVIVO_D1GRPH_LUT_SEL + radeon_crtc->crtc_offset, radeon_crtc->crtc_id, ~1);
 }
 
 static void dce4_crtc_load_lut(struct drm_crtc *crtc)
@@ -284,7 +285,6 @@ static void radeon_unpin_work_func(struct work_struct *__work)
 void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id)
 {
         struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
-        struct radeon_flip_work *work;
         unsigned long flags;
         u32 update_pending;
         int vpos, hpos;
@@ -294,8 +294,11 @@ void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id)
                 return;
 
         spin_lock_irqsave(&rdev->ddev->event_lock, flags);
-        work = radeon_crtc->flip_work;
-        if (work == NULL) {
+        if (radeon_crtc->flip_status != RADEON_FLIP_SUBMITTED) {
+                DRM_DEBUG_DRIVER("radeon_crtc->flip_status = %d != "
+                                 "RADEON_FLIP_SUBMITTED(%d)\n",
+                                 radeon_crtc->flip_status,
+                                 RADEON_FLIP_SUBMITTED);
                 spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
                 return;
         }
@@ -343,12 +346,17 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 
         spin_lock_irqsave(&rdev->ddev->event_lock, flags);
         work = radeon_crtc->flip_work;
-        if (work == NULL) {
+        if (radeon_crtc->flip_status != RADEON_FLIP_SUBMITTED) {
+                DRM_DEBUG_DRIVER("radeon_crtc->flip_status = %d != "
+                                 "RADEON_FLIP_SUBMITTED(%d)\n",
+                                 radeon_crtc->flip_status,
+                                 RADEON_FLIP_SUBMITTED);
                 spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
                 return;
         }
 
         /* Pageflip completed. Clean up. */
+        radeon_crtc->flip_status = RADEON_FLIP_NONE;
         radeon_crtc->flip_work = NULL;
 
         /* wakeup userspace */
@@ -357,8 +365,9 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 
         spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
 
+        drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
         radeon_fence_unref(&work->fence);
-        radeon_irq_kms_pflip_irq_get(rdev, work->crtc_id);
+        radeon_irq_kms_pflip_irq_put(rdev, work->crtc_id);
         queue_work(radeon_crtc->flip_queue, &work->unpin_work);
 }
 
@@ -459,6 +468,12 @@ static void radeon_flip_work_func(struct work_struct *__work)
                 base &= ~7;
         }
 
+        r = drm_vblank_get(crtc->dev, radeon_crtc->crtc_id);
+        if (r) {
+                DRM_ERROR("failed to get vblank before flip\n");
+                goto pflip_cleanup;
+        }
+
         /* We borrow the event spin lock for protecting flip_work */
         spin_lock_irqsave(&crtc->dev->event_lock, flags);
 
@@ -468,11 +483,22 @@ static void radeon_flip_work_func(struct work_struct *__work)
         /* do the flip (mmio) */
         radeon_page_flip(rdev, radeon_crtc->crtc_id, base);
 
+        radeon_crtc->flip_status = RADEON_FLIP_SUBMITTED;
         spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
         up_read(&rdev->exclusive_lock);
 
         return;
 
+pflip_cleanup:
+        if (unlikely(radeon_bo_reserve(work->new_rbo, false) != 0)) {
+                DRM_ERROR("failed to reserve new rbo in error path\n");
+                goto cleanup;
+        }
+        if (unlikely(radeon_bo_unpin(work->new_rbo) != 0)) {
+                DRM_ERROR("failed to unpin new rbo in error path\n");
+        }
+        radeon_bo_unreserve(work->new_rbo);
+
 cleanup:
         drm_gem_object_unreference_unlocked(&work->old_rbo->gem_base);
         radeon_fence_unref(&work->fence);
@@ -526,7 +552,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
         /* We borrow the event spin lock for protecting flip_work */
         spin_lock_irqsave(&crtc->dev->event_lock, flags);
 
-        if (radeon_crtc->flip_work) {
+        if (radeon_crtc->flip_status != RADEON_FLIP_NONE) {
                 DRM_DEBUG_DRIVER("flip queue: crtc already busy\n");
                 spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
                 drm_gem_object_unreference_unlocked(&work->old_rbo->gem_base);
@@ -534,6 +560,7 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
                 kfree(work);
                 return -EBUSY;
         }
+        radeon_crtc->flip_status = RADEON_FLIP_PENDING;
         radeon_crtc->flip_work = work;
 
         /* update crtc fb */
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 6e3017413386..cb1421369e3a 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -175,6 +175,7 @@ int radeon_runtime_pm = -1;
 int radeon_hard_reset = 0;
 int radeon_vm_size = 4096;
 int radeon_vm_block_size = 9;
+int radeon_deep_color = 0;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -248,6 +249,9 @@ module_param_named(vm_size, radeon_vm_size, int, 0444);
 MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default 9)");
 module_param_named(vm_block_size, radeon_vm_block_size, int, 0444);
 
+MODULE_PARM_DESC(deep_color, "Deep Color support (1 = enable, 0 = disable (default))");
+module_param_named(deep_color, radeon_deep_color, int, 0444);
+
 static struct pci_device_id pciidlist[] = {
         radeon_PCI_IDS
 };
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index ad0e4b8cc7e3..0592ddb0904b 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -46,6 +46,10 @@ struct radeon_device;
 #define to_radeon_encoder(x) container_of(x, struct radeon_encoder, base)
 #define to_radeon_framebuffer(x) container_of(x, struct radeon_framebuffer, base)
 
+#define RADEON_MAX_HPD_PINS 7
+#define RADEON_MAX_CRTCS 6
+#define RADEON_MAX_AFMT_BLOCKS 7
+
 enum radeon_rmx_type {
         RMX_OFF,
         RMX_FULL,
@@ -233,8 +237,8 @@ struct radeon_mode_info {
         struct card_info *atom_card_info;
         enum radeon_connector_table connector_table;
         bool mode_config_initialized;
-        struct radeon_crtc *crtcs[6];
-        struct radeon_afmt *afmt[7];
+        struct radeon_crtc *crtcs[RADEON_MAX_CRTCS];
+        struct radeon_afmt *afmt[RADEON_MAX_AFMT_BLOCKS];
         /* DVI-I properties */
         struct drm_property *coherent_mode_property;
         /* DAC enable load detect */
@@ -302,6 +306,12 @@ struct radeon_atom_ss {
         uint16_t amount;
 };
 
+enum radeon_flip_status {
+        RADEON_FLIP_NONE,
+        RADEON_FLIP_PENDING,
+        RADEON_FLIP_SUBMITTED
+};
+
 struct radeon_crtc {
         struct drm_crtc base;
         int crtc_id;
@@ -327,6 +337,7 @@ struct radeon_crtc {
         /* page flipping */
         struct workqueue_struct *flip_queue;
         struct radeon_flip_work *flip_work;
+        enum radeon_flip_status flip_status;
         /* pll sharing */
         struct radeon_atom_ss ss;
         bool ss_enabled;
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 12c663e86ca1..e447e390d09a 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -73,8 +73,10 @@ void radeon_pm_acpi_event_handler(struct radeon_device *rdev)
                         rdev->pm.dpm.ac_power = true;
                 else
                         rdev->pm.dpm.ac_power = false;
-                if (rdev->asic->dpm.enable_bapm)
-                        radeon_dpm_enable_bapm(rdev, rdev->pm.dpm.ac_power);
+                if (rdev->family == CHIP_ARUBA) {
+                        if (rdev->asic->dpm.enable_bapm)
+                                radeon_dpm_enable_bapm(rdev, rdev->pm.dpm.ac_power);
+                }
                 mutex_unlock(&rdev->pm.mutex);
         } else if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
                 if (rdev->pm.profile == PM_PROFILE_AUTO) {
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 899d9126cad6..eecff6bbd341 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -495,7 +495,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                 mutex_unlock(&vm->mutex);
 
                 r = radeon_bo_create(rdev, RADEON_VM_PTE_COUNT * 8,
-                                     RADEON_GPU_PAGE_SIZE, false, 
+                                     RADEON_GPU_PAGE_SIZE, true,
                                      RADEON_GEM_DOMAIN_VRAM, NULL, &pt);
                 if (r)
                         return r;
@@ -992,7 +992,7 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm)
                 return -ENOMEM;
         }
 
-        r = radeon_bo_create(rdev, pd_size, align, false,
+        r = radeon_bo_create(rdev, pd_size, align, true,
                              RADEON_GEM_DOMAIN_VRAM, NULL,
                              &vm->page_directory);
         if (r)
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index 2a2822c03329..20da6ff183df 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -1874,7 +1874,15 @@ int trinity_dpm_init(struct radeon_device *rdev)
         for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++)
                 pi->at[i] = TRINITY_AT_DFLT;
 
-        pi->enable_bapm = false;
+        /* There are stability issues reported on latops with
+         * bapm installed when switching between AC and battery
+         * power.  At the same time, some desktop boards hang
+         * if it's not enabled and dpm is enabled.
+         */
+        if (rdev->flags & RADEON_IS_MOBILITY)
+                pi->enable_bapm = false;
+        else
+                pi->enable_bapm = true;
         pi->enable_nbps_policy = true;
         pi->enable_sclk_ds = true;
         pi->enable_gfx_power_gating = true;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index a89ad938eacf..b031b48dbb3c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -179,7 +179,6 @@ static int vmw_fb_set_par(struct fb_info *info)
                 vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, info->var.yoffset);
                 vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres);
                 vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres);
-                vmw_write(vmw_priv, SVGA_REG_BYTES_PER_LINE, info->fix.line_length);
                 vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
         }
 
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 08531a128f53..02d3d85829f3 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1052,7 +1052,7 @@ config SENSORS_PC87427
           will be called pc87427.
 
 config SENSORS_NTC_THERMISTOR
-        tristate "NTC thermistor support"
+        tristate "NTC thermistor support from Murata"
         depends on !OF || IIO=n || IIO
         help
           This driver supports NTC thermistors sensor reading and its
@@ -1060,7 +1060,8 @@ config SENSORS_NTC_THERMISTOR
           send notifications about the temperature.
 
           Currently, this driver supports
-          NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333.
+          NCP15WB473, NCP18WB473, NCP21WB473, NCP03WB473, and NCP15WL333
+          from Murata.
 
           This driver can also be built as a module.  If so, the module
           will be called ntc-thermistor.
@@ -1176,6 +1177,7 @@ config SENSORS_DME1737
 config SENSORS_EMC1403
         tristate "SMSC EMC1403/23 thermal sensor"
         depends on I2C
+        select REGMAP_I2C
         help
           If you say yes here you get support for the SMSC EMC1403/23
           temperature monitoring chip.
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index ba35e4d530b5..2566c43dd1e9 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -538,7 +538,7 @@ static int gpio_fan_probe(struct platform_device *pdev)
 
         /* Make this driver part of hwmon class. */
         fan_data->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
-                                                "gpio-fan", fan_data,
+                                                "gpio_fan", fan_data,
                                                 gpio_fan_groups);
         if (IS_ERR(fan_data->hwmon_dev))
                 return PTR_ERR(fan_data->hwmon_dev);
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index e76feb86a1d4..bdfbe9114889 100644
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -163,6 +163,18 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
 }
 
 static const struct of_device_id ntc_match[] = {
+        { .compatible = "murata,ncp15wb473",
+                .data = &ntc_thermistor_id[0] },
+        { .compatible = "murata,ncp18wb473",
+                .data = &ntc_thermistor_id[1] },
+        { .compatible = "murata,ncp21wb473",
+                .data = &ntc_thermistor_id[2] },
+        { .compatible = "murata,ncp03wb473",
+                .data = &ntc_thermistor_id[3] },
+        { .compatible = "murata,ncp15wl333",
+                .data = &ntc_thermistor_id[4] },
+
+        /* Usage of vendor name "ntc" is deprecated */
         { .compatible = "ntc,ncp15wb473",
                 .data = &ntc_thermistor_id[0] },
         { .compatible = "ntc,ncp18wb473",
@@ -534,7 +546,7 @@ static struct platform_driver ntc_thermistor_driver = {
 
 module_platform_driver(ntc_thermistor_driver);
 
-MODULE_DESCRIPTION("NTC Thermistor Driver");
+MODULE_DESCRIPTION("NTC Thermistor Driver from Murata");
 MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:ntc-thermistor");
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c
index 6ed76ceb9270..32487c19cbfc 100644
--- a/drivers/hwmon/w83l786ng.c
+++ b/drivers/hwmon/w83l786ng.c
@@ -249,7 +249,7 @@ static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
         int nr = to_sensor_dev_attr(attr)->index; \
         struct w83l786ng_data *data = w83l786ng_update_device(dev); \
         return sprintf(buf, "%d\n", \
-                FAN_FROM_REG(data->fan[nr], DIV_FROM_REG(data->fan_div[nr]))); \
+                FAN_FROM_REG(data->reg[nr], DIV_FROM_REG(data->fan_div[nr]))); \
 }
 
 show_fan_reg(fan);
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 620d1004a1e7..9f7d5859cf65 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -676,6 +676,16 @@ config I2C_RIIC
           This driver can also be built as a module.  If so, the module
           will be called i2c-riic.
 
+config I2C_RK3X
+        tristate "Rockchip RK3xxx I2C adapter"
+        depends on OF
+        help
+          Say Y here to include support for the I2C adapter in Rockchip RK3xxx
+          SoCs.
+
+          This driver can also be built as a module. If so, the module will
+          be called i2c-rk3x.
+
 config HAVE_S3C2410_I2C
         bool
         help
@@ -764,6 +774,19 @@ config I2C_STU300
           This driver can also be built as a module. If so, the module
           will be called i2c-stu300.
 
+config I2C_SUN6I_P2WI
+        tristate "Allwinner sun6i internal P2WI controller"
+        depends on RESET_CONTROLLER
+        depends on MACH_SUN6I || COMPILE_TEST
+        help
+          If you say yes to this option, support will be included for the
+          P2WI (Push/Pull 2 Wire Interface) controller embedded in some sunxi
+          SOCs.
+          The P2WI looks like an SMBus controller (which supports only byte
+          accesses), except that it only supports one slave device.
+          This interface is used to connect to specific PMIC devices (like the
+          AXP221).
+
 config I2C_TEGRA
         tristate "NVIDIA Tegra internal I2C controller"
         depends on ARCH_TEGRA
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 298692cc6000..dd9a7f8e873f 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_I2C_PXA)		+= i2c-pxa.o
 obj-$(CONFIG_I2C_PXA_PCI)       += i2c-pxa-pci.o
 obj-$(CONFIG_I2C_QUP)           += i2c-qup.o
 obj-$(CONFIG_I2C_RIIC)          += i2c-riic.o
+obj-$(CONFIG_I2C_RK3X)          += i2c-rk3x.o
 obj-$(CONFIG_I2C_S3C2410)       += i2c-s3c2410.o
 obj-$(CONFIG_I2C_S6000)         += i2c-s6000.o
 obj-$(CONFIG_I2C_SH7760)        += i2c-sh7760.o
@@ -74,6 +75,7 @@ obj-$(CONFIG_I2C_SIMTEC)	+= i2c-simtec.o
 obj-$(CONFIG_I2C_SIRF)          += i2c-sirf.o
 obj-$(CONFIG_I2C_ST)            += i2c-st.o
 obj-$(CONFIG_I2C_STU300)        += i2c-stu300.o
+obj-$(CONFIG_I2C_SUN6I_P2WI)    += i2c-sun6i-p2wi.o
 obj-$(CONFIG_I2C_TEGRA)         += i2c-tegra.o
 obj-$(CONFIG_I2C_VERSATILE)     += i2c-versatile.o
 obj-$(CONFIG_I2C_WMT)           += i2c-wmt.o
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
new file mode 100644
index 000000000000..a9791509966a
--- /dev/null
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -0,0 +1,763 @@
+/*
+ * Driver for I2C adapter in Rockchip RK3xxx SoC
+ *
+ * Max Schwarz <max.schwarz@online.de>
+ * based on the patches by Rockchip Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/spinlock.h>
+#include <linux/clk.h>
+#include <linux/wait.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+
+
+/* Register Map */
+#define REG_CON        0x00 /* control register */
+#define REG_CLKDIV     0x04 /* clock divisor register */
+#define REG_MRXADDR    0x08 /* slave address for REGISTER_TX */
+#define REG_MRXRADDR   0x0c /* slave register address for REGISTER_TX */
+#define REG_MTXCNT     0x10 /* number of bytes to be transmitted */
+#define REG_MRXCNT     0x14 /* number of bytes to be received */
+#define REG_IEN        0x18 /* interrupt enable */
+#define REG_IPD        0x1c /* interrupt pending */
+#define REG_FCNT       0x20 /* finished count */
+
+/* Data buffer offsets */
+#define TXBUFFER_BASE 0x100
+#define RXBUFFER_BASE 0x200
+
+/* REG_CON bits */
+#define REG_CON_EN        BIT(0)
+enum {
+        REG_CON_MOD_TX = 0,      /* transmit data */
+        REG_CON_MOD_REGISTER_TX, /* select register and restart */
+        REG_CON_MOD_RX,          /* receive data */
+        REG_CON_MOD_REGISTER_RX, /* broken: transmits read addr AND writes
+                                  * register addr */
+};
+#define REG_CON_MOD(mod)  ((mod) << 1)
+#define REG_CON_MOD_MASK  (BIT(1) | BIT(2))
+#define REG_CON_START     BIT(3)
+#define REG_CON_STOP      BIT(4)
+#define REG_CON_LASTACK   BIT(5) /* 1: send NACK after last received byte */
+#define REG_CON_ACTACK    BIT(6) /* 1: stop if NACK is received */
+
+/* REG_MRXADDR bits */
+#define REG_MRXADDR_VALID(x) BIT(24 + (x)) /* [x*8+7:x*8] of MRX[R]ADDR valid */
+
+/* REG_IEN/REG_IPD bits */
+#define REG_INT_BTF       BIT(0) /* a byte was transmitted */
+#define REG_INT_BRF       BIT(1) /* a byte was received */
+#define REG_INT_MBTF      BIT(2) /* master data transmit finished */
+#define REG_INT_MBRF      BIT(3) /* master data receive finished */
+#define REG_INT_START     BIT(4) /* START condition generated */
+#define REG_INT_STOP      BIT(5) /* STOP condition generated */
+#define REG_INT_NAKRCV    BIT(6) /* NACK received */
+#define REG_INT_ALL       0x7f
+
+/* Constants */
+#define WAIT_TIMEOUT      200 /* ms */
+#define DEFAULT_SCL_RATE  (100 * 1000) /* Hz */
+
+enum rk3x_i2c_state {
+        STATE_IDLE,
+        STATE_START,
+        STATE_READ,
+        STATE_WRITE,
+        STATE_STOP
+};
+
+/**
+ * @grf_offset: offset inside the grf regmap for setting the i2c type
+ */
+struct rk3x_i2c_soc_data {
+        int grf_offset;
+};
+
+struct rk3x_i2c {
+        struct i2c_adapter adap;
+        struct device *dev;
+        struct rk3x_i2c_soc_data *soc_data;
+
+        /* Hardware resources */
+        void __iomem *regs;
+        struct clk *clk;
+
+        /* Settings */
+        unsigned int scl_frequency;
+
+        /* Synchronization & notification */
+        spinlock_t lock;
+        wait_queue_head_t wait;
+        bool busy;
+
+        /* Current message */
+        struct i2c_msg *msg;
+        u8 addr;
+        unsigned int mode;
+        bool is_last_msg;
+
+        /* I2C state machine */
+        enum rk3x_i2c_state state;
+        unsigned int processed; /* sent/received bytes */
+        int error;
+};
+
+static inline void i2c_writel(struct rk3x_i2c *i2c, u32 value,
+                              unsigned int offset)
+{
+        writel(value, i2c->regs + offset);
+}
+
+static inline u32 i2c_readl(struct rk3x_i2c *i2c, unsigned int offset)
+{
+        return readl(i2c->regs + offset);
+}
+
+/* Reset all interrupt pending bits */
+static inline void rk3x_i2c_clean_ipd(struct rk3x_i2c *i2c)
+{
+        i2c_writel(i2c, REG_INT_ALL, REG_IPD);
+}
+
+/**
+ * Generate a START condition, which triggers a REG_INT_START interrupt.
+ */
+static void rk3x_i2c_start(struct rk3x_i2c *i2c)
+{
+        u32 val;
+
+        rk3x_i2c_clean_ipd(i2c);
+        i2c_writel(i2c, REG_INT_START, REG_IEN);
+
+        /* enable adapter with correct mode, send START condition */
+        val = REG_CON_EN | REG_CON_MOD(i2c->mode) | REG_CON_START;
+
+        /* if we want to react to NACK, set ACTACK bit */
+        if (!(i2c->msg->flags & I2C_M_IGNORE_NAK))
+                val |= REG_CON_ACTACK;
+
+        i2c_writel(i2c, val, REG_CON);
+}
+
+/**
+ * Generate a STOP condition, which triggers a REG_INT_STOP interrupt.
+ *
+ * @error: Error code to return in rk3x_i2c_xfer
+ */
+static void rk3x_i2c_stop(struct rk3x_i2c *i2c, int error)
+{
+        unsigned int ctrl;
+
+        i2c->processed = 0;
+        i2c->msg = NULL;
+        i2c->error = error;
+
+        if (i2c->is_last_msg) {
+                /* Enable stop interrupt */
+                i2c_writel(i2c, REG_INT_STOP, REG_IEN);
+
+                i2c->state = STATE_STOP;
+
+                ctrl = i2c_readl(i2c, REG_CON);
+                ctrl |= REG_CON_STOP;
+                i2c_writel(i2c, ctrl, REG_CON);
+        } else {
+                /* Signal rk3x_i2c_xfer to start the next message. */
+                i2c->busy = false;
+                i2c->state = STATE_IDLE;
+
+                /*
+                 * The HW is actually not capable of REPEATED START. But we can
+                 * get the intended effect by resetting its internal state
+                 * and issuing an ordinary START.
+                 */
+                i2c_writel(i2c, 0, REG_CON);
+
+                /* signal that we are finished with the current msg */
+                wake_up(&i2c->wait);
+        }
+}
+
+/**
+ * Setup a read according to i2c->msg
+ */
+static void rk3x_i2c_prepare_read(struct rk3x_i2c *i2c)
+{
+        unsigned int len = i2c->msg->len - i2c->processed;
+        u32 con;
+
+        con = i2c_readl(i2c, REG_CON);
+
+        /*
+         * The hw can read up to 32 bytes at a time. If we need more than one
+         * chunk, send an ACK after the last byte of the current chunk.
+         */
+        if (unlikely(len > 32)) {
+                len = 32;
+                con &= ~REG_CON_LASTACK;
+        } else {
+                con |= REG_CON_LASTACK;
+        }
+
+        /* make sure we are in plain RX mode if we read a second chunk */
+        if (i2c->processed != 0) {
+                con &= ~REG_CON_MOD_MASK;
+                con |= REG_CON_MOD(REG_CON_MOD_RX);
+        }
+
+        i2c_writel(i2c, con, REG_CON);
+        i2c_writel(i2c, len, REG_MRXCNT);
+}
+
+/**
+ * Fill the transmit buffer with data from i2c->msg
+ */
+static void rk3x_i2c_fill_transmit_buf(struct rk3x_i2c *i2c)
+{
+        unsigned int i, j;
+        u32 cnt = 0;
+        u32 val;
+        u8 byte;
+
+        for (i = 0; i < 8; ++i) {
+                val = 0;
+                for (j = 0; j < 4; ++j) {
+                        if (i2c->processed == i2c->msg->len)
+                                break;
+
+                        if (i2c->processed == 0 && cnt == 0)
+                                byte = (i2c->addr & 0x7f) << 1;
+                        else
+                                byte = i2c->msg->buf[i2c->processed++];
+
+                        val |= byte << (j * 8);
+                        cnt++;
+                }
+
+                i2c_writel(i2c, val, TXBUFFER_BASE + 4 * i);
+
+                if (i2c->processed == i2c->msg->len)
+                        break;
+        }
+
+        i2c_writel(i2c, cnt, REG_MTXCNT);
+}
+
+
+/* IRQ handlers for individual states */
+
+static void rk3x_i2c_handle_start(struct rk3x_i2c *i2c, unsigned int ipd)
+{
+        if (!(ipd & REG_INT_START)) {
+                rk3x_i2c_stop(i2c, -EIO);
+                dev_warn(i2c->dev, "unexpected irq in START: 0x%x\n", ipd);
+                rk3x_i2c_clean_ipd(i2c);
+                return;
+        }
+
+        /* ack interrupt */
+        i2c_writel(i2c, REG_INT_START, REG_IPD);
+
+        /* disable start bit */
+        i2c_writel(i2c, i2c_readl(i2c, REG_CON) & ~REG_CON_START, REG_CON);
+
+        /* enable appropriate interrupts and transition */
+        if (i2c->mode == REG_CON_MOD_TX) {
+                i2c_writel(i2c, REG_INT_MBTF | REG_INT_NAKRCV, REG_IEN);
+                i2c->state = STATE_WRITE;
+                rk3x_i2c_fill_transmit_buf(i2c);
+        } else {
+                /* in any other case, we are going to be reading. */
+                i2c_writel(i2c, REG_INT_MBRF | REG_INT_NAKRCV, REG_IEN);
+                i2c->state = STATE_READ;
+                rk3x_i2c_prepare_read(i2c);
+        }
+}
+
+static void rk3x_i2c_handle_write(struct rk3x_i2c *i2c, unsigned int ipd)
+{
+        if (!(ipd & REG_INT_MBTF)) {
+                rk3x_i2c_stop(i2c, -EIO);
+                dev_err(i2c->dev, "unexpected irq in WRITE: 0x%x\n", ipd);
+                rk3x_i2c_clean_ipd(i2c);
+                return;
+        }
+
+        /* ack interrupt */
+        i2c_writel(i2c, REG_INT_MBTF, REG_IPD);
+
+        /* are we finished? */
+        if (i2c->processed == i2c->msg->len)
+                rk3x_i2c_stop(i2c, i2c->error);
+        else
+                rk3x_i2c_fill_transmit_buf(i2c);
+}
+
+static void rk3x_i2c_handle_read(struct rk3x_i2c *i2c, unsigned int ipd)
+{
+        unsigned int i;
+        unsigned int len = i2c->msg->len - i2c->processed;
+        u32 uninitialized_var(val);
+        u8 byte;
+
+        /* we only care for MBRF here. */
+        if (!(ipd & REG_INT_MBRF))
+                return;
+
+        /* ack interrupt */
+        i2c_writel(i2c, REG_INT_MBRF, REG_IPD);
+
+        /* read the data from receive buffer */
+        for (i = 0; i < len; ++i) {
+                if (i % 4 == 0)
+                        val = i2c_readl(i2c, RXBUFFER_BASE + (i / 4) * 4);
+
+                byte = (val >> ((i % 4) * 8)) & 0xff;
+                i2c->msg->buf[i2c->processed++] = byte;
+        }
+
+        /* are we finished? */
+        if (i2c->processed == i2c->msg->len)
+                rk3x_i2c_stop(i2c, i2c->error);
+        else
+                rk3x_i2c_prepare_read(i2c);
+}
+
+static void rk3x_i2c_handle_stop(struct rk3x_i2c *i2c, unsigned int ipd)
+{
+        unsigned int con;
+
+        if (!(ipd & REG_INT_STOP)) {
+                rk3x_i2c_stop(i2c, -EIO);
+                dev_err(i2c->dev, "unexpected irq in STOP: 0x%x\n", ipd);
+                rk3x_i2c_clean_ipd(i2c);
+                return;
+        }
+
+        /* ack interrupt */
+        i2c_writel(i2c, REG_INT_STOP, REG_IPD);
+
+        /* disable STOP bit */
+        con = i2c_readl(i2c, REG_CON);
+        con &= ~REG_CON_STOP;
+        i2c_writel(i2c, con, REG_CON);
+
+        i2c->busy = false;
+        i2c->state = STATE_IDLE;
+
+        /* signal rk3x_i2c_xfer that we are finished */
+        wake_up(&i2c->wait);
+}
+
+static irqreturn_t rk3x_i2c_irq(int irqno, void *dev_id)
+{
+        struct rk3x_i2c *i2c = dev_id;
+        unsigned int ipd;
+
+        spin_lock(&i2c->lock);
+
+        ipd = i2c_readl(i2c, REG_IPD);
+        if (i2c->state == STATE_IDLE) {
+                dev_warn(i2c->dev, "irq in STATE_IDLE, ipd = 0x%x\n", ipd);
+                rk3x_i2c_clean_ipd(i2c);
+                goto out;
+        }
+
+        dev_dbg(i2c->dev, "IRQ: state %d, ipd: %x\n", i2c->state, ipd);
+
+        /* Clean interrupt bits we don't care about */
+        ipd &= ~(REG_INT_BRF | REG_INT_BTF);
+
+        if (ipd & REG_INT_NAKRCV) {
+                /*
+                 * We got a NACK in the last operation. Depending on whether
+                 * IGNORE_NAK is set, we have to stop the operation and report
+                 * an error.
+                 */
+                i2c_writel(i2c, REG_INT_NAKRCV, REG_IPD);
+
+                ipd &= ~REG_INT_NAKRCV;
+
+                if (!(i2c->msg->flags & I2C_M_IGNORE_NAK))
+                        rk3x_i2c_stop(i2c, -ENXIO);
+        }
+
+        /* is there anything left to handle? */
+        if (unlikely(ipd == 0))
+                goto out;
+
+        switch (i2c->state) {
+        case STATE_START:
+                rk3x_i2c_handle_start(i2c, ipd);
+                break;
+        case STATE_WRITE:
+                rk3x_i2c_handle_write(i2c, ipd);
+                break;
+        case STATE_READ:
+                rk3x_i2c_handle_read(i2c, ipd);
+                break;
+        case STATE_STOP:
+                rk3x_i2c_handle_stop(i2c, ipd);
+                break;
+        case STATE_IDLE:
+                break;
+        }
+
+out:
+        spin_unlock(&i2c->lock);
+        return IRQ_HANDLED;
+}
+
+static void rk3x_i2c_set_scl_rate(struct rk3x_i2c *i2c, unsigned long scl_rate)
+{
+        unsigned long i2c_rate = clk_get_rate(i2c->clk);
+        unsigned int div;
+
+        /* SCL rate = (clk rate) / (8 * DIV) */
+        div = DIV_ROUND_UP(i2c_rate, scl_rate * 8);
+
+        /* The lower and upper half of the CLKDIV reg describe the length of
+         * SCL low & high periods. */
+        div = DIV_ROUND_UP(div, 2);
+
+        i2c_writel(i2c, (div << 16) | (div & 0xffff), REG_CLKDIV);
+}
+
+/**
+ * Setup I2C registers for an I2C operation specified by msgs, num.
+ *
+ * Must be called with i2c->lock held.
+ *
+ * @msgs: I2C msgs to process
+ * @num: Number of msgs
+ *
+ * returns: Number of I2C msgs processed or negative in case of error
+ */
+static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num)
+{
+        u32 addr = (msgs[0].addr & 0x7f) << 1;
+        int ret = 0;
+
+        /*
+         * The I2C adapter can issue a small (len < 4) write packet before
+         * reading. This speeds up SMBus-style register reads.
+         * The MRXADDR/MRXRADDR hold the slave address and the slave register
+         * address in this case.
+         */
+
+        if (num >= 2 && msgs[0].len < 4 &&
+            !(msgs[0].flags & I2C_M_RD) && (msgs[1].flags & I2C_M_RD)) {
+                u32 reg_addr = 0;
+                int i;
+
+                dev_dbg(i2c->dev, "Combined write/read from addr 0x%x\n",
+                        addr >> 1);
+
+                /* Fill MRXRADDR with the register address(es) */
+                for (i = 0; i < msgs[0].len; ++i) {
+                        reg_addr |= msgs[0].buf[i] << (i * 8);
+                        reg_addr |= REG_MRXADDR_VALID(i);
+                }
+
+                /* msgs[0] is handled by hw. */
+                i2c->msg = &msgs[1];
+
+                i2c->mode = REG_CON_MOD_REGISTER_TX;
+
+                i2c_writel(i2c, addr | REG_MRXADDR_VALID(0), REG_MRXADDR);
+                i2c_writel(i2c, reg_addr, REG_MRXRADDR);
+
+                ret = 2;
+        } else {
+                /*
+                 * We'll have to do it the boring way and process the msgs
+                 * one-by-one.
+                 */
+
+                if (msgs[0].flags & I2C_M_RD) {
+                        addr |= 1; /* set read bit */
+
+                        /*
+                         * We have to transmit the slave addr first. Use
+                         * MOD_REGISTER_TX for that purpose.
+                         */
+                        i2c->mode = REG_CON_MOD_REGISTER_TX;
+                        i2c_writel(i2c, addr | REG_MRXADDR_VALID(0),
+                                   REG_MRXADDR);
+                        i2c_writel(i2c, 0, REG_MRXRADDR);
+                } else {
+                        i2c->mode = REG_CON_MOD_TX;
+                }
+
+                i2c->msg = &msgs[0];
+
+                ret = 1;
+        }
+
+        i2c->addr = msgs[0].addr;
+        i2c->busy = true;
+        i2c->state = STATE_START;
+        i2c->processed = 0;
+        i2c->error = 0;
+
+        rk3x_i2c_clean_ipd(i2c);
+
+        return ret;
+}
+
+static int rk3x_i2c_xfer(struct i2c_adapter *adap,
+                         struct i2c_msg *msgs, int num)
+{
+        struct rk3x_i2c *i2c = (struct rk3x_i2c *)adap->algo_data;
+        unsigned long timeout, flags;
+        int ret = 0;
+        int i;
+
+        spin_lock_irqsave(&i2c->lock, flags);
+
+        clk_enable(i2c->clk);
+
+        /* The clock rate might have changed, so setup the divider again */
+        rk3x_i2c_set_scl_rate(i2c, i2c->scl_frequency);
+
+        i2c->is_last_msg = false;
+
+        /*
+         * Process msgs. We can handle more than one message at once (see
+         * rk3x_i2c_setup()).
+         */
+        for (i = 0; i < num; i += ret) {
+                ret = rk3x_i2c_setup(i2c, msgs + i, num - i);
+
+                if (ret < 0) {
+                        dev_err(i2c->dev, "rk3x_i2c_setup() failed\n");
+                        break;
+                }
+
+                if (i + ret >= num)
+                        i2c->is_last_msg = true;
+
+                spin_unlock_irqrestore(&i2c->lock, flags);
+
+                rk3x_i2c_start(i2c);
+
+                timeout = wait_event_timeout(i2c->wait, !i2c->busy,
+                                             msecs_to_jiffies(WAIT_TIMEOUT));
+
+                spin_lock_irqsave(&i2c->lock, flags);
+
+                if (timeout == 0) {
+                        dev_err(i2c->dev, "timeout, ipd: 0x%02x, state: %d\n",
+                                i2c_readl(i2c, REG_IPD), i2c->state);
+
+                        /* Force a STOP condition without interrupt */
+                        i2c_writel(i2c, 0, REG_IEN);
+                        i2c_writel(i2c, REG_CON_EN | REG_CON_STOP, REG_CON);
+
+                        i2c->state = STATE_IDLE;
+
+                        ret = -ETIMEDOUT;
+                        break;
+                }
+
+                if (i2c->error) {
+                        ret = i2c->error;
+                        break;
+                }
+        }
+
+        clk_disable(i2c->clk);
+        spin_unlock_irqrestore(&i2c->lock, flags);
+
+        return ret;
+}
+
+static u32 rk3x_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING;
+}
+
+static const struct i2c_algorithm rk3x_i2c_algorithm = {
+        .master_xfer            = rk3x_i2c_xfer,
+        .functionality          = rk3x_i2c_func,
+};
+
+static struct rk3x_i2c_soc_data soc_data[3] = {
+        { .grf_offset = 0x154 }, /* rk3066 */
+        { .grf_offset = 0x0a4 }, /* rk3188 */
+        { .grf_offset = -1 },    /* no I2C switching needed */
+};
+
+static const struct of_device_id rk3x_i2c_match[] = {
+        { .compatible = "rockchip,rk3066-i2c", .data = (void *)&soc_data[0] },
+        { .compatible = "rockchip,rk3188-i2c", .data = (void *)&soc_data[1] },
+        { .compatible = "rockchip,rk3288-i2c", .data = (void *)&soc_data[2] },
+        {},
+};
+
+static int rk3x_i2c_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        const struct of_device_id *match;
+        struct rk3x_i2c *i2c;
+        struct resource *mem;
+        int ret = 0;
+        int bus_nr;
+        u32 value;
+        int irq;
+
+        i2c = devm_kzalloc(&pdev->dev, sizeof(struct rk3x_i2c), GFP_KERNEL);
+        if (!i2c)
+                return -ENOMEM;
+
+        match = of_match_node(rk3x_i2c_match, np);
+        i2c->soc_data = (struct rk3x_i2c_soc_data *)match->data;
+
+        if (of_property_read_u32(pdev->dev.of_node, "clock-frequency",
+                                 &i2c->scl_frequency)) {
+                dev_info(&pdev->dev, "using default SCL frequency: %d\n",
+                         DEFAULT_SCL_RATE);
+                i2c->scl_frequency = DEFAULT_SCL_RATE;
+        }
+
+        if (i2c->scl_frequency == 0 || i2c->scl_frequency > 400 * 1000) {
+                dev_warn(&pdev->dev, "invalid SCL frequency specified.\n");
+                dev_warn(&pdev->dev, "using default SCL frequency: %d\n",
+                         DEFAULT_SCL_RATE);
+                i2c->scl_frequency = DEFAULT_SCL_RATE;
+        }
+
+        strlcpy(i2c->adap.name, "rk3x-i2c", sizeof(i2c->adap.name));
+        i2c->adap.owner = THIS_MODULE;
+        i2c->adap.algo = &rk3x_i2c_algorithm;
+        i2c->adap.retries = 3;
+        i2c->adap.dev.of_node = np;
+        i2c->adap.algo_data = i2c;
+        i2c->adap.dev.parent = &pdev->dev;
+
+        i2c->dev = &pdev->dev;
+
+        spin_lock_init(&i2c->lock);
+        init_waitqueue_head(&i2c->wait);
+
+        i2c->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(i2c->clk)) {
+                dev_err(&pdev->dev, "cannot get clock\n");
+                return PTR_ERR(i2c->clk);
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        i2c->regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(i2c->regs))
+                return PTR_ERR(i2c->regs);
+
+        /* Try to set the I2C adapter number from dt */
+        bus_nr = of_alias_get_id(np, "i2c");
+
+        /*
+         * Switch to new interface if the SoC also offers the old one.
+         * The control bit is located in the GRF register space.
+         */
+        if (i2c->soc_data->grf_offset >= 0) {
+                struct regmap *grf;
+
+                grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+                if (IS_ERR(grf)) {
+                        dev_err(&pdev->dev,
+                                "rk3x-i2c needs 'rockchip,grf' property\n");
+                        return PTR_ERR(grf);
+                }
+
+                if (bus_nr < 0) {
+                        dev_err(&pdev->dev, "rk3x-i2c needs i2cX alias");
+                        return -EINVAL;
+                }
+
+                /* 27+i: write mask, 11+i: value */
+                value = BIT(27 + bus_nr) | BIT(11 + bus_nr);
+
+                ret = regmap_write(grf, i2c->soc_data->grf_offset, value);
+                if (ret != 0) {
+                        dev_err(i2c->dev, "Could not write to GRF: %d\n", ret);
+                        return ret;
+                }
+        }
+
+        /* IRQ setup */
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "cannot find rk3x IRQ\n");
+                return irq;
+        }
+
+        ret = devm_request_irq(&pdev->dev, irq, rk3x_i2c_irq,
+                               0, dev_name(&pdev->dev), i2c);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "cannot request IRQ\n");
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, i2c);
+
+        ret = clk_prepare(i2c->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Could not prepare clock\n");
+                return ret;
+        }
+
+        ret = i2c_add_adapter(&i2c->adap);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Could not register adapter\n");
+                goto err_clk;
+        }
+
+        dev_info(&pdev->dev, "Initialized RK3xxx I2C bus at %p\n", i2c->regs);
+
+        return 0;
+
+err_clk:
+        clk_unprepare(i2c->clk);
+        return ret;
+}
+
+static int rk3x_i2c_remove(struct platform_device *pdev)
+{
+        struct rk3x_i2c *i2c = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&i2c->adap);
+        clk_unprepare(i2c->clk);
+
+        return 0;
+}
+
+static struct platform_driver rk3x_i2c_driver = {
+        .probe   = rk3x_i2c_probe,
+        .remove  = rk3x_i2c_remove,
+        .driver  = {
+                .owner = THIS_MODULE,
+                .name  = "rk3x-i2c",
+                .of_match_table = rk3x_i2c_match,
+        },
+};
+
+module_platform_driver(rk3x_i2c_driver);
+
+MODULE_DESCRIPTION("Rockchip RK3xxx I2C Bus driver");
+MODULE_AUTHOR("Max Schwarz <max.schwarz@online.de>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
new file mode 100644
index 000000000000..09de4fd12d57
--- /dev/null
+++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
@@ -0,0 +1,345 @@
+/*
+ * P2WI (Push-Pull Two Wire Interface) bus driver.
+ *
+ * Author: Boris BREZILLON <boris.brezillon@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ * The P2WI controller looks like an SMBus controller which only supports byte
+ * data transfers. But, it differs from standard SMBus protocol on several
+ * aspects:
+ * - it supports only one slave device, and thus drop the address field
+ * - it adds a parity bit every 8bits of data
+ * - only one read access is required to read a byte (instead of a write
+ *   followed by a read access in standard SMBus protocol)
+ * - there's no Ack bit after each byte transfer
+ *
+ * This means this bus cannot be used to interface with standard SMBus
+ * devices (the only known device to support this interface is the AXP221
+ * PMIC).
+ *
+ */
+#include <linux/clk.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/reset.h>
+
+
+/* P2WI registers */
+#define P2WI_CTRL               0x0
+#define P2WI_CCR                0x4
+#define P2WI_INTE               0x8
+#define P2WI_INTS               0xc
+#define P2WI_DADDR0             0x10
+#define P2WI_DADDR1             0x14
+#define P2WI_DLEN               0x18
+#define P2WI_DATA0              0x1c
+#define P2WI_DATA1              0x20
+#define P2WI_LCR                0x24
+#define P2WI_PMCR               0x28
+
+/* CTRL fields */
+#define P2WI_CTRL_START_TRANS           BIT(7)
+#define P2WI_CTRL_ABORT_TRANS           BIT(6)
+#define P2WI_CTRL_GLOBAL_INT_ENB        BIT(1)
+#define P2WI_CTRL_SOFT_RST              BIT(0)
+
+/* CLK CTRL fields */
+#define P2WI_CCR_SDA_OUT_DELAY(v)       (((v) & 0x7) << 8)
+#define P2WI_CCR_MAX_CLK_DIV            0xff
+#define P2WI_CCR_CLK_DIV(v)             ((v) & P2WI_CCR_MAX_CLK_DIV)
+
+/* STATUS fields */
+#define P2WI_INTS_TRANS_ERR_ID(v)       (((v) >> 8) & 0xff)
+#define P2WI_INTS_LOAD_BSY              BIT(2)
+#define P2WI_INTS_TRANS_ERR             BIT(1)
+#define P2WI_INTS_TRANS_OVER            BIT(0)
+
+/* DATA LENGTH fields*/
+#define P2WI_DLEN_READ                  BIT(4)
+#define P2WI_DLEN_DATA_LENGTH(v)        ((v - 1) & 0x7)
+
+/* LINE CTRL fields*/
+#define P2WI_LCR_SCL_STATE              BIT(5)
+#define P2WI_LCR_SDA_STATE              BIT(4)
+#define P2WI_LCR_SCL_CTL                BIT(3)
+#define P2WI_LCR_SCL_CTL_EN             BIT(2)
+#define P2WI_LCR_SDA_CTL                BIT(1)
+#define P2WI_LCR_SDA_CTL_EN             BIT(0)
+
+/* PMU MODE CTRL fields */
+#define P2WI_PMCR_PMU_INIT_SEND         BIT(31)
+#define P2WI_PMCR_PMU_INIT_DATA(v)      (((v) & 0xff) << 16)
+#define P2WI_PMCR_PMU_MODE_REG(v)       (((v) & 0xff) << 8)
+#define P2WI_PMCR_PMU_DEV_ADDR(v)       ((v) & 0xff)
+
+#define P2WI_MAX_FREQ                   6000000
+
+struct p2wi {
+        struct i2c_adapter adapter;
+        struct completion complete;
+        unsigned int status;
+        void __iomem *regs;
+        struct clk *clk;
+        struct reset_control *rstc;
+        int slave_addr;
+};
+
+static irqreturn_t p2wi_interrupt(int irq, void *dev_id)
+{
+        struct p2wi *p2wi = dev_id;
+        unsigned long status;
+
+        status = readl(p2wi->regs + P2WI_INTS);
+        p2wi->status = status;
+
+        /* Clear interrupts */
+        status &= (P2WI_INTS_LOAD_BSY | P2WI_INTS_TRANS_ERR |
+                   P2WI_INTS_TRANS_OVER);
+        writel(status, p2wi->regs + P2WI_INTS);
+
+        complete(&p2wi->complete);
+
+        return IRQ_HANDLED;
+}
+
+static u32 p2wi_functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_BYTE_DATA;
+}
+
+static int p2wi_smbus_xfer(struct i2c_adapter *adap, u16 addr,
+                           unsigned short flags, char read_write,
+                           u8 command, int size, union i2c_smbus_data *data)
+{
+        struct p2wi *p2wi = i2c_get_adapdata(adap);
+        unsigned long dlen = P2WI_DLEN_DATA_LENGTH(1);
+
+        if (p2wi->slave_addr >= 0 && addr != p2wi->slave_addr) {
+                dev_err(&adap->dev, "invalid P2WI address\n");
+                return -EINVAL;
+        }
+
+        if (!data)
+                return -EINVAL;
+
+        writel(command, p2wi->regs + P2WI_DADDR0);
+
+        if (read_write == I2C_SMBUS_READ)
+                dlen |= P2WI_DLEN_READ;
+        else
+                writel(data->byte, p2wi->regs + P2WI_DATA0);
+
+        writel(dlen, p2wi->regs + P2WI_DLEN);
+
+        if (readl(p2wi->regs + P2WI_CTRL) & P2WI_CTRL_START_TRANS) {
+                dev_err(&adap->dev, "P2WI bus busy\n");
+                return -EBUSY;
+        }
+
+        reinit_completion(&p2wi->complete);
+
+        writel(P2WI_INTS_LOAD_BSY | P2WI_INTS_TRANS_ERR | P2WI_INTS_TRANS_OVER,
+               p2wi->regs + P2WI_INTE);
+
+        writel(P2WI_CTRL_START_TRANS | P2WI_CTRL_GLOBAL_INT_ENB,
+               p2wi->regs + P2WI_CTRL);
+
+        wait_for_completion(&p2wi->complete);
+
+        if (p2wi->status & P2WI_INTS_LOAD_BSY) {
+                dev_err(&adap->dev, "P2WI bus busy\n");
+                return -EBUSY;
+        }
+
+        if (p2wi->status & P2WI_INTS_TRANS_ERR) {
+                dev_err(&adap->dev, "P2WI bus xfer error\n");
+                return -ENXIO;
+        }
+
+        if (read_write == I2C_SMBUS_READ)
+                data->byte = readl(p2wi->regs + P2WI_DATA0);
+
+        return 0;
+}
+
+static const struct i2c_algorithm p2wi_algo = {
+        .smbus_xfer = p2wi_smbus_xfer,
+        .functionality = p2wi_functionality,
+};
+
+static const struct of_device_id p2wi_of_match_table[] = {
+        { .compatible = "allwinner,sun6i-a31-p2wi" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, p2wi_of_match_table);
+
+static int p2wi_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *np = dev->of_node;
+        struct device_node *childnp;
+        unsigned long parent_clk_freq;
+        u32 clk_freq = 100000;
+        struct resource *r;
+        struct p2wi *p2wi;
+        u32 slave_addr;
+        int clk_div;
+        int irq;
+        int ret;
+
+        of_property_read_u32(np, "clock-frequency", &clk_freq);
+        if (clk_freq > P2WI_MAX_FREQ) {
+                dev_err(dev,
+                        "required clock-frequency (%u Hz) is too high (max = 6MHz)",
+                        clk_freq);
+                return -EINVAL;
+        }
+
+        if (of_get_child_count(np) > 1) {
+                dev_err(dev, "P2WI only supports one slave device\n");
+                return -EINVAL;
+        }
+
+        p2wi = devm_kzalloc(dev, sizeof(struct p2wi), GFP_KERNEL);
+        if (!p2wi)
+                return -ENOMEM;
+
+        p2wi->slave_addr = -1;
+
+        /*
+         * Authorize a p2wi node without any children to be able to use an
+         * i2c-dev from userpace.
+         * In this case the slave_addr is set to -1 and won't be checked when
+         * launching a P2WI transfer.
+         */
+        childnp = of_get_next_available_child(np, NULL);
+        if (childnp) {
+                ret = of_property_read_u32(childnp, "reg", &slave_addr);
+                if (ret) {
+                        dev_err(dev, "invalid slave address on node %s\n",
+                                childnp->full_name);
+                        return -EINVAL;
+                }
+
+                p2wi->slave_addr = slave_addr;
+        }
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        p2wi->regs = devm_ioremap_resource(dev, r);
+        if (IS_ERR(p2wi->regs))
+                return PTR_ERR(p2wi->regs);
+
+        strlcpy(p2wi->adapter.name, pdev->name, sizeof(p2wi->adapter.name));
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(dev, "failed to retrieve irq: %d\n", irq);
+                return irq;
+        }
+
+        p2wi->clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(p2wi->clk)) {
+                ret = PTR_ERR(p2wi->clk);
+                dev_err(dev, "failed to retrieve clk: %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(p2wi->clk);
+        if (ret) {
+                dev_err(dev, "failed to enable clk: %d\n", ret);
+                return ret;
+        }
+
+        parent_clk_freq = clk_get_rate(p2wi->clk);
+
+        p2wi->rstc = devm_reset_control_get(dev, NULL);
+        if (IS_ERR(p2wi->rstc)) {
+                ret = PTR_ERR(p2wi->rstc);
+                dev_err(dev, "failed to retrieve reset controller: %d\n", ret);
+                goto err_clk_disable;
+        }
+
+        ret = reset_control_deassert(p2wi->rstc);
+        if (ret) {
+                dev_err(dev, "failed to deassert reset line: %d\n", ret);
+                goto err_clk_disable;
+        }
+
+        init_completion(&p2wi->complete);
+        p2wi->adapter.dev.parent = dev;
+        p2wi->adapter.algo = &p2wi_algo;
+        p2wi->adapter.owner = THIS_MODULE;
+        p2wi->adapter.dev.of_node = pdev->dev.of_node;
+        platform_set_drvdata(pdev, p2wi);
+        i2c_set_adapdata(&p2wi->adapter, p2wi);
+
+        ret = devm_request_irq(dev, irq, p2wi_interrupt, 0, pdev->name, p2wi);
+        if (ret) {
+                dev_err(dev, "can't register interrupt handler irq%d: %d\n",
+                        irq, ret);
+                goto err_reset_assert;
+        }
+
+        writel(P2WI_CTRL_SOFT_RST, p2wi->regs + P2WI_CTRL);
+
+        clk_div = parent_clk_freq / clk_freq;
+        if (!clk_div) {
+                dev_warn(dev,
+                         "clock-frequency is too high, setting it to %lu Hz\n",
+                         parent_clk_freq);
+                clk_div = 1;
+        } else if (clk_div > P2WI_CCR_MAX_CLK_DIV) {
+                dev_warn(dev,
+                         "clock-frequency is too low, setting it to %lu Hz\n",
+                         parent_clk_freq / P2WI_CCR_MAX_CLK_DIV);
+                clk_div = P2WI_CCR_MAX_CLK_DIV;
+        }
+
+        writel(P2WI_CCR_SDA_OUT_DELAY(1) | P2WI_CCR_CLK_DIV(clk_div),
+               p2wi->regs + P2WI_CCR);
+
+        ret = i2c_add_adapter(&p2wi->adapter);
+        if (!ret)
+                return 0;
+
+err_reset_assert:
+        reset_control_assert(p2wi->rstc);
+
+err_clk_disable:
+        clk_disable_unprepare(p2wi->clk);
+
+        return ret;
+}
+
+static int p2wi_remove(struct platform_device *dev)
+{
+        struct p2wi *p2wi = platform_get_drvdata(dev);
+
+        reset_control_assert(p2wi->rstc);
+        clk_disable_unprepare(p2wi->clk);
+        i2c_del_adapter(&p2wi->adapter);
+
+        return 0;
+}
+
+static struct platform_driver p2wi_driver = {
+        .probe  = p2wi_probe,
+        .remove = p2wi_remove,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "i2c-sunxi-p2wi",
+                .of_match_table = p2wi_of_match_table,
+        },
+};
+module_platform_driver(p2wi_driver);
+
+MODULE_AUTHOR("Boris BREZILLON <boris.brezillon@free-electrons.com>");
+MODULE_DESCRIPTION("Allwinner P2WI driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index 39b4cb48d738..6eba301ee03d 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -427,9 +427,12 @@ static int ad799x_write_event_value(struct iio_dev *indio_dev,
         int ret;
         struct ad799x_state *st = iio_priv(indio_dev);
 
+        if (val < 0 || val > RES_MASK(chan->scan_type.realbits))
+                return -EINVAL;
+
         mutex_lock(&indio_dev->mlock);
         ret = ad799x_i2c_write16(st, ad799x_threshold_reg(chan, dir, info),
-                val);
+                val << chan->scan_type.shift);
         mutex_unlock(&indio_dev->mlock);
 
         return ret;
@@ -452,7 +455,8 @@ static int ad799x_read_event_value(struct iio_dev *indio_dev,
         mutex_unlock(&indio_dev->mlock);
         if (ret < 0)
                 return ret;
-        *val = valin;
+        *val = (valin >> chan->scan_type.shift) &
+                RES_MASK(chan->scan_type.realbits);
 
         return IIO_VAL_INT;
 }
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 3b5bacd4d8da..2b6a9ce9927c 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -510,12 +510,11 @@ static int at91_adc_channel_init(struct iio_dev *idev)
         return idev->num_channels;
 }
 
-static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
+static int at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
                                              struct at91_adc_trigger *triggers,
                                              const char *trigger_name)
 {
         struct at91_adc_state *st = iio_priv(idev);
-        u8 value = 0;
         int i;
 
         for (i = 0; i < st->trigger_number; i++) {
@@ -528,15 +527,16 @@ static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
                         return -ENOMEM;
 
                 if (strcmp(trigger_name, name) == 0) {
-                        value = triggers[i].value;
                         kfree(name);
-                        break;
+                        if (triggers[i].value == 0)
+                                return -EINVAL;
+                        return triggers[i].value;
                 }
 
                 kfree(name);
         }
 
-        return value;
+        return -EINVAL;
 }
 
 static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
@@ -546,14 +546,14 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
         struct iio_buffer *buffer = idev->buffer;
         struct at91_adc_reg_desc *reg = st->registers;
         u32 status = at91_adc_readl(st, reg->trigger_register);
-        u8 value;
+        int value;
         u8 bit;
 
         value = at91_adc_get_trigger_value_by_name(idev,
                                                    st->trigger_list,
                                                    idev->trig->name);
-        if (value == 0)
-                return -EINVAL;
+        if (value < 0)
+                return value;
 
         if (state) {
                 st->buffer = kmalloc(idev->scan_bytes, GFP_KERNEL);
diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
index 6989c16aec2b..b58d6302521f 100644
--- a/drivers/iio/adc/men_z188_adc.c
+++ b/drivers/iio/adc/men_z188_adc.c
@@ -121,8 +121,8 @@ static int men_z188_probe(struct mcb_device *dev,
         indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels);
 
         mem = mcb_request_mem(dev, "z188-adc");
-        if (!mem)
-                return -ENOMEM;
+        if (IS_ERR(mem))
+                return PTR_ERR(mem);
 
         adc->base = ioremap(mem->start, resource_size(mem));
         if (adc->base == NULL)
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 7de1c4c87942..eb86786e698e 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -645,6 +645,7 @@ int twl4030_get_madc_conversion(int channel_no)
         req.channels = (1 << channel_no);
         req.method = TWL4030_MADC_SW2;
         req.active = 0;
+        req.raw = 0;
         req.func_cb = NULL;
         ret = twl4030_madc_conversion(&req);
         if (ret < 0)
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 73282cee0c81..a3109a6f4d86 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -75,6 +75,9 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
                                         (s32)report_val);
         }
 
+        sensor_hub_get_feature(st->hsdev, st->power_state.report_id,
+                                        st->power_state.index,
+                                        &state_val);
         return 0;
 }
 EXPORT_SYMBOL(hid_sensor_power_state);
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index d833d55052ea..c7497009d60a 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -183,7 +183,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
                 else if (name && index >= 0) {
                         pr_err("ERROR: could not get IIO channel %s:%s(%i)\n",
                                 np->full_name, name ? name : "", index);
-                        return chan;
+                        return NULL;
                 }
 
                 /*
@@ -193,8 +193,9 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
                  */
                 np = np->parent;
                 if (np && !of_get_property(np, "io-channel-ranges", NULL))
-                        break;
+                        return NULL;
         }
+
         return chan;
 }
 
@@ -317,6 +318,7 @@ struct iio_channel *iio_channel_get(struct device *dev,
                 if (channel != NULL)
                         return channel;
         }
+
         return iio_channel_get_sys(name, channel_name);
 }
 EXPORT_SYMBOL_GPL(iio_channel_get);
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index 09ea5c481f4c..ea08313af0d2 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -373,8 +373,6 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
 {
         struct ak8975_data *data = iio_priv(indio_dev);
         struct i2c_client *client = data->client;
-        u16 meas_reg;
-        s16 raw;
         int ret;
 
         mutex_lock(&data->lock);
@@ -422,16 +420,11 @@ static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
                 dev_err(&client->dev, "Read axis data fails\n");
                 goto exit;
         }
-        meas_reg = ret;
 
         mutex_unlock(&data->lock);
 
-        /* Endian conversion of the measured values. */
-        raw = (s16) (le16_to_cpu(meas_reg));
-
         /* Clamp to valid range. */
-        raw = clamp_t(s16, raw, -4096, 4095);
-        *val = raw;
+        *val = clamp_t(s16, ret, -4096, 4095);
         return IIO_VAL_INT;
 
 exit:
diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
index ba6d0c520e63..01b2e0b18878 100644
--- a/drivers/iio/pressure/mpl3115.c
+++ b/drivers/iio/pressure/mpl3115.c
@@ -98,7 +98,7 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,
                         mutex_unlock(&data->lock);
                         if (ret < 0)
                                 return ret;
-                        *val = sign_extend32(be32_to_cpu(tmp) >> 12, 23);
+                        *val = be32_to_cpu(tmp) >> 12;
                         return IIO_VAL_INT;
                 case IIO_TEMP: /* in 0.0625 celsius / LSB */
                         mutex_lock(&data->lock);
@@ -112,7 +112,7 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev,
                         mutex_unlock(&data->lock);
                         if (ret < 0)
                                 return ret;
-                        *val = sign_extend32(be32_to_cpu(tmp) >> 20, 15);
+                        *val = sign_extend32(be32_to_cpu(tmp) >> 20, 11);
                         return IIO_VAL_INT;
                 default:
                         return -EINVAL;
@@ -185,7 +185,7 @@ static const struct iio_chan_spec mpl3115_channels[] = {
                         BIT(IIO_CHAN_INFO_SCALE),
                 .scan_index = 0,
                 .scan_type = {
-                        .sign = 's',
+                        .sign = 'u',
                         .realbits = 20,
                         .storagebits = 32,
                         .shift = 12,
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index d4daa05efe60..499b4366a98d 100644
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -45,7 +45,7 @@ struct pri_queue {
 struct pasid_state {
         struct list_head list;                  /* For global state-list */
         atomic_t count;                         /* Reference count */
-        atomic_t mmu_notifier_count;            /* Counting nested mmu_notifier
+        unsigned mmu_notifier_count;            /* Counting nested mmu_notifier
                                                    calls */
         struct task_struct *task;               /* Task bound to this PASID */
         struct mm_struct *mm;                   /* mm_struct for the faults */
@@ -53,7 +53,8 @@ struct pasid_state {
         struct pri_queue pri[PRI_QUEUE_SIZE];   /* PRI tag states */
         struct device_state *device_state;      /* Link to our device_state */
         int pasid;                              /* PASID index */
-        spinlock_t lock;                        /* Protect pri_queues */
+        spinlock_t lock;                        /* Protect pri_queues and
+                                                   mmu_notifer_count */
         wait_queue_head_t wq;                   /* To wait for count == 0 */
 };
 
@@ -431,15 +432,19 @@ static void mn_invalidate_range_start(struct mmu_notifier *mn,
 {
         struct pasid_state *pasid_state;
         struct device_state *dev_state;
+        unsigned long flags;
 
         pasid_state = mn_to_state(mn);
         dev_state   = pasid_state->device_state;
 
-        if (atomic_add_return(1, &pasid_state->mmu_notifier_count) == 1) {
+        spin_lock_irqsave(&pasid_state->lock, flags);
+        if (pasid_state->mmu_notifier_count == 0) {
                 amd_iommu_domain_set_gcr3(dev_state->domain,
                                           pasid_state->pasid,
                                           __pa(empty_page_table));
         }
+        pasid_state->mmu_notifier_count += 1;
+        spin_unlock_irqrestore(&pasid_state->lock, flags);
 }
 
 static void mn_invalidate_range_end(struct mmu_notifier *mn,
@@ -448,15 +453,19 @@ static void mn_invalidate_range_end(struct mmu_notifier *mn,
 {
         struct pasid_state *pasid_state;
         struct device_state *dev_state;
+        unsigned long flags;
 
         pasid_state = mn_to_state(mn);
         dev_state   = pasid_state->device_state;
 
-        if (atomic_dec_and_test(&pasid_state->mmu_notifier_count)) {
+        spin_lock_irqsave(&pasid_state->lock, flags);
+        pasid_state->mmu_notifier_count -= 1;
+        if (pasid_state->mmu_notifier_count == 0) {
                 amd_iommu_domain_set_gcr3(dev_state->domain,
                                           pasid_state->pasid,
                                           __pa(pasid_state->mm->pgd));
         }
+        spin_unlock_irqrestore(&pasid_state->lock, flags);
 }
 
 static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm)
@@ -650,7 +659,6 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, int pasid,
                 goto out;
 
         atomic_set(&pasid_state->count, 1);
-        atomic_set(&pasid_state->mmu_notifier_count, 0);
         init_waitqueue_head(&pasid_state->wq);
         spin_lock_init(&pasid_state->lock);
 
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 6bb32773c3ac..51b6b77dc3e5 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3816,14 +3816,11 @@ int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info)
                                 ((void *)rmrr) + rmrr->header.length,
                                 rmrr->segment, rmrru->devices,
                                 rmrru->devices_cnt);
-                        if (ret > 0)
-                                break;
-                        else if(ret < 0)
+                        if(ret < 0)
                                 return ret;
                 } else if (info->event == BUS_NOTIFY_DEL_DEVICE) {
-                        if (dmar_remove_dev_scope(info, rmrr->segment,
-                                rmrru->devices, rmrru->devices_cnt))
-                                break;
+                        dmar_remove_dev_scope(info, rmrr->segment,
+                                rmrru->devices, rmrru->devices_cnt);
                 }
         }
 
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index c887e6eebc41..574aba0eba4e 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -334,6 +334,15 @@ static void armada_mpic_send_doorbell(const struct cpumask *mask,
 
 static void armada_xp_mpic_smp_cpu_init(void)
 {
+        u32 control;
+        int nr_irqs, i;
+
+        control = readl(main_int_base + ARMADA_370_XP_INT_CONTROL);
+        nr_irqs = (control >> 2) & 0x3ff;
+
+        for (i = 0; i < nr_irqs; i++)
+                writel(i, per_cpu_int_base + ARMADA_370_XP_INT_SET_MASK_OFFS);
+
         /* Clear pending IPIs */
         writel(0, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);
 
@@ -474,7 +483,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
                                              struct device_node *parent)
 {
         struct resource main_int_res, per_cpu_int_res;
-        int parent_irq;
+        int parent_irq, nr_irqs, i;
         u32 control;
 
         BUG_ON(of_address_to_resource(node, 0, &main_int_res));
@@ -496,9 +505,13 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
         BUG_ON(!per_cpu_int_base);
 
         control = readl(main_int_base + ARMADA_370_XP_INT_CONTROL);
+        nr_irqs = (control >> 2) & 0x3ff;
+
+        for (i = 0; i < nr_irqs; i++)
+                writel(i, main_int_base + ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS);
 
         armada_370_xp_mpic_domain =
-                irq_domain_add_linear(node, (control >> 2) & 0x3ff,
+                irq_domain_add_linear(node, nr_irqs,
                                 &armada_370_xp_mpic_irq_ops, NULL);
 
         BUG_ON(!armada_370_xp_mpic_domain);
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c
index 8ee2a36d5840..c15c840987d2 100644
--- a/drivers/irqchip/irq-brcmstb-l2.c
+++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -150,7 +150,7 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
 
         /* Allocate a single Generic IRQ chip for this node */
         ret = irq_alloc_domain_generic_chips(data->domain, 32, 1,
-                                np->full_name, handle_level_irq, clr, 0, 0);
+                                np->full_name, handle_edge_irq, clr, 0, 0);
         if (ret) {
                 pr_err("failed to allocate generic irq chip\n");
                 goto out_free_domain;
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
index 3fdda3a40269..6ce6bd3441bf 100644
--- a/drivers/irqchip/spear-shirq.c
+++ b/drivers/irqchip/spear-shirq.c
@@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = {
 };
 
 static struct spear_shirq spear320_shirq_ras3 = {
-        .irq_nr = 3,
+        .irq_nr = 7,
         .irq_bit_off = 0,
         .invalid_irq = 1,
         .regs = {
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index d9edcc94c2a8..97465ac5a2d5 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -16,7 +16,7 @@ config ISDN_DRV_HISAX
           also to the configuration option of the driver for your particular
           card, below.
 
-if ISDN_DRV_HISAX!=n
+if ISDN_DRV_HISAX
 
 comment "D-channel protocol features"
 
@@ -348,10 +348,6 @@ config HISAX_ENTERNOW_PCI
           This enables HiSax support for the Formula-n enter:now PCI
           ISDN card.
 
-endif
-
-if ISDN_DRV_HISAX
-
 config HISAX_DEBUG
         bool "HiSax debugging"
         help
@@ -420,11 +416,6 @@ config HISAX_FRITZ_PCIPNP
           (the latter also needs you to select "ISA Plug and Play support"
           from the menu "Plug and Play configuration")
 
-config HISAX_AVM_A1_PCMCIA
-        bool
-        depends on HISAX_AVM_A1_CS
-        default y
-
 endif
 
 endmenu
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 23b4a3b28dbc..4eab93aa570b 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1257,7 +1257,8 @@ static unsigned int smu_fpoll(struct file *file, poll_table *wait)
                 if (pp->busy && pp->cmd.status != 1)
                         mask |= POLLIN;
                 spin_unlock_irqrestore(&pp->lock, flags);
-        } if (pp->mode == smu_file_events) {
+        }
+        if (pp->mode == smu_file_events) {
                 /* Not yet implemented */
         }
         return mask;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 34846856dbc6..32fc19c540d4 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5599,7 +5599,7 @@ static int get_array_info(struct mddev * mddev, void __user * arg)
         if (mddev->in_sync)
                 info.state = (1<<MD_SB_CLEAN);
         if (mddev->bitmap && mddev->bitmap_info.offset)
-                info.state = (1<<MD_SB_BITMAP_PRESENT);
+                info.state |= (1<<MD_SB_BITMAP_PRESENT);
         info.active_disks  = insync;
         info.working_disks = working;
         info.failed_disks  = failed;
@@ -7501,6 +7501,19 @@ void md_do_sync(struct md_thread *thread)
                             rdev->recovery_offset < j)
                                 j = rdev->recovery_offset;
                 rcu_read_unlock();
+
+                /* If there is a bitmap, we need to make sure all
+                 * writes that started before we added a spare
+                 * complete before we start doing a recovery.
+                 * Otherwise the write might complete and (via
+                 * bitmap_endwrite) set a bit in the bitmap after the
+                 * recovery has checked that bit and skipped that
+                 * region.
+                 */
+                if (mddev->bitmap) {
+                        mddev->pers->quiesce(mddev, 1);
+                        mddev->pers->quiesce(mddev, 0);
+                }
         }
 
         printk(KERN_INFO "md: %s of RAID array %s\n", desc, mdname(mddev));
diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c
index 2a635b6fdaf7..c880ba685754 100644
--- a/drivers/memstick/host/rtsx_pci_ms.c
+++ b/drivers/memstick/host/rtsx_pci_ms.c
@@ -601,6 +601,7 @@ static int rtsx_pci_ms_drv_remove(struct platform_device *pdev)
         pcr->slots[RTSX_MS_CARD].card_event = NULL;
         msh = host->msh;
         host->eject = true;
+        cancel_work_sync(&host->handle_req);
 
         mutex_lock(&host->host_mutex);
         if (host->req) {
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index ee8204cc31e9..6cc4b6acc22a 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -760,6 +760,7 @@ config MFD_SYSCON
 config MFD_DAVINCI_VOICECODEC
         tristate
         select MFD_CORE
+        select REGMAP_MMIO
 
 config MFD_TI_AM335X_TSCADC
         tristate "TI ADC / Touch Screen chip support"
@@ -1225,7 +1226,7 @@ config MFD_WM8994
           functionaltiy of the device other drivers must be enabled.
 
 config MFD_STW481X
-        bool "Support for ST Microelectronics STw481x"
+        tristate "Support for ST Microelectronics STw481x"
         depends on I2C && ARCH_NOMADIK
         select REGMAP_I2C
         select MFD_CORE
@@ -1248,7 +1249,7 @@ config MCP_SA11X0
 
 # Chip drivers
 config MCP_UCB1200
-        bool "Support for UCB1200 / UCB1300"
+        tristate "Support for UCB1200 / UCB1300"
         depends on MCP_SA11X0
         select MCP
 
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index a8ee4a36a1d8..cf2e6a198c6b 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -591,7 +591,7 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np)
                 num_irqs = AB8500_NR_IRQS;
 
         /* If ->irq_base is zero this will give a linear mapping */
-        ab8500->domain = irq_domain_add_simple(NULL,
+        ab8500->domain = irq_domain_add_simple(ab8500->dev->of_node,
                         num_irqs, 0,
                         &ab8500_irq_ops, ab8500);
 
diff --git a/drivers/misc/vexpress-syscfg.c b/drivers/misc/vexpress-syscfg.c
index 73068e50e56d..3250fc1df0aa 100644
--- a/drivers/misc/vexpress-syscfg.c
+++ b/drivers/misc/vexpress-syscfg.c
@@ -199,7 +199,7 @@ static struct regmap *vexpress_syscfg_regmap_init(struct device *dev,
         func = kzalloc(sizeof(*func) + sizeof(*func->template) * num,
                         GFP_KERNEL);
         if (!func)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         func->syscfg = syscfg;
         func->num_templates = num;
@@ -231,10 +231,14 @@ static struct regmap *vexpress_syscfg_regmap_init(struct device *dev,
         func->regmap = regmap_init(dev, NULL, func,
                         &vexpress_syscfg_regmap_config);
 
-        if (IS_ERR(func->regmap))
+        if (IS_ERR(func->regmap)) {
+                void *err = func->regmap;
+
                 kfree(func);
-        else
-                list_add(&func->list, &syscfg->funcs);
+                return err;
+        }
+
+        list_add(&func->list, &syscfg->funcs);
 
         return func->regmap;
 }
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 2421835d5daf..191617492181 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -17,7 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Maintained by: Dmitry Torokhov <dtor@vmware.com>
+ * Maintained by:       Xavier Deguillard <xdeguillard@vmware.com>
+ *                      Philip Moltmann <moltmann@vmware.com>
  */
 
 /*
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 04f35f960cb8..3a451b6cd3d5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1025,10 +1025,14 @@ static netdev_features_t bond_fix_features(struct net_device *dev,
                                  NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \
                                  NETIF_F_HIGHDMA | NETIF_F_LRO)
 
+#define BOND_ENC_FEATURES       (NETIF_F_ALL_CSUM | NETIF_F_SG | NETIF_F_RXCSUM |\
+                                 NETIF_F_TSO | NETIF_F_GSO_UDP_TUNNEL)
+
 static void bond_compute_features(struct bonding *bond)
 {
         unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
         netdev_features_t vlan_features = BOND_VLAN_FEATURES;
+        netdev_features_t enc_features  = BOND_ENC_FEATURES;
         struct net_device *bond_dev = bond->dev;
         struct list_head *iter;
         struct slave *slave;
@@ -1044,6 +1048,9 @@ static void bond_compute_features(struct bonding *bond)
                 vlan_features = netdev_increment_features(vlan_features,
                         slave->dev->vlan_features, BOND_VLAN_FEATURES);
 
+                enc_features = netdev_increment_features(enc_features,
+                                                         slave->dev->hw_enc_features,
+                                                         BOND_ENC_FEATURES);
                 dst_release_flag &= slave->dev->priv_flags;
                 if (slave->dev->hard_header_len > max_hard_header_len)
                         max_hard_header_len = slave->dev->hard_header_len;
@@ -1054,6 +1061,7 @@ static void bond_compute_features(struct bonding *bond)
 
 done:
         bond_dev->vlan_features = vlan_features;
+        bond_dev->hw_enc_features = enc_features;
         bond_dev->hard_header_len = max_hard_header_len;
         bond_dev->gso_max_segs = gso_max_segs;
         netif_set_gso_max_size(bond_dev, gso_max_size);
@@ -3975,6 +3983,7 @@ void bond_setup(struct net_device *bond_dev)
                                 NETIF_F_HW_VLAN_CTAG_FILTER;
 
         bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM);
+        bond_dev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;
         bond_dev->features |= bond_dev->hw_features;
 }
 
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index dcf9196f6316..ea4d4f1a6411 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -52,6 +52,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/workqueue.h>
 #include <linux/can.h>
 #include <linux/can/skb.h>
 
@@ -85,6 +86,7 @@ struct slcan {
         struct tty_struct       *tty;           /* ptr to TTY structure      */
         struct net_device       *dev;           /* easy for intr handling    */
         spinlock_t              lock;
+        struct work_struct      tx_work;        /* Flushes transmit buffer   */
 
         /* These are pointers to the malloc()ed frame buffers. */
         unsigned char           rbuff[SLC_MTU]; /* receiver buffer           */
@@ -309,36 +311,46 @@ static void slc_encaps(struct slcan *sl, struct can_frame *cf)
         sl->dev->stats.tx_bytes += cf->can_dlc;
 }
 
-/*
- * Called by the driver when there's room for more data.  If we have
- * more packets to send, we send them here.
- */
-static void slcan_write_wakeup(struct tty_struct *tty)
+/* Write out any remaining transmit buffer. Scheduled when tty is writable */
+static void slcan_transmit(struct work_struct *work)
 {
+        struct slcan *sl = container_of(work, struct slcan, tx_work);
         int actual;
-        struct slcan *sl = (struct slcan *) tty->disc_data;
 
+        spin_lock_bh(&sl->lock);
         /* First make sure we're connected. */
-        if (!sl || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev))
+        if (!sl->tty || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev)) {
+                spin_unlock_bh(&sl->lock);
                 return;
+        }
 
-        spin_lock_bh(&sl->lock);
         if (sl->xleft <= 0)  {
                 /* Now serial buffer is almost free & we can start
                  * transmission of another packet */
                 sl->dev->stats.tx_packets++;
-                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
                 spin_unlock_bh(&sl->lock);
                 netif_wake_queue(sl->dev);
                 return;
         }
 
-        actual = tty->ops->write(tty, sl->xhead, sl->xleft);
+        actual = sl->tty->ops->write(sl->tty, sl->xhead, sl->xleft);
         sl->xleft -= actual;
         sl->xhead += actual;
         spin_unlock_bh(&sl->lock);
 }
 
+/*
+ * Called by the driver when there's room for more data.
+ * Schedule the transmit.
+ */
+static void slcan_write_wakeup(struct tty_struct *tty)
+{
+        struct slcan *sl = tty->disc_data;
+
+        schedule_work(&sl->tx_work);
+}
+
 /* Send a can_frame to a TTY queue. */
 static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev)
 {
@@ -528,6 +540,7 @@ static struct slcan *slc_alloc(dev_t line)
         sl->magic = SLCAN_MAGIC;
         sl->dev = dev;
         spin_lock_init(&sl->lock);
+        INIT_WORK(&sl->tx_work, slcan_transmit);
         slcan_devs[i] = dev;
 
         return sl;
@@ -626,8 +639,12 @@ static void slcan_close(struct tty_struct *tty)
         if (!sl || sl->magic != SLCAN_MAGIC || sl->tty != tty)
                 return;
 
+        spin_lock_bh(&sl->lock);
         tty->disc_data = NULL;
         sl->tty = NULL;
+        spin_unlock_bh(&sl->lock);
+
+        flush_work(&sl->tx_work);
 
         /* Flush network side */
         unregister_netdev(sl->dev);
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 28460676b8ca..d81e7167a8b5 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -736,6 +736,7 @@ static int emac_open(struct net_device *dev)
 
         ret = emac_mdio_probe(dev);
         if (ret < 0) {
+                free_irq(dev->irq, dev);
                 netdev_err(dev, "cannot probe MDIO bus\n");
                 return ret;
         }
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index df2792d8383d..8afa579e7c40 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -3224,7 +3224,7 @@ static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
         return 0;
 }
 
-#define NVRAM_CMD_TIMEOUT 100
+#define NVRAM_CMD_TIMEOUT 5000
 
 static int tg3_nvram_exec_cmd(struct tg3 *tp, u32 nvram_cmd)
 {
@@ -3232,7 +3232,7 @@ static int tg3_nvram_exec_cmd(struct tg3 *tp, u32 nvram_cmd)
 
         tw32(NVRAM_CMD, nvram_cmd);
         for (i = 0; i < NVRAM_CMD_TIMEOUT; i++) {
-                udelay(10);
+                usleep_range(10, 40);
                 if (tr32(NVRAM_CMD) & NVRAM_CMD_DONE) {
                         udelay(10);
                         break;
@@ -7854,8 +7854,8 @@ static int tg3_tso_bug(struct tg3 *tp, struct sk_buff *skb)
                 netif_wake_queue(tp->dev);
         }
 
-        segs = skb_gso_segment(skb, tp->dev->features & ~NETIF_F_TSO);
-        if (IS_ERR(segs))
+        segs = skb_gso_segment(skb, tp->dev->features & ~(NETIF_F_TSO | NETIF_F_TSO6));
+        if (IS_ERR(segs) || !segs)
                 goto tg3_tso_bug_end;
 
         do {
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 2f8d6b910383..a83271cf17c3 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4057,22 +4057,19 @@ int cxgb4_unregister_uld(enum cxgb4_uld type)
 EXPORT_SYMBOL(cxgb4_unregister_uld);
 
 /* Check if netdev on which event is occured belongs to us or not. Return
- * suceess (1) if it belongs otherwise failure (0).
+ * success (true) if it belongs otherwise failure (false).
+ * Called with rcu_read_lock() held.
  */
-static int cxgb4_netdev(struct net_device *netdev)
+static bool cxgb4_netdev(const struct net_device *netdev)
 {
         struct adapter *adap;
         int i;
 
-        spin_lock(&adap_rcu_lock);
         list_for_each_entry_rcu(adap, &adap_rcu_list, rcu_node)
                 for (i = 0; i < MAX_NPORTS; i++)
-                        if (adap->port[i] == netdev) {
-                                spin_unlock(&adap_rcu_lock);
-                                return 1;
-                        }
-        spin_unlock(&adap_rcu_lock);
-        return 0;
+                        if (adap->port[i] == netdev)
+                                return true;
+        return false;
 }
 
 static int clip_add(struct net_device *event_dev, struct inet6_ifaddr *ifa,
@@ -6396,6 +6393,7 @@ static void remove_one(struct pci_dev *pdev)
                         adapter->flags &= ~DEV_ENABLED;
                 }
                 pci_release_regions(pdev);
+                synchronize_rcu();
                 kfree(adapter);
         } else
                 pci_release_regions(pdev);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index bba67681aeaa..931478e7bd28 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -3962,6 +3962,7 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
                 p->lport = j;
                 p->rss_size = rss_size;
                 memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
+                adap->port[i]->dev_port = j;
 
                 ret = ntohl(c.u.info.lstatus_to_modtype);
                 p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP) ?
diff --git a/drivers/net/ethernet/dec/tulip/timer.c b/drivers/net/ethernet/dec/tulip/timer.c
index 768379b8aee9..523d9dde50a2 100644
--- a/drivers/net/ethernet/dec/tulip/timer.c
+++ b/drivers/net/ethernet/dec/tulip/timer.c
@@ -158,7 +158,7 @@ void comet_timer(unsigned long data)
 {
         struct net_device *dev = (struct net_device *)data;
         struct tulip_private *tp = netdev_priv(dev);
-        int next_tick = 60*HZ;
+        int next_tick = 2*HZ;
 
         if (tulip_debug > 1)
                 netdev_dbg(dev, "Comet link status %04x partner capability %04x\n",
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 2e7c5553955e..c2f5d2d3b932 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -557,9 +557,7 @@ static inline u16 be_max_qs(struct be_adapter *adapter)
 #define be_pvid_tagging_enabled(adapter)        (adapter->pvid)
 
 /* Is BE in QNQ multi-channel mode */
-#define be_is_qnq_mode(adapter)         (adapter->mc_type == FLEX10 ||  \
-                                         adapter->mc_type == vNIC1 ||   \
-                                         adapter->mc_type == UFP)
+#define be_is_qnq_mode(adapter)         (adapter->function_mode & QNQ_MODE)
 
 #define lancer_chip(adapter)    (adapter->pdev->device == OC_DEVICE_ID3 || \
                                  adapter->pdev->device == OC_DEVICE_ID4)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 3e0a6b243806..59b3c056f329 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1091,7 +1091,7 @@ struct be_cmd_resp_modify_eq_delay {
  * based on the skew/IPL.
  */
 #define RDMA_ENABLED                            0x4
-#define FLEX10_MODE                             0x400
+#define QNQ_MODE                                0x400
 #define VNIC_MODE                               0x20000
 #define UMC_ENABLED                             0x1000000
 struct be_cmd_req_query_fw_cfg {
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 6822b3d76d85..34a26e42f19d 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3254,9 +3254,9 @@ err:
 
 static u8 be_convert_mc_type(u32 function_mode)
 {
-        if (function_mode & VNIC_MODE && function_mode & FLEX10_MODE)
+        if (function_mode & VNIC_MODE && function_mode & QNQ_MODE)
                 return vNIC1;
-        else if (function_mode & FLEX10_MODE)
+        else if (function_mode & QNQ_MODE)
                 return FLEX10;
         else if (function_mode & VNIC_MODE)
                 return vNIC2;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 38d9d276ab8b..77037fd377b8 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -320,6 +320,11 @@ static void *swap_buffer(void *bufaddr, int len)
         return bufaddr;
 }
 
+static inline bool is_ipv4_pkt(struct sk_buff *skb)
+{
+        return skb->protocol == htons(ETH_P_IP) && ip_hdr(skb)->version == 4;
+}
+
 static int
 fec_enet_clear_csum(struct sk_buff *skb, struct net_device *ndev)
 {
@@ -330,7 +335,8 @@ fec_enet_clear_csum(struct sk_buff *skb, struct net_device *ndev)
         if (unlikely(skb_cow_head(skb, 0)))
                 return -1;
 
-        ip_hdr(skb)->check = 0;
+        if (is_ipv4_pkt(skb))
+                ip_hdr(skb)->check = 0;
         *(__sum16 *)(skb->head + skb->csum_start + skb->csum_offset) = 0;
 
         return 0;
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 7f81ae66cc89..e912b6887d40 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -4199,6 +4199,13 @@ static struct dmi_system_id skge_32bit_dma_boards[] = {
                         DMI_MATCH(DMI_BOARD_NAME, "P5NSLI")
                 },
         },
+        {
+                .ident = "FUJITSU SIEMENS A8NE-FM",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
+                        DMI_MATCH(DMI_BOARD_NAME, "A8NE-FM")
+                },
+        },
         {}
 };
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 5f42f6d6e4c6..82ab427290c3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2439,7 +2439,8 @@ slave_start:
                             (num_vfs_argc > 1 || probe_vfs_argc > 1)) {
                                 mlx4_err(dev,
                                          "Invalid syntax of num_vfs/probe_vfs with IB port - single port VFs syntax is only supported when all ports are configured as ethernet\n");
-                                goto err_close;
+                                err = -EINVAL;
+                                goto err_master_mfunc;
                         }
                         for (i = 0; i < sizeof(nvfs)/sizeof(nvfs[0]); i++) {
                                 unsigned j;
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index ff380dac6629..b988d16cd34e 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1212,7 +1212,12 @@ static int cpsw_ndo_open(struct net_device *ndev)
         for_each_slave(priv, cpsw_slave_open, priv);
 
         /* Add default VLAN */
-        cpsw_add_default_vlan(priv);
+        if (!priv->data.dual_emac)
+                cpsw_add_default_vlan(priv);
+        else
+                cpsw_ale_add_vlan(priv->ale, priv->data.default_vlan,
+                                  ALE_ALL_PORTS << priv->host_port,
+                                  ALE_ALL_PORTS << priv->host_port, 0, 0);
 
         if (!cpsw_common_res_usage_state(priv)) {
                 /* setup tx dma to fixed prio and zero offset */
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index 14389f841d43..4c70360967c2 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -2191,7 +2191,6 @@ static void tile_net_setup(struct net_device *dev)
 static void tile_net_dev_init(const char *name, const uint8_t *mac)
 {
         int ret;
-        int i;
         struct net_device *dev;
         struct tile_net_priv *priv;
 
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index c041f63a6d30..4ed38eaecea8 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -189,7 +189,7 @@ static int netvsc_destroy_buf(struct netvsc_device *net_device)
                                    "unable to teardown send buffer's gpadl\n");
                         return ret;
                 }
-                net_device->recv_buf_gpadl_handle = 0;
+                net_device->send_buf_gpadl_handle = 0;
         }
         if (net_device->send_buf) {
                 /* Free up the receive buffer */
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 4517b149ed07..50899416f668 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1137,6 +1137,8 @@ static int at86rf230_probe(struct spi_device *spi)
         dev->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK;
 
         irq_type = irq_get_trigger_type(spi->irq);
+        if (!irq_type)
+                irq_type = IRQF_TRIGGER_RISING;
         if (irq_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
                 irq_worker = at86rf230_irqwork;
                 irq_handler = at86rf230_isr;
@@ -1168,7 +1170,8 @@ static int at86rf230_probe(struct spi_device *spi)
         if (rc)
                 goto err_hw_init;
 
-        rc = devm_request_irq(&spi->dev, spi->irq, irq_handler, IRQF_SHARED,
+        rc = devm_request_irq(&spi->dev, spi->irq, irq_handler,
+                              IRQF_SHARED | irq_type,
                               dev_name(&spi->dev), lp);
         if (rc)
                 goto err_hw_init;
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 6c622aedbae1..fdc1b418fa6a 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -16,9 +16,13 @@
 #include <linux/string.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
 
 #define AT803X_INTR_ENABLE                      0x12
 #define AT803X_INTR_STATUS                      0x13
+#define AT803X_SMART_SPEED                      0x14
+#define AT803X_LED_CONTROL                      0x18
 #define AT803X_WOL_ENABLE                       0x01
 #define AT803X_DEVICE_ADDR                      0x03
 #define AT803X_LOC_MAC_ADDR_0_15_OFFSET         0x804C
@@ -35,10 +39,52 @@
 #define AT803X_DEBUG_SYSTEM_MODE_CTRL           0x05
 #define AT803X_DEBUG_RGMII_TX_CLK_DLY           BIT(8)
 
+#define ATH8030_PHY_ID 0x004dd076
+#define ATH8031_PHY_ID 0x004dd074
+#define ATH8035_PHY_ID 0x004dd072
+
 MODULE_DESCRIPTION("Atheros 803x PHY driver");
 MODULE_AUTHOR("Matus Ujhelyi");
 MODULE_LICENSE("GPL");
 
+struct at803x_priv {
+        bool phy_reset:1;
+        struct gpio_desc *gpiod_reset;
+};
+
+struct at803x_context {
+        u16 bmcr;
+        u16 advertise;
+        u16 control1000;
+        u16 int_enable;
+        u16 smart_speed;
+        u16 led_control;
+};
+
+/* save relevant PHY registers to private copy */
+static void at803x_context_save(struct phy_device *phydev,
+                                struct at803x_context *context)
+{
+        context->bmcr = phy_read(phydev, MII_BMCR);
+        context->advertise = phy_read(phydev, MII_ADVERTISE);
+        context->control1000 = phy_read(phydev, MII_CTRL1000);
+        context->int_enable = phy_read(phydev, AT803X_INTR_ENABLE);
+        context->smart_speed = phy_read(phydev, AT803X_SMART_SPEED);
+        context->led_control = phy_read(phydev, AT803X_LED_CONTROL);
+}
+
+/* restore relevant PHY registers from private copy */
+static void at803x_context_restore(struct phy_device *phydev,
+                                   const struct at803x_context *context)
+{
+        phy_write(phydev, MII_BMCR, context->bmcr);
+        phy_write(phydev, MII_ADVERTISE, context->advertise);
+        phy_write(phydev, MII_CTRL1000, context->control1000);
+        phy_write(phydev, AT803X_INTR_ENABLE, context->int_enable);
+        phy_write(phydev, AT803X_SMART_SPEED, context->smart_speed);
+        phy_write(phydev, AT803X_LED_CONTROL, context->led_control);
+}
+
 static int at803x_set_wol(struct phy_device *phydev,
                           struct ethtool_wolinfo *wol)
 {
@@ -142,6 +188,26 @@ static int at803x_resume(struct phy_device *phydev)
         return 0;
 }
 
+static int at803x_probe(struct phy_device *phydev)
+{
+        struct device *dev = &phydev->dev;
+        struct at803x_priv *priv;
+
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->gpiod_reset = devm_gpiod_get(dev, "reset");
+        if (IS_ERR(priv->gpiod_reset))
+                priv->gpiod_reset = NULL;
+        else
+                gpiod_direction_output(priv->gpiod_reset, 1);
+
+        phydev->priv = priv;
+
+        return 0;
+}
+
 static int at803x_config_init(struct phy_device *phydev)
 {
         int ret;
@@ -189,58 +255,99 @@ static int at803x_config_intr(struct phy_device *phydev)
         return err;
 }
 
+static void at803x_link_change_notify(struct phy_device *phydev)
+{
+        struct at803x_priv *priv = phydev->priv;
+
+        /*
+         * Conduct a hardware reset for AT8030 every time a link loss is
+         * signalled. This is necessary to circumvent a hardware bug that
+         * occurs when the cable is unplugged while TX packets are pending
+         * in the FIFO. In such cases, the FIFO enters an error mode it
+         * cannot recover from by software.
+         */
+        if (phydev->drv->phy_id == ATH8030_PHY_ID) {
+                if (phydev->state == PHY_NOLINK) {
+                        if (priv->gpiod_reset && !priv->phy_reset) {
+                                struct at803x_context context;
+
+                                at803x_context_save(phydev, &context);
+
+                                gpiod_set_value(priv->gpiod_reset, 0);
+                                msleep(1);
+                                gpiod_set_value(priv->gpiod_reset, 1);
+                                msleep(1);
+
+                                at803x_context_restore(phydev, &context);
+
+                                dev_dbg(&phydev->dev, "%s(): phy was reset\n",
+                                        __func__);
+                                priv->phy_reset = true;
+                        }
+                } else {
+                        priv->phy_reset = false;
+                }
+        }
+}
+
 static struct phy_driver at803x_driver[] = {
 {
         /* ATHEROS 8035 */
-        .phy_id         = 0x004dd072,
-        .name           = "Atheros 8035 ethernet",
-        .phy_id_mask    = 0xffffffef,
-        .config_init    = at803x_config_init,
-        .set_wol        = at803x_set_wol,
-        .get_wol        = at803x_get_wol,
-        .suspend        = at803x_suspend,
-        .resume         = at803x_resume,
-        .features       = PHY_GBIT_FEATURES,
-        .flags          = PHY_HAS_INTERRUPT,
-        .config_aneg    = genphy_config_aneg,
-        .read_status    = genphy_read_status,
-        .driver         = {
+        .phy_id                 = ATH8035_PHY_ID,
+        .name                   = "Atheros 8035 ethernet",
+        .phy_id_mask            = 0xffffffef,
+        .probe                  = at803x_probe,
+        .config_init            = at803x_config_init,
+        .link_change_notify     = at803x_link_change_notify,
+        .set_wol                = at803x_set_wol,
+        .get_wol                = at803x_get_wol,
+        .suspend                = at803x_suspend,
+        .resume                 = at803x_resume,
+        .features               = PHY_GBIT_FEATURES,
+        .flags                  = PHY_HAS_INTERRUPT,
+        .config_aneg            = genphy_config_aneg,
+        .read_status            = genphy_read_status,
+        .driver                 = {
                 .owner = THIS_MODULE,
         },
 }, {
         /* ATHEROS 8030 */
-        .phy_id         = 0x004dd076,
-        .name           = "Atheros 8030 ethernet",
-        .phy_id_mask    = 0xffffffef,
-        .config_init    = at803x_config_init,
-        .set_wol        = at803x_set_wol,
-        .get_wol        = at803x_get_wol,
-        .suspend        = at803x_suspend,
-        .resume         = at803x_resume,
-        .features       = PHY_GBIT_FEATURES,
-        .flags          = PHY_HAS_INTERRUPT,
-        .config_aneg    = genphy_config_aneg,
-        .read_status    = genphy_read_status,
-        .driver         = {
+        .phy_id                 = ATH8030_PHY_ID,
+        .name                   = "Atheros 8030 ethernet",
+        .phy_id_mask            = 0xffffffef,
+        .probe                  = at803x_probe,
+        .config_init            = at803x_config_init,
+        .link_change_notify     = at803x_link_change_notify,
+        .set_wol                = at803x_set_wol,
+        .get_wol                = at803x_get_wol,
+        .suspend                = at803x_suspend,
+        .resume                 = at803x_resume,
+        .features               = PHY_GBIT_FEATURES,
+        .flags                  = PHY_HAS_INTERRUPT,
+        .config_aneg            = genphy_config_aneg,
+        .read_status            = genphy_read_status,
+        .driver                 = {
                 .owner = THIS_MODULE,
         },
 }, {
         /* ATHEROS 8031 */
-        .phy_id         = 0x004dd074,
-        .name           = "Atheros 8031 ethernet",
-        .phy_id_mask    = 0xffffffef,
-        .config_init    = at803x_config_init,
-        .set_wol        = at803x_set_wol,
-        .get_wol        = at803x_get_wol,
-        .suspend        = at803x_suspend,
-        .resume         = at803x_resume,
-        .features       = PHY_GBIT_FEATURES,
-        .flags          = PHY_HAS_INTERRUPT,
-        .config_aneg    = genphy_config_aneg,
-        .read_status    = genphy_read_status,
-        .ack_interrupt  = &at803x_ack_interrupt,
-        .config_intr    = &at803x_config_intr,
-        .driver         = {
+        .phy_id                 = ATH8031_PHY_ID,
+        .name                   = "Atheros 8031 ethernet",
+        .phy_id_mask            = 0xffffffef,
+        .probe                  = at803x_probe,
+        .config_init            = at803x_config_init,
+        .link_change_notify     = at803x_link_change_notify,
+        .set_wol                = at803x_set_wol,
+        .get_wol                = at803x_get_wol,
+        .suspend                = at803x_suspend,
+        .resume                 = at803x_resume,
+        .features               = PHY_GBIT_FEATURES,
+        .flags                  = PHY_HAS_INTERRUPT,
+        .config_aneg            = genphy_config_aneg,
+        .read_status            = genphy_read_status,
+        .ack_interrupt          = &at803x_ack_interrupt,
+        .config_intr            = &at803x_config_intr,
+        .driver                 = {
                 .owner = THIS_MODULE,
         },
 } };
@@ -260,9 +367,9 @@ module_init(atheros_init);
 module_exit(atheros_exit);
 
 static struct mdio_device_id __maybe_unused atheros_tbl[] = {
-        { 0x004dd076, 0xffffffef },
-        { 0x004dd074, 0xffffffef },
-        { 0x004dd072, 0xffffffef },
+        { ATH8030_PHY_ID, 0xffffffef },
+        { ATH8031_PHY_ID, 0xffffffef },
+        { ATH8035_PHY_ID, 0xffffffef },
         { }
 };
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3bc079a67a3d..f7c61812ea4a 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -720,6 +720,9 @@ void phy_state_machine(struct work_struct *work)
 
         mutex_lock(&phydev->lock);
 
+        if (phydev->drv->link_change_notify)
+                phydev->drv->link_change_notify(phydev);
+
         switch (phydev->state) {
         case PHY_DOWN:
         case PHY_STARTING:
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index ad4a94e9ff57..87526443841f 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -83,6 +83,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/workqueue.h>
 #include "slip.h"
 #ifdef CONFIG_INET
 #include <linux/ip.h>
@@ -416,36 +417,46 @@ static void sl_encaps(struct slip *sl, unsigned char *icp, int len)
 #endif
 }
 
-/*
- * Called by the driver when there's room for more data.  If we have
- * more packets to send, we send them here.
- */
-static void slip_write_wakeup(struct tty_struct *tty)
+/* Write out any remaining transmit buffer. Scheduled when tty is writable */
+static void slip_transmit(struct work_struct *work)
 {
+        struct slip *sl = container_of(work, struct slip, tx_work);
         int actual;
-        struct slip *sl = tty->disc_data;
 
+        spin_lock_bh(&sl->lock);
         /* First make sure we're connected. */
-        if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev))
+        if (!sl->tty || sl->magic != SLIP_MAGIC || !netif_running(sl->dev)) {
+                spin_unlock_bh(&sl->lock);
                 return;
+        }
 
-        spin_lock_bh(&sl->lock);
         if (sl->xleft <= 0)  {
                 /* Now serial buffer is almost free & we can start
                  * transmission of another packet */
                 sl->dev->stats.tx_packets++;
-                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
                 spin_unlock_bh(&sl->lock);
                 sl_unlock(sl);
                 return;
         }
 
-        actual = tty->ops->write(tty, sl->xhead, sl->xleft);
+        actual = sl->tty->ops->write(sl->tty, sl->xhead, sl->xleft);
         sl->xleft -= actual;
         sl->xhead += actual;
         spin_unlock_bh(&sl->lock);
 }
 
+/*
+ * Called by the driver when there's room for more data.
+ * Schedule the transmit.
+ */
+static void slip_write_wakeup(struct tty_struct *tty)
+{
+        struct slip *sl = tty->disc_data;
+
+        schedule_work(&sl->tx_work);
+}
+
 static void sl_tx_timeout(struct net_device *dev)
 {
         struct slip *sl = netdev_priv(dev);
@@ -749,6 +760,7 @@ static struct slip *sl_alloc(dev_t line)
         sl->magic       = SLIP_MAGIC;
         sl->dev         = dev;
         spin_lock_init(&sl->lock);
+        INIT_WORK(&sl->tx_work, slip_transmit);
         sl->mode        = SL_MODE_DEFAULT;
 #ifdef CONFIG_SLIP_SMART
         /* initialize timer_list struct */
@@ -872,8 +884,12 @@ static void slip_close(struct tty_struct *tty)
         if (!sl || sl->magic != SLIP_MAGIC || sl->tty != tty)
                 return;
 
+        spin_lock_bh(&sl->lock);
         tty->disc_data = NULL;
         sl->tty = NULL;
+        spin_unlock_bh(&sl->lock);
+
+        flush_work(&sl->tx_work);
 
         /* VSV = very important to remove timers */
 #ifdef CONFIG_SLIP_SMART
diff --git a/drivers/net/slip/slip.h b/drivers/net/slip/slip.h
index 67673cf1266b..cf32aadf508f 100644
--- a/drivers/net/slip/slip.h
+++ b/drivers/net/slip/slip.h
@@ -53,6 +53,7 @@ struct slip {
   struct tty_struct     *tty;           /* ptr to TTY structure         */
   struct net_device     *dev;           /* easy for intr handling       */
   spinlock_t            lock;
+  struct work_struct    tx_work;        /* Flushes transmit buffer      */
 
 #ifdef SL_INCLUDE_CSLIP
   struct slcompress     *slcomp;        /* for header compression       */
diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c
index f9822bc75425..5d95a13dbe2a 100644
--- a/drivers/net/usb/huawei_cdc_ncm.c
+++ b/drivers/net/usb/huawei_cdc_ncm.c
@@ -84,12 +84,13 @@ static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev,
         ctx = drvstate->ctx;
 
         if (usbnet_dev->status)
-                /* CDC-WMC r1.1 requires wMaxCommand to be "at least 256
-                 * decimal (0x100)"
+                /* The wMaxCommand buffer must be big enough to hold
+                 * any message from the modem. Experience has shown
+                 * that some replies are more than 256 bytes long
                  */
                 subdriver = usb_cdc_wdm_register(ctx->control,
                                                  &usbnet_dev->status->desc,
-                                                 256, /* wMaxCommand */
+                                                 1024, /* wMaxCommand */
                                                  huawei_cdc_ncm_wdm_manage_power);
         if (IS_ERR(subdriver)) {
                 ret = PTR_ERR(subdriver);
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 97394345e5dd..b76f7dcde0db 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2589,8 +2589,8 @@ vmxnet3_open(struct net_device *netdev)
         for (i = 0; i < adapter->num_tx_queues; i++)
                 spin_lock_init(&adapter->tx_queue[i].tx_lock);
 
-        err = vmxnet3_create_queues(adapter, VMXNET3_DEF_TX_RING_SIZE,
-                                    VMXNET3_DEF_RX_RING_SIZE,
+        err = vmxnet3_create_queues(adapter, adapter->tx_ring_size,
+                                    adapter->rx_ring_size,
                                     VMXNET3_DEF_RX_RING_SIZE);
         if (err)
                 goto queue_err;
@@ -2968,6 +2968,9 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         adapter->netdev = netdev;
         adapter->pdev = pdev;
 
+        adapter->tx_ring_size = VMXNET3_DEF_TX_RING_SIZE;
+        adapter->rx_ring_size = VMXNET3_DEF_RX_RING_SIZE;
+
         spin_lock_init(&adapter->cmd_lock);
         adapter->adapter_pa = dma_map_single(&adapter->pdev->dev, adapter,
                                              sizeof(struct vmxnet3_adapter),
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 40c1c7b0d9e0..b725fd9e7803 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -449,8 +449,8 @@ vmxnet3_get_ringparam(struct net_device *netdev,
         param->rx_mini_max_pending = 0;
         param->rx_jumbo_max_pending = 0;
 
-        param->rx_pending = adapter->rx_queue[0].rx_ring[0].size;
-        param->tx_pending = adapter->tx_queue[0].tx_ring.size;
+        param->rx_pending = adapter->rx_ring_size;
+        param->tx_pending = adapter->tx_ring_size;
         param->rx_mini_pending = 0;
         param->rx_jumbo_pending = 0;
 }
@@ -529,9 +529,11 @@ vmxnet3_set_ringparam(struct net_device *netdev,
                          * size */
                         netdev_err(netdev, "failed to apply new sizes, "
                                    "try the default ones\n");
+                        new_rx_ring_size = VMXNET3_DEF_RX_RING_SIZE;
+                        new_tx_ring_size = VMXNET3_DEF_TX_RING_SIZE;
                         err = vmxnet3_create_queues(adapter,
-                                                    VMXNET3_DEF_TX_RING_SIZE,
-                                                    VMXNET3_DEF_RX_RING_SIZE,
+                                                    new_tx_ring_size,
+                                                    new_rx_ring_size,
                                                     VMXNET3_DEF_RX_RING_SIZE);
                         if (err) {
                                 netdev_err(netdev, "failed to create queues "
@@ -545,6 +547,8 @@ vmxnet3_set_ringparam(struct net_device *netdev,
                         netdev_err(netdev, "failed to re-activate, error %d."
                                    " Closing it\n", err);
         }
+        adapter->tx_ring_size = new_tx_ring_size;
+        adapter->rx_ring_size = new_rx_ring_size;
 
 out:
         clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 190569d02450..29ee77f2c97f 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -349,6 +349,11 @@ struct vmxnet3_adapter {
         u32     link_speed; /* in mbps */
 
         u64     tx_timeout_count;
+
+        /* Ring sizes */
+        u32 tx_ring_size;
+        u32 rx_ring_size;
+
         struct work_struct work;
 
         unsigned long  state;    /* VMXNET3_STATE_BIT_xxx */
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index e3f67b8d3f80..40fd9b7b1426 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -36,7 +36,7 @@ config B43_SSB
 choice
         prompt "Supported bus types"
         depends on B43
-        default B43_BCMA_AND_SSB
+        default B43_BUSES_BCMA_AND_SSB
 
 config B43_BUSES_BCMA_AND_SSB
         bool "BCMA and SSB"
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 32538ac5f7e4..0d6a0bb1f876 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5221,6 +5221,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
         /* We don't support 5 GHz on some PHYs yet */
         switch (dev->phy.type) {
         case B43_PHYTYPE_A:
+        case B43_PHYTYPE_G:
         case B43_PHYTYPE_N:
         case B43_PHYTYPE_LP:
         case B43_PHYTYPE_HT:
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 4f38f19b8e3d..6e6ef3fc2247 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
                 break;
         case B43_PHYTYPE_G:
                 status.band = IEEE80211_BAND_2GHZ;
-                /* chanid is the radio channel cookie value as used
-                 * to tune the radio. */
-                status.freq = chanid + 2400;
+                /* Somewhere between 478.104 and 508.1084 firmware for G-PHY
+                 * has been modified to be compatible with N-PHY and others.
+                 */
+                if (dev->fw.rev >= 508)
+                        status.freq = ieee80211_channel_to_frequency(chanid, status.band);
+                else
+                        status.freq = chanid + 2400;
                 break;
         case B43_PHYTYPE_N:
         case B43_PHYTYPE_LP:
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 574d4b597468..2cc9b6fca490 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -50,7 +50,7 @@ mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
                 return -1;
         }
         mapping.len = size;
-        memcpy(skb->cb, &mapping, sizeof(mapping));
+        mwifiex_store_mapping(skb, &mapping);
         return 0;
 }
 
@@ -60,7 +60,7 @@ static void mwifiex_unmap_pci_memory(struct mwifiex_adapter *adapter,
         struct pcie_service_card *card = adapter->card;
         struct mwifiex_dma_mapping mapping;
 
-        MWIFIEX_SKB_PACB(skb, &mapping);
+        mwifiex_get_mapping(skb, &mapping);
         pci_unmap_single(card->dev, mapping.addr, mapping.len, flags);
 }
 
diff --git a/drivers/net/wireless/mwifiex/util.h b/drivers/net/wireless/mwifiex/util.h
index ddae57021397..caadb3737b9e 100644
--- a/drivers/net/wireless/mwifiex/util.h
+++ b/drivers/net/wireless/mwifiex/util.h
@@ -20,32 +20,55 @@
 #ifndef _MWIFIEX_UTIL_H_
 #define _MWIFIEX_UTIL_H_
 
+struct mwifiex_dma_mapping {
+        dma_addr_t addr;
+        size_t len;
+};
+
+struct mwifiex_cb {
+        struct mwifiex_dma_mapping dma_mapping;
+        union {
+                struct mwifiex_rxinfo rx_info;
+                struct mwifiex_txinfo tx_info;
+        };
+};
+
 static inline struct mwifiex_rxinfo *MWIFIEX_SKB_RXCB(struct sk_buff *skb)
 {
-        return (struct mwifiex_rxinfo *)(skb->cb + sizeof(dma_addr_t));
+        struct mwifiex_cb *cb = (struct mwifiex_cb *)skb->cb;
+
+        BUILD_BUG_ON(sizeof(struct mwifiex_cb) > sizeof(skb->cb));
+        return &cb->rx_info;
 }
 
 static inline struct mwifiex_txinfo *MWIFIEX_SKB_TXCB(struct sk_buff *skb)
 {
-        return (struct mwifiex_txinfo *)(skb->cb + sizeof(dma_addr_t));
+        struct mwifiex_cb *cb = (struct mwifiex_cb *)skb->cb;
+
+        return &cb->tx_info;
 }
 
-struct mwifiex_dma_mapping {
-        dma_addr_t addr;
-        size_t len;
-};
+static inline void mwifiex_store_mapping(struct sk_buff *skb,
+                                         struct mwifiex_dma_mapping *mapping)
+{
+        struct mwifiex_cb *cb = (struct mwifiex_cb *)skb->cb;
+
+        memcpy(&cb->dma_mapping, mapping, sizeof(*mapping));
+}
 
-static inline void MWIFIEX_SKB_PACB(struct sk_buff *skb,
-                                        struct mwifiex_dma_mapping *mapping)
+static inline void mwifiex_get_mapping(struct sk_buff *skb,
+                                       struct mwifiex_dma_mapping *mapping)
 {
-        memcpy(mapping, skb->cb, sizeof(*mapping));
+        struct mwifiex_cb *cb = (struct mwifiex_cb *)skb->cb;
+
+        memcpy(mapping, &cb->dma_mapping, sizeof(*mapping));
 }
 
 static inline dma_addr_t MWIFIEX_SKB_DMA_ADDR(struct sk_buff *skb)
 {
         struct mwifiex_dma_mapping mapping;
 
-        MWIFIEX_SKB_PACB(skb, &mapping);
+        mwifiex_get_mapping(skb, &mapping);
 
         return mapping.addr;
 }
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 2f1cd929c6f6..a511cccc9f01 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1681,8 +1681,13 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Detect if this device has an hardware controlled radio.
          */
-        if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))
+        if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO)) {
                 __set_bit(CAPABILITY_HW_BUTTON, &rt2x00dev->cap_flags);
+                /*
+                 * On this device RFKILL initialized during probe does not work.
+                 */
+                __set_bit(REQUIRE_DELAYED_RFKILL, &rt2x00dev->cap_flags);
+        }
 
         /*
          * Check if the BBP tuning should be enabled.
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index a49c3d73ea2c..e11dab2216c6 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -229,6 +229,27 @@ static enum hrtimer_restart rt2800usb_tx_sta_fifo_timeout(struct hrtimer *timer)
 /*
  * Firmware functions
  */
+static int rt2800usb_autorun_detect(struct rt2x00_dev *rt2x00dev)
+{
+        __le32 reg;
+        u32 fw_mode;
+
+        /* cannot use rt2x00usb_register_read here as it uses different
+         * mode (MULTI_READ vs. DEVICE_MODE) and does not pass the
+         * magic value USB_MODE_AUTORUN (0x11) to the device, thus the
+         * returned value would be invalid.
+         */
+        rt2x00usb_vendor_request(rt2x00dev, USB_DEVICE_MODE,
+                                 USB_VENDOR_REQUEST_IN, 0, USB_MODE_AUTORUN,
+                                 &reg, sizeof(reg), REGISTER_TIMEOUT_FIRMWARE);
+        fw_mode = le32_to_cpu(reg);
+
+        if ((fw_mode & 0x00000003) == 2)
+                return 1;
+
+        return 0;
+}
+
 static char *rt2800usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
 {
         return FIRMWARE_RT2870;
@@ -257,8 +278,13 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev,
         /*
          * Write firmware to device.
          */
-        rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
-                                      data + offset, length);
+        if (rt2800usb_autorun_detect(rt2x00dev)) {
+                rt2x00_info(rt2x00dev,
+                            "Firmware loading not required - NIC in AutoRun mode\n");
+        } else {
+                rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
+                                              data + offset, length);
+        }
 
         rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
         rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
@@ -735,11 +761,18 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
 /*
  * Device probe functions.
  */
+static int rt2800usb_efuse_detect(struct rt2x00_dev *rt2x00dev)
+{
+        if (rt2800usb_autorun_detect(rt2x00dev))
+                return 1;
+        return rt2800_efuse_detect(rt2x00dev);
+}
+
 static int rt2800usb_read_eeprom(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
 
-        if (rt2800_efuse_detect(rt2x00dev))
+        if (rt2800usb_efuse_detect(rt2x00dev))
                 retval = rt2800_read_eeprom_efuse(rt2x00dev);
         else
                 retval = rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom,
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 010b76505243..d13f25cd70d5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -693,6 +693,7 @@ enum rt2x00_capability_flags {
         REQUIRE_SW_SEQNO,
         REQUIRE_HT_TX_DESC,
         REQUIRE_PS_AUTOWAKE,
+        REQUIRE_DELAYED_RFKILL,
 
         /*
          * Capabilities
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 2bde6729f5e6..4fa43a2eeb73 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1126,9 +1126,10 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
                 return;
 
         /*
-         * Unregister extra components.
+         * Stop rfkill polling.
          */
-        rt2x00rfkill_unregister(rt2x00dev);
+        if (test_bit(REQUIRE_DELAYED_RFKILL, &rt2x00dev->cap_flags))
+                rt2x00rfkill_unregister(rt2x00dev);
 
         /*
          * Allow the HW to uninitialize.
@@ -1166,6 +1167,12 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
 
         set_bit(DEVICE_STATE_INITIALIZED, &rt2x00dev->flags);
 
+        /*
+         * Start rfkill polling.
+         */
+        if (test_bit(REQUIRE_DELAYED_RFKILL, &rt2x00dev->cap_flags))
+                rt2x00rfkill_register(rt2x00dev);
+
         return 0;
 }
 
@@ -1375,7 +1382,12 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
         rt2x00link_register(rt2x00dev);
         rt2x00leds_register(rt2x00dev);
         rt2x00debug_register(rt2x00dev);
-        rt2x00rfkill_register(rt2x00dev);
+
+        /*
+         * Start rfkill polling.
+         */
+        if (!test_bit(REQUIRE_DELAYED_RFKILL, &rt2x00dev->cap_flags))
+                rt2x00rfkill_register(rt2x00dev);
 
         return 0;
 
@@ -1391,6 +1403,12 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
         clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
 
         /*
+         * Stop rfkill polling.
+         */
+        if (!test_bit(REQUIRE_DELAYED_RFKILL, &rt2x00dev->cap_flags))
+                rt2x00rfkill_unregister(rt2x00dev);
+
+        /*
          * Disable radio.
          */
         rt2x00lib_disable_radio(rt2x00dev);
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 212ac4842c16..004dff9b962d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -487,6 +487,8 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         crypto.cipher = rt2x00crypto_key_to_cipher(key);
         if (crypto.cipher == CIPHER_NONE)
                 return -EOPNOTSUPP;
+        if (crypto.cipher == CIPHER_TKIP && rt2x00_is_usb(rt2x00dev))
+                return -EOPNOTSUPP;
 
         crypto.cmd = cmd;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index e7bcf62347d5..831b65f93feb 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -93,6 +93,7 @@ enum rt2x00usb_mode_offset {
         USB_MODE_SLEEP = 7,     /* RT73USB */
         USB_MODE_FIRMWARE = 8,  /* RT73USB */
         USB_MODE_WAKEUP = 9,    /* RT73USB */
+        USB_MODE_AUTORUN = 17, /* RT2800USB */
 };
 
 /**
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 4dd7c4a1923b..2532ce85d718 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -222,6 +222,7 @@ struct xenvif {
 
         /* Queues */
         struct xenvif_queue *queues;
+        unsigned int num_queues; /* active queues, resource allocated */
 
         /* Miscellaneous private stuff. */
         struct net_device *dev;
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 852da34b8961..9e97c7ca0ddd 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -137,32 +137,11 @@ static void xenvif_wake_queue_callback(unsigned long data)
         }
 }
 
-static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb,
-                               void *accel_priv, select_queue_fallback_t fallback)
-{
-        unsigned int num_queues = dev->real_num_tx_queues;
-        u32 hash;
-        u16 queue_index;
-
-        /* First, check if there is only one queue to optimise the
-         * single-queue or old frontend scenario.
-         */
-        if (num_queues == 1) {
-                queue_index = 0;
-        } else {
-                /* Use skb_get_hash to obtain an L4 hash if available */
-                hash = skb_get_hash(skb);
-                queue_index = hash % num_queues;
-        }
-
-        return queue_index;
-}
-
 static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct xenvif *vif = netdev_priv(dev);
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         u16 index;
         int min_slots_needed;
 
@@ -225,7 +204,7 @@ static struct net_device_stats *xenvif_get_stats(struct net_device *dev)
 {
         struct xenvif *vif = netdev_priv(dev);
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         unsigned long rx_bytes = 0;
         unsigned long rx_packets = 0;
         unsigned long tx_bytes = 0;
@@ -256,7 +235,7 @@ out:
 static void xenvif_up(struct xenvif *vif)
 {
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = vif->dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         unsigned int queue_index;
 
         for (queue_index = 0; queue_index < num_queues; ++queue_index) {
@@ -272,7 +251,7 @@ static void xenvif_up(struct xenvif *vif)
 static void xenvif_down(struct xenvif *vif)
 {
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = vif->dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         unsigned int queue_index;
 
         for (queue_index = 0; queue_index < num_queues; ++queue_index) {
@@ -379,7 +358,7 @@ static void xenvif_get_ethtool_stats(struct net_device *dev,
                                      struct ethtool_stats *stats, u64 * data)
 {
         struct xenvif *vif = netdev_priv(dev);
-        unsigned int num_queues = dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         int i;
         unsigned int queue_index;
         struct xenvif_stats *vif_stats;
@@ -424,7 +403,6 @@ static const struct net_device_ops xenvif_netdev_ops = {
         .ndo_fix_features = xenvif_fix_features,
         .ndo_set_mac_address = eth_mac_addr,
         .ndo_validate_addr   = eth_validate_addr,
-        .ndo_select_queue = xenvif_select_queue,
 };
 
 struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
@@ -438,7 +416,7 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
         snprintf(name, IFNAMSIZ - 1, "vif%u.%u", domid, handle);
         /* Allocate a netdev with the max. supported number of queues.
          * When the guest selects the desired number, it will be updated
-         * via netif_set_real_num_tx_queues().
+         * via netif_set_real_num_*_queues().
          */
         dev = alloc_netdev_mq(sizeof(struct xenvif), name, ether_setup,
                               xenvif_max_queues);
@@ -458,11 +436,9 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
         vif->dev = dev;
         vif->disabled = false;
 
-        /* Start out with no queues. The call below does not require
-         * rtnl_lock() as it happens before register_netdev().
-         */
+        /* Start out with no queues. */
         vif->queues = NULL;
-        netif_set_real_num_tx_queues(dev, 0);
+        vif->num_queues = 0;
 
         dev->netdev_ops = &xenvif_netdev_ops;
         dev->hw_features = NETIF_F_SG |
@@ -677,7 +653,7 @@ static void xenvif_wait_unmap_timeout(struct xenvif_queue *queue,
 void xenvif_disconnect(struct xenvif *vif)
 {
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = vif->dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         unsigned int queue_index;
 
         if (netif_carrier_ok(vif->dev))
@@ -724,7 +700,7 @@ void xenvif_deinit_queue(struct xenvif_queue *queue)
 void xenvif_free(struct xenvif *vif)
 {
         struct xenvif_queue *queue = NULL;
-        unsigned int num_queues = vif->dev->real_num_tx_queues;
+        unsigned int num_queues = vif->num_queues;
         unsigned int queue_index;
         /* Here we want to avoid timeout messages if an skb can be legitimately
          * stuck somewhere else. Realistically this could be an another vif's
@@ -748,12 +724,9 @@ void xenvif_free(struct xenvif *vif)
                 xenvif_deinit_queue(queue);
         }
 
-        /* Free the array of queues. The call below does not require
-         * rtnl_lock() because it happens after unregister_netdev().
-         */
-        netif_set_real_num_tx_queues(vif->dev, 0);
         vfree(vif->queues);
         vif->queues = NULL;
+        vif->num_queues = 0;
 
         free_netdev(vif->dev);
 
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index 96c63dc2509e..3d85acd84bad 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -527,9 +527,7 @@ static void connect(struct backend_info *be)
         /* Use the number of queues requested by the frontend */
         be->vif->queues = vzalloc(requested_num_queues *
                                   sizeof(struct xenvif_queue));
-        rtnl_lock();
-        netif_set_real_num_tx_queues(be->vif->dev, requested_num_queues);
-        rtnl_unlock();
+        be->vif->num_queues = requested_num_queues;
 
         for (queue_index = 0; queue_index < requested_num_queues; ++queue_index) {
                 queue = &be->vif->queues[queue_index];
@@ -546,9 +544,7 @@ static void connect(struct backend_info *be)
                          * earlier queues can be destroyed using the regular
                          * disconnect logic.
                          */
-                        rtnl_lock();
-                        netif_set_real_num_tx_queues(be->vif->dev, queue_index);
-                        rtnl_unlock();
+                        be->vif->num_queues = queue_index;
                         goto err;
                 }
 
@@ -561,13 +557,19 @@ static void connect(struct backend_info *be)
                          * and also clean up any previously initialised queues.
                          */
                         xenvif_deinit_queue(queue);
-                        rtnl_lock();
-                        netif_set_real_num_tx_queues(be->vif->dev, queue_index);
-                        rtnl_unlock();
+                        be->vif->num_queues = queue_index;
                         goto err;
                 }
         }
 
+        /* Initialisation completed, tell core driver the number of
+         * active queues.
+         */
+        rtnl_lock();
+        netif_set_real_num_tx_queues(be->vif->dev, requested_num_queues);
+        netif_set_real_num_rx_queues(be->vif->dev, requested_num_queues);
+        rtnl_unlock();
+
         xenvif_carrier_on(be->vif);
 
         unregister_hotplug_status_watch(be);
@@ -582,13 +584,11 @@ static void connect(struct backend_info *be)
         return;
 
 err:
-        if (be->vif->dev->real_num_tx_queues > 0)
+        if (be->vif->num_queues > 0)
                 xenvif_disconnect(be->vif); /* Clean up existing queues */
         vfree(be->vif->queues);
         be->vif->queues = NULL;
-        rtnl_lock();
-        netif_set_real_num_tx_queues(be->vif->dev, 0);
-        rtnl_unlock();
+        be->vif->num_queues = 0;
         return;
 }
 
@@ -596,7 +596,7 @@ err:
 static int connect_rings(struct backend_info *be, struct xenvif_queue *queue)
 {
         struct xenbus_device *dev = be->dev;
-        unsigned int num_queues = queue->vif->dev->real_num_tx_queues;
+        unsigned int num_queues = queue->vif->num_queues;
         unsigned long tx_ring_ref, rx_ring_ref;
         unsigned int tx_evtchn, rx_evtchn;
         int err;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 5a7872ac3566..2ccb4a02368b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1287,7 +1287,7 @@ static irqreturn_t xennet_rx_interrupt(int irq, void *dev_id)
 
         if (likely(netif_carrier_ok(dev) &&
                    RING_HAS_UNCONSUMED_RESPONSES(&queue->rx)))
-                        napi_schedule(&queue->napi);
+                napi_schedule(&queue->napi);
 
         return IRQ_HANDLED;
 }
@@ -1437,10 +1437,11 @@ static void xennet_end_access(int ref, void *page)
 static void xennet_disconnect_backend(struct netfront_info *info)
 {
         unsigned int i = 0;
-        struct netfront_queue *queue = NULL;
         unsigned int num_queues = info->netdev->real_num_tx_queues;
 
         for (i = 0; i < num_queues; ++i) {
+                struct netfront_queue *queue = &info->queues[i];
+
                 /* Stop old i/f to prevent errors whilst we rebuild the state. */
                 spin_lock_bh(&queue->rx_lock);
                 spin_lock_irq(&queue->tx_lock);
@@ -1698,8 +1699,6 @@ static int xennet_init_queue(struct netfront_queue *queue)
                 goto exit_free_tx;
         }
 
-        netif_napi_add(queue->info->netdev, &queue->napi, xennet_poll, 64);
-
         return 0;
 
  exit_free_tx:
@@ -1790,6 +1789,70 @@ error:
         return err;
 }
 
+static void xennet_destroy_queues(struct netfront_info *info)
+{
+        unsigned int i;
+
+        rtnl_lock();
+
+        for (i = 0; i < info->netdev->real_num_tx_queues; i++) {
+                struct netfront_queue *queue = &info->queues[i];
+
+                if (netif_running(info->netdev))
+                        napi_disable(&queue->napi);
+                netif_napi_del(&queue->napi);
+        }
+
+        rtnl_unlock();
+
+        kfree(info->queues);
+        info->queues = NULL;
+}
+
+static int xennet_create_queues(struct netfront_info *info,
+                                unsigned int num_queues)
+{
+        unsigned int i;
+        int ret;
+
+        info->queues = kcalloc(num_queues, sizeof(struct netfront_queue),
+                               GFP_KERNEL);
+        if (!info->queues)
+                return -ENOMEM;
+
+        rtnl_lock();
+
+        for (i = 0; i < num_queues; i++) {
+                struct netfront_queue *queue = &info->queues[i];
+
+                queue->id = i;
+                queue->info = info;
+
+                ret = xennet_init_queue(queue);
+                if (ret < 0) {
+                        dev_warn(&info->netdev->dev, "only created %d queues\n",
+                                 num_queues);
+                        num_queues = i;
+                        break;
+                }
+
+                netif_napi_add(queue->info->netdev, &queue->napi,
+                               xennet_poll, 64);
+                if (netif_running(info->netdev))
+                        napi_enable(&queue->napi);
+        }
+
+        netif_set_real_num_tx_queues(info->netdev, num_queues);
+
+        rtnl_unlock();
+
+        if (num_queues == 0) {
+                dev_err(&info->netdev->dev, "no queues\n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
 /* Common code used when first setting up, and when resuming. */
 static int talk_to_netback(struct xenbus_device *dev,
                            struct netfront_info *info)
@@ -1826,42 +1889,20 @@ static int talk_to_netback(struct xenbus_device *dev,
                 goto out;
         }
 
-        /* Allocate array of queues */
-        info->queues = kcalloc(num_queues, sizeof(struct netfront_queue), GFP_KERNEL);
-        if (!info->queues) {
-                err = -ENOMEM;
-                goto out;
-        }
-        rtnl_lock();
-        netif_set_real_num_tx_queues(info->netdev, num_queues);
-        rtnl_unlock();
+        if (info->queues)
+                xennet_destroy_queues(info);
+
+        err = xennet_create_queues(info, num_queues);
+        if (err < 0)
+                goto destroy_ring;
 
         /* Create shared ring, alloc event channel -- for each queue */
         for (i = 0; i < num_queues; ++i) {
                 queue = &info->queues[i];
-                queue->id = i;
-                queue->info = info;
-                err = xennet_init_queue(queue);
-                if (err) {
-                        /* xennet_init_queue() cleans up after itself on failure,
-                         * but we still have to clean up any previously initialised
-                         * queues. If i > 0, set num_queues to i, then goto
-                         * destroy_ring, which calls xennet_disconnect_backend()
-                         * to tidy up.
-                         */
-                        if (i > 0) {
-                                rtnl_lock();
-                                netif_set_real_num_tx_queues(info->netdev, i);
-                                rtnl_unlock();
-                                goto destroy_ring;
-                        } else {
-                                goto out;
-                        }
-                }
                 err = setup_netfront(dev, queue, feature_split_evtchn);
                 if (err) {
-                        /* As for xennet_init_queue(), setup_netfront() will tidy
-                         * up the current queue on error, but we need to clean up
+                        /* setup_netfront() will tidy up the current
+                         * queue on error, but we need to clean up
                          * those already allocated.
                          */
                         if (i > 0) {
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 8368d96ae7b4..b9864806e9b8 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -227,7 +227,8 @@ static int __of_node_add(struct device_node *np)
         np->kobj.kset = of_kset;
         if (!np->parent) {
                 /* Nodes without parents are new top level trees */
-                rc = kobject_add(&np->kobj, NULL, safe_name(&of_kset->kobj, "base"));
+                rc = kobject_add(&np->kobj, NULL, "%s",
+                                 safe_name(&of_kset->kobj, "base"));
         } else {
                 name = safe_name(&np->parent->kobj, kbasename(np->full_name));
                 if (!name || !name[0])
@@ -1960,9 +1961,9 @@ int of_attach_node(struct device_node *np)
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
         np->sibling = np->parent->child;
-        np->allnext = of_allnodes;
+        np->allnext = np->parent->allnext;
+        np->parent->allnext = np;
         np->parent->child = np;
-        of_allnodes = np;
         of_node_clear_flag(np, OF_DETACHED);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c4cddf0cd96d..b777d8f46bd5 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -880,6 +880,21 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
         const u64 phys_offset = __pa(PAGE_OFFSET);
         base &= PAGE_MASK;
         size &= PAGE_MASK;
+
+        if (sizeof(phys_addr_t) < sizeof(u64)) {
+                if (base > ULONG_MAX) {
+                        pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
+                                        base, base + size);
+                        return;
+                }
+
+                if (base + size > ULONG_MAX) {
+                        pr_warning("Ignoring memory range 0x%lx - 0x%llx\n",
+                                        ULONG_MAX, base + size);
+                        size = ULONG_MAX - base;
+                }
+        }
+
         if (base + size < phys_offset) {
                 pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
                            base, base + size);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index fb4a59830648..a3bf2122a8d5 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -323,11 +323,13 @@ int of_phy_register_fixed_link(struct device_node *np)
         fixed_link_node = of_get_child_by_name(np, "fixed-link");
         if (fixed_link_node) {
                 status.link = 1;
-                status.duplex = of_property_read_bool(np, "full-duplex");
+                status.duplex = of_property_read_bool(fixed_link_node,
+                                                      "full-duplex");
                 if (of_property_read_u32(fixed_link_node, "speed", &status.speed))
                         return -EINVAL;
-                status.pause = of_property_read_bool(np, "pause");
-                status.asym_pause = of_property_read_bool(np, "asym-pause");
+                status.pause = of_property_read_bool(fixed_link_node, "pause");
+                status.asym_pause = of_property_read_bool(fixed_link_node,
+                                                          "asym-pause");
                 of_node_put(fixed_link_node);
                 return fixed_phy_register(PHY_POLL, &status, np);
         }
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 6c48d73a7fd7..500436f9be7f 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -166,10 +166,6 @@ static void of_dma_configure(struct platform_device *pdev)
         int ret;
         struct device *dev = &pdev->dev;
 
-#if defined(CONFIG_MICROBLAZE)
-        pdev->archdata.dma_mask = 0xffffffffUL;
-#endif
-
         /*
          * Set default dma-mask to 32 bit. Drivers are expected to setup
          * the correct supported dma_mask.
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index 6aea373547f6..ee3de3421f2d 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -74,7 +74,7 @@ config DP83640_PHY
 
 config PTP_1588_CLOCK_PCH
         tristate "Intel PCH EG20T as PTP clock"
-        depends on X86 || COMPILE_TEST
+        depends on X86_32 || COMPILE_TEST
         depends on HAS_IOMEM && NET
         select PTP_1588_CLOCK
         help
diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c
index 85585219ce82..ad9e0c9b7daf 100644
--- a/drivers/regulator/as3722-regulator.c
+++ b/drivers/regulator/as3722-regulator.c
@@ -433,6 +433,7 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = {
 };
 
 static const struct regulator_linear_range as3722_ldo_ranges[] = {
+        REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),
         REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),
         REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),
 };
@@ -609,6 +610,7 @@ static bool as3722_sd0_is_low_voltage(struct as3722_regulators *as3722_regs)
 }
 
 static const struct regulator_linear_range as3722_sd2345_ranges[] = {
+        REGULATOR_LINEAR_RANGE(0, 0x00, 0x00, 0),
         REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
         REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
         REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c
index 57544e254a78..58ece59367ae 100644
--- a/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@ -119,6 +119,10 @@ static const unsigned int ldo_c_table[] = {
         2900000, 3000000, 3300000,
 };
 
+static const unsigned int ldo_vbus[] = {
+        5000000,
+};
+
 /* DCDC group CSR: supported voltages in microvolts */
 static const struct regulator_linear_range dcdc_csr_ranges[] = {
         REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000),
@@ -192,6 +196,7 @@ static struct bcm590xx_info bcm590xx_regs[] = {
         BCM590XX_REG_TABLE(gpldo4, ldo_a_table),
         BCM590XX_REG_TABLE(gpldo5, ldo_a_table),
         BCM590XX_REG_TABLE(gpldo6, ldo_a_table),
+        BCM590XX_REG_TABLE(vbus, ldo_vbus),
 };
 
 struct bcm590xx_reg {
diff --git a/drivers/regulator/ltc3589.c b/drivers/regulator/ltc3589.c
index 110a99ee1162..c8105182b8b8 100644
--- a/drivers/regulator/ltc3589.c
+++ b/drivers/regulator/ltc3589.c
@@ -255,7 +255,7 @@ static int ltc3589_parse_regulators_dt(struct ltc3589 *ltc3589)
         struct device_node *node;
         int i, ret;
 
-        node = of_find_node_by_name(dev->of_node, "regulators");
+        node = of_get_child_by_name(dev->of_node, "regulators");
         if (!node) {
                 dev_err(dev, "regulators node not found\n");
                 return -EINVAL;
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 864ed02ce4b7..93b4ad842901 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -37,12 +37,14 @@ struct regs_info {
 };
 
 static const struct regulator_linear_range smps_low_ranges[] = {
+        REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
         REGULATOR_LINEAR_RANGE(500000, 0x1, 0x6, 0),
         REGULATOR_LINEAR_RANGE(510000, 0x7, 0x79, 10000),
         REGULATOR_LINEAR_RANGE(1650000, 0x7A, 0x7f, 0),
 };
 
 static const struct regulator_linear_range smps_high_ranges[] = {
+        REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
         REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x6, 0),
         REGULATOR_LINEAR_RANGE(1020000, 0x7, 0x79, 20000),
         REGULATOR_LINEAR_RANGE(3300000, 0x7A, 0x7f, 0),
@@ -323,6 +325,10 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode)
         if (rail_enable)
                 palmas_smps_write(pmic->palmas,
                         palmas_regs_info[id].ctrl_addr, reg);
+
+        /* Switch the enable value to ensure this is used for enable */
+        pmic->desc[id].enable_val = pmic->current_reg_mode[id];
+
         return 0;
 }
 
@@ -962,6 +968,14 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                                 return ret;
                         pmic->current_reg_mode[id] = reg &
                                         PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
+
+                        pmic->desc[id].enable_reg =
+                                        PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+                                                palmas_regs_info[id].ctrl_addr);
+                        pmic->desc[id].enable_mask =
+                                        PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
+                        /* set_mode overrides this value */
+                        pmic->desc[id].enable_val = SMPS_CTRL_MODE_ON;
                 }
 
                 pmic->desc[id].type = REGULATOR_VOLTAGE;
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index 69b4b7750410..9effe48c605e 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -209,7 +209,7 @@ static const struct regulator_desc regulators[] = {
                            1, -1, -1, TPS65218_REG_ENABLE1,
                            TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0),
         TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,
-                           TPS65218_REG_CONTROL_DCDC4,
+                           TPS65218_REG_CONTROL_LDO1,
                            TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,
                            TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,
                            2, 0),
@@ -240,6 +240,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
         config.init_data = init_data;
         config.driver_data = tps;
         config.regmap = tps->regmap;
+        config.of_node = pdev->dev.of_node;
 
         rdev = devm_regulator_register(&pdev->dev, &regulators[id], &config);
         if (IS_ERR(rdev)) {
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index ce1743d0b679..5e343bab9458 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -44,7 +44,7 @@ config STE_MODEM_RPROC
 config DA8XX_REMOTEPROC
         tristate "DA8xx/OMAP-L13x remoteproc support"
         depends on ARCH_DAVINCI_DA8XX
-        select CMA
+        select CMA if MMU
         select REMOTEPROC
         select RPMSG
         help
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 1ecfe3bd92ac..1cff2a21db67 100644
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -71,7 +71,7 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
 {
         unsigned int tmp;
 
-        dev_debug(dev, "%s: pie=%d\n", __func__, enabled);
+        dev_dbg(dev, "%s: pie=%d\n", __func__, enabled);
 
         spin_lock_irq(&puv3_rtc_pie_lock);
         tmp = readl(RTC_RTSR) & ~RTC_RTSR_HZE;
@@ -140,7 +140,7 @@ static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         rtc_tm_to_time(tm, &rtcalarm_count);
         writel(rtcalarm_count, RTC_RTAR);
 
-        puv3_rtc_setaie(&dev->dev, alrm->enabled);
+        puv3_rtc_setaie(dev, alrm->enabled);
 
         if (alrm->enabled)
                 enable_irq_wake(puv3_rtc_alarmno);
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index ee0e85abe1fd..0f471750327e 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -593,7 +593,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         dev_info->start = dcssblk_find_lowest_addr(dev_info);
         dev_info->end = dcssblk_find_highest_addr(dev_info);
 
-        dev_set_name(&dev_info->dev, dev_info->segment_name);
+        dev_set_name(&dev_info->dev, "%s", dev_info->segment_name);
         dev_info->dev.release = dcssblk_release_segment;
         dev_info->dev.groups = dcssblk_dev_attr_groups;
         INIT_LIST_HEAD(&dev_info->lh);
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 629fcc275e92..78b6ace7edcb 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o
 obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 obj-$(CONFIG_SCLP_ASYNC) += sclp_async.o
 
-obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o
 obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o
 obj-$(CONFIG_VMCP) += vmcp.o
 
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index cd9c91909596..b9a9f721716d 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -838,8 +838,6 @@ sclp_vt220_con_init(void)
 {
         int rc;
 
-        if (!CONSOLE_IS_SCLP)
-                return 0;
         rc = __sclp_vt220_init(sclp_console_pages);
         if (rc)
                 return rc;
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index cf31d3321dab..a8848db7b09d 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -761,7 +761,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
 
         dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (dev) {
-                dev_set_name(dev, priv->internal_name);
+                dev_set_name(dev, "%s", priv->internal_name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 dev->driver = &vmlogrdr_driver;
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
deleted file mode 100644
index d5eac985976b..000000000000
--- a/drivers/s390/char/vmwatchdog.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Watchdog implementation based on z/VM Watchdog Timer API
- *
- * Copyright IBM Corp. 2004, 2009
- *
- * The user space watchdog daemon can use this driver as
- * /dev/vmwatchdog to have z/VM execute the specified CP
- * command when the timeout expires. The default command is
- * "IPL", which which cause an immediate reboot.
- */
-#define KMSG_COMPONENT "vmwatchdog"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/slab.h>
-#include <linux/suspend.h>
-#include <linux/watchdog.h>
-
-#include <asm/ebcdic.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-
-#define MAX_CMDLEN 240
-#define MIN_INTERVAL 15
-static char vmwdt_cmd[MAX_CMDLEN] = "IPL";
-static bool vmwdt_conceal;
-
-static bool vmwdt_nowayout = WATCHDOG_NOWAYOUT;
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
-MODULE_DESCRIPTION("z/VM Watchdog Timer");
-module_param_string(cmd, vmwdt_cmd, MAX_CMDLEN, 0644);
-MODULE_PARM_DESC(cmd, "CP command that is run when the watchdog triggers");
-module_param_named(conceal, vmwdt_conceal, bool, 0644);
-MODULE_PARM_DESC(conceal, "Enable the CONCEAL CP option while the watchdog "
-                " is active");
-module_param_named(nowayout, vmwdt_nowayout, bool, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"
-                " (default=CONFIG_WATCHDOG_NOWAYOUT)");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
-static unsigned int vmwdt_interval = 60;
-static unsigned long vmwdt_is_open;
-static int vmwdt_expect_close;
-
-static DEFINE_MUTEX(vmwdt_mutex);
-
-#define VMWDT_OPEN      0       /* devnode is open or suspend in progress */
-#define VMWDT_RUNNING   1       /* The watchdog is armed */
-
-enum vmwdt_func {
-        /* function codes */
-        wdt_init   = 0,
-        wdt_change = 1,
-        wdt_cancel = 2,
-        /* flags */
-        wdt_conceal = 0x80000000,
-};
-
-static int __diag288(enum vmwdt_func func, unsigned int timeout,
-                            char *cmd, size_t len)
-{
-        register unsigned long __func asm("2") = func;
-        register unsigned long __timeout asm("3") = timeout;
-        register unsigned long __cmdp asm("4") = virt_to_phys(cmd);
-        register unsigned long __cmdl asm("5") = len;
-        int err;
-
-        err = -EINVAL;
-        asm volatile(
-                "       diag    %1,%3,0x288\n"
-                "0:     la      %0,0\n"
-                "1:\n"
-                EX_TABLE(0b,1b)
-                : "+d" (err) : "d"(__func), "d"(__timeout),
-                  "d"(__cmdp), "d"(__cmdl) : "1", "cc");
-        return err;
-}
-
-static int vmwdt_keepalive(void)
-{
-        /* we allocate new memory every time to avoid having
-         * to track the state. static allocation is not an
-         * option since that might not be contiguous in real
-         * storage in case of a modular build */
-        static char *ebc_cmd;
-        size_t len;
-        int ret;
-        unsigned int func;
-
-        ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
-        if (!ebc_cmd)
-                return -ENOMEM;
-
-        len = strlcpy(ebc_cmd, vmwdt_cmd, MAX_CMDLEN);
-        ASCEBC(ebc_cmd, MAX_CMDLEN);
-        EBC_TOUPPER(ebc_cmd, MAX_CMDLEN);
-
-        func = vmwdt_conceal ? (wdt_init | wdt_conceal) : wdt_init;
-        set_bit(VMWDT_RUNNING, &vmwdt_is_open);
-        ret = __diag288(func, vmwdt_interval, ebc_cmd, len);
-        WARN_ON(ret != 0);
-        kfree(ebc_cmd);
-        return ret;
-}
-
-static int vmwdt_disable(void)
-{
-        char cmd[] = {'\0'};
-        int ret = __diag288(wdt_cancel, 0, cmd, 0);
-        WARN_ON(ret != 0);
-        clear_bit(VMWDT_RUNNING, &vmwdt_is_open);
-        return ret;
-}
-
-static int __init vmwdt_probe(void)
-{
-        /* there is no real way to see if the watchdog is supported,
-         * so we try initializing it with a NOP command ("BEGIN")
-         * that won't cause any harm even if the following disable
-         * fails for some reason */
-        char ebc_begin[] = {
-                194, 197, 199, 201, 213
-        };
-        if (__diag288(wdt_init, 15, ebc_begin, sizeof(ebc_begin)) != 0)
-                return -EINVAL;
-        return vmwdt_disable();
-}
-
-static int vmwdt_open(struct inode *i, struct file *f)
-{
-        int ret;
-        if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open))
-                return -EBUSY;
-        ret = vmwdt_keepalive();
-        if (ret)
-                clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-        return ret ? ret : nonseekable_open(i, f);
-}
-
-static int vmwdt_close(struct inode *i, struct file *f)
-{
-        if (vmwdt_expect_close == 42)
-                vmwdt_disable();
-        vmwdt_expect_close = 0;
-        clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-        return 0;
-}
-
-static struct watchdog_info vmwdt_info = {
-        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
-        .firmware_version = 0,
-        .identity = "z/VM Watchdog Timer",
-};
-
-static int __vmwdt_ioctl(unsigned int cmd, unsigned long arg)
-{
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                if (copy_to_user((void __user *)arg, &vmwdt_info,
-                                        sizeof(vmwdt_info)))
-                        return -EFAULT;
-                return 0;
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                return put_user(0, (int __user *)arg);
-        case WDIOC_GETTEMP:
-                return -EINVAL;
-        case WDIOC_SETOPTIONS:
-                {
-                        int options, ret;
-                        if (get_user(options, (int __user *)arg))
-                                return -EFAULT;
-                        ret = -EINVAL;
-                        if (options & WDIOS_DISABLECARD) {
-                                ret = vmwdt_disable();
-                                if (ret)
-                                        return ret;
-                        }
-                        if (options & WDIOS_ENABLECARD) {
-                                ret = vmwdt_keepalive();
-                        }
-                        return ret;
-                }
-        case WDIOC_GETTIMEOUT:
-                return put_user(vmwdt_interval, (int __user *)arg);
-        case WDIOC_SETTIMEOUT:
-                {
-                        int interval;
-                        if (get_user(interval, (int __user *)arg))
-                                return -EFAULT;
-                        if (interval < MIN_INTERVAL)
-                                return -EINVAL;
-                        vmwdt_interval = interval;
-                }
-                return vmwdt_keepalive();
-        case WDIOC_KEEPALIVE:
-                return vmwdt_keepalive();
-        }
-        return -EINVAL;
-}
-
-static long vmwdt_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
-{
-        int rc;
-
-        mutex_lock(&vmwdt_mutex);
-        rc = __vmwdt_ioctl(cmd, arg);
-        mutex_unlock(&vmwdt_mutex);
-        return (long) rc;
-}
-
-static ssize_t vmwdt_write(struct file *f, const char __user *buf,
-                                size_t count, loff_t *ppos)
-{
-        if(count) {
-                if (!vmwdt_nowayout) {
-                        size_t i;
-
-                        /* note: just in case someone wrote the magic character
-                         * five months ago... */
-                        vmwdt_expect_close = 0;
-
-                        for (i = 0; i != count; i++) {
-                                char c;
-                                if (get_user(c, buf+i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        vmwdt_expect_close = 42;
-                        }
-                }
-                /* someone wrote to us, we should restart timer */
-                vmwdt_keepalive();
-        }
-        return count;
-}
-
-static int vmwdt_resume(void)
-{
-        clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-        return NOTIFY_DONE;
-}
-
-/*
- * It makes no sense to go into suspend while the watchdog is running.
- * Depending on the memory size, the watchdog might trigger, while we
- * are still saving the memory.
- * We reuse the open flag to ensure that suspend and watchdog open are
- * exclusive operations
- */
-static int vmwdt_suspend(void)
-{
-        if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
-                pr_err("The system cannot be suspended while the watchdog"
-                        " is in use\n");
-                return notifier_from_errno(-EBUSY);
-        }
-        if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
-                clear_bit(VMWDT_OPEN, &vmwdt_is_open);
-                pr_err("The system cannot be suspended while the watchdog"
-                        " is running\n");
-                return notifier_from_errno(-EBUSY);
-        }
-        return NOTIFY_DONE;
-}
-
-/*
- * This function is called for suspend and resume.
- */
-static int vmwdt_power_event(struct notifier_block *this, unsigned long event,
-                             void *ptr)
-{
-        switch (event) {
-        case PM_POST_HIBERNATION:
-        case PM_POST_SUSPEND:
-                return vmwdt_resume();
-        case PM_HIBERNATION_PREPARE:
-        case PM_SUSPEND_PREPARE:
-                return vmwdt_suspend();
-        default:
-                return NOTIFY_DONE;
-        }
-}
-
-static struct notifier_block vmwdt_power_notifier = {
-        .notifier_call = vmwdt_power_event,
-};
-
-static const struct file_operations vmwdt_fops = {
-        .open    = &vmwdt_open,
-        .release = &vmwdt_close,
-        .unlocked_ioctl = &vmwdt_ioctl,
-        .write   = &vmwdt_write,
-        .owner   = THIS_MODULE,
-        .llseek  = noop_llseek,
-};
-
-static struct miscdevice vmwdt_dev = {
-        .minor      = WATCHDOG_MINOR,
-        .name       = "watchdog",
-        .fops       = &vmwdt_fops,
-};
-
-static int __init vmwdt_init(void)
-{
-        int ret;
-
-        ret = vmwdt_probe();
-        if (ret)
-                return ret;
-        ret = register_pm_notifier(&vmwdt_power_notifier);
-        if (ret)
-                return ret;
-        /*
-         * misc_register() has to be the last action in module_init(), because
-         * file operations will be available right after this.
-         */
-        ret = misc_register(&vmwdt_dev);
-        if (ret) {
-                unregister_pm_notifier(&vmwdt_power_notifier);
-                return ret;
-        }
-        return 0;
-}
-module_init(vmwdt_init);
-
-static void __exit vmwdt_exit(void)
-{
-        unregister_pm_notifier(&vmwdt_power_notifier);
-        misc_deregister(&vmwdt_dev);
-}
-module_exit(vmwdt_exit);
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index 445564c790f6..00bfbee0af9e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -196,11 +196,11 @@ EXPORT_SYMBOL(airq_iv_release);
  */
 unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num)
 {
-        unsigned long bit, i;
+        unsigned long bit, i, flags;
 
         if (!iv->avail || num == 0)
                 return -1UL;
-        spin_lock(&iv->lock);
+        spin_lock_irqsave(&iv->lock, flags);
         bit = find_first_bit_inv(iv->avail, iv->bits);
         while (bit + num <= iv->bits) {
                 for (i = 1; i < num; i++)
@@ -218,9 +218,8 @@ unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num)
         }
         if (bit + num > iv->bits)
                 bit = -1UL;
-        spin_unlock(&iv->lock);
+        spin_unlock_irqrestore(&iv->lock, flags);
         return bit;
-
 }
 EXPORT_SYMBOL(airq_iv_alloc);
 
@@ -232,11 +231,11 @@ EXPORT_SYMBOL(airq_iv_alloc);
  */
 void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num)
 {
-        unsigned long i;
+        unsigned long i, flags;
 
         if (!iv->avail || num == 0)
                 return;
-        spin_lock(&iv->lock);
+        spin_lock_irqsave(&iv->lock, flags);
         for (i = 0; i < num; i++) {
                 /* Clear (possibly left over) interrupt bit */
                 clear_bit_inv(bit + i, iv->vector);
@@ -248,7 +247,7 @@ void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num)
                 while (iv->end > 0 && !test_bit_inv(iv->end - 1, iv->avail))
                         iv->end--;
         }
-        spin_unlock(&iv->lock);
+        spin_unlock_irqrestore(&iv->lock, flags);
 }
 EXPORT_SYMBOL(airq_iv_free);
 
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index dfd7bc681c25..e443b0d0b236 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -184,7 +184,7 @@ static ssize_t ccwgroup_ungroup_store(struct device *dev,
                                       const char *buf, size_t count)
 {
         struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-        int rc;
+        int rc = 0;
 
         /* Prevent concurrent online/offline processing and ungrouping. */
         if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
@@ -196,11 +196,12 @@ static ssize_t ccwgroup_ungroup_store(struct device *dev,
 
         if (device_remove_file_self(dev, attr))
                 ccwgroup_ungroup(gdev);
+        else
+                rc = -ENODEV;
 out:
         if (rc) {
-                if (rc != -EAGAIN)
-                        /* Release onoff "lock" when ungrouping failed. */
-                        atomic_set(&gdev->onoff, 0);
+                /* Release onoff "lock" when ungrouping failed. */
+                atomic_set(&gdev->onoff, 0);
                 return rc;
         }
         return count;
@@ -227,6 +228,7 @@ static void ccwgroup_ungroup_workfn(struct work_struct *work)
                 container_of(work, struct ccwgroup_device, ungroup_work);
 
         ccwgroup_ungroup(gdev);
+        put_device(&gdev->dev);
 }
 
 static void ccwgroup_release(struct device *dev)
@@ -412,8 +414,10 @@ static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
 {
         struct ccwgroup_device *gdev = to_ccwgroupdev(data);
 
-        if (action == BUS_NOTIFY_UNBIND_DRIVER)
+        if (action == BUS_NOTIFY_UNBIND_DRIVER) {
+                get_device(&gdev->dev);
                 schedule_work(&gdev->ungroup_work);
+        }
 
         return NOTIFY_OK;
 }
@@ -582,11 +586,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
                                          __ccwgroup_match_all))) {
                 struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
 
-                mutex_lock(&gdev->reg_mutex);
-                __ccwgroup_remove_symlinks(gdev);
-                device_unregister(dev);
-                __ccwgroup_remove_cdev_refs(gdev);
-                mutex_unlock(&gdev->reg_mutex);
+                ccwgroup_ungroup(gdev);
                 put_device(dev);
         }
         driver_unregister(&cdriver->driver);
@@ -633,13 +633,7 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev)
         get_device(&gdev->dev);
         spin_unlock_irq(cdev->ccwlock);
         /* Unregister group device. */
-        mutex_lock(&gdev->reg_mutex);
-        if (device_is_registered(&gdev->dev)) {
-                __ccwgroup_remove_symlinks(gdev);
-                device_unregister(&gdev->dev);
-                __ccwgroup_remove_cdev_refs(gdev);
-        }
-        mutex_unlock(&gdev->reg_mutex);
+        ccwgroup_ungroup(gdev);
         /* Release ccwgroup device reference for local processing. */
         put_device(&gdev->dev);
 }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 77f9c92df4b9..2905d8b0ec95 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -602,6 +602,7 @@ void __init init_cio_interrupts(void)
 
 #ifdef CONFIG_CCW_CONSOLE
 static struct subchannel *console_sch;
+static struct lock_class_key console_sch_key;
 
 /*
  * Use cio_tsch to update the subchannel status and call the interrupt handler
@@ -686,6 +687,7 @@ struct subchannel *cio_probe_console(void)
         if (IS_ERR(sch))
                 return sch;
 
+        lockdep_set_class(sch->lock, &console_sch_key);
         isc_register(CONSOLE_ISC);
         sch->config.isc = CONSOLE_ISC;
         sch->config.intparm = (u32)(addr_t)sch;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index d8d9b5b5cc56..dfef5e63cb7b 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -678,18 +678,11 @@ static const struct attribute_group *ccwdev_attr_groups[] = {
         NULL,
 };
 
-/* this is a simple abstraction for device_register that sets the
- * correct bus type and adds the bus specific files */
-static int ccw_device_register(struct ccw_device *cdev)
+static int ccw_device_add(struct ccw_device *cdev)
 {
         struct device *dev = &cdev->dev;
-        int ret;
 
         dev->bus = &ccw_bus_type;
-        ret = dev_set_name(&cdev->dev, "0.%x.%04x", cdev->private->dev_id.ssid,
-                           cdev->private->dev_id.devno);
-        if (ret)
-                return ret;
         return device_add(dev);
 }
 
@@ -764,22 +757,46 @@ static void ccw_device_todo(struct work_struct *work);
 static int io_subchannel_initialize_dev(struct subchannel *sch,
                                         struct ccw_device *cdev)
 {
-        cdev->private->cdev = cdev;
-        cdev->private->int_class = IRQIO_CIO;
-        atomic_set(&cdev->private->onoff, 0);
+        struct ccw_device_private *priv = cdev->private;
+        int ret;
+
+        priv->cdev = cdev;
+        priv->int_class = IRQIO_CIO;
+        priv->state = DEV_STATE_NOT_OPER;
+        priv->dev_id.devno = sch->schib.pmcw.dev;
+        priv->dev_id.ssid = sch->schid.ssid;
+        priv->schid = sch->schid;
+
+        INIT_WORK(&priv->todo_work, ccw_device_todo);
+        INIT_LIST_HEAD(&priv->cmb_list);
+        init_waitqueue_head(&priv->wait_q);
+        init_timer(&priv->timer);
+
+        atomic_set(&priv->onoff, 0);
+        cdev->ccwlock = sch->lock;
         cdev->dev.parent = &sch->dev;
         cdev->dev.release = ccw_device_release;
-        INIT_WORK(&cdev->private->todo_work, ccw_device_todo);
         cdev->dev.groups = ccwdev_attr_groups;
         /* Do first half of device_register. */
         device_initialize(&cdev->dev);
+        ret = dev_set_name(&cdev->dev, "0.%x.%04x", cdev->private->dev_id.ssid,
+                           cdev->private->dev_id.devno);
+        if (ret)
+                goto out_put;
         if (!get_device(&sch->dev)) {
-                /* Release reference from device_initialize(). */
-                put_device(&cdev->dev);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_put;
         }
-        cdev->private->flags.initialized = 1;
+        priv->flags.initialized = 1;
+        spin_lock_irq(sch->lock);
+        sch_set_cdev(sch, cdev);
+        spin_unlock_irq(sch->lock);
         return 0;
+
+out_put:
+        /* Release reference from device_initialize(). */
+        put_device(&cdev->dev);
+        return ret;
 }
 
 static struct ccw_device * io_subchannel_create_ccwdev(struct subchannel *sch)
@@ -858,7 +875,7 @@ static void io_subchannel_register(struct ccw_device *cdev)
         dev_set_uevent_suppress(&sch->dev, 0);
         kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
         /* make it known to the system */
-        ret = ccw_device_register(cdev);
+        ret = ccw_device_add(cdev);
         if (ret) {
                 CIO_MSG_EVENT(0, "Could not register ccw dev 0.%x.%04x: %d\n",
                               cdev->private->dev_id.ssid,
@@ -923,26 +940,11 @@ io_subchannel_recog_done(struct ccw_device *cdev)
 
 static void io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
 {
-        struct ccw_device_private *priv;
-
-        cdev->ccwlock = sch->lock;
-
-        /* Init private data. */
-        priv = cdev->private;
-        priv->dev_id.devno = sch->schib.pmcw.dev;
-        priv->dev_id.ssid = sch->schid.ssid;
-        priv->schid = sch->schid;
-        priv->state = DEV_STATE_NOT_OPER;
-        INIT_LIST_HEAD(&priv->cmb_list);
-        init_waitqueue_head(&priv->wait_q);
-        init_timer(&priv->timer);
-
         /* Increase counter of devices currently in recognition. */
         atomic_inc(&ccw_device_init_count);
 
         /* Start async. device sensing. */
         spin_lock_irq(sch->lock);
-        sch_set_cdev(sch, cdev);
         ccw_device_recognition(cdev);
         spin_unlock_irq(sch->lock);
 }
@@ -1083,7 +1085,7 @@ static int io_subchannel_probe(struct subchannel *sch)
                 dev_set_uevent_suppress(&sch->dev, 0);
                 kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
                 cdev = sch_get_cdev(sch);
-                rc = ccw_device_register(cdev);
+                rc = ccw_device_add(cdev);
                 if (rc) {
                         /* Release online reference. */
                         put_device(&cdev->dev);
@@ -1597,7 +1599,6 @@ int __init ccw_device_enable_console(struct ccw_device *cdev)
         if (rc)
                 return rc;
         sch->driver = &io_subchannel_driver;
-        sch_set_cdev(sch, cdev);
         io_subchannel_recog(cdev, sch);
         /* Now wait for the async. recognition to come to an end. */
         spin_lock_irq(cdev->ccwlock);
@@ -1639,6 +1640,7 @@ struct ccw_device * __init ccw_device_create_console(struct ccw_driver *drv)
                 put_device(&sch->dev);
                 return ERR_PTR(-ENOMEM);
         }
+        set_io_private(sch, io_priv);
         cdev = io_subchannel_create_ccwdev(sch);
         if (IS_ERR(cdev)) {
                 put_device(&sch->dev);
@@ -1646,7 +1648,6 @@ struct ccw_device * __init ccw_device_create_console(struct ccw_driver *drv)
                 return cdev;
         }
         cdev->drv = drv;
-        set_io_private(sch, io_priv);
         ccw_device_set_int_class(cdev);
         return cdev;
 }
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index 4221b02085ad..f1f3baa8e6e4 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -7,6 +7,7 @@
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/export.h>
+#include <linux/slab.h>
 #include <asm/debug.h>
 #include "qdio_debug.h"
 #include "qdio.h"
@@ -16,11 +17,51 @@ debug_info_t *qdio_dbf_error;
 
 static struct dentry *debugfs_root;
 #define QDIO_DEBUGFS_NAME_LEN   10
+#define QDIO_DBF_NAME_LEN       20
 
-void qdio_allocate_dbf(struct qdio_initialize *init_data,
+struct qdio_dbf_entry {
+        char dbf_name[QDIO_DBF_NAME_LEN];
+        debug_info_t *dbf_info;
+        struct list_head dbf_list;
+};
+
+static LIST_HEAD(qdio_dbf_list);
+static DEFINE_MUTEX(qdio_dbf_list_mutex);
+
+static debug_info_t *qdio_get_dbf_entry(char *name)
+{
+        struct qdio_dbf_entry *entry;
+        debug_info_t *rc = NULL;
+
+        mutex_lock(&qdio_dbf_list_mutex);
+        list_for_each_entry(entry, &qdio_dbf_list, dbf_list) {
+                if (strcmp(entry->dbf_name, name) == 0) {
+                        rc = entry->dbf_info;
+                        break;
+                }
+        }
+        mutex_unlock(&qdio_dbf_list_mutex);
+        return rc;
+}
+
+static void qdio_clear_dbf_list(void)
+{
+        struct qdio_dbf_entry *entry, *tmp;
+
+        mutex_lock(&qdio_dbf_list_mutex);
+        list_for_each_entry_safe(entry, tmp, &qdio_dbf_list, dbf_list) {
+                list_del(&entry->dbf_list);
+                debug_unregister(entry->dbf_info);
+                kfree(entry);
+        }
+        mutex_unlock(&qdio_dbf_list_mutex);
+}
+
+int qdio_allocate_dbf(struct qdio_initialize *init_data,
                        struct qdio_irq *irq_ptr)
 {
-        char text[20];
+        char text[QDIO_DBF_NAME_LEN];
+        struct qdio_dbf_entry *new_entry;
 
         DBF_EVENT("qfmt:%1d", init_data->q_format);
         DBF_HEX(init_data->adapter_name, 8);
@@ -38,11 +79,34 @@ void qdio_allocate_dbf(struct qdio_initialize *init_data,
         DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);
 
         /* allocate trace view for the interface */
-        snprintf(text, 20, "qdio_%s", dev_name(&init_data->cdev->dev));
-        irq_ptr->debug_area = debug_register(text, 2, 1, 16);
-        debug_register_view(irq_ptr->debug_area, &debug_hex_ascii_view);
-        debug_set_level(irq_ptr->debug_area, DBF_WARN);
-        DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf created");
+        snprintf(text, QDIO_DBF_NAME_LEN, "qdio_%s",
+                                        dev_name(&init_data->cdev->dev));
+        irq_ptr->debug_area = qdio_get_dbf_entry(text);
+        if (irq_ptr->debug_area)
+                DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf reused");
+        else {
+                irq_ptr->debug_area = debug_register(text, 2, 1, 16);
+                if (!irq_ptr->debug_area)
+                        return -ENOMEM;
+                if (debug_register_view(irq_ptr->debug_area,
+                                                &debug_hex_ascii_view)) {
+                        debug_unregister(irq_ptr->debug_area);
+                        return -ENOMEM;
+                }
+                debug_set_level(irq_ptr->debug_area, DBF_WARN);
+                DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf created");
+                new_entry = kzalloc(sizeof(struct qdio_dbf_entry), GFP_KERNEL);
+                if (!new_entry) {
+                        debug_unregister(irq_ptr->debug_area);
+                        return -ENOMEM;
+                }
+                strlcpy(new_entry->dbf_name, text, QDIO_DBF_NAME_LEN);
+                new_entry->dbf_info = irq_ptr->debug_area;
+                mutex_lock(&qdio_dbf_list_mutex);
+                list_add(&new_entry->dbf_list, &qdio_dbf_list);
+                mutex_unlock(&qdio_dbf_list_mutex);
+        }
+        return 0;
 }
 
 static int qstat_show(struct seq_file *m, void *v)
@@ -300,6 +364,7 @@ int __init qdio_debug_init(void)
 
 void qdio_debug_exit(void)
 {
+        qdio_clear_dbf_list();
         debugfs_remove(debugfs_root);
         if (qdio_dbf_setup)
                 debug_unregister(qdio_dbf_setup);
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index dfac9bfefea3..f33ce8577619 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -75,7 +75,7 @@ static inline void DBF_DEV_HEX(struct qdio_irq *dev, void *addr,
         }
 }
 
-void qdio_allocate_dbf(struct qdio_initialize *init_data,
+int qdio_allocate_dbf(struct qdio_initialize *init_data,
                        struct qdio_irq *irq_ptr);
 void qdio_setup_debug_entries(struct qdio_irq *irq_ptr,
                               struct ccw_device *cdev);
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 77466c4faabb..848e3b64ea6e 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -409,17 +409,16 @@ static inline void qdio_stop_polling(struct qdio_q *q)
                 set_buf_state(q, q->u.in.ack_start, SLSB_P_INPUT_NOT_INIT);
 }
 
-static inline void account_sbals(struct qdio_q *q, int count)
+static inline void account_sbals(struct qdio_q *q, unsigned int count)
 {
-        int pos = 0;
+        int pos;
 
         q->q_stats.nr_sbal_total += count;
         if (count == QDIO_MAX_BUFFERS_MASK) {
                 q->q_stats.nr_sbals[7]++;
                 return;
         }
-        while (count >>= 1)
-                pos++;
+        pos = ilog2(count);
         q->q_stats.nr_sbals[pos]++;
 }
 
@@ -1234,12 +1233,10 @@ int qdio_free(struct ccw_device *cdev)
                 return -ENODEV;
 
         DBF_EVENT("qfree:%4x", cdev->private->schid.sch_no);
+        DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf abandoned");
         mutex_lock(&irq_ptr->setup_mutex);
 
-        if (irq_ptr->debug_area != NULL) {
-                debug_unregister(irq_ptr->debug_area);
-                irq_ptr->debug_area = NULL;
-        }
+        irq_ptr->debug_area = NULL;
         cdev->private->qdio_data = NULL;
         mutex_unlock(&irq_ptr->setup_mutex);
 
@@ -1276,7 +1273,8 @@ int qdio_allocate(struct qdio_initialize *init_data)
                 goto out_err;
 
         mutex_init(&irq_ptr->setup_mutex);
-        qdio_allocate_dbf(init_data, irq_ptr);
+        if (qdio_allocate_dbf(init_data, irq_ptr))
+                goto out_rel;
 
         /*
          * Allocate a page for the chsc calls in qdio_establish.
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 8eec1653c9cc..69ef4f8cfac8 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -77,12 +77,12 @@ MODULE_ALIAS("z90crypt");
  * Module parameter
  */
 int ap_domain_index = -1;       /* Adjunct Processor Domain Index */
-module_param_named(domain, ap_domain_index, int, 0000);
+module_param_named(domain, ap_domain_index, int, S_IRUSR|S_IRGRP);
 MODULE_PARM_DESC(domain, "domain index for ap devices");
 EXPORT_SYMBOL(ap_domain_index);
 
 static int ap_thread_flag = 0;
-module_param_named(poll_thread, ap_thread_flag, int, 0000);
+module_param_named(poll_thread, ap_thread_flag, int, S_IRUSR|S_IRGRP);
 MODULE_PARM_DESC(poll_thread, "Turn on/off poll thread, default is 0 (off).");
 
 static struct device *ap_root_device = NULL;
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 5222ebe15705..0e18c5dcd91f 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -356,7 +356,7 @@ struct zcrypt_ops *zcrypt_msgtype_request(unsigned char *name, int variant)
 
         zops = __ops_lookup(name, variant);
         if (!zops) {
-                request_module(name);
+                request_module("%s", name);
                 zops = __ops_lookup(name, variant);
         }
         if ((!zops) || (!try_module_get(zops->owner)))
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 554349029628..56467df3d6de 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -4198,6 +4198,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)
                 kfree(phba->ep_array);
                 phba->ep_array = NULL;
                 ret = -ENOMEM;
+
+                goto free_memory;
         }
 
         for (i = 0; i < phba->params.cxns_per_ctrl; i++) {
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 6045aa78986a..07934b0b9ee1 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -1008,10 +1008,8 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                 BE2_IPV6 : BE2_IPV4 ;
 
         rc = mgmt_get_if_info(phba, ip_type, &if_info);
-        if (rc) {
-                kfree(if_info);
+        if (rc)
                 return rc;
-        }
 
         if (boot_proto == ISCSI_BOOTPROTO_DHCP) {
                 if (if_info->dhcp_state) {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index f54843023466..785d0d71781e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -516,23 +516,17 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
         skb_pull(skb, sizeof(struct fcoe_hdr));
         fr_len = skb->len - sizeof(struct fcoe_crc_eof);
 
-        stats = per_cpu_ptr(lport->stats, get_cpu());
-        stats->RxFrames++;
-        stats->RxWords += fr_len / FCOE_WORD_TO_BYTE;
-
         fp = (struct fc_frame *)skb;
         fc_frame_init(fp);
         fr_dev(fp) = lport;
         fr_sof(fp) = hp->fcoe_sof;
         if (skb_copy_bits(skb, fr_len, &crc_eof, sizeof(crc_eof))) {
-                put_cpu();
                 kfree_skb(skb);
                 return;
         }
         fr_eof(fp) = crc_eof.fcoe_eof;
         fr_crc(fp) = crc_eof.fcoe_crc32;
         if (pskb_trim(skb, fr_len)) {
-                put_cpu();
                 kfree_skb(skb);
                 return;
         }
@@ -544,7 +538,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
                 port = lport_priv(vn_port);
                 if (!ether_addr_equal(port->data_src_addr, dest_mac)) {
                         BNX2FC_HBA_DBG(lport, "fpma mismatch\n");
-                        put_cpu();
                         kfree_skb(skb);
                         return;
                 }
@@ -552,7 +545,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
         if (fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA &&
             fh->fh_type == FC_TYPE_FCP) {
                 /* Drop FCP data. We dont this in L2 path */
-                put_cpu();
                 kfree_skb(skb);
                 return;
         }
@@ -562,7 +554,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
                 case ELS_LOGO:
                         if (ntoh24(fh->fh_s_id) == FC_FID_FLOGI) {
                                 /* drop non-FIP LOGO */
-                                put_cpu();
                                 kfree_skb(skb);
                                 return;
                         }
@@ -572,22 +563,23 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
 
         if (fh->fh_r_ctl == FC_RCTL_BA_ABTS) {
                 /* Drop incoming ABTS */
-                put_cpu();
                 kfree_skb(skb);
                 return;
         }
 
+        stats = per_cpu_ptr(lport->stats, smp_processor_id());
+        stats->RxFrames++;
+        stats->RxWords += fr_len / FCOE_WORD_TO_BYTE;
+
         if (le32_to_cpu(fr_crc(fp)) !=
                         ~crc32(~0, skb->data, fr_len)) {
                 if (stats->InvalidCRCCount < 5)
                         printk(KERN_WARNING PFX "dropping frame with "
                                "CRC error\n");
                 stats->InvalidCRCCount++;
-                put_cpu();
                 kfree_skb(skb);
                 return;
         }
-        put_cpu();
         fc_exch_recv(lport, fp);
 }
 
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 32a5e0a2a669..7bc47fc7c686 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -282,6 +282,8 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
                                        arr_sz, GFP_KERNEL);
         if (!cmgr->free_list_lock) {
                 printk(KERN_ERR PFX "failed to alloc free_list_lock\n");
+                kfree(cmgr->free_list);
+                cmgr->free_list = NULL;
                 goto mem_err;
         }
 
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 2ebfb2bb0f42..7b23f21f22f1 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -185,6 +185,11 @@ static struct viosrp_crq *crq_queue_next_crq(struct crq_queue *queue)
         if (crq->valid & 0x80) {
                 if (++queue->cur == queue->size)
                         queue->cur = 0;
+
+                /* Ensure the read of the valid bit occurs before reading any
+                 * other bits of the CRQ entry
+                 */
+                rmb();
         } else
                 crq = NULL;
         spin_unlock_irqrestore(&queue->lock, flags);
@@ -203,6 +208,11 @@ static int ibmvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
 {
         struct vio_dev *vdev = to_vio_dev(hostdata->dev);
 
+        /*
+         * Ensure the command buffer is flushed to memory before handing it
+         * over to the VIOS to prevent it from fetching any stale data.
+         */
+        mb();
         return plpar_hcall_norets(H_SEND_CRQ, vdev->unit_address, word1, word2);
 }
 
@@ -797,7 +807,8 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code)
                                        evt->hostdata->dev);
                         if (evt->cmnd_done)
                                 evt->cmnd_done(evt->cmnd);
-                } else if (evt->done)
+                } else if (evt->done && evt->crq.format != VIOSRP_MAD_FORMAT &&
+                           evt->iu.srp.login_req.opcode != SRP_LOGIN_REQ)
                         evt->done(evt);
                 free_event_struct(&evt->hostdata->pool, evt);
                 spin_lock_irqsave(hostdata->host->host_lock, flags);
diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c
index 1e4479f3331a..9270d15ff1a4 100644
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/drivers/scsi/mvsas/mv_94xx.c
@@ -564,7 +564,7 @@ static void mvs_94xx_interrupt_enable(struct mvs_info *mvi)
         u32 tmp;
 
         tmp = mr32(MVS_GBL_CTL);
-        tmp |= (IRQ_SAS_A | IRQ_SAS_B);
+        tmp |= (MVS_IRQ_SAS_A | MVS_IRQ_SAS_B);
         mw32(MVS_GBL_INT_STAT, tmp);
         writel(tmp, regs + 0x0C);
         writel(tmp, regs + 0x10);
@@ -580,7 +580,7 @@ static void mvs_94xx_interrupt_disable(struct mvs_info *mvi)
 
         tmp = mr32(MVS_GBL_CTL);
 
-        tmp &= ~(IRQ_SAS_A | IRQ_SAS_B);
+        tmp &= ~(MVS_IRQ_SAS_A | MVS_IRQ_SAS_B);
         mw32(MVS_GBL_INT_STAT, tmp);
         writel(tmp, regs + 0x0C);
         writel(tmp, regs + 0x10);
@@ -596,7 +596,7 @@ static u32 mvs_94xx_isr_status(struct mvs_info *mvi, int irq)
         if (!(mvi->flags & MVF_FLAG_SOC)) {
                 stat = mr32(MVS_GBL_INT_STAT);
 
-                if (!(stat & (IRQ_SAS_A | IRQ_SAS_B)))
+                if (!(stat & (MVS_IRQ_SAS_A | MVS_IRQ_SAS_B)))
                         return 0;
         }
         return stat;
@@ -606,8 +606,8 @@ static irqreturn_t mvs_94xx_isr(struct mvs_info *mvi, int irq, u32 stat)
 {
         void __iomem *regs = mvi->regs;
 
-        if (((stat & IRQ_SAS_A) && mvi->id == 0) ||
-                        ((stat & IRQ_SAS_B) && mvi->id == 1)) {
+        if (((stat & MVS_IRQ_SAS_A) && mvi->id == 0) ||
+                        ((stat & MVS_IRQ_SAS_B) && mvi->id == 1)) {
                 mw32_f(MVS_INT_STAT, CINT_DONE);
 
                 spin_lock(&mvi->lock);
diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
index 487aa6f97412..14e197497b46 100644
--- a/drivers/scsi/mvsas/mv_94xx.h
+++ b/drivers/scsi/mvsas/mv_94xx.h
@@ -150,35 +150,35 @@ enum chip_register_bits {
 
 enum pci_interrupt_cause {
         /*  MAIN_IRQ_CAUSE (R10200) Bits*/
-        IRQ_COM_IN_I2O_IOP0            = (1 << 0),
-        IRQ_COM_IN_I2O_IOP1            = (1 << 1),
-        IRQ_COM_IN_I2O_IOP2            = (1 << 2),
-        IRQ_COM_IN_I2O_IOP3            = (1 << 3),
-        IRQ_COM_OUT_I2O_HOS0           = (1 << 4),
-        IRQ_COM_OUT_I2O_HOS1           = (1 << 5),
-        IRQ_COM_OUT_I2O_HOS2           = (1 << 6),
-        IRQ_COM_OUT_I2O_HOS3           = (1 << 7),
-        IRQ_PCIF_TO_CPU_DRBL0          = (1 << 8),
-        IRQ_PCIF_TO_CPU_DRBL1          = (1 << 9),
-        IRQ_PCIF_TO_CPU_DRBL2          = (1 << 10),
-        IRQ_PCIF_TO_CPU_DRBL3          = (1 << 11),
-        IRQ_PCIF_DRBL0                 = (1 << 12),
-        IRQ_PCIF_DRBL1                 = (1 << 13),
-        IRQ_PCIF_DRBL2                 = (1 << 14),
-        IRQ_PCIF_DRBL3                 = (1 << 15),
-        IRQ_XOR_A                      = (1 << 16),
-        IRQ_XOR_B                      = (1 << 17),
-        IRQ_SAS_A                      = (1 << 18),
-        IRQ_SAS_B                      = (1 << 19),
-        IRQ_CPU_CNTRL                  = (1 << 20),
-        IRQ_GPIO                       = (1 << 21),
-        IRQ_UART                       = (1 << 22),
-        IRQ_SPI                        = (1 << 23),
-        IRQ_I2C                        = (1 << 24),
-        IRQ_SGPIO                      = (1 << 25),
-        IRQ_COM_ERR                    = (1 << 29),
-        IRQ_I2O_ERR                    = (1 << 30),
-        IRQ_PCIE_ERR                   = (1 << 31),
+        MVS_IRQ_COM_IN_I2O_IOP0        = (1 << 0),
+        MVS_IRQ_COM_IN_I2O_IOP1        = (1 << 1),
+        MVS_IRQ_COM_IN_I2O_IOP2        = (1 << 2),
+        MVS_IRQ_COM_IN_I2O_IOP3        = (1 << 3),
+        MVS_IRQ_COM_OUT_I2O_HOS0       = (1 << 4),
+        MVS_IRQ_COM_OUT_I2O_HOS1       = (1 << 5),
+        MVS_IRQ_COM_OUT_I2O_HOS2       = (1 << 6),
+        MVS_IRQ_COM_OUT_I2O_HOS3       = (1 << 7),
+        MVS_IRQ_PCIF_TO_CPU_DRBL0      = (1 << 8),
+        MVS_IRQ_PCIF_TO_CPU_DRBL1      = (1 << 9),
+        MVS_IRQ_PCIF_TO_CPU_DRBL2      = (1 << 10),
+        MVS_IRQ_PCIF_TO_CPU_DRBL3      = (1 << 11),
+        MVS_IRQ_PCIF_DRBL0             = (1 << 12),
+        MVS_IRQ_PCIF_DRBL1             = (1 << 13),
+        MVS_IRQ_PCIF_DRBL2             = (1 << 14),
+        MVS_IRQ_PCIF_DRBL3             = (1 << 15),
+        MVS_IRQ_XOR_A                  = (1 << 16),
+        MVS_IRQ_XOR_B                  = (1 << 17),
+        MVS_IRQ_SAS_A                  = (1 << 18),
+        MVS_IRQ_SAS_B                  = (1 << 19),
+        MVS_IRQ_CPU_CNTRL              = (1 << 20),
+        MVS_IRQ_GPIO                   = (1 << 21),
+        MVS_IRQ_UART                   = (1 << 22),
+        MVS_IRQ_SPI                    = (1 << 23),
+        MVS_IRQ_I2C                    = (1 << 24),
+        MVS_IRQ_SGPIO                  = (1 << 25),
+        MVS_IRQ_COM_ERR                = (1 << 29),
+        MVS_IRQ_I2O_ERR                = (1 << 30),
+        MVS_IRQ_PCIE_ERR               = (1 << 31),
 };
 
 union reg_phy_cfg {
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index c4f31b21feb8..e90c89f1d480 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -677,7 +677,7 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
  * pm8001_get_phy_settings_info : Read phy setting values.
  * @pm8001_ha : our hba.
  */
-void pm8001_get_phy_settings_info(struct pm8001_hba_info *pm8001_ha)
+static int pm8001_get_phy_settings_info(struct pm8001_hba_info *pm8001_ha)
 {
 
 #ifdef PM8001_READ_VPD
@@ -691,11 +691,15 @@ void pm8001_get_phy_settings_info(struct pm8001_hba_info *pm8001_ha)
         payload.offset = 0;
         payload.length = 4096;
         payload.func_specific = kzalloc(4096, GFP_KERNEL);
+        if (!payload.func_specific)
+                return -ENOMEM;
         /* Read phy setting values from flash */
         PM8001_CHIP_DISP->get_nvmd_req(pm8001_ha, &payload);
         wait_for_completion(&completion);
         pm8001_set_phy_profile(pm8001_ha, sizeof(u8), payload.func_specific);
+        kfree(payload.func_specific);
 #endif
+        return 0;
 }
 
 #ifdef PM8001_USE_MSIX
@@ -879,8 +883,11 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
         pm8001_init_sas_add(pm8001_ha);
         /* phy setting support for motherboard controller */
         if (pdev->subsystem_vendor != PCI_VENDOR_ID_ADAPTEC2 &&
-                pdev->subsystem_vendor != 0)
-                pm8001_get_phy_settings_info(pm8001_ha);
+                pdev->subsystem_vendor != 0) {
+                rc = pm8001_get_phy_settings_info(pm8001_ha);
+                if (rc)
+                        goto err_out_shost;
+        }
         pm8001_post_sas_ha_init(shost, chip);
         rc = sas_register_ha(SHOST_TO_SAS_HA(shost));
         if (rc)
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 4b188b0164e9..e632e14180cf 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1128,7 +1128,7 @@ static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
         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;
+        ctio->u.status1.ox_id = cpu_to_le16(entry->fcp_hdr_le.ox_id);
 
         qla2x00_start_iocbs(vha, vha->req);
 
@@ -1262,6 +1262,7 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
 {
         struct atio_from_isp *atio = &mcmd->orig_iocb.atio;
         struct ctio7_to_24xx *ctio;
+        uint16_t temp;
 
         ql_dbg(ql_dbg_tgt, ha, 0xe008,
             "Sending task mgmt CTIO7 (ha=%p, atio=%p, resp_code=%x\n",
@@ -1292,7 +1293,8 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
         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);
+        temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
+        ctio->u.status1.ox_id = cpu_to_le16(temp);
         ctio->u.status1.scsi_status =
             __constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
         ctio->u.status1.response_len = __constant_cpu_to_le16(8);
@@ -1513,6 +1515,7 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
         struct ctio7_to_24xx *pkt;
         struct qla_hw_data *ha = vha->hw;
         struct atio_from_isp *atio = &prm->cmd->atio;
+        uint16_t temp;
 
         pkt = (struct ctio7_to_24xx *)vha->req->ring_ptr;
         prm->pkt = pkt;
@@ -1541,13 +1544,13 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
         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);
+        temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
+        pkt->u.status0.ox_id = cpu_to_le16(temp);
         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));
+            vha->vp_idx, pkt->handle, QLA_TGT_TIMEOUT, temp);
         return 0;
 }
 
@@ -2619,6 +2622,7 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
         struct qla_hw_data *ha = vha->hw;
         request_t *pkt;
         int ret = 0;
+        uint16_t temp;
 
         ql_dbg(ql_dbg_tgt, vha, 0xe01c, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
 
@@ -2655,7 +2659,8 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
         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);
+        temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
+        ctio24->u.status1.ox_id = cpu_to_le16(temp);
 
         /* Most likely, it isn't needed */
         ctio24->u.status1.residual = get_unaligned((uint32_t *)
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index e0a58fd13f66..d1d24fb0160a 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -443,7 +443,7 @@ struct ctio7_to_24xx {
                         uint16_t reserved1;
                         __le16 flags;
                         uint32_t residual;
-                        uint16_t ox_id;
+                        __le16 ox_id;
                         uint16_t scsi_status;
                         uint32_t relative_offset;
                         uint32_t reserved2;
@@ -458,7 +458,7 @@ struct ctio7_to_24xx {
                         uint16_t sense_length;
                         uint16_t flags;
                         uint32_t residual;
-                        uint16_t ox_id;
+                        __le16 ox_id;
                         uint16_t scsi_status;
                         uint16_t response_len;
                         uint16_t reserved;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index cbe38e5e7955..7e957918f33f 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -131,7 +131,7 @@ scmd_eh_abort_handler(struct work_struct *work)
                                     "aborting command %p\n", scmd));
                 rtn = scsi_try_to_abort_cmd(sdev->host->hostt, scmd);
                 if (rtn == SUCCESS) {
-                        scmd->result |= DID_TIME_OUT << 16;
+                        set_host_byte(scmd, DID_TIME_OUT);
                         if (scsi_host_eh_past_deadline(sdev->host)) {
                                 SCSI_LOG_ERROR_RECOVERY(3,
                                         scmd_printk(KERN_INFO, scmd,
@@ -167,7 +167,7 @@ scmd_eh_abort_handler(struct work_struct *work)
                         scmd_printk(KERN_WARNING, scmd,
                                     "scmd %p terminate "
                                     "aborted command\n", scmd));
-                scmd->result |= DID_TIME_OUT << 16;
+                set_host_byte(scmd, DID_TIME_OUT);
                 scsi_finish_command(scmd);
         }
 }
@@ -287,15 +287,15 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
         else if (host->hostt->eh_timed_out)
                 rtn = host->hostt->eh_timed_out(scmd);
 
-        if (rtn == BLK_EH_NOT_HANDLED && !host->hostt->no_async_abort)
-                if (scsi_abort_command(scmd) == SUCCESS)
+        if (rtn == BLK_EH_NOT_HANDLED) {
+                if (!host->hostt->no_async_abort &&
+                    scsi_abort_command(scmd) == SUCCESS)
                         return BLK_EH_NOT_HANDLED;
 
-        scmd->result |= DID_TIME_OUT << 16;
-
-        if (unlikely(rtn == BLK_EH_NOT_HANDLED &&
-                     !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)))
-                rtn = BLK_EH_HANDLED;
+                set_host_byte(scmd, DID_TIME_OUT);
+                if (!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))
+                        rtn = BLK_EH_HANDLED;
+        }
 
         return rtn;
 }
@@ -1777,7 +1777,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
                 break;
         case DID_ABORT:
                 if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {
-                        scmd->result |= DID_TIME_OUT << 16;
+                        set_host_byte(scmd, DID_TIME_OUT);
                         return SUCCESS;
                 }
         case DID_NO_CONNECT:
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index f80908f74ca9..521f5838594b 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2549,6 +2549,7 @@ fc_rport_final_delete(struct work_struct *work)
                         fc_flush_devloss(shost);
                 if (!cancel_delayed_work(&rport->dev_loss_work))
                         fc_flush_devloss(shost);
+                cancel_work_sync(&rport->scan_work);
                 spin_lock_irqsave(shost->host_lock, flags);
                 rport->flags &= ~FC_RPORT_DEVLOSS_PENDING;
         }
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e9689d57ccb6..6825eda1114a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2441,7 +2441,10 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
                 }
 
                 sdkp->DPOFUA = (data.device_specific & 0x10) != 0;
-                if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {
+                if (sdp->broken_fua) {
+                        sd_first_printk(KERN_NOTICE, sdkp, "Disabling FUA\n");
+                        sdkp->DPOFUA = 0;
+                } else if (sdkp->DPOFUA && !sdkp->device->use_10_for_rw) {
                         sd_first_printk(KERN_NOTICE, sdkp,
                                   "Uses READ/WRITE(6), disabling FUA\n");
                         sdkp->DPOFUA = 0;
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 89ee5929eb6d..308256b5e4cb 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -237,6 +237,16 @@ static void virtscsi_req_done(struct virtqueue *vq)
         virtscsi_vq_done(vscsi, req_vq, virtscsi_complete_cmd);
 };
 
+static void virtscsi_poll_requests(struct virtio_scsi *vscsi)
+{
+        int i, num_vqs;
+
+        num_vqs = vscsi->num_queues;
+        for (i = 0; i < num_vqs; i++)
+                virtscsi_vq_done(vscsi, &vscsi->req_vqs[i],
+                                 virtscsi_complete_cmd);
+}
+
 static void virtscsi_complete_free(struct virtio_scsi *vscsi, void *buf)
 {
         struct virtio_scsi_cmd *cmd = buf;
@@ -253,6 +263,8 @@ static void virtscsi_ctrl_done(struct virtqueue *vq)
         virtscsi_vq_done(vscsi, &vscsi->ctrl_vq, virtscsi_complete_free);
 };
 
+static void virtscsi_handle_event(struct work_struct *work);
+
 static int virtscsi_kick_event(struct virtio_scsi *vscsi,
                                struct virtio_scsi_event_node *event_node)
 {
@@ -260,6 +272,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi,
         struct scatterlist sg;
         unsigned long flags;
 
+        INIT_WORK(&event_node->work, virtscsi_handle_event);
         sg_init_one(&sg, &event_node->event, sizeof(struct virtio_scsi_event));
 
         spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags);
@@ -377,7 +390,6 @@ static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf)
 {
         struct virtio_scsi_event_node *event_node = buf;
 
-        INIT_WORK(&event_node->work, virtscsi_handle_event);
         schedule_work(&event_node->work);
 }
 
@@ -589,6 +601,18 @@ static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
             cmd->resp.tmf.response == VIRTIO_SCSI_S_FUNCTION_SUCCEEDED)
                 ret = SUCCESS;
 
+        /*
+         * The spec guarantees that all requests related to the TMF have
+         * been completed, but the callback might not have run yet if
+         * we're using independent interrupts (e.g. MSI).  Poll the
+         * virtqueues once.
+         *
+         * In the abort case, sc->scsi_done will do nothing, because
+         * the block layer must have detected a timeout and as a result
+         * REQ_ATOM_COMPLETE has been set.
+         */
+        virtscsi_poll_requests(vscsi);
+
 out:
         mempool_free(cmd, virtscsi_cmd_pool);
         return ret;
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index f6759dc0153b..c41ff148a2b4 100644
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -368,7 +368,7 @@ int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
          * otherwise we use the default. Also we use the default FIFO
          * thresholds for now.
          */
-        *burst_code = chip_info ? chip_info->dma_burst_size : 16;
+        *burst_code = chip_info ? chip_info->dma_burst_size : 1;
         *threshold = SSCR1_RxTresh(RX_THRESH_DFLT)
                    | SSCR1_TxTresh(TX_THRESH_DFLT);
 
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index a98df7eeb42d..fe792106bdc5 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -118,6 +118,7 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
          */
         orig = readl(drv_data->ioaddr + offset + SPI_CS_CONTROL);
 
+        /* Test SPI_CS_CONTROL_SW_MODE bit enabling */
         value = orig | SPI_CS_CONTROL_SW_MODE;
         writel(value, drv_data->ioaddr + offset + SPI_CS_CONTROL);
         value = readl(drv_data->ioaddr + offset + SPI_CS_CONTROL);
@@ -126,10 +127,13 @@ static void lpss_ssp_setup(struct driver_data *drv_data)
                 goto detection_done;
         }
 
-        value &= ~SPI_CS_CONTROL_SW_MODE;
+        orig = readl(drv_data->ioaddr + offset + SPI_CS_CONTROL);
+
+        /* Test SPI_CS_CONTROL_SW_MODE bit disabling */
+        value = orig & ~SPI_CS_CONTROL_SW_MODE;
         writel(value, drv_data->ioaddr + offset + SPI_CS_CONTROL);
         value = readl(drv_data->ioaddr + offset + SPI_CS_CONTROL);
-        if (value != orig) {
+        if (value != (orig & ~SPI_CS_CONTROL_SW_MODE)) {
                 offset = 0x800;
                 goto detection_done;
         }
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index fc1de86d3c8a..c08da380cb23 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -424,31 +424,6 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer)
         return 0;
 }
 
-static void spi_qup_set_cs(struct spi_device *spi, bool enable)
-{
-        struct spi_qup *controller = spi_master_get_devdata(spi->master);
-
-        u32 iocontol, mask;
-
-        iocontol = readl_relaxed(controller->base + SPI_IO_CONTROL);
-
-        /* Disable auto CS toggle and use manual */
-        iocontol &= ~SPI_IO_C_MX_CS_MODE;
-        iocontol |= SPI_IO_C_FORCE_CS;
-
-        iocontol &= ~SPI_IO_C_CS_SELECT_MASK;
-        iocontol |= SPI_IO_C_CS_SELECT(spi->chip_select);
-
-        mask = SPI_IO_C_CS_N_POLARITY_0 << spi->chip_select;
-
-        if (enable)
-                iocontol |= mask;
-        else
-                iocontol &= ~mask;
-
-        writel_relaxed(iocontol, controller->base + SPI_IO_CONTROL);
-}
-
 static int spi_qup_transfer_one(struct spi_master *master,
                               struct spi_device *spi,
                               struct spi_transfer *xfer)
@@ -571,12 +546,16 @@ static int spi_qup_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        /* use num-cs unless not present or out of range */
+        if (of_property_read_u16(dev->of_node, "num-cs",
+                        &master->num_chipselect) ||
+                        (master->num_chipselect > SPI_NUM_CHIPSELECTS))
+                master->num_chipselect = SPI_NUM_CHIPSELECTS;
+
         master->bus_num = pdev->id;
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
-        master->num_chipselect = SPI_NUM_CHIPSELECTS;
         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
         master->max_speed_hz = max_freq;
-        master->set_cs = spi_qup_set_cs;
         master->transfer_one = spi_qup_transfer_one;
         master->dev.of_node = pdev->dev.of_node;
         master->auto_runtime_pm = true;
@@ -640,16 +619,19 @@ static int spi_qup_probe(struct platform_device *pdev)
         if (ret)
                 goto error;
 
-        ret = devm_spi_register_master(dev, master);
-        if (ret)
-                goto error;
-
         pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC);
         pm_runtime_use_autosuspend(dev);
         pm_runtime_set_active(dev);
         pm_runtime_enable(dev);
+
+        ret = devm_spi_register_master(dev, master);
+        if (ret)
+                goto disable_pm;
+
         return 0;
 
+disable_pm:
+        pm_runtime_disable(&pdev->dev);
 error:
         clk_disable_unprepare(cclk);
         clk_disable_unprepare(iclk);
diff --git a/drivers/spi/spi-sh-sci.c b/drivers/spi/spi-sh-sci.c
index 1f56ef651d1a..b83dd733684c 100644
--- a/drivers/spi/spi-sh-sci.c
+++ b/drivers/spi/spi-sh-sci.c
@@ -175,9 +175,9 @@ static int sh_sci_spi_remove(struct platform_device *dev)
 {
         struct sh_sci_spi *sp = platform_get_drvdata(dev);
 
-        iounmap(sp->membase);
-        setbits(sp, PIN_INIT, 0);
         spi_bitbang_stop(&sp->bitbang);
+        setbits(sp, PIN_INIT, 0);
+        iounmap(sp->membase);
         spi_master_put(sp->bitbang.master);
         return 0;
 }
diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
index 2c617834dc46..c341ac11c5a3 100644
--- a/drivers/staging/android/timed_output.c
+++ b/drivers/staging/android/timed_output.c
@@ -97,7 +97,6 @@ void timed_output_dev_unregister(struct timed_output_dev *tdev)
 {
         tdev->enable(tdev, 0);
         device_destroy(timed_output_class, MKDEV(0, tdev->index));
-        dev_set_drvdata(tdev->dev, NULL);
 }
 EXPORT_SYMBOL_GPL(timed_output_dev_unregister);
 
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 5d56428d508a..a2f6957e7ee9 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -651,6 +651,7 @@ config COMEDI_ADDI_APCI_1516
 
 config COMEDI_ADDI_APCI_1564
         tristate "ADDI-DATA APCI_1564 support"
+        select COMEDI_ADDI_WATCHDOG
         ---help---
           Enable support for ADDI-DATA APCI_1564 cards
 
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index b36feb080cba..fa38be0982f9 100644
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -36,10 +36,11 @@ config IIO_SIMPLE_DUMMY_EVENTS
          Add some dummy events to the simple dummy driver.
 
 config IIO_SIMPLE_DUMMY_BUFFER
-       boolean "Buffered capture support"
-       select IIO_KFIFO_BUF
-       help
-         Add buffered data capture to the simple dummy driver.
+        boolean "Buffered capture support"
+        select IIO_BUFFER
+        select IIO_KFIFO_BUF
+        help
+          Add buffered data capture to the simple dummy driver.
 
 endif # IIO_SIMPLE_DUMMY
 
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 357cef2a6f4c..7194bd138762 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -465,7 +465,7 @@ static int ad7291_probe(struct i2c_client *client,
         struct ad7291_platform_data *pdata = client->dev.platform_data;
         struct ad7291_chip_info *chip;
         struct iio_dev *indio_dev;
-        int ret = 0;
+        int ret;
 
         indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
         if (!indio_dev)
@@ -475,7 +475,7 @@ static int ad7291_probe(struct i2c_client *client,
         if (pdata && pdata->use_external_ref) {
                 chip->reg = devm_regulator_get(&client->dev, "vref");
                 if (IS_ERR(chip->reg))
-                        return ret;
+                        return PTR_ERR(chip->reg);
 
                 ret = regulator_enable(chip->reg);
                 if (ret)
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index dae8d1a9038e..52d7517b342e 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -846,6 +846,14 @@ static int mxs_lradc_read_single(struct iio_dev *iio_dev, int chan, int *val)
                         LRADC_CTRL1);
         mxs_lradc_reg_clear(lradc, 0xff, LRADC_CTRL0);
 
+        /* Enable / disable the divider per requirement */
+        if (test_bit(chan, &lradc->is_divided))
+                mxs_lradc_reg_set(lradc, 1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
+                        LRADC_CTRL2);
+        else
+                mxs_lradc_reg_clear(lradc,
+                        1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, LRADC_CTRL2);
+
         /* Clean the slot's previous content, then set new one. */
         mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0),
                         LRADC_CTRL4);
@@ -961,15 +969,11 @@ static int mxs_lradc_write_raw(struct iio_dev *iio_dev,
                 if (val == scale_avail[MXS_LRADC_DIV_DISABLED].integer &&
                     val2 == scale_avail[MXS_LRADC_DIV_DISABLED].nano) {
                         /* divider by two disabled */
-                        writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
-                               lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_CLR);
                         clear_bit(chan->channel, &lradc->is_divided);
                         ret = 0;
                 } else if (val == scale_avail[MXS_LRADC_DIV_ENABLED].integer &&
                            val2 == scale_avail[MXS_LRADC_DIV_ENABLED].nano) {
                         /* divider by two enabled */
-                        writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
-                               lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_SET);
                         set_bit(chan->channel, &lradc->is_divided);
                         ret = 0;
                 }
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 9e0f2a9c73ae..ab338e3ddd05 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -667,9 +667,13 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
         chip->tsl2x7x_config[TSL2X7X_PRX_COUNT] =
                         chip->tsl2x7x_settings.prox_pulse_count;
         chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHLO] =
-        chip->tsl2x7x_settings.prox_thres_low;
+                        (chip->tsl2x7x_settings.prox_thres_low) & 0xFF;
+        chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHHI] =
+                        (chip->tsl2x7x_settings.prox_thres_low >> 8) & 0xFF;
         chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHLO] =
-                        chip->tsl2x7x_settings.prox_thres_high;
+                        (chip->tsl2x7x_settings.prox_thres_high) & 0xFF;
+        chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHHI] =
+                        (chip->tsl2x7x_settings.prox_thres_high >> 8) & 0xFF;
 
         /* and make sure we're not already on */
         if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) {
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index b5678328fc40..4ca61afdf622 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -173,6 +173,13 @@ static int imx_pd_register(struct drm_device *drm,
         if (ret)
                 return ret;
 
+        /* set the connector's dpms to OFF so that
+         * drm_helper_connector_dpms() won't return
+         * immediately since the current state is ON
+         * at this point.
+         */
+        imxpd->connector.dpms = DRM_MODE_DPMS_OFF;
+
         drm_encoder_helper_add(&imxpd->encoder, &imx_pd_encoder_helper_funcs);
         drm_encoder_init(drm, &imxpd->encoder, &imx_pd_encoder_funcs,
                          DRM_MODE_ENCODER_NONE);
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 0acacab95a48..46f5abcbaeeb 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -298,7 +298,7 @@ int rtl8723a_FirmwareDownload(struct rtw_adapter *padapter)
         RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __func__));
 
         if (IS_8723A_A_CUT(pHalData->VersionID)) {
-                fw_name = "rtlwifi/rtl8723aufw.bin";
+                fw_name = "rtlwifi/rtl8723aufw_A.bin";
                 RT_TRACE(_module_hal_init_c_, _drv_info_,
                          ("rtl8723a_FirmwareDownload: R8723FwImageArray_UMC "
                           "for RTL8723A A CUT\n"));
diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index 4e32003a4437..1fb34386a4e5 100644
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -29,7 +29,9 @@ MODULE_AUTHOR("Realtek Semiconductor Corp.");
 MODULE_AUTHOR("Larry Finger <Larry.Finger@lwfinger.net>");
 MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@redhat.com>");
 MODULE_VERSION(DRIVERVERSION);
-MODULE_FIRMWARE("rtlwifi/rtl8821aefw.bin");
+MODULE_FIRMWARE("rtlwifi/rtl8723aufw_A.bin");
+MODULE_FIRMWARE("rtlwifi/rtl8723aufw_B.bin");
+MODULE_FIRMWARE("rtlwifi/rtl8723aufw_B_NoBT.bin");
 
 /* module param defaults */
 static int rtw_chip_version = 0x00;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 8945b4e3a2a6..cb50120ed7b5 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -280,8 +280,10 @@ static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt)
                                         OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL);
 
                 /* Wait until the state has moved to ON */
-                while (*pdata->dsp_prm_read(OMAP3430_IVA2_MOD, OMAP2_PM_PWSTST)&
-                                        OMAP_INTRANSITION_MASK);
+                while ((*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD,
+                                              OMAP2_PM_PWSTST) &
+                                                OMAP_INTRANSITION_MASK)
+                        ;
                 /* Disable Automatic transition */
                 (*pdata->dsp_cm_write)(OMAP34XX_CLKSTCTRL_DISABLE_AUTO,
                                         OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL);
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 5663f4d19d02..1f4c794f5fcc 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1309,7 +1309,7 @@ iscsit_check_dataout_hdr(struct iscsi_conn *conn, unsigned char *buf,
         if (cmd->data_direction != DMA_TO_DEVICE) {
                 pr_err("Command ITT: 0x%08x received DataOUT for a"
                         " NON-WRITE command.\n", cmd->init_task_tag);
-                return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, buf);
+                return iscsit_dump_data_payload(conn, payload_length, 1);
         }
         se_cmd = &cmd->se_cmd;
         iscsit_mod_dataout_timer(cmd);
diff --git a/drivers/target/iscsi/iscsi_target_auth.c b/drivers/target/iscsi/iscsi_target_auth.c
index 19b842c3e0b3..ab4915c0d933 100644
--- a/drivers/target/iscsi/iscsi_target_auth.c
+++ b/drivers/target/iscsi/iscsi_target_auth.c
@@ -174,7 +174,6 @@ static int chap_server_compute_md5(
         char *nr_out_ptr,
         unsigned int *nr_out_len)
 {
-        char *endptr;
         unsigned long id;
         unsigned char id_as_uchar;
         unsigned char digest[MD5_SIGNATURE_SIZE];
@@ -320,9 +319,14 @@ static int chap_server_compute_md5(
         }
 
         if (type == HEX)
-                id = simple_strtoul(&identifier[2], &endptr, 0);
+                ret = kstrtoul(&identifier[2], 0, &id);
         else
-                id = simple_strtoul(identifier, &endptr, 0);
+                ret = kstrtoul(identifier, 0, &id);
+
+        if (ret < 0) {
+                pr_err("kstrtoul() failed for CHAP identifier: %d\n", ret);
+                goto out;
+        }
         if (id > 255) {
                 pr_err("chap identifier: %lu greater than 255\n", id);
                 goto out;
@@ -351,6 +355,10 @@ static int chap_server_compute_md5(
                 pr_err("Unable to convert incoming challenge\n");
                 goto out;
         }
+        if (challenge_len > 1024) {
+                pr_err("CHAP_C exceeds maximum binary size of 1024 bytes\n");
+                goto out;
+        }
         /*
          * During mutual authentication, the CHAP_C generated by the
          * initiator must not match the original CHAP_C generated by
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index fecb69535a15..5e71ac609418 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -1216,7 +1216,7 @@ old_sess_out:
 static int __iscsi_target_login_thread(struct iscsi_np *np)
 {
         u8 *buffer, zero_tsih = 0;
-        int ret = 0, rc, stop;
+        int ret = 0, rc;
         struct iscsi_conn *conn = NULL;
         struct iscsi_login *login;
         struct iscsi_portal_group *tpg = NULL;
@@ -1230,6 +1230,9 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         if (np->np_thread_state == ISCSI_NP_THREAD_RESET) {
                 np->np_thread_state = ISCSI_NP_THREAD_ACTIVE;
                 complete(&np->np_restart_comp);
+        } else if (np->np_thread_state == ISCSI_NP_THREAD_SHUTDOWN) {
+                spin_unlock_bh(&np->np_thread_lock);
+                goto exit;
         } else {
                 np->np_thread_state = ISCSI_NP_THREAD_ACTIVE;
         }
@@ -1422,10 +1425,8 @@ old_sess_out:
         }
 
 out:
-        stop = kthread_should_stop();
-        /* Wait for another socket.. */
-        if (!stop)
-                return 1;
+        return 1;
+
 exit:
         iscsi_stop_login_thread_timer(np);
         spin_lock_bh(&np->np_thread_lock);
@@ -1442,7 +1443,7 @@ int iscsi_target_login_thread(void *arg)
 
         allow_signal(SIGINT);
 
-        while (!kthread_should_stop()) {
+        while (1) {
                 ret = __iscsi_target_login_thread(np);
                 /*
                  * We break and exit here unless another sock_accept() call
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 53e157cb8c54..fd90b28f1d94 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -1295,6 +1295,8 @@ int iscsit_tx_login_rsp(struct iscsi_conn *conn, u8 status_class, u8 status_deta
         login->login_failed = 1;
         iscsit_collect_login_stats(conn, status_class, status_detail);
 
+        memset(&login->rsp[0], 0, ISCSI_HDR_LEN);
+
         hdr     = (struct iscsi_login_rsp *)&login->rsp[0];
         hdr->opcode             = ISCSI_OP_LOGIN_RSP;
         hdr->status_class       = status_class;
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 6d2f37578b29..8c64b8776a96 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -239,6 +239,7 @@ static void tcm_loop_submission_work(struct work_struct *work)
         return;
 
 out_done:
+        kmem_cache_free(tcm_loop_cmd_cache, tl_cmd);
         sc->scsi_done(sc);
         return;
 }
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 11d26fe65bfb..98da90167159 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -616,6 +616,7 @@ void core_dev_unexport(
         dev->export_count--;
         spin_unlock(&hba->device_lock);
 
+        lun->lun_sep = NULL;
         lun->lun_se_dev = NULL;
 }
 
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index a8aaf6ac2ae2..946562389ca8 100644
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -129,7 +129,10 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
 
                 tc_device_get_irq(tdev);
 
-                device_register(&tdev->dev);
+                if (device_register(&tdev->dev)) {
+                        put_device(&tdev->dev);
+                        goto out_err;
+                }
                 list_add_tail(&tdev->node, &tbus->devices);
 
 out_err:
@@ -148,7 +151,10 @@ static int __init tc_init(void)
 
         INIT_LIST_HEAD(&tc_bus.devices);
         dev_set_name(&tc_bus.dev, "tc");
-        device_register(&tc_bus.dev);
+        if (device_register(&tc_bus.dev)) {
+                put_device(&tc_bus.dev);
+                return 0;
+        }
 
         if (tc_bus.info.slot_size) {
                 unsigned int tc_clock = tc_get_speed(&tc_bus) / 100000;
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index f95569dedc88..f44f1ba762c3 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1214,15 +1214,16 @@ static void n_tty_receive_parity_error(struct tty_struct *tty, unsigned char c)
 {
         struct n_tty_data *ldata = tty->disc_data;
 
-        if (I_IGNPAR(tty))
-                return;
-        if (I_PARMRK(tty)) {
-                put_tty_queue('\377', ldata);
-                put_tty_queue('\0', ldata);
-                put_tty_queue(c, ldata);
-        } else  if (I_INPCK(tty))
-                put_tty_queue('\0', ldata);
-        else
+        if (I_INPCK(tty)) {
+                if (I_IGNPAR(tty))
+                        return;
+                if (I_PARMRK(tty)) {
+                        put_tty_queue('\377', ldata);
+                        put_tty_queue('\0', ldata);
+                        put_tty_queue(c, ldata);
+                } else
+                        put_tty_queue('\0', ldata);
+        } else
                 put_tty_queue(c, ldata);
         if (waitqueue_active(&tty->read_wait))
                 wake_up_interruptible(&tty->read_wait);
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 27f7ad6b74c1..7a91c6d1eb7d 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -2357,7 +2357,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index cfef801a49d4..4858b8a99d3b 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -144,8 +144,11 @@ static int __init early_serial8250_setup(struct earlycon_device *device,
         if (!(device->port.membase || device->port.iobase))
                 return 0;
 
-        if (!device->baud)
+        if (!device->baud) {
                 device->baud = probe_baud(&device->port);
+                snprintf(device->options, sizeof(device->options), "%u",
+                         device->baud);
+        }
 
         init_port(device);
 
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 501667e3e3f5..323376668b72 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -185,6 +185,12 @@ static void altera_uart_set_termios(struct uart_port *port,
         uart_update_timeout(port, termios->c_cflag, baud);
         altera_uart_writel(port, baudclk, ALTERA_UART_DIVISOR_REG);
         spin_unlock_irqrestore(&port->lock, flags);
+
+        /*
+         * FIXME: port->read_status_mask and port->ignore_status_mask
+         * need to be initialized based on termios settings for
+         * INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT
+         */
 }
 
 static void altera_uart_rx_chars(struct altera_uart *pp)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 01c9e72433e1..971af1e22d0f 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -420,7 +420,7 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
         uap->port.read_status_mask = UART01x_RSR_OE;
         if (termios->c_iflag & INPCK)
                 uap->port.read_status_mask |= UART01x_RSR_FE | UART01x_RSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uap->port.read_status_mask |= UART01x_RSR_BE;
 
         /*
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 908a6e3142a2..0e26dcbd5ea4 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1744,7 +1744,7 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = UART011_DR_OE | 255;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART011_DR_FE | UART011_DR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART011_DR_BE;
 
         /*
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 3fceae099c44..c4f750314100 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1932,7 +1932,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = ATMEL_US_OVRE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (ATMEL_US_FRAME | ATMEL_US_PARE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= ATMEL_US_RXBRK;
 
         if (atmel_use_pdc_rx(port))
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index a47421e4627c..231519022b73 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -567,7 +567,7 @@ static void bcm_uart_set_termios(struct uart_port *port,
                 port->read_status_mask |= UART_FIFO_FRAMEERR_MASK;
                 port->read_status_mask |= UART_FIFO_PARERR_MASK;
         }
-        if (new->c_iflag & (BRKINT))
+        if (new->c_iflag & (IGNBRK | BRKINT))
                 port->read_status_mask |= UART_FIFO_BRKDET_MASK;
 
         port->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 869ceba2ec57..ac86a20992e9 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -833,7 +833,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = OE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (FE | PE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= BI;
 
         /*
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 2f2b2e538a54..cdbbc788230a 100644
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -625,7 +625,7 @@ static void dz_set_termios(struct uart_port *uport, struct ktermios *termios,
         dport->port.read_status_mask = DZ_OERR;
         if (termios->c_iflag & INPCK)
                 dport->port.read_status_mask |= DZ_FERR | DZ_PERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 dport->port.read_status_mask |= DZ_BREAK;
 
         /* characters to ignore */
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 5131b5ee6164..a514ee6f5406 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -25,7 +25,7 @@
 #include <asm/serial.h>
 
 static struct console early_con = {
-        .name =         "earlycon",
+        .name =         "uart", /* 8250 console switch requires this name */
         .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index b373f6416e8c..3b0ee9afd76f 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -407,7 +407,7 @@ static void efm32_uart_set_termios(struct uart_port *port,
         if (new->c_iflag & INPCK)
                 port->read_status_mask |=
                         UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
-        if (new->c_iflag & (BRKINT | PARMRK))
+        if (new->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SW_UARTn_RXDATAX_BERR;
 
         port->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index c5eb897de9de..49385c86cfba 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -902,7 +902,7 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,
         sport->port.read_status_mask = 0;
         if (termios->c_iflag & INPCK)
                 sport->port.read_status_mask |= (UARTSR1_FE | UARTSR1_PE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 sport->port.read_status_mask |= UARTSR1_FE;
 
         /* characters to ignore */
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index 1d9420548e16..1efd4c36ba0c 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -850,7 +850,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag,
         up->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
                 up->port.read_status_mask |= CRC_ERR | PAR_ERR;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= BRK_ABRT;
 
         up->port.ignore_status_mask = 0;
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 9cd9b4eba9fc..68f2c53e0b54 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -737,7 +737,7 @@ static void m32r_sio_set_termios(struct uart_port *port,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 2a99d0c61b9e..ba285cd45b59 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -835,7 +835,7 @@ static void max310x_set_termios(struct uart_port *port,
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= MAX310X_LSR_RXPAR_BIT |
                                           MAX310X_LSR_FRERR_BIT;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= MAX310X_LSR_RXBRK_BIT;
 
         /* Set status ignore mask */
diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 0edfaf8cd269..a6f085717f94 100644
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -248,6 +248,12 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios,
                 mr1 |= MCFUART_MR1_PARITYNONE;
         }
 
+        /*
+         * FIXME: port->read_status_mask and port->ignore_status_mask
+         * need to be initialized based on termios settings for
+         * INPCK, IGNBRK, IGNPAR, PARMRK, BRKINT
+         */
+
         if (termios->c_cflag & CSTOPB)
                 mr2 |= MCFUART_MR2_STOP2;
         else
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index 52c930fac210..445799dc9846 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -977,7 +977,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /* Characters to ignore */
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index e30a3ca3cea3..759c6a6fa74a 100644
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -1458,7 +1458,7 @@ static void mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
                 pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE
                         | SDMA_DESC_CMDSTAT_FR;
 
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR;
 
         /* Characters/events to ignore */
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 778e376f197e..72000a6d5af0 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -582,7 +582,7 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios,
         port->read_status_mask = 0;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= UART_SR_PAR_FRAME_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_SR_RX_BREAK;
 
         uart_update_timeout(port, termios->c_cflag, baud);
@@ -991,7 +991,7 @@ static const struct of_device_id msm_uartdm_table[] = {
         { }
 };
 
-static int __init msm_serial_probe(struct platform_device *pdev)
+static int msm_serial_probe(struct platform_device *pdev)
 {
         struct msm_port *msm_port;
         struct resource *resource;
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 4b5b3c2fe328..86de4477d98a 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -604,7 +604,7 @@ static void mxs_auart_settermios(struct uart_port *u,
 
         if (termios->c_iflag & INPCK)
                 u->read_status_mask |= AUART_STAT_PERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 u->read_status_mask |= AUART_STAT_BERR;
 
         /*
diff --git a/drivers/tty/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
index 0a4dd70d29eb..7a6745601d4e 100644
--- a/drivers/tty/serial/netx-serial.c
+++ b/drivers/tty/serial/netx-serial.c
@@ -419,7 +419,7 @@ netx_set_termios(struct uart_port *port, struct ktermios *termios,
         }
 
         port->read_status_mask = 0;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SR_BE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= SR_PE | SR_FE;
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index e9d420ff3931..8193635103ee 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1092,7 +1092,7 @@ static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag,
         uap->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
                 uap->port.read_status_mask |= CRC_ERR | PAR_ERR;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 uap->port.read_status_mask |= BRK_ABRT;
 
         uap->port.ignore_status_mask = 0;
diff --git a/drivers/tty/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
index de6c05c63683..2ba24a45c97f 100644
--- a/drivers/tty/serial/pnx8xxx_uart.c
+++ b/drivers/tty/serial/pnx8xxx_uart.c
@@ -477,7 +477,7 @@ pnx8xxx_set_termios(struct uart_port *port, struct ktermios *termios,
                 sport->port.read_status_mask |=
                         FIFO_TO_SM(PNX8XXX_UART_FIFO_RXFE) |
                         FIFO_TO_SM(PNX8XXX_UART_FIFO_RXPAR);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 sport->port.read_status_mask |=
                         ISTAT_TO_SM(PNX8XXX_UART_INT_BREAK);
 
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 9e7ee39f8b2a..c638c53cd2b6 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -492,7 +492,7 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 329337711bb0..c1d3ebdf3b97 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -66,7 +66,7 @@ static void dbg(const char *fmt, ...)
         char buff[256];
 
         va_start(va, fmt);
-        vscnprintf(buff, sizeof(buf), fmt, va);
+        vscnprintf(buff, sizeof(buff), fmt, va);
         va_end(va);
 
         printascii(buff);
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
index a7cdec2962dd..771f361c47ea 100644
--- a/drivers/tty/serial/sb1250-duart.c
+++ b/drivers/tty/serial/sb1250-duart.c
@@ -596,7 +596,7 @@ static void sbd_set_termios(struct uart_port *uport, struct ktermios *termios,
         if (termios->c_iflag & INPCK)
                 uport->read_status_mask |= M_DUART_FRM_ERR |
                                            M_DUART_PARITY_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uport->read_status_mask |= M_DUART_RCVD_BRK;
 
         uport->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index 5443b46345ed..e84b6a3bdd18 100644
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -665,7 +665,7 @@ static void sccnxp_set_termios(struct uart_port *port,
         port->read_status_mask = SR_OVR;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= SR_PE | SR_FE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= SR_BRK;
 
         /* Set status ignore mask */
diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
index e1caa99e3d3b..5c79bdab985d 100644
--- a/drivers/tty/serial/serial_ks8695.c
+++ b/drivers/tty/serial/serial_ks8695.c
@@ -437,7 +437,7 @@ static void ks8695uart_set_termios(struct uart_port *port, struct ktermios *term
         port->read_status_mask = URLS_URROE;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= (URLS_URFE | URLS_URPE);
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= URLS_URBI;
 
         /*
diff --git a/drivers/tty/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
index 60f49b9d7e39..ea8546092c7e 100644
--- a/drivers/tty/serial/serial_txx9.c
+++ b/drivers/tty/serial/serial_txx9.c
@@ -697,7 +697,7 @@ serial_txx9_set_termios(struct uart_port *port, struct ktermios *termios,
                 TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS;
         if (termios->c_iflag & INPCK)
                 up->port.read_status_mask |= TXX9_SIDISR_UFER | TXX9_SIDISR_UPER;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= TXX9_SIDISR_UBRK;
 
         /*
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1f2be48c92ce..9b4d71cff00d 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -896,7 +896,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
                 if (termios->c_iflag & INPCK)
                         port->read_status_mask |= uint_en->sirfsoc_frm_err_en;
         }
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                         port->read_status_mask |= uint_en->sirfsoc_rxd_brk_en;
         if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) {
                 if (termios->c_iflag & IGNPAR)
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index c7f61ac27132..f48b1cc07eea 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -547,7 +547,7 @@ static void asc_set_termios(struct uart_port *port, struct ktermios *termios,
         ascport->port.read_status_mask = ASC_RXBUF_DUMMY_OE;
         if (termios->c_iflag & INPCK)
                 ascport->port.read_status_mask |= ASC_RXBUF_FE | ASC_RXBUF_PE;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 ascport->port.read_status_mask |= ASC_RXBUF_DUMMY_BE;
 
         /*
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index 5faa8e905e98..80a58eca785b 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -719,7 +719,7 @@ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cfla
         if (iflag & INPCK)
                 up->port.read_status_mask |= (SAB82532_ISR0_PERR |
                                               SAB82532_ISR0_FERR);
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= (SAB82532_ISR1_BRK << 8);
 
         /*
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 9a0f24f83720..5326ae195e5f 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -834,7 +834,7 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
         up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
         if (iflag & INPCK)
                 up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= UART_LSR_BI;
 
         /*
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index a2c40ed287d2..a85db8b87156 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -915,7 +915,7 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
         up->port.read_status_mask = Rx_OVR;
         if (iflag & INPCK)
                 up->port.read_status_mask |= CRC_ERR | PAR_ERR;
-        if (iflag & (BRKINT | PARMRK))
+        if (iflag & (IGNBRK | BRKINT | PARMRK))
                 up->port.read_status_mask |= BRK_ABRT;
 
         up->port.ignore_status_mask = 0;
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index d569ca58bab6..1c52074c38df 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -936,7 +936,7 @@ static void qe_uart_set_termios(struct uart_port *port,
         port->read_status_mask = BD_SC_EMPTY | BD_SC_OV;
         if (termios->c_iflag & INPCK)
                 port->read_status_mask |= BD_SC_FR | BD_SC_PR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= BD_SC_BR;
 
         /*
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index a63c14bc9a24..db0c8a4ab03e 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -559,7 +559,7 @@ static void siu_set_termios(struct uart_port *port, struct ktermios *new,
         port->read_status_mask = UART_LSR_THRE | UART_LSR_OE | UART_LSR_DR;
         if (c_iflag & INPCK)
                 port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (c_iflag & (BRKINT | PARMRK))
+        if (c_iflag & (IGNBRK | BRKINT | PARMRK))
                 port->read_status_mask |= UART_LSR_BI;
 
         port->ignore_status_mask = 0;
diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index 6a169877109b..2b65bb7ffb8a 100644
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -923,7 +923,7 @@ static void zs_set_termios(struct uart_port *uport, struct ktermios *termios,
         uport->read_status_mask = Rx_OVR;
         if (termios->c_iflag & INPCK)
                 uport->read_status_mask |= FRM_ERR | PAR_ERR;
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                 uport->read_status_mask |= Rx_BRK;
 
         uport->ignore_status_mask = 0;
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 5e0f6ff2e2f5..b33b00b386de 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3226,8 +3226,7 @@ int do_unbind_con_driver(const struct consw *csw, int first, int last, int deflt
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
                 con_back = &registered_con_driver[i];
 
-                if (con_back->con &&
-                    !(con_back->flag & CON_DRIVER_FLAG_MODULE)) {
+                if (con_back->con && con_back->con != csw) {
                         defcsw = con_back->con;
                         retval = 0;
                         break;
@@ -3332,6 +3331,7 @@ static int vt_unbind(struct con_driver *con)
 {
         const struct consw *csw = NULL;
         int i, more = 1, first = -1, last = -1, deflt = 0;
+        int ret;
 
         if (!con->con || !(con->flag & CON_DRIVER_FLAG_MODULE) ||
             con_is_graphics(con->con, con->first, con->last))
@@ -3357,8 +3357,10 @@ static int vt_unbind(struct con_driver *con)
 
                 if (first != -1) {
                         console_lock();
-                        do_unbind_con_driver(csw, first, last, deflt);
+                        ret = do_unbind_con_driver(csw, first, last, deflt);
                         console_unlock();
+                        if (ret != 0)
+                                return ret;
                 }
 
                 first = -1;
@@ -3645,17 +3647,20 @@ err:
  */
 int do_unregister_con_driver(const struct consw *csw)
 {
-        int i, retval = -ENODEV;
+        int i;
 
         /* cannot unregister a bound driver */
         if (con_is_bound(csw))
-                goto err;
+                return -EBUSY;
+
+        if (csw == conswitchp)
+                return -EINVAL;
 
         for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
                 struct con_driver *con_driver = &registered_con_driver[i];
 
                 if (con_driver->con == csw &&
-                    con_driver->flag & CON_DRIVER_FLAG_MODULE) {
+                    con_driver->flag & CON_DRIVER_FLAG_INIT) {
                         vtconsole_deinit_device(con_driver);
                         device_destroy(vtconsole_class,
                                        MKDEV(0, con_driver->node));
@@ -3666,12 +3671,11 @@ int do_unregister_con_driver(const struct consw *csw)
                         con_driver->flag = 0;
                         con_driver->first = 0;
                         con_driver->last = 0;
-                        retval = 0;
-                        break;
+                        return 0;
                 }
         }
-err:
-        return retval;
+
+        return -ENODEV;
 }
 EXPORT_SYMBOL_GPL(do_unregister_con_driver);
 
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index e371f5af11f5..a673e5b6a2e0 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -655,7 +655,7 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 
         if (mem->addr & ~PAGE_MASK)
                 return -ENODEV;
-        if (vma->vm_end - vma->vm_start > PAGE_ALIGN(mem->size))
+        if (vma->vm_end - vma->vm_start > mem->size)
                 return -EINVAL;
 
         vma->vm_ops = &uio_physical_vm_ops;
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 69425b3cb6b7..9d2b673f90e3 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1321,6 +1321,7 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req)
         struct ci_hw_ep  *hwep  = container_of(ep,  struct ci_hw_ep, ep);
         struct ci_hw_req *hwreq = container_of(req, struct ci_hw_req, req);
         unsigned long flags;
+        struct td_node *node, *tmpnode;
 
         if (ep == NULL || req == NULL || hwreq->req.status != -EALREADY ||
                 hwep->ep.desc == NULL || list_empty(&hwreq->queue) ||
@@ -1331,6 +1332,12 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req)
 
         hw_ep_flush(hwep->ci, hwep->num, hwep->dir);
 
+        list_for_each_entry_safe(node, tmpnode, &hwreq->tds, td) {
+                dma_pool_free(hwep->td_pool, node->ptr, node->dma);
+                list_del(&node->td);
+                kfree(node);
+        }
+
         /* pop request */
         list_del_init(&hwreq->queue);
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 879b66e13370..21b99b4b4082 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1526,18 +1526,6 @@ static int hub_configure(struct usb_hub *hub,
                 dev_dbg(hub_dev, "%umA bus power budget for each child\n",
                                 hub->mA_per_port);
 
-        /* Update the HCD's internal representation of this hub before khubd
-         * starts getting port status changes for devices under the hub.
-         */
-        if (hcd->driver->update_hub_device) {
-                ret = hcd->driver->update_hub_device(hcd, hdev,
-                                &hub->tt, GFP_KERNEL);
-                if (ret < 0) {
-                        message = "can't update HCD hub info";
-                        goto fail;
-                }
-        }
-
         ret = hub_hub_status(hub, &hubstatus, &hubchange);
         if (ret < 0) {
                 message = "can't get hub status";
@@ -1589,10 +1577,28 @@ static int hub_configure(struct usb_hub *hub,
                 }
         }
         hdev->maxchild = i;
+        for (i = 0; i < hdev->maxchild; i++) {
+                struct usb_port *port_dev = hub->ports[i];
+
+                pm_runtime_put(&port_dev->dev);
+        }
+
         mutex_unlock(&usb_port_peer_mutex);
         if (ret < 0)
                 goto fail;
 
+        /* Update the HCD's internal representation of this hub before khubd
+         * starts getting port status changes for devices under the hub.
+         */
+        if (hcd->driver->update_hub_device) {
+                ret = hcd->driver->update_hub_device(hcd, hdev,
+                                &hub->tt, GFP_KERNEL);
+                if (ret < 0) {
+                        message = "can't update HCD hub info";
+                        goto fail;
+                }
+        }
+
         usb_hub_adjust_deviceremovable(hdev, hub->descriptor);
 
         hub_activate(hub, HUB_INIT);
@@ -3458,7 +3464,8 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                 struct usb_device *udev = port_dev->child;
 
                 if (udev && udev->can_submit) {
-                        dev_warn(&port_dev->dev, "not suspended yet\n");
+                        dev_warn(&port_dev->dev, "device %s not suspended yet\n",
+                                        dev_name(&udev->dev));
                         if (PMSG_IS_AUTO(msg))
                                 return -EBUSY;
                 }
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 0a7cdc0ef0a9..326308e53961 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -84,6 +84,7 @@ struct usb_hub {
  * @dev: generic device interface
  * @port_owner: port's owner
  * @peer: related usb2 and usb3 ports (share the same connector)
+ * @req: default pm qos request for hubs without port power control
  * @connect_type: port's connect type
  * @location: opaque representation of platform connector location
  * @status_lock: synchronize port_event() vs usb_port_{suspend|resume}
@@ -95,6 +96,7 @@ struct usb_port {
         struct device dev;
         struct usb_dev_state *port_owner;
         struct usb_port *peer;
+        struct dev_pm_qos_request *req;
         enum usb_port_connect_type connect_type;
         usb_port_location_t location;
         struct mutex status_lock;
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 62036faf56c0..fe1b6d0967e3 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -21,6 +21,8 @@
 
 #include "hub.h"
 
+static int usb_port_block_power_off;
+
 static const struct attribute_group *port_dev_group[];
 
 static ssize_t connect_type_show(struct device *dev,
@@ -66,6 +68,7 @@ static void usb_port_device_release(struct device *dev)
 {
         struct usb_port *port_dev = to_usb_port(dev);
 
+        kfree(port_dev->req);
         kfree(port_dev);
 }
 
@@ -142,6 +145,9 @@ static int usb_port_runtime_suspend(struct device *dev)
                         == PM_QOS_FLAGS_ALL)
                 return -EAGAIN;
 
+        if (usb_port_block_power_off)
+                return -EBUSY;
+
         usb_autopm_get_interface(intf);
         retval = usb_hub_set_port_power(hdev, hub, port1, false);
         usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_CONNECTION);
@@ -190,11 +196,19 @@ static int link_peers(struct usb_port *left, struct usb_port *right)
         if (left->peer || right->peer) {
                 struct usb_port *lpeer = left->peer;
                 struct usb_port *rpeer = right->peer;
-
-                WARN(1, "failed to peer %s and %s (%s -> %p) (%s -> %p)\n",
-                        dev_name(&left->dev), dev_name(&right->dev),
-                        dev_name(&left->dev), lpeer,
-                        dev_name(&right->dev), rpeer);
+                char *method;
+
+                if (left->location && left->location == right->location)
+                        method = "location";
+                else
+                        method = "default";
+
+                pr_warn("usb: failed to peer %s and %s by %s (%s:%s) (%s:%s)\n",
+                        dev_name(&left->dev), dev_name(&right->dev), method,
+                        dev_name(&left->dev),
+                        lpeer ? dev_name(&lpeer->dev) : "none",
+                        dev_name(&right->dev),
+                        rpeer ? dev_name(&rpeer->dev) : "none");
                 return -EBUSY;
         }
 
@@ -251,6 +265,7 @@ static void link_peers_report(struct usb_port *left, struct usb_port *right)
                 dev_warn(&left->dev, "failed to peer to %s (%d)\n",
                                 dev_name(&right->dev), rc);
                 pr_warn_once("usb: port power management may be unreliable\n");
+                usb_port_block_power_off = 1;
         }
 }
 
@@ -386,9 +401,13 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
         int retval;
 
         port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL);
-        if (!port_dev) {
-                retval = -ENOMEM;
-                goto exit;
+        if (!port_dev)
+                return -ENOMEM;
+
+        port_dev->req = kzalloc(sizeof(*(port_dev->req)), GFP_KERNEL);
+        if (!port_dev->req) {
+                kfree(port_dev);
+                return -ENOMEM;
         }
 
         hub->ports[port1 - 1] = port_dev;
@@ -404,31 +423,53 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
                         port1);
         mutex_init(&port_dev->status_lock);
         retval = device_register(&port_dev->dev);
-        if (retval)
-                goto error_register;
+        if (retval) {
+                put_device(&port_dev->dev);
+                return retval;
+        }
+
+        /* Set default policy of port-poweroff disabled. */
+        retval = dev_pm_qos_add_request(&port_dev->dev, port_dev->req,
+                        DEV_PM_QOS_FLAGS, PM_QOS_FLAG_NO_POWER_OFF);
+        if (retval < 0) {
+                device_unregister(&port_dev->dev);
+                return retval;
+        }
 
         find_and_link_peer(hub, port1);
 
+        /*
+         * Enable runtime pm and hold a refernce that hub_configure()
+         * will drop once the PM_QOS_NO_POWER_OFF flag state has been set
+         * and the hub has been fully registered (hdev->maxchild set).
+         */
         pm_runtime_set_active(&port_dev->dev);
+        pm_runtime_get_noresume(&port_dev->dev);
+        pm_runtime_enable(&port_dev->dev);
+        device_enable_async_suspend(&port_dev->dev);
 
         /*
-         * Do not enable port runtime pm if the hub does not support
-         * power switching.  Also, userspace must have final say of
-         * whether a port is permitted to power-off.  Do not enable
-         * runtime pm if we fail to expose pm_qos_no_power_off.
+         * Keep hidden the ability to enable port-poweroff if the hub
+         * does not support power switching.
          */
-        if (hub_is_port_power_switchable(hub)
-                        && dev_pm_qos_expose_flags(&port_dev->dev,
-                        PM_QOS_FLAG_NO_POWER_OFF) == 0)
-                pm_runtime_enable(&port_dev->dev);
+        if (!hub_is_port_power_switchable(hub))
+                return 0;
 
-        device_enable_async_suspend(&port_dev->dev);
-        return 0;
+        /* Attempt to let userspace take over the policy. */
+        retval = dev_pm_qos_expose_flags(&port_dev->dev,
+                        PM_QOS_FLAG_NO_POWER_OFF);
+        if (retval < 0) {
+                dev_warn(&port_dev->dev, "failed to expose pm_qos_no_poweroff\n");
+                return 0;
+        }
 
-error_register:
-        put_device(&port_dev->dev);
-exit:
-        return retval;
+        /* Userspace owns the policy, drop the kernel 'no_poweroff' request. */
+        retval = dev_pm_qos_remove_request(port_dev->req);
+        if (retval >= 0) {
+                kfree(port_dev->req);
+                port_dev->req = NULL;
+        }
+        return 0;
 }
 
 void usb_hub_remove_port_device(struct usb_hub *hub, int port1)
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 8eb996e4f058..261c3b428220 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -45,6 +45,7 @@ comment "Platform Glue Driver Support"
 config USB_DWC3_OMAP
         tristate "Texas Instruments OMAP5 and similar Platforms"
         depends on EXTCON && (ARCH_OMAP2PLUS || COMPILE_TEST)
+        depends on OF
         default USB_DWC3
         help
           Some platforms from Texas Instruments like OMAP5, DRA7xxx and
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 4af4c3567656..07a736acd0f2 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -322,7 +322,7 @@ static int dwc3_omap_remove_core(struct device *dev, void *c)
 {
         struct platform_device *pdev = to_platform_device(dev);
 
-        platform_device_unregister(pdev);
+        of_device_unregister(pdev);
 
         return 0;
 }
@@ -599,7 +599,7 @@ static int dwc3_omap_prepare(struct device *dev)
 {
         struct dwc3_omap        *omap = dev_get_drvdata(dev);
 
-        dwc3_omap_disable_irqs(omap);
+        dwc3_omap_write_irqmisc_set(omap, 0x00);
 
         return 0;
 }
@@ -607,8 +607,19 @@ static int dwc3_omap_prepare(struct device *dev)
 static void dwc3_omap_complete(struct device *dev)
 {
         struct dwc3_omap        *omap = dev_get_drvdata(dev);
+        u32                     reg;
 
-        dwc3_omap_enable_irqs(omap);
+        reg = (USBOTGSS_IRQMISC_OEVT |
+                        USBOTGSS_IRQMISC_DRVVBUS_RISE |
+                        USBOTGSS_IRQMISC_CHRGVBUS_RISE |
+                        USBOTGSS_IRQMISC_DISCHRGVBUS_RISE |
+                        USBOTGSS_IRQMISC_IDPULLUP_RISE |
+                        USBOTGSS_IRQMISC_DRVVBUS_FALL |
+                        USBOTGSS_IRQMISC_CHRGVBUS_FALL |
+                        USBOTGSS_IRQMISC_DISCHRGVBUS_FALL |
+                        USBOTGSS_IRQMISC_IDPULLUP_FALL);
+
+        dwc3_omap_write_irqmisc_set(omap, reg);
 }
 
 static int dwc3_omap_suspend(struct device *dev)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 9d64dd02c57e..dab7927d1009 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -828,10 +828,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
                         length, last ? " last" : "",
                         chain ? " chain" : "");
 
-        /* Skip the LINK-TRB on ISOC */
-        if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
-                        usb_endpoint_xfer_isoc(dep->endpoint.desc))
-                dep->free_slot++;
 
         trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
 
@@ -843,6 +839,10 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
         }
 
         dep->free_slot++;
+        /* Skip the LINK-TRB on ISOC */
+        if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
+                        usb_endpoint_xfer_isoc(dep->endpoint.desc))
+                dep->free_slot++;
 
         trb->size = DWC3_TRB_SIZE_LENGTH(length);
         trb->bpl = lower_32_bits(dma);
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 2ddcd635ca2a..97142146eead 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1145,15 +1145,15 @@ static struct configfs_item_operations interf_item_ops = {
         .store_attribute        = usb_os_desc_attr_store,
 };
 
-static ssize_t rndis_grp_compatible_id_show(struct usb_os_desc *desc,
-                                            char *page)
+static ssize_t interf_grp_compatible_id_show(struct usb_os_desc *desc,
+                                             char *page)
 {
         memcpy(page, desc->ext_compat_id, 8);
         return 8;
 }
 
-static ssize_t rndis_grp_compatible_id_store(struct usb_os_desc *desc,
-                                             const char *page, size_t len)
+static ssize_t interf_grp_compatible_id_store(struct usb_os_desc *desc,
+                                              const char *page, size_t len)
 {
         int l;
 
@@ -1171,20 +1171,20 @@ static ssize_t rndis_grp_compatible_id_store(struct usb_os_desc *desc,
         return len;
 }
 
-static struct usb_os_desc_attribute rndis_grp_attr_compatible_id =
+static struct usb_os_desc_attribute interf_grp_attr_compatible_id =
         __CONFIGFS_ATTR(compatible_id, S_IRUGO | S_IWUSR,
-                        rndis_grp_compatible_id_show,
-                        rndis_grp_compatible_id_store);
+                        interf_grp_compatible_id_show,
+                        interf_grp_compatible_id_store);
 
-static ssize_t rndis_grp_sub_compatible_id_show(struct usb_os_desc *desc,
-                                                char *page)
+static ssize_t interf_grp_sub_compatible_id_show(struct usb_os_desc *desc,
+                                                 char *page)
 {
         memcpy(page, desc->ext_compat_id + 8, 8);
         return 8;
 }
 
-static ssize_t rndis_grp_sub_compatible_id_store(struct usb_os_desc *desc,
-                                                 const char *page, size_t len)
+static ssize_t interf_grp_sub_compatible_id_store(struct usb_os_desc *desc,
+                                                  const char *page, size_t len)
 {
         int l;
 
@@ -1202,20 +1202,21 @@ static ssize_t rndis_grp_sub_compatible_id_store(struct usb_os_desc *desc,
         return len;
 }
 
-static struct usb_os_desc_attribute rndis_grp_attr_sub_compatible_id =
+static struct usb_os_desc_attribute interf_grp_attr_sub_compatible_id =
         __CONFIGFS_ATTR(sub_compatible_id, S_IRUGO | S_IWUSR,
-                        rndis_grp_sub_compatible_id_show,
-                        rndis_grp_sub_compatible_id_store);
+                        interf_grp_sub_compatible_id_show,
+                        interf_grp_sub_compatible_id_store);
 
 static struct configfs_attribute *interf_grp_attrs[] = {
-        &rndis_grp_attr_compatible_id.attr,
-        &rndis_grp_attr_sub_compatible_id.attr,
+        &interf_grp_attr_compatible_id.attr,
+        &interf_grp_attr_sub_compatible_id.attr,
         NULL
 };
 
 int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                                    int n_interf,
                                    struct usb_os_desc **desc,
+                                   char **names,
                                    struct module *owner)
 {
         struct config_group **f_default_groups, *os_desc_group,
@@ -1257,8 +1258,8 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                 d = desc[n_interf];
                 d->owner = owner;
                 config_group_init_type_name(&d->group, "", interface_type);
-                config_item_set_name(&d->group.cg_item, "interface.%d",
-                                     n_interf);
+                config_item_set_name(&d->group.cg_item, "interface.%s",
+                                     names[n_interf]);
                 interface_groups[n_interf] = &d->group;
         }
 
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h
index a14ac792c698..36c468c4f5e9 100644
--- a/drivers/usb/gadget/configfs.h
+++ b/drivers/usb/gadget/configfs.h
@@ -8,6 +8,7 @@ void unregister_gadget_item(struct config_item *item);
 int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                                    int n_interf,
                                    struct usb_os_desc **desc,
+                                   char **names,
                                    struct module *owner);
 
 static inline struct usb_os_desc *to_usb_os_desc(struct config_item *item)
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 74202d67f911..8598c27c7d43 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1483,11 +1483,13 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)
         ffs->ep0req->context = ffs;
 
         lang = ffs->stringtabs;
-        for (lang = ffs->stringtabs; *lang; ++lang) {
-                struct usb_string *str = (*lang)->strings;
-                int id = first_id;
-                for (; str->s; ++id, ++str)
-                        str->id = id;
+        if (lang) {
+                for (; *lang; ++lang) {
+                        struct usb_string *str = (*lang)->strings;
+                        int id = first_id;
+                        for (; str->s; ++id, ++str)
+                                str->id = id;
+                }
         }
 
         ffs->gadget = cdev->gadget;
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index eed3ad878047..9c41e9515b8e 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -687,7 +687,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                 f->os_desc_table = kzalloc(sizeof(*f->os_desc_table),
                                            GFP_KERNEL);
                 if (!f->os_desc_table)
-                        return PTR_ERR(f->os_desc_table);
+                        return -ENOMEM;
                 f->os_desc_n = 1;
                 f->os_desc_table[0].os_desc = &rndis_opts->rndis_os_desc;
         }
@@ -905,6 +905,7 @@ static struct usb_function_instance *rndis_alloc_inst(void)
 {
         struct f_rndis_opts *opts;
         struct usb_os_desc *descs[1];
+        char *names[1];
 
         opts = kzalloc(sizeof(*opts), GFP_KERNEL);
         if (!opts)
@@ -922,8 +923,9 @@ static struct usb_function_instance *rndis_alloc_inst(void)
         INIT_LIST_HEAD(&opts->rndis_os_desc.ext_prop);
 
         descs[0] = &opts->rndis_os_desc;
+        names[0] = "rndis";
         usb_os_desc_prepare_interf_dir(&opts->func_inst.group, 1, descs,
-                                       THIS_MODULE);
+                                       names, THIS_MODULE);
         config_group_init_type_name(&opts->func_inst.group, "",
                                     &rndis_func_type);
 
diff --git a/drivers/usb/gadget/gr_udc.c b/drivers/usb/gadget/gr_udc.c
index 99a37ed03e27..c7004ee89c90 100644
--- a/drivers/usb/gadget/gr_udc.c
+++ b/drivers/usb/gadget/gr_udc.c
@@ -1532,8 +1532,9 @@ static int gr_ep_enable(struct usb_ep *_ep,
                         "%s mode: multiple trans./microframe not valid\n",
                         (mode == 2 ? "Bulk" : "Control"));
                 return -EINVAL;
-        } else if (nt == 0x11) {
-                dev_err(dev->dev, "Invalid value for trans./microframe\n");
+        } else if (nt == 0x3) {
+                dev_err(dev->dev,
+                        "Invalid value 0x3 for additional trans./microframe\n");
                 return -EINVAL;
         } else if ((nt + 1) * max > buffer_size) {
                 dev_err(dev->dev, "Hw buffer size %d < max payload %d * %d\n",
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index ee6c16416c30..2e4ce7704908 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1264,8 +1264,13 @@ dev_release (struct inode *inode, struct file *fd)
 
         kfree (dev->buf);
         dev->buf = NULL;
-        put_dev (dev);
 
+        /* other endpoints were all decoupled from this device */
+        spin_lock_irq(&dev->lock);
+        dev->state = STATE_DEV_DISABLED;
+        spin_unlock_irq(&dev->lock);
+
+        put_dev (dev);
         return 0;
 }
 
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 3d78a8844e43..97b027724ee7 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -1120,7 +1120,10 @@ void gether_disconnect(struct gether *link)
 
         DBG(dev, "%s\n", __func__);
 
+        netif_tx_lock(dev->net);
         netif_stop_queue(dev->net);
+        netif_tx_unlock(dev->net);
+
         netif_carrier_off(dev->net);
 
         /* disable endpoints, forcing (synchronous) completion
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 61b7817bd66b..03314f861bee 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -176,7 +176,7 @@ config USB_EHCI_HCD_AT91
 
 config USB_EHCI_MSM
         tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
-        depends on ARCH_MSM
+        depends on ARCH_MSM || ARCH_QCOM
         select USB_EHCI_ROOT_HUB_TT
         ---help---
           Enables support for the USB Host controller present on the
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 4a6d3dd68572..2f3acebb577a 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -656,6 +656,14 @@ static const struct dmi_system_id ehci_dmi_nohandoff_table[] = {
                         DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"),
                 },
         },
+        {
+                /* HASEE E200 */
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "HASEE"),
+                        DMI_MATCH(DMI_BOARD_NAME, "E210"),
+                        DMI_MATCH(DMI_BIOS_VERSION, "6.00"),
+                },
+        },
         { }
 };
 
@@ -665,9 +673,14 @@ static void ehci_bios_handoff(struct pci_dev *pdev,
 {
         int try_handoff = 1, tried_handoff = 0;
 
-        /* The Pegatron Lucid tablet sporadically waits for 98 seconds trying
-         * the handoff on its unused controller.  Skip it. */
-        if (pdev->vendor == 0x8086 && pdev->device == 0x283a) {
+        /*
+         * The Pegatron Lucid tablet sporadically waits for 98 seconds trying
+         * the handoff on its unused controller.  Skip it.
+         *
+         * The HASEE E200 hangs when the semaphore is set (bugzilla #77021).
+         */
+        if (pdev->vendor == 0x8086 && (pdev->device == 0x283a ||
+                        pdev->device == 0x27cc)) {
                 if (dmi_check_system(ehci_dmi_nohandoff_table))
                         try_handoff = 0;
         }
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 6231ce6aa0c3..aa79e8749040 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -22,6 +22,7 @@
 
 
 #include <linux/slab.h>
+#include <linux/device.h>
 #include <asm/unaligned.h>
 
 #include "xhci.h"
@@ -287,7 +288,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
                 if (virt_dev->eps[i].ring && virt_dev->eps[i].ring->dequeue) {
                         struct xhci_command *command;
                         command = xhci_alloc_command(xhci, false, false,
-                                                     GFP_NOIO);
+                                                     GFP_NOWAIT);
                         if (!command) {
                                 spin_unlock_irqrestore(&xhci->lock, flags);
                                 xhci_free_command(xhci, cmd);
@@ -1139,7 +1140,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                  * including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME
                  * is enabled, so also enable remote wake here.
                  */
-                if (hcd->self.root_hub->do_remote_wakeup) {
+                if (hcd->self.root_hub->do_remote_wakeup
+                                && device_may_wakeup(hcd->self.controller)) {
+
                         if (t1 & PORT_CONNECT) {
                                 t2 |= PORT_WKOC_E | PORT_WKDISC_E;
                                 t2 &= ~PORT_WKCONN_E;
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index d67ff71209f5..749fc68eb5c1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1433,8 +1433,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
                 xhci_handle_cmd_reset_ep(xhci, slot_id, cmd_trb, cmd_comp_code);
                 break;
         case TRB_RESET_DEV:
-                WARN_ON(slot_id != TRB_TO_SLOT_ID(
-                                le32_to_cpu(cmd_trb->generic.field[3])));
+                /* SLOT_ID field in reset device cmd completion event TRB is 0.
+                 * Use the SLOT_ID from the command TRB instead (xhci 4.6.11)
+                 */
+                slot_id = TRB_TO_SLOT_ID(
+                                le32_to_cpu(cmd_trb->generic.field[3]));
                 xhci_handle_cmd_reset_dev(xhci, slot_id, event);
                 break;
         case TRB_NEC_GET_FW:
@@ -3534,7 +3537,7 @@ static unsigned int xhci_get_burst_count(struct xhci_hcd *xhci,
                 return 0;
 
         max_burst = urb->ep->ss_ep_comp.bMaxBurst;
-        return roundup(total_packet_count, max_burst + 1) - 1;
+        return DIV_ROUND_UP(total_packet_count, max_burst + 1) - 1;
 }
 
 /*
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2b8d9a24af09..7436d5f5e67a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -936,7 +936,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
  */
 int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 {
-        u32                     command, temp = 0;
+        u32                     command, temp = 0, status;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
         struct usb_hcd          *secondary_hcd;
         int                     retval = 0;
@@ -1054,8 +1054,12 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 
  done:
         if (retval == 0) {
-                usb_hcd_resume_root_hub(hcd);
-                usb_hcd_resume_root_hub(xhci->shared_hcd);
+                /* Resume root hubs only when have pending events. */
+                status = readl(&xhci->op_regs->status);
+                if (status & STS_EINT) {
+                        usb_hcd_resume_root_hub(hcd);
+                        usb_hcd_resume_root_hub(xhci->shared_hcd);
+                }
         }
 
         /*
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 51a6da256772..829f446064ea 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -7,7 +7,7 @@
 #include <linux/moduleparam.h>
 #include <linux/scatterlist.h>
 #include <linux/mutex.h>
-
+#include <linux/timer.h>
 #include <linux/usb.h>
 
 #define SIMPLE_IO_TIMEOUT       10000   /* in milliseconds */
@@ -484,6 +484,14 @@ alloc_sglist(int nents, int max, int vary)
         return sg;
 }
 
+static void sg_timeout(unsigned long _req)
+{
+        struct usb_sg_request   *req = (struct usb_sg_request *) _req;
+
+        req->status = -ETIMEDOUT;
+        usb_sg_cancel(req);
+}
+
 static int perform_sglist(
         struct usbtest_dev      *tdev,
         unsigned                iterations,
@@ -495,6 +503,9 @@ static int perform_sglist(
 {
         struct usb_device       *udev = testdev_to_usbdev(tdev);
         int                     retval = 0;
+        struct timer_list       sg_timer;
+
+        setup_timer_on_stack(&sg_timer, sg_timeout, (unsigned long) req);
 
         while (retval == 0 && iterations-- > 0) {
                 retval = usb_sg_init(req, udev, pipe,
@@ -505,7 +516,10 @@ static int perform_sglist(
 
                 if (retval)
                         break;
+                mod_timer(&sg_timer, jiffies +
+                                msecs_to_jiffies(SIMPLE_IO_TIMEOUT));
                 usb_sg_wait(req);
+                del_timer_sync(&sg_timer);
                 retval = req->status;
 
                 /* FIXME check resulting data pattern */
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index d2353781bd2d..1e58ed2361cc 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -19,21 +19,6 @@ err:
         return ret;
 }
 
-static int of_remove_populated_child(struct device *dev, void *d)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-
-        of_device_unregister(pdev);
-        return 0;
-}
-
-static int am335x_child_remove(struct platform_device *pdev)
-{
-        device_for_each_child(&pdev->dev, NULL, of_remove_populated_child);
-        pm_runtime_disable(&pdev->dev);
-        return 0;
-}
-
 static const struct of_device_id am335x_child_of_match[] = {
         { .compatible = "ti,am33xx-usb" },
         {  },
@@ -42,13 +27,17 @@ MODULE_DEVICE_TABLE(of, am335x_child_of_match);
 
 static struct platform_driver am335x_child_driver = {
         .probe          = am335x_child_probe,
-        .remove         = am335x_child_remove,
         .driver         = {
                 .name   = "am335x-usb-childs",
                 .of_match_table = am335x_child_of_match,
         },
 };
 
-module_platform_driver(am335x_child_driver);
+static int __init am335x_child_init(void)
+{
+        return platform_driver_register(&am335x_child_driver);
+}
+module_init(am335x_child_init);
+
 MODULE_DESCRIPTION("AM33xx child devices");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 61da471b7aed..eff3c5cf84f4 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -849,7 +849,7 @@ b_host:
         }
 
         /* handle babble condition */
-        if (int_usb & MUSB_INTR_BABBLE)
+        if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb))
                 schedule_work(&musb->recover_work);
 
 #if 0
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
index 7b8bbf53127e..5341bb223b7c 100644
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@ -318,7 +318,7 @@ static void cppi41_dma_callback(void *private_data)
                 }
                 list_add_tail(&cppi41_channel->tx_check,
                                 &controller->early_tx_list);
-                if (!hrtimer_active(&controller->early_tx)) {
+                if (!hrtimer_is_queued(&controller->early_tx)) {
                         hrtimer_start_range_ns(&controller->early_tx,
                                 ktime_set(0, 140 * NSEC_PER_USEC),
                                 40 * NSEC_PER_USEC,
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 51beb13c7e1a..09529f94e72d 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -494,10 +494,9 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
         struct dsps_glue *glue = dev_get_drvdata(dev->parent);
         const struct dsps_musb_wrapper *wrp = glue->wrp;
         void __iomem *ctrl_base = musb->ctrl_base;
-        void __iomem *base = musb->mregs;
         u32 reg;
 
-        reg = dsps_readl(base, wrp->mode);
+        reg = dsps_readl(ctrl_base, wrp->mode);
 
         switch (mode) {
         case MUSB_HOST:
@@ -510,7 +509,7 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
                  */
                 reg |= (1 << wrp->iddig_mux);
 
-                dsps_writel(base, wrp->mode, reg);
+                dsps_writel(ctrl_base, wrp->mode, reg);
                 dsps_writel(ctrl_base, wrp->phy_utmi, 0x02);
                 break;
         case MUSB_PERIPHERAL:
@@ -523,10 +522,10 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
                  */
                 reg |= (1 << wrp->iddig_mux);
 
-                dsps_writel(base, wrp->mode, reg);
+                dsps_writel(ctrl_base, wrp->mode, reg);
                 break;
         case MUSB_OTG:
-                dsps_writel(base, wrp->phy_utmi, 0x02);
+                dsps_writel(ctrl_base, wrp->phy_utmi, 0x02);
                 break;
         default:
                 dev_err(glue->dev, "unsupported mode %d\n", mode);
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index c2e45e632723..f202e5088461 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -274,7 +274,6 @@ static int ux500_probe(struct platform_device *pdev)
         musb->dev.parent                = &pdev->dev;
         musb->dev.dma_mask              = &pdev->dev.coherent_dma_mask;
         musb->dev.coherent_dma_mask     = pdev->dev.coherent_dma_mask;
-        musb->dev.of_node               = pdev->dev.of_node;
 
         glue->dev                       = &pdev->dev;
         glue->musb                      = musb;
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index ced34f39bdd4..c929370cdaa6 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1229,7 +1229,9 @@ static void msm_otg_sm_work(struct work_struct *w)
                         motg->chg_state = USB_CHG_STATE_UNDEFINED;
                         motg->chg_type = USB_INVALID_CHARGER;
                 }
-                pm_runtime_put_sync(otg->phy->dev);
+
+                if (otg->phy->state == OTG_STATE_B_IDLE)
+                        pm_runtime_put_sync(otg->phy->dev);
                 break;
         case OTG_STATE_B_PERIPHERAL:
                 dev_dbg(otg->phy->dev, "OTG_STATE_B_PERIPHERAL state\n");
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index d49f9c326035..4fd36530bfa3 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -681,6 +681,14 @@ usbhs_fifo_read_end:
                 usbhs_pipe_number(pipe),
                 pkt->length, pkt->actual, *is_done, pkt->zero);
 
+        /*
+         * Transmission end
+         */
+        if (*is_done) {
+                if (usbhs_pipe_is_dcp(pipe))
+                        usbhs_dcp_control_transfer_done(pipe);
+        }
+
 usbhs_fifo_read_busy:
         usbhsf_fifo_unselect(pipe, fifo);
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index edf3b124583c..115662c16dcc 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1566,14 +1566,17 @@ static void ftdi_set_max_packet_size(struct usb_serial_port *port)
         struct usb_device *udev = serial->dev;
 
         struct usb_interface *interface = serial->interface;
-        struct usb_endpoint_descriptor *ep_desc = &interface->cur_altsetting->endpoint[1].desc;
+        struct usb_endpoint_descriptor *ep_desc;
 
         unsigned num_endpoints;
-        int i;
+        unsigned i;
 
         num_endpoints = interface->cur_altsetting->desc.bNumEndpoints;
         dev_info(&udev->dev, "Number of endpoints %d\n", num_endpoints);
 
+        if (!num_endpoints)
+                return;
+
         /* NOTE: some customers have programmed FT232R/FT245R devices
          * with an endpoint size of 0 - not good.  In this case, we
          * want to override the endpoint descriptor setting and use a
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 59c3108cc136..ac73f49cd9f0 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -352,6 +352,9 @@ static void option_instat_callback(struct urb *urb);
 /* Zoom */
 #define ZOOM_PRODUCT_4597                       0x9607
 
+/* SpeedUp SU9800 usb 3g modem */
+#define SPEEDUP_PRODUCT_SU9800                  0x9800
+
 /* Haier products */
 #define HAIER_VENDOR_ID                         0x201e
 #define HAIER_PRODUCT_CE100                     0x2009
@@ -372,8 +375,12 @@ static void option_instat_callback(struct urb *urb);
 /* Olivetti products */
 #define OLIVETTI_VENDOR_ID                      0x0b3c
 #define OLIVETTI_PRODUCT_OLICARD100             0xc000
+#define OLIVETTI_PRODUCT_OLICARD120             0xc001
+#define OLIVETTI_PRODUCT_OLICARD140             0xc002
 #define OLIVETTI_PRODUCT_OLICARD145             0xc003
+#define OLIVETTI_PRODUCT_OLICARD155             0xc004
 #define OLIVETTI_PRODUCT_OLICARD200             0xc005
+#define OLIVETTI_PRODUCT_OLICARD160             0xc00a
 #define OLIVETTI_PRODUCT_OLICARD500             0xc00b
 
 /* Celot products */
@@ -1577,6 +1584,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
           .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
         },
+        { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
         { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
@@ -1611,15 +1619,21 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
         { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
-
-        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140),
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155),
+                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
-                .driver_info = (kernel_ulong_t)&net_intf6_blacklist
-        },
+                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160),
+                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist
-        },
+                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 9d38ddc8da49..866b5df36ed1 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -256,6 +256,10 @@ static int slave_configure(struct scsi_device *sdev)
                 if (us->fflags & US_FL_WRITE_CACHE)
                         sdev->wce_default_on = 1;
 
+                /* A few buggy USB-ATA bridges don't understand FUA */
+                if (us->fflags & US_FL_BROKEN_FUA)
+                        sdev->broken_fua = 1;
+
         } else {
 
                 /* Non-disk-type devices don't need to blacklist any pages
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 174a447868cd..80a5b366255f 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1936,6 +1936,13 @@ UNUSUAL_DEV(  0x14cd, 0x6600, 0x0201, 0x0201,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Michael Büsch <m@bues.ch> */
+UNUSUAL_DEV(  0x152d, 0x0567, 0x0114, 0x0114,
+                "JMicron",
+                "USB to ATA/ATAPI Bridge",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_BROKEN_FUA ),
+
 /* Reported by Alexandre Oliva <oliva@lsd.ic.unicamp.br>
  * JMicron responds to USN and several other SCSI ioctls with a
  * residue that causes subsequent I/O requests to fail.  */
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 971a760af4a1..8dae2f724a35 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -700,14 +700,6 @@ static void handle_rx_net(struct vhost_work *work)
         handle_rx(net);
 }
 
-static void vhost_net_free(void *addr)
-{
-        if (is_vmalloc_addr(addr))
-                vfree(addr);
-        else
-                kfree(addr);
-}
-
 static int vhost_net_open(struct inode *inode, struct file *f)
 {
         struct vhost_net *n;
@@ -723,7 +715,7 @@ static int vhost_net_open(struct inode *inode, struct file *f)
         }
         vqs = kmalloc(VHOST_NET_VQ_MAX * sizeof(*vqs), GFP_KERNEL);
         if (!vqs) {
-                vhost_net_free(n);
+                kvfree(n);
                 return -ENOMEM;
         }
 
@@ -840,7 +832,7 @@ static int vhost_net_release(struct inode *inode, struct file *f)
          * since jobs can re-queue themselves. */
         vhost_net_flush(n);
         kfree(n->dev.vqs);
-        vhost_net_free(n);
+        kvfree(n);
         return 0;
 }
 
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 4f4ffa4c604e..69906cacd04f 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1503,14 +1503,6 @@ static int vhost_scsi_set_features(struct vhost_scsi *vs, u64 features)
         return 0;
 }
 
-static void vhost_scsi_free(struct vhost_scsi *vs)
-{
-        if (is_vmalloc_addr(vs))
-                vfree(vs);
-        else
-                kfree(vs);
-}
-
 static int vhost_scsi_open(struct inode *inode, struct file *f)
 {
         struct vhost_scsi *vs;
@@ -1550,7 +1542,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
         return 0;
 
 err_vqs:
-        vhost_scsi_free(vs);
+        kvfree(vs);
 err_vs:
         return r;
 }
@@ -1569,7 +1561,7 @@ static int vhost_scsi_release(struct inode *inode, struct file *f)
         /* Jobs can re-queue themselves in evt kick handler. Do extra flush. */
         vhost_scsi_flush(vs);
         kfree(vs->dev.vqs);
-        vhost_scsi_free(vs);
+        kvfree(vs);
         return 0;
 }
 
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index b63860f7beab..40bec8d64b0a 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -77,3 +77,4 @@ const struct consw dummy_con = {
     .con_set_palette =  DUMMY,
     .con_scrolldelta =  DUMMY,
 };
+EXPORT_SYMBOL_GPL(dummy_con);
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index f267284b423b..6e6aa704fe84 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -1441,5 +1441,6 @@ const struct consw vga_con = {
         .con_build_attr = vgacon_build_attr,
         .con_invert_region = vgacon_invert_region,
 };
+EXPORT_SYMBOL(vga_con);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index e683b6ef9594..d36e830d6fc6 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1057,6 +1057,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
                 goto put_display_node;
         }
 
+        INIT_LIST_HEAD(&pdata->pwr_gpios);
         ret = -ENOMEM;
         for (i = 0; i < of_gpio_named_count(display_np, "atmel,power-control-gpio"); i++) {
                 gpio = of_get_named_gpio_flags(display_np, "atmel,power-control-gpio",
@@ -1082,6 +1083,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
                         dev_err(dev, "set direction output gpio %d failed\n", gpio);
                         goto put_display_node;
                 }
+                list_add(&og->list, &pdata->pwr_gpios);
         }
 
         if (is_gpio_power)
diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c
index a54f7f7d763b..8fe41caac38e 100644
--- a/drivers/video/fbdev/bfin_adv7393fb.c
+++ b/drivers/video/fbdev/bfin_adv7393fb.c
@@ -408,7 +408,7 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
         /* Workaround "PPI Does Not Start Properly In Specific Mode" */
         if (ANOMALY_05000400) {
                 ret = gpio_request_one(P_IDENT(P_PPI0_FS3), GPIOF_OUT_INIT_LOW,
-                                        "PPI0_FS3")
+                                        "PPI0_FS3");
                 if (ret) {
                         dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
                         ret = -EBUSY;
diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index 7d44d669d5b6..43a0a52fc527 100644
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -91,15 +91,6 @@ extern boot_infos_t *boot_infos;
 #define AVIVO_DC_LUTB_WHITE_OFFSET_GREEN        0x6cd4
 #define AVIVO_DC_LUTB_WHITE_OFFSET_RED          0x6cd8
 
-#define FB_RIGHT_POS(p, bpp)         (fb_be_math(p) ? 0 : (32 - (bpp)))
-
-static inline u32 offb_cmap_byteswap(struct fb_info *info, u32 value)
-{
-        u32 bpp = info->var.bits_per_pixel;
-
-        return cpu_to_be32(value) >> FB_RIGHT_POS(info, bpp);
-}
-
     /*
      *  Set a single color register. The values supplied are already
      *  rounded down to the hardware's capabilities (according to the
@@ -129,7 +120,7 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                         mask <<= info->var.transp.offset;
                         value |= mask;
                 }
-                pal[regno] = offb_cmap_byteswap(info, value);
+                pal[regno] = value;
                 return 0;
         }
 
diff --git a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
index 99af9e88b2d8..2f0822ee3ff9 100644
--- a/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
+++ b/drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
@@ -121,9 +121,11 @@ static void __init omapdss_add_to_list(struct device_node *node, bool root)
 {
         struct dss_conv_node *n = kmalloc(sizeof(struct dss_conv_node),
                 GFP_KERNEL);
-        n->node = node;
-        n->root = root;
-        list_add(&n->list, &dss_conv_list);
+        if (n) {
+                n->node = node;
+                n->root = root;
+                list_add(&n->list, &dss_conv_list);
+        }
 }
 
 static bool __init omapdss_list_contains(const struct device_node *node)
diff --git a/drivers/video/fbdev/vt8500lcdfb.c b/drivers/video/fbdev/vt8500lcdfb.c
index a8f2b280f796..a1134c3f6c11 100644
--- a/drivers/video/fbdev/vt8500lcdfb.c
+++ b/drivers/video/fbdev/vt8500lcdfb.c
@@ -474,8 +474,6 @@ static int vt8500lcd_remove(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, resource_size(res));
 
-        kfree(fbi);
-
         return 0;
 }
 
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 67b067a3e2ab..a5df5e89d456 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -66,7 +66,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
 
                 udelay(100);
         }
-        return !!(reg_val & MXC_W1_CONTROL_PST);
+        return !(reg_val & MXC_W1_CONTROL_PST);
 }
 
 /*
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index c845527b503a..76dd54122f76 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1280,14 +1280,17 @@ config WATCHDOG_RTAS
 
 # S390 Architecture
 
-config ZVM_WATCHDOG
-        tristate "z/VM Watchdog Timer"
+config DIAG288_WATCHDOG
+        tristate "System z diag288 Watchdog"
         depends on S390
+        select WATCHDOG_CORE
         help
           IBM s/390 and zSeries machines running under z/VM 5.1 or later
           provide a virtual watchdog timer to their guest that cause a
           user define Control Program command to be executed after a
           timeout.
+          LPAR provides a very similar interface. This driver handles
+          both.
 
           To compile this driver as a module, choose M here. The module
           will be called vmwatchdog.
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 7b8a91ed20e7..468c3204c3b1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -153,6 +153,7 @@ obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 
 # S390 Architecture
+obj-$(CONFIG_DIAG288_WATCHDOG) += diag288_wdt.o
 
 # SUPERH (sh + sh64) Architecture
 obj-$(CONFIG_SH_WDT) += shwdt.o
diff --git a/drivers/watchdog/diag288_wdt.c b/drivers/watchdog/diag288_wdt.c
new file mode 100644
index 000000000000..429494b6c822
--- /dev/null
+++ b/drivers/watchdog/diag288_wdt.c
@@ -0,0 +1,316 @@
+/*
+ * Watchdog driver for z/VM and LPAR using the diag 288 interface.
+ *
+ * Under z/VM, expiration of the watchdog will send a "system restart" command
+ * to CP.
+ *
+ * The command can be altered using the module parameter "cmd". This is
+ * not recommended because it's only supported on z/VM but not whith LPAR.
+ *
+ * On LPAR, the watchdog will always trigger a system restart. the module
+ * paramter cmd is meaningless here.
+ *
+ *
+ * Copyright IBM Corp. 2004, 2013
+ * Author(s): Arnd Bergmann (arndb@de.ibm.com)
+ *            Philipp Hachtmann (phacht@de.ibm.com)
+ *
+ */
+
+#define KMSG_COMPONENT "diag288_wdt"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/suspend.h>
+#include <asm/ebcdic.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+
+#define MAX_CMDLEN 240
+#define DEFAULT_CMD "SYSTEM RESTART"
+
+#define MIN_INTERVAL 15     /* Minimal time supported by diag88 */
+#define MAX_INTERVAL 3600   /* One hour should be enough - pure estimation */
+
+#define WDT_DEFAULT_TIMEOUT 30
+
+/* Function codes - init, change, cancel */
+#define WDT_FUNC_INIT 0
+#define WDT_FUNC_CHANGE 1
+#define WDT_FUNC_CANCEL 2
+#define WDT_FUNC_CONCEAL 0x80000000
+
+/* Action codes for LPAR watchdog */
+#define LPARWDT_RESTART 0
+
+static char wdt_cmd[MAX_CMDLEN] = DEFAULT_CMD;
+static bool conceal_on;
+static bool nowayout_info = WATCHDOG_NOWAYOUT;
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
+MODULE_AUTHOR("Philipp Hachtmann <phacht@de.ibm.com>");
+
+MODULE_DESCRIPTION("System z diag288  Watchdog Timer");
+
+module_param_string(cmd, wdt_cmd, MAX_CMDLEN, 0644);
+MODULE_PARM_DESC(cmd, "CP command that is run when the watchdog triggers (z/VM only)");
+
+module_param_named(conceal, conceal_on, bool, 0644);
+MODULE_PARM_DESC(conceal, "Enable the CONCEAL CP option while the watchdog is active (z/VM only)");
+
+module_param_named(nowayout, nowayout_info, bool, 0444);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default = CONFIG_WATCHDOG_NOWAYOUT)");
+
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("vmwatchdog");
+
+static int __diag288(unsigned int func, unsigned int timeout,
+                     unsigned long action, unsigned int len)
+{
+        register unsigned long __func asm("2") = func;
+        register unsigned long __timeout asm("3") = timeout;
+        register unsigned long __action asm("4") = action;
+        register unsigned long __len asm("5") = len;
+        int err;
+
+        err = -EINVAL;
+        asm volatile(
+                "       diag    %1, %3, 0x288\n"
+                "0:     la      %0, 0\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : "+d" (err) : "d"(__func), "d"(__timeout),
+                  "d"(__action), "d"(__len) : "1", "cc");
+        return err;
+}
+
+static int __diag288_vm(unsigned int  func, unsigned int timeout,
+                        char *cmd, size_t len)
+{
+        return __diag288(func, timeout, virt_to_phys(cmd), len);
+}
+
+static int __diag288_lpar(unsigned int func, unsigned int timeout,
+                          unsigned long action)
+{
+        return __diag288(func, timeout, action, 0);
+}
+
+static int wdt_start(struct watchdog_device *dev)
+{
+        char *ebc_cmd;
+        size_t len;
+        int ret;
+        unsigned int func;
+
+        ret = -ENODEV;
+
+        if (MACHINE_IS_VM) {
+                ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
+                if (!ebc_cmd)
+                        return -ENOMEM;
+                len = strlcpy(ebc_cmd, wdt_cmd, MAX_CMDLEN);
+                ASCEBC(ebc_cmd, MAX_CMDLEN);
+                EBC_TOUPPER(ebc_cmd, MAX_CMDLEN);
+
+                func = conceal_on ? (WDT_FUNC_INIT | WDT_FUNC_CONCEAL)
+                        : WDT_FUNC_INIT;
+                ret = __diag288_vm(func, dev->timeout, ebc_cmd, len);
+                WARN_ON(ret != 0);
+                kfree(ebc_cmd);
+        }
+
+        if (MACHINE_IS_LPAR) {
+                ret = __diag288_lpar(WDT_FUNC_INIT,
+                                     dev->timeout, LPARWDT_RESTART);
+        }
+
+        if (ret) {
+                pr_err("The watchdog cannot be activated\n");
+                return ret;
+        }
+        pr_info("The watchdog was activated\n");
+        return 0;
+}
+
+static int wdt_stop(struct watchdog_device *dev)
+{
+        int ret;
+
+        ret = __diag288(WDT_FUNC_CANCEL, 0, 0, 0);
+        pr_info("The watchdog was deactivated\n");
+        return ret;
+}
+
+static int wdt_ping(struct watchdog_device *dev)
+{
+        char *ebc_cmd;
+        size_t len;
+        int ret;
+        unsigned int func;
+
+        ret = -ENODEV;
+
+        if (MACHINE_IS_VM) {
+                ebc_cmd = kmalloc(MAX_CMDLEN, GFP_KERNEL);
+                if (!ebc_cmd)
+                        return -ENOMEM;
+                len = strlcpy(ebc_cmd, wdt_cmd, MAX_CMDLEN);
+                ASCEBC(ebc_cmd, MAX_CMDLEN);
+                EBC_TOUPPER(ebc_cmd, MAX_CMDLEN);
+
+                /*
+                 * It seems to be ok to z/VM to use the init function to
+                 * retrigger the watchdog. On LPAR WDT_FUNC_CHANGE must
+                 * be used when the watchdog is running.
+                 */
+                func = conceal_on ? (WDT_FUNC_INIT | WDT_FUNC_CONCEAL)
+                        : WDT_FUNC_INIT;
+
+                ret = __diag288_vm(func, dev->timeout, ebc_cmd, len);
+                WARN_ON(ret != 0);
+                kfree(ebc_cmd);
+        }
+
+        if (MACHINE_IS_LPAR)
+                ret = __diag288_lpar(WDT_FUNC_CHANGE, dev->timeout, 0);
+
+        if (ret)
+                pr_err("The watchdog timer cannot be started or reset\n");
+        return ret;
+}
+
+static int wdt_set_timeout(struct watchdog_device * dev, unsigned int new_to)
+{
+        dev->timeout = new_to;
+        return wdt_ping(dev);
+}
+
+static struct watchdog_ops wdt_ops = {
+        .owner = THIS_MODULE,
+        .start = wdt_start,
+        .stop = wdt_stop,
+        .ping = wdt_ping,
+        .set_timeout = wdt_set_timeout,
+};
+
+static struct watchdog_info wdt_info = {
+        .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+        .firmware_version = 0,
+        .identity = "z Watchdog",
+};
+
+static struct watchdog_device wdt_dev = {
+        .parent = NULL,
+        .info = &wdt_info,
+        .ops = &wdt_ops,
+        .bootstatus = 0,
+        .timeout = WDT_DEFAULT_TIMEOUT,
+        .min_timeout = MIN_INTERVAL,
+        .max_timeout = MAX_INTERVAL,
+};
+
+/*
+ * It makes no sense to go into suspend while the watchdog is running.
+ * Depending on the memory size, the watchdog might trigger, while we
+ * are still saving the memory.
+ * We reuse the open flag to ensure that suspend and watchdog open are
+ * exclusive operations
+ */
+static int wdt_suspend(void)
+{
+        if (test_and_set_bit(WDOG_DEV_OPEN, &wdt_dev.status)) {
+                pr_err("Linux cannot be suspended while the watchdog is in use\n");
+                return notifier_from_errno(-EBUSY);
+        }
+        if (test_bit(WDOG_ACTIVE, &wdt_dev.status)) {
+                clear_bit(WDOG_DEV_OPEN, &wdt_dev.status);
+                pr_err("Linux cannot be suspended while the watchdog is in use\n");
+                return notifier_from_errno(-EBUSY);
+        }
+        return NOTIFY_DONE;
+}
+
+static int wdt_resume(void)
+{
+        clear_bit(WDOG_DEV_OPEN, &wdt_dev.status);
+        return NOTIFY_DONE;
+}
+
+static int wdt_power_event(struct notifier_block *this, unsigned long event,
+                           void *ptr)
+{
+        switch (event) {
+        case PM_POST_HIBERNATION:
+        case PM_POST_SUSPEND:
+                return wdt_resume();
+        case PM_HIBERNATION_PREPARE:
+        case PM_SUSPEND_PREPARE:
+                return wdt_suspend();
+        default:
+                return NOTIFY_DONE;
+        }
+}
+
+static struct notifier_block wdt_power_notifier = {
+        .notifier_call = wdt_power_event,
+};
+
+static int __init diag288_init(void)
+{
+        int ret;
+        char ebc_begin[] = {
+                194, 197, 199, 201, 213
+        };
+
+        watchdog_set_nowayout(&wdt_dev, nowayout_info);
+
+        if (MACHINE_IS_VM) {
+                pr_info("The watchdog device driver detected a z/VM environment\n");
+                if (__diag288_vm(WDT_FUNC_INIT, 15,
+                                 ebc_begin, sizeof(ebc_begin)) != 0) {
+                        pr_err("The watchdog cannot be initialized\n");
+                        return -EINVAL;
+                }
+        } else if (MACHINE_IS_LPAR) {
+                pr_info("The watchdog device driver detected an LPAR environment\n");
+                if (__diag288_lpar(WDT_FUNC_INIT, 30, LPARWDT_RESTART)) {
+                        pr_err("The watchdog cannot be initialized\n");
+                        return -EINVAL;
+                }
+        } else {
+                pr_err("Linux runs in an environment that does not support the diag288 watchdog\n");
+                return -ENODEV;
+        }
+
+        if (__diag288_lpar(WDT_FUNC_CANCEL, 0, 0)) {
+                pr_err("The watchdog cannot be deactivated\n");
+                return -EINVAL;
+        }
+
+        ret = register_pm_notifier(&wdt_power_notifier);
+        if (ret)
+                return ret;
+
+        ret = watchdog_register_device(&wdt_dev);
+        if (ret)
+                unregister_pm_notifier(&wdt_power_notifier);
+
+        return ret;
+}
+
+static void __exit diag288_exit(void)
+{
+        watchdog_unregister_device(&wdt_dev);
+        unregister_pm_notifier(&wdt_power_notifier);
+}
+
+module_init(diag288_init);
+module_exit(diag288_exit);
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 6d325bda76da..5d4de88fe5b8 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1168,7 +1168,8 @@ int gnttab_resume(void)
 
 int gnttab_suspend(void)
 {
-        gnttab_interface->unmap_frames();
+        if (!xen_feature(XENFEAT_auto_translated_physmap))
+                gnttab_interface->unmap_frames();
         return 0;
 }